JBoss Tools SVN: r44560 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-10-17 13:26:08 -0400 (Wed, 17 Oct 2012)
New Revision: 44560
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIImages.java
Log:
JBIDE-12866
https://issues.jboss.org/browse/JBIDE-12866
CommonUIImages modified.
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIImages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIImages.java 2012-10-17 16:56:48 UTC (rev 44559)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIImages.java 2012-10-17 17:26:08 UTC (rev 44560)
@@ -82,7 +82,10 @@
public final Image getOrCreateImage(String key) {
getOrCreateImageDescriptor(key);
- return getImageRegistry().get(key);
+ ImageRegistry registry = getImageRegistry();
+ synchronized(registry) {
+ return registry.get(key);
+ }
}
public final Image getImageByFileName(String key) {
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44559 - in trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui: wizard/service and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-10-17 12:56:48 -0400 (Wed, 17 Oct 2012)
New Revision: 44559
Added:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIImages.java
Removed:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ModelUIImages.java
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java
Log:
JBIDE-12866
https://issues.jboss.org/browse/JBIDE-12866
CommonUIImages modified.
Copied: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIImages.java (from rev 44556, trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ModelUIImages.java)
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIImages.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIImages.java 2012-10-17 16:56:48 UTC (rev 44559)
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.common.ui.CommonUIPlugin;
+
+public class CommonUIImages {
+ private static CommonUIImages INSTANCE;
+
+ static {
+ try {
+ INSTANCE = new CommonUIImages(new URL(CommonUIPlugin.getDefault().getBundle().getEntry("/"), "icons/")); //$NON-NLS-1$ //$NON-NLS-2$
+ } catch (MalformedURLException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ }
+
+ public static final String JAVA_SERVICE_PROVIDER_IMAGE = "wizard/JavaServiceProviderWizBan.png"; //$NON-NLS-1$
+ public static final String NEW_JAVA_SERVICE_PROVIDER_IMAGE = "wizard/NewJavaServiceProviderWizBan.png"; //$NON-NLS-1$
+
+ public final static Image getImage(ImageDescriptor descriptor) {
+ return CommonUIPlugin.getImageDescriptorRegistry().get(descriptor);
+ }
+
+ public static void setImageDescriptors(IAction action, String iconName) {
+ action.setImageDescriptor(getInstance().getOrCreateImageDescriptor(iconName));
+ }
+
+ public static CommonUIImages getInstance() {
+ return INSTANCE;
+ }
+
+ protected URL baseUrl;
+ protected CommonUIImages parentRegistry;
+
+ protected CommonUIImages(URL registryUrl, CommonUIImages parent){
+ if(registryUrl == null) throw new IllegalArgumentException(CommonUIMessages.IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL);
+ baseUrl = registryUrl;
+ parentRegistry = parent;
+ }
+
+ protected CommonUIImages(URL url){
+ this(url,null);
+ }
+
+ protected ImageRegistry getImageRegistry() {
+ return CommonUIPlugin.getDefault().getImageRegistry();
+ }
+
+ public final ImageDescriptor getOrCreateImageDescriptor(String key) {
+ ImageDescriptor result = null;
+ ImageRegistry registry = getImageRegistry();
+ synchronized(registry) {
+ result = registry.getDescriptor(key);
+ }
+ if(result == null) {
+ result = createImageDescriptor(key);
+ if(result != null) {
+ synchronized (registry) {
+ registry.remove(key);
+ registry.put(key, result);
+ }
+ }
+ }
+ return result;
+ }
+
+ public final Image getOrCreateImage(String key) {
+ getOrCreateImageDescriptor(key);
+ return getImageRegistry().get(key);
+ }
+
+ public final Image getImageByFileName(String key) {
+ return getOrCreateImage(key);
+ }
+
+ public final ImageDescriptor createImageDescriptor(String key) {
+ try {
+ return ImageDescriptor.createFromURL(makeIconFileURL(key));
+ } catch (MalformedURLException e) {
+ if(parentRegistry == null) {
+ return ImageDescriptor.getMissingImageDescriptor();
+ } else {
+ return parentRegistry.createImageDescriptor(key);
+ }
+ }
+ }
+
+ private URL makeIconFileURL(String name) throws MalformedURLException {
+ if (name == null) throw new MalformedURLException(CommonUIMessages.IMAGESIMAGE_NAME_CANNOT_BE_NULL);
+ return new URL(baseUrl, name);
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIImages.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ModelUIImages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ModelUIImages.java 2012-10-17 16:08:14 UTC (rev 44558)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/ModelUIImages.java 2012-10-17 16:56:48 UTC (rev 44559)
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.common.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.jboss.tools.common.ui.CommonUIPlugin;
-
-public class ModelUIImages {
-
- private static ModelUIImages INSTANCE;
-
- static {
- try {
- INSTANCE = new ModelUIImages(new URL(CommonUIPlugin.getDefault().getBundle().getEntry("/"), "icons/")); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (MalformedURLException e) {
- CommonUIPlugin.getDefault().logError(e);
- }
- }
-
- public static final String JAVA_SERVICE_PROVIDER_IMAGE = "wizard/JavaServiceProviderWizBan.png"; //$NON-NLS-1$
- public static final String NEW_JAVA_SERVICE_PROVIDER_IMAGE = "wizard/NewJavaServiceProviderWizBan.png"; //$NON-NLS-1$
-
- public static Image getImage(ImageDescriptor descriptor) {
- return CommonUIPlugin.getImageDescriptorRegistry().get(descriptor);
- }
-
- public static Image getImage(String key) {
- return INSTANCE.createImageDescriptor(key).createImage();
- }
-
- public static ImageDescriptor getImageDescriptor(String key) {
- return INSTANCE.createImageDescriptor(key);
- }
-
- public static void setImageDescriptors(IAction action, String iconName) {
- action.setImageDescriptor(INSTANCE.createImageDescriptor(iconName));
- }
-
- public static ModelUIImages getInstance() {
- return INSTANCE;
- }
-
- private URL baseUrl;
- private ModelUIImages parentRegistry;
-
- protected ModelUIImages(URL registryUrl, ModelUIImages parent){
- if(registryUrl == null) throw new IllegalArgumentException(CommonUIMessages.IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL);
- baseUrl = registryUrl;
- parentRegistry = parent;
- }
-
- protected ModelUIImages(URL url){
- this(url,null);
- }
-
- public Image getImageByFileName(String key) {
- return createImageDescriptor(key).createImage();
- }
-
- public ImageDescriptor createImageDescriptor(String key) {
- try {
- return ImageDescriptor.createFromURL(makeIconFileURL(key));
- } catch (MalformedURLException e) {
- if(parentRegistry == null) {
- return ImageDescriptor.getMissingImageDescriptor();
- } else {
- return parentRegistry.createImageDescriptor(key);
- }
- }
- }
-
- private URL makeIconFileURL(String name) throws MalformedURLException {
- if (name == null) throw new MalformedURLException(CommonUIMessages.IMAGESIMAGE_NAME_CANNOT_BE_NULL);
- return new URL(baseUrl, name);
- }
-
-}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java 2012-10-17 16:08:14 UTC (rev 44558)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/NewServiceWizardPage.java 2012-10-17 16:56:48 UTC (rev 44559)
@@ -47,7 +47,7 @@
import org.jboss.tools.common.ui.CommonUIMessages;
import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.common.ui.IValidator;
-import org.jboss.tools.common.ui.ModelUIImages;
+import org.jboss.tools.common.ui.CommonUIImages;
import org.jboss.tools.common.ui.widget.editor.ButtonFieldEditor.ButtonPressedAction;
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
import org.jboss.tools.common.ui.widget.editor.SwtFieldEditorFactory;
@@ -68,7 +68,7 @@
public NewServiceWizardPage() {
setTitle(CommonUIMessages.NEW_SERVICE_WIZARD_PAGE_NAME);
setDescription(CommonUIMessages.NEW_SERVICE_WIZARD_DESCRIPTION);
- setImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.NEW_JAVA_SERVICE_PROVIDER_IMAGE));
+ setImageDescriptor(CommonUIImages.getInstance().getOrCreateImageDescriptor(CommonUIImages.NEW_JAVA_SERVICE_PROVIDER_IMAGE));
}
public void init(IStructuredSelection selection) {
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java 2012-10-17 16:08:14 UTC (rev 44558)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/wizard/service/RegisterAsServiceDialog.java 2012-10-17 16:56:48 UTC (rev 44559)
@@ -29,7 +29,7 @@
import org.jboss.tools.common.java.ParametedTypeFactory;
import org.jboss.tools.common.ui.CommonUIMessages;
import org.jboss.tools.common.ui.CommonUIPlugin;
-import org.jboss.tools.common.ui.ModelUIImages;
+import org.jboss.tools.common.ui.CommonUIImages;
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
@@ -72,7 +72,7 @@
protected Control createDialogArea(Composite parent) {
getShell().setText(CommonUIMessages.REGISTER_AS_SERVICE_TITLE);
setTitle(NLS.bind(CommonUIMessages.REGISTER_AS_SERVICE_SUB_TITLE, type.getFullyQualifiedName()));
- setTitleImage(ModelUIImages.getImage(ModelUIImages.JAVA_SERVICE_PROVIDER_IMAGE)); // image is managed by registry
+ setTitleImage(CommonUIImages.getInstance().getOrCreateImage(CommonUIImages.JAVA_SERVICE_PROVIDER_IMAGE)); // image is managed by registry
setMessage(CommonUIMessages.REGISTER_AS_SERVICE_MESSAGE);
if(types.isEmpty()) {
setErrorMessage(CommonUIMessages.REGISTER_AS_SERVICE_NO_TYPES_MESSAGE);
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44558 - in trunk/ws: tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-10-17 12:08:14 -0400 (Wed, 17 Oct 2012)
New Revision: 44558
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaScannerTestCase.java
Log:
Fixed - JBIDE-12887 - JAX-RS should not analyse jars in the project's classpath
https://issues.jboss.org/browse/JBIDE-12887
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java 2012-10-17 15:49:34 UTC (rev 44557)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilter.java 2012-10-17 16:08:14 UTC (rev 44558)
@@ -41,6 +41,7 @@
import org.eclipse.jdt.core.ElementChangedEvent;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaElementDelta;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.jboss.tools.ws.jaxrs.core.internal.utils.ConstantUtils;
import org.jboss.tools.ws.jaxrs.core.internal.utils.Logger;
import org.jboss.tools.ws.jaxrs.core.jdt.JdtUtils;
@@ -124,7 +125,8 @@
IJavaElement element = event.getElement();
// prevent processing java elements in a closed java project
// prevent processing of any file named 'package-info.java'
- if (isProjectClosed(element) || isPackageInfoFile(element)) {
+ // prevent processing of any jar file
+ if (isProjectClosed(element) || isPackageInfoFile(element) || isJarArchive(element)) {
return false;
}
int flags = event.getFlags();
@@ -142,6 +144,16 @@
}
/**
+ *
+ * @param element
+ * @return true if the given java element is a Jar archive.
+ */
+ private boolean isJarArchive(IJavaElement element) {
+ return (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT && ((IPackageFragmentRoot)element).isArchive());
+
+ }
+
+ /**
* Returns true if the element resource is a file named 'package-info.java' (whatever the containing folder)
* @param element
* @return
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java 2012-10-17 15:49:34 UTC (rev 44557)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaFilterTestCase.java 2012-10-17 16:08:14 UTC (rev 44558)
@@ -13,7 +13,7 @@
import static org.eclipse.core.resources.IResourceDelta.REMOVED;
import static org.eclipse.jdt.core.ElementChangedEvent.POST_CHANGE;
import static org.eclipse.jdt.core.ElementChangedEvent.POST_RECONCILE;
-import static org.eclipse.jdt.core.IJavaElement.ANNOTATION;
+import static org.eclipse.jdt.core.IJavaElement.*;
import static org.eclipse.jdt.core.IJavaElement.COMPILATION_UNIT;
import static org.eclipse.jdt.core.IJavaElement.METHOD;
import static org.eclipse.jdt.core.IJavaElement.TYPE;
@@ -30,6 +30,7 @@
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.junit.Before;
@@ -117,4 +118,18 @@
assertFalse("Wrong result", filter.apply(createEvent(element, REMOVED, POST_CHANGE, NO_FLAG)));
}
+ @Test
+ public void shouldNotAcceptChangesInJarFile() {
+ IPackageFragmentRoot element = createMock(IPackageFragmentRoot.class, PACKAGE_FRAGMENT_ROOT);
+ IResource resource = mock(IResource.class);
+ when(element.getResource()).thenReturn(resource);
+ when(element.isArchive()).thenReturn(true);
+ when(resource.getType()).thenReturn(IResource.FILE);
+ assertFalse("Wrong result", filter.apply(createEvent(element, ADDED, POST_RECONCILE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, ADDED, POST_CHANGE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, CHANGED, POST_RECONCILE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, CHANGED, POST_CHANGE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, REMOVED, POST_RECONCILE, NO_FLAG)));
+ assertFalse("Wrong result", filter.apply(createEvent(element, REMOVED, POST_CHANGE, NO_FLAG)));
+ }
}
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaScannerTestCase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaScannerTestCase.java 2012-10-17 15:49:34 UTC (rev 44557)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JavaElementDeltaScannerTestCase.java 2012-10-17 16:08:14 UTC (rev 44558)
@@ -549,12 +549,12 @@
}
@Test
- public void shouldNotifyWhenLibraryAddedInClasspath() throws CoreException, InterruptedException {
+ public void shouldNotNotifyWhenLibraryAddedInClasspath() throws CoreException, InterruptedException {
// operation
IPackageFragmentRoot addedEntry = WorkbenchTasks.addClasspathEntry(javaProject, "slf4j-api-1.5.2.jar",
new NullProgressMonitor());
// verifications
- verifyEventNotification(addedEntry, ADDED, POST_CHANGE, NO_FLAG, times(1));
+ verifyEventNotification(addedEntry, ADDED, POST_CHANGE, NO_FLAG, times(0));
}
@Test
@@ -567,13 +567,13 @@
}
@Test
- public void shouldNotifyWhenLibraryRemovedFromClasspath() throws CoreException, InterruptedException {
+ public void shouldNotNotifyWhenLibraryRemovedFromClasspath() throws CoreException, InterruptedException {
// operation
List<IPackageFragmentRoot> removedEntries = WorkbenchUtils.removeClasspathEntry(javaProject,
"jaxrs-api-2.0.1.GA.jar", null);
// verifications
for (IPackageFragmentRoot removedEntry : removedEntries) {
- verifyEventNotification(removedEntry, REMOVED, POST_CHANGE, F_REMOVED_FROM_CLASSPATH, times(1));
+ verifyEventNotification(removedEntry, REMOVED, POST_CHANGE, F_REMOVED_FROM_CLASSPATH, times(0));
}
}
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44557 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/core/behaviour and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-10-17 11:49:34 -0400 (Wed, 17 Oct 2012)
New Revision: 44557
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionMarker.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizard.java
Log:
[JBIDE-12864] fixed NPE by refactoring connection model
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-10-17 15:49:34 UTC (rev 44557)
@@ -56,12 +56,34 @@
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.openshift.express.internal.core;x-friends:="org.jboss.tools.openshift.express.test",
org.jboss.tools.openshift.express.internal.core.behaviour;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.core.connection;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.core.portforward;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.core.util;x-friends:="org.jboss.tools.openshift.express.test",
org.jboss.tools.openshift.express.internal.ui;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.action;x-friends:="org.jboss.tools.openshift.express.test",
org.jboss.tools.openshift.express.internal.ui.behaviour;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.command;x-friends:="org.jboss.tools.openshift.express.test",
org.jboss.tools.openshift.express.internal.ui.console;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.databinding;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.explorer;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.explorer.actionDelegate;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.job;x-friends:="org.jboss.tools.openshift.express.test",
org.jboss.tools.openshift.express.internal.ui.messages;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.preferences;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.property;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.propertytable;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.serverviewer.actionDelegate;x-friends:="org.jboss.tools.openshift.express.test",
org.jboss.tools.openshift.express.internal.ui.utils;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.viewer;x-friends:="org.jboss.tools.openshift.express.test",
org.jboss.tools.openshift.express.internal.ui.wizard;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.wizard.application;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.wizard.application.details;x-friends:="org.jboss.tools.openshift.express.test",
org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation;x-friends:="org.jboss.tools.openshift.express.test",
- org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.project;x-friends:="org.jboss.tools.openshift.express.test"
+ org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.project;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.wizard.connection;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.wizard.domain;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.wizard.embed;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.wizard.ssh;x-friends:="org.jboss.tools.openshift.express.test",
+ org.jboss.tools.openshift.express.internal.ui.wizard.ssh.databinding;x-friends:="org.jboss.tools.openshift.express.test"
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -480,7 +480,7 @@
private static void setConnectionUrl(Connection connection, IEclipsePreferences node) {
try {
- node.put(ExpressServerUtils.SETTING_CONNECTIONURL, connection.toURLString());
+ node.put(ExpressServerUtils.SETTING_CONNECTIONURL, ConnectionUtils.getUrlForConnection(connection));
if (hasUsername(node)) {
node.put(ExpressServerUtils.SETTING_USERNAME, connection.getUsername());
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -67,16 +67,21 @@
this(null, null, null, false);
}
- public Connection(String username, ICredentialsPrompter prompter) {
+ public Connection(String username) {
this.username = username;
- this.prompter = prompter;
}
-
- public Connection(URL url, ICredentialsPrompter prompter) throws MalformedURLException, UnsupportedEncodingException {
+
+ public Connection(String username, String host) {
+ this.username = username;
+ setHost(host);
+ }
+
+ public Connection(URL url, ICredentialsPrompter prompter) throws MalformedURLException,
+ UnsupportedEncodingException {
UrlPortions portions = UrlUtils.toPortions(url);
this.username = portions.getUsername();
this.password = portions.getPassword();
- setHost(portions.getHost());
+ setHost(portions.getProtocol() + UrlUtils.SCHEME_SEPARATOR + portions.getHost());
this.prompter = prompter;
}
@@ -111,7 +116,7 @@
}
return username;
}
-
+
private void setUser(IUser user) {
if (user == null) {
return;
@@ -154,36 +159,37 @@
*/
public String getHost() {
if (isDefaultHost()) {
- return UrlUtils.cutScheme(ConnectionUtils.getDefaultHostUrl());
+ return ConnectionUtils.getDefaultHostUrl();
}
return host;
}
+
+ /**
+ * Returns the scheme of this connections. Returns https by default;
+ * @return
+ */
+ public String getScheme() {
+ String scheme = UrlUtils.getScheme(getHost());
+ if (StringUtils.isEmpty(scheme)) {
+ scheme = UrlUtils.HTTPS;
+ }
+ return scheme;
+ }
public String setHost(String host) {
- if (isDefaultHost(host)) {
- this.host = null;
- } else {
- this.host = host;
+ if (!UrlUtils.hasScheme(host)) {
+ host = UrlUtils.SCHEME_HTTPS + StringUtils.null2emptyString(host);
}
+ this.host = host;
clearUser();
return host;
}
-
- public boolean isDefaultHost() {
- return isDefaultHost(host);
+ private boolean isDefaultHost() {
+ return ConnectionUtils.isDefaultHost(host);
}
- private boolean isDefaultHost(String host) {
- try {
- return StringUtils.isEmpty(host)
- || new URL(UrlUtils.ensureStartsWithSchemeOrHttps(host)).getHost().isEmpty();
- } catch (MalformedURLException e) {
- return true;
- }
- }
-
public boolean isRememberPassword() {
return rememberPassword;
}
@@ -460,13 +466,4 @@
SecurePasswordStore store = new SecurePasswordStore(key);
return store;
}
-
- /**
- * @return an url-alike string that always starts with a scheme but
- * eventually has no host where the default host shall be used.
- * @throws UnsupportedEncodingException
- */
- public String toURLString() throws UnsupportedEncodingException {
- return UrlUtils.toUrlString(username, host);
- }
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionUtils.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionUtils.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -12,6 +12,7 @@
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
+import java.net.URL;
import org.jboss.tools.openshift.express.internal.core.util.UrlUtils;
import org.jboss.tools.openshift.express.internal.core.util.UrlUtils.UrlPortions;
@@ -19,6 +20,7 @@
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+import com.openshift.client.configuration.IOpenShiftConfiguration;
import com.openshift.client.configuration.OpenShiftConfiguration;
/**
@@ -31,16 +33,48 @@
}
public static String getUrlForUsername(String username) throws UnsupportedEncodingException, MalformedURLException {
+ if (StringUtils.isEmpty(username)) {
+ return null;
+ }
UrlPortions portions = UrlUtils.toPortions(getDefaultHostUrl());
- return UrlUtils.getUrlFor(username, portions.getHost(), portions.getProtocol());
+ return UrlUtils.getUrlFor(username, null, portions.getProtocol() + UrlUtils.SCHEME_SEPARATOR);
}
+ public static String getUrlForUsernameAndHost(String username, String host) throws UnsupportedEncodingException {
+ String scheme = UrlUtils.SCHEME_HTTPS;
+ if (isDefaultHost(host)) {
+ scheme = UrlUtils.ensureStartsWithSchemeOrHttps(UrlUtils.getScheme(host));
+ host = null;
+ } else if (UrlUtils.hasScheme(host)) {
+ scheme = UrlUtils.getScheme(host);
+ host = UrlUtils.cutScheme(host);
+ }
+ return UrlUtils.getUrlFor(username, host, scheme);
+ }
+
/**
+ * @return an url-alike string that always starts with a scheme but
+ * eventually has no host where the default host shall be used.
+ * @throws UnsupportedEncodingException
+ */
+ public static String getUrlForConnection(Connection connection) throws UnsupportedEncodingException {
+ String username = connection.getUsername();
+ String host = connection.getHost();
+ if (isDefaultHost(host)) {
+ host = null;
+ }
+ return UrlUtils.toUrlString(username, host, connection.getScheme());
+ }
+
+ /**
* Returns the default host from the preferences if present. If it's not it
* will return the host defined in the OpenShift configuration. The host
* that is returned will always have the scheme prefix.
*
* @return the default host
+ *
+ * @see OpenShiftPreferences#getDefaultHost()
+ * @see IOpenShiftConfiguration#getLibraServer()
*/
public static String getDefaultHostUrl() {
try {
@@ -54,4 +88,39 @@
}
return null;
}
+
+ /**
+ * Returns <code>true</code> if the given host is the default host. This
+ * method reports a given String is the default host if it is empty or if
+ * it's equal to the default host defined for this plugin. This plugin takes
+ * the default host from the preferences or the openshift configuration. If
+ * the given host has no scheme this method will assume it's https.
+ *
+ * @param host
+ * the host to check whether it is the default host
+ * @return true if it is equal to the default host
+ *
+ * @see getDefaultHost()
+ */
+ public static boolean isDefaultHost(String host) {
+ return isEmptyHost(host)
+ || getDefaultHostUrl().equals(UrlUtils.ensureStartsWithSchemeOrHttps(host));
+ }
+
+ /**
+ * Returns <code>true</code> if the given host is an empty string or is an
+ * url with an empty host portion.
+ *
+ * @param host
+ * the host to check whether it is empty
+ * @return true if empty string or url without a host portion
+ */
+ public static boolean isEmptyHost(String host) {
+ try {
+ return StringUtils.isEmpty(host)
+ || new URL(UrlUtils.ensureStartsWithSchemeOrHttps(host)).getHost().isEmpty();
+ } catch (MalformedURLException e) {
+ return false;
+ }
+ }
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -64,7 +64,7 @@
public void addConnection(Connection connection) {
try {
- allConnections.put(connection.toURLString(), connection);
+ allConnections.put(ConnectionUtils.getUrlForConnection(connection), connection);
this.recentConnection = connection;
fireModelChange(connection, ADDED);
} catch (UnsupportedEncodingException e) {
@@ -76,7 +76,7 @@
public boolean hasConnection(Connection connection) {
try {
- String url = connection.toURLString();
+ String url = ConnectionUtils.getUrlForConnection(connection);
return getConnectionByUrl(url) != null;
} catch (UnsupportedEncodingException e) {
OpenShiftUIActivator.log(
@@ -92,7 +92,7 @@
public void removeConnection(Connection connection) {
try {
- allConnections.remove(connection.toURLString());
+ allConnections.remove(ConnectionUtils.getUrlForConnection(connection));
if (this.recentConnection == connection)
this.recentConnection = null;
fireModelChange(connection, REMOVED);
@@ -139,13 +139,24 @@
return allConnections.get(url);
}
+ public Connection getConnectionByUsernameAndHost(String username, String host) {
+ try {
+ return getConnectionByUrl(ConnectionUtils.getUrlForUsernameAndHost(username, host));
+ } catch (UnsupportedEncodingException e) {
+ OpenShiftUIActivator.log(NLS.bind("Could not get url for connection {0} - {1}", username, host), e);
+ return null;
+ }
+ }
+
public Connection getConnectionByUsername(String username) {
try {
- String url = new Connection(username, null).toURLString();
- return getConnectionByUrl(url);
+ return getConnectionByUrl(ConnectionUtils.getUrlForUsername(username));
} catch (UnsupportedEncodingException e) {
OpenShiftUIActivator.log(NLS.bind("Could not get url for connection {0}", username), e);
return null;
+ } catch (MalformedURLException e) {
+ OpenShiftUIActivator.log(NLS.bind("Could not get url for connection {0}", username), e);
+ return null;
}
}
@@ -158,7 +169,7 @@
/**
* Load the user list from preferences and secure storage
*/
- public void load() {
+ private void load() {
String[] connections = OpenShiftPreferences.INSTANCE.getConnections();
for (int i = 0; i < connections.length; i++) {
Connection connection = null;
@@ -183,7 +194,7 @@
Connection connection = entry.getValue();
connection.save();
try {
- persistedConnections.add(connection.toURLString());
+ persistedConnections.add(ConnectionUtils.getUrlForConnection(connection));
} catch (UnsupportedEncodingException e) {
OpenShiftUIActivator.log(
NLS.bind("Could not store connection {0}/{1}", connection.getUsername(), connection.getHost()),
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -82,9 +82,8 @@
}
- public static String toUrlString(String username, String host) throws UnsupportedEncodingException {
- host = cutScheme(host);
- StringBuilder builder = new StringBuilder();
+ public static String toUrlString(String username, String host, String scheme) throws UnsupportedEncodingException {
+ StringBuilder builder = new StringBuilder(scheme);
if (!isEmpty(username)) {
builder.append(URLEncoder.encode(username, "UTF-8"))
.append(CREDENTIALS_HOST_SEPARATOR);
@@ -92,7 +91,7 @@
if (!isEmpty(host)) {
builder.append(host);
}
- return ensureStartsWithSchemeOrHttps(builder.toString());
+ return (builder.toString());
}
public static String ensureStartsWithSchemeOrHttps(String host) {
@@ -109,20 +108,39 @@
if (isEmpty(host)) {
return host;
}
- int schemeDelimiterIndex = getSchemeIndex(host);
- if (schemeDelimiterIndex > -1) {
- return host.substring(schemeDelimiterIndex + SCHEME_SEPARATOR.length());
+ int hostIndex = getHostIndex(host);
+ if (hostIndex > -1) {
+ return host.substring(hostIndex);
}
return host;
}
- private static boolean hasScheme(String host) {
+ public static String getScheme(String url) {
+ if (isEmpty(url)) {
+ return null;
+ }
+
+ int hostIndex = getHostIndex(url);
+ if (hostIndex == -1) {
+ return null;
+ }
+
+ return url.substring(0, hostIndex);
+ }
+
+ public static boolean hasScheme(String host) {
+ if (isEmpty(host)) {
+ return false;
+ }
return host.indexOf(SCHEME_SEPARATOR) > -1;
}
- private static int getSchemeIndex(String host) {
- int schemeDelimiterIndex = host.indexOf(SCHEME_SEPARATOR);
- return schemeDelimiterIndex;
+ private static int getHostIndex(String url) {
+ int schemeSeparatorIndex = url.indexOf(SCHEME_SEPARATOR);
+ if (schemeSeparatorIndex == -1) {
+ return schemeSeparatorIndex;
+ }
+ return schemeSeparatorIndex + SCHEME_SEPARATOR.length();
}
private static boolean isEmpty(String string) {
@@ -141,19 +159,21 @@
* @param scheme
* the scheme to prepend
* @return
+ * @throws UnsupportedEncodingException
*/
- public static String getUrlFor(String username, String host, String scheme) {
+ public static String getUrlFor(String username, String host, String scheme) throws UnsupportedEncodingException {
StringBuilder builder = new StringBuilder();
- if (StringUtils.isEmpty(host)
- || !hasScheme(host)) {
- builder.append(scheme).append(SCHEME_SEPARATOR);
+ if (!hasScheme(host)) {
+ builder.append(scheme);
}
if (!StringUtils.isEmpty(username)) {
- builder.append(username)
+ builder.append(URLEncoder.encode(username, "UTF-8"))
.append(UrlUtils.CREDENTIALS_HOST_SEPARATOR);
}
- return builder.append(host)
- .toString();
+ if (!isEmpty(host)) {
+ builder.append(host);
+ }
+ return builder.toString();
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -22,6 +22,7 @@
import org.jboss.tools.openshift.express.internal.ui.wizard.embed.EmbedCartridgeWizard;
import com.openshift.client.IApplication;
+import com.openshift.client.IUser;
import com.openshift.client.OpenShiftException;
/**
@@ -40,8 +41,9 @@
if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) {
try {
final IApplication application = (IApplication) treeSelection.getFirstElement();
- final Connection user = ConnectionsModel.getDefault().getConnectionByUrl(application.getDomain().getUser().getRhlogin());
- EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, user);
+ final IUser user = application.getDomain().getUser();
+ final Connection connection = ConnectionsModel.getDefault().getConnectionByUsernameAndHost(user.getRhlogin(), user.getServer());
+ EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, connection);
int result = WizardUtils.openWizardDialog(wizard, Display.getCurrent().getActiveShell());
if(result == Dialog.OK) {
RefreshViewerJob.refresh(viewer);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -135,7 +135,7 @@
private void initModel() {
String connectionUrl = ExpressServerUtils.getExpressConnectionUrl(server);
- if (ConnectionUtils.getDefaultHostUrl().equals(connectionUrl)) {
+ if (ConnectionUtils.isDefaultHost(connectionUrl)) {
initModelNewServerWizard();
return;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionMarker.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionMarker.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/NewConnectionMarker.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -22,6 +22,6 @@
public class NewConnectionMarker extends Connection {
public NewConnectionMarker() {
- super();
+ super("<New Connection>");
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationWizardModel.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationWizardModel.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -21,11 +21,11 @@
public class ApplicationWizardModel extends ObservableUIPojo {
private IApplication application;
- private Connection user;
+ private Connection connection;
- public ApplicationWizardModel(IApplication application, Connection user) {
+ public ApplicationWizardModel(IApplication application, Connection connection) {
this.application = application;
- this.user = user;
+ this.connection = connection;
}
public IApplication getApplication() {
@@ -33,6 +33,6 @@
}
public Connection getUser() {
- return user;
+ return connection;
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -103,9 +103,7 @@
}
public void setSelectedConnection(Connection connection) {
- if ((this.selectedConnection instanceof NewConnectionMarker
- && connection instanceof NewConnectionMarker)
- || Diffs.equals(selectedConnection, connection)) {
+ if (Diffs.equals(selectedConnection, connection)) {
return;
}
this.isCreateNewConnection = getIsCreateNewConnection(connection);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizard.java 2012-10-17 10:35:47 UTC (rev 44556)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizard.java 2012-10-17 15:49:34 UTC (rev 44557)
@@ -24,8 +24,8 @@
private ApplicationWizardModel wizardModel;
private EmbedCartridgeWizardPage embedCartridgeWizardPage;
- public EmbedCartridgeWizard(IApplication application, Connection user) {
- this.wizardModel = new ApplicationWizardModel(application, user);
+ public EmbedCartridgeWizard(IApplication application, Connection connection) {
+ this.wizardModel = new ApplicationWizardModel(application, connection);
setNeedsProgressMonitor(true);
setWindowTitle("Edit Embedded Cartridges");
}
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44556 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-10-17 06:35:47 -0400 (Wed, 17 Oct 2012)
New Revision: 44556
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-12843 - Some VPE tests are failing when run on Git repository, fixed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java 2012-10-17 07:58:36 UTC (rev 44555)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1494Test.java 2012-10-17 10:35:47 UTC (rev 44556)
@@ -17,6 +17,7 @@
import org.eclipse.swt.custom.StyledText;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
@@ -57,12 +58,12 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- StyledText styledText = part.getSourceEditor().getTextViewer()
- .getTextWidget();
+ StructuredTextViewer textViewer = part.getSourceEditor().getTextViewer();
+ StyledText styledText = textViewer.getTextWidget();
+ int offset = TestUtil.getLinePositionOffcet(textViewer, 12, 9);
- styledText.setCaretOffset(424);
- Node h_outputText = (Node) ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 424);
+ styledText.setCaretOffset(offset);
+ Node h_outputText = (Node) ContentAssistUtils.getNodeAt(textViewer, offset);
assertNotNull(h_outputText);
@@ -77,8 +78,8 @@
//text formating for h:output
assertEquals(8, h_output_template.getTextFormattingData().getAllFormatData().length);
- Node h_dataTable = (Node) ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 473);
+ offset = TestUtil.getLinePositionOffcet(textViewer, 13, 9);
+ Node h_dataTable = (Node) ContentAssistUtils.getNodeAt(textViewer, offset);
assertNotNull(h_dataTable);
@@ -90,8 +91,8 @@
assertEquals(9, h_data_Table.getTextFormattingData().getAllFormatData().length);
- Node span =(Node) ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 615);
+ offset = TestUtil.getLinePositionOffcet(textViewer, 21, 4);
+ Node span =(Node) ContentAssistUtils.getNodeAt(textViewer, offset);
dependencySet=new HashSet();
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2012-10-17 07:58:36 UTC (rev 44555)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2584Test.java 2012-10-17 10:35:47 UTC (rev 44556)
@@ -75,7 +75,7 @@
assertEquals(simpleTextNode ,domMapping.getNearElementMappingAtVisualNode(domNode).getSourceNode());
assertEquals("Node should be a text node", nsIDOMNode.TEXT_NODE,domNode.getNodeType()); //$NON-NLS-1$
- assertEquals(simpleTextNode.getNodeValue(), domNode.getNodeValue());
+ assertEquals(simpleTextNode.getNodeValue().trim(), domNode.getNodeValue().trim());
}
public void testForElText() throws Throwable {
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2012-10-17 07:58:36 UTC (rev 44555)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE675Test.java 2012-10-17 10:35:47 UTC (rev 44556)
@@ -15,6 +15,7 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
+import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
@@ -125,14 +126,12 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- StyledText styledText = part.getSourceEditor().getTextViewer()
- .getTextWidget();
-
+ StructuredTextViewer textViewer = part.getSourceEditor().getTextViewer();
+ StyledText styledText = textViewer.getTextWidget();
+ int offset = TestUtil.getLinePositionOffcet(textViewer, 8, 14);
for (int i = 0; i < 20; i++) {
-
- styledText.setCaretOffset(311);
- IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 311);
+ styledText.setCaretOffset(offset);
+ IndexedRegion treeNode = ContentAssistUtils.getNodeAt(textViewer, offset);
Node node = (Node) treeNode;
assertNotNull(node);
@@ -183,15 +182,16 @@
// open and get editor
JSPMultiPageEditor part = openEditor(input);
- StyledText styledText = part.getSourceEditor().getTextViewer()
- .getTextWidget();
-
- styledText.setCaretOffset(285);
+ StructuredTextViewer textViewer = part.getSourceEditor().getTextViewer();
+ StyledText styledText = textViewer.getTextWidget();
+ int offset = TestUtil.getLinePositionOffcet(textViewer, 6, 25);
+
+ styledText.setCaretOffset(offset);
styledText.insert("<test></test>"); //$NON-NLS-1$
TestUtil.delay(450);
TestUtil.waitForJobs();
- IndexedRegion treeNode = ContentAssistUtils.getNodeAt(part
- .getSourceEditor().getTextViewer(), 290);
+ offset = TestUtil.getLinePositionOffcet(textViewer, 6, 30);
+ IndexedRegion treeNode = ContentAssistUtils.getNodeAt(textViewer, offset);
Node node = (Node) treeNode;
assertNotNull(node);
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html 2012-10-17 07:58:36 UTC (rev 44555)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/WebContent/pages/selection/jbide-8115-test-case.html 2012-10-17 10:35:47 UTC (rev 44556)
@@ -1,13 +1,6 @@
<html>
<head></head>
<body>
-<input type ="button" value="1" />
-<p/>
-<input type ="button" value="2" />
-<p/>
-<input type ="button" value="3" />
-<p/>
-<input type ="button" value="4" />
-<p/>
+<span>span1</span><p/><span>span2</span><p/><span>span3</span><p/>
</body>
</html>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java 2012-10-17 07:58:36 UTC (rev 44555)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/MultipleSelectionTest.java 2012-10-17 10:35:47 UTC (rev 44556)
@@ -46,13 +46,19 @@
JSPMultiPageEditor part = openEditor(input);
ITextViewer viewer = part.getSourceEditor().getTextViewer();
- int startSelectionOffcet = TestUtil.getLinePositionOffcet(viewer, 6, 1);
- int length = TestUtil.getLinePositionOffcet(viewer, 9, 4)-startSelectionOffcet;
+ int startSelectionOffcet = TestUtil.getLinePositionOffcet(viewer, 4, 1);
+ int length = TestUtil.getLinePositionOffcet(viewer, 4, 45)-startSelectionOffcet;
viewer.setSelectedRange(startSelectionOffcet, length);
VpeController vpeController = TestUtil.getVpeController(part);
vpeController.sourceSelectionChanged();
List<nsIDOMNode> selectedNodes = vpeController.getXulRunnerEditor().getSelectedNodes();
- assertEquals("Shuld be selected ",3,selectedNodes.size()); //$NON-NLS-1$
+ /*
+ * When Git repository is checked out on Windows OS
+ * git could add window style caret return symbol,
+ * after that additional text nodes appear.
+ * To fix it: test page was changed.
+ */
+ assertEquals("Shuld be selected ",4,selectedNodes.size()); //$NON-NLS-1$
}
}
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44555 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-10-17 03:58:36 -0400 (Wed, 17 Oct 2012)
New Revision: 44555
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
Log:
JBIDE-10592 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java 2012-10-17 06:08:24 UTC (rev 44554)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java 2012-10-17 07:58:36 UTC (rev 44555)
@@ -59,6 +59,7 @@
// kind = [incremental, full, auto, clean] = [1,2,3,4]
// delta = [no_change, added, changed, removed] = [0,1,2,3]
+ // modulePublish= [unknown, none, incremental full] = [0,1,2,3]
if( module.length == 0 ) return IServer.PUBLISH_STATE_NONE;
int modulePublishState = behaviour.getServer().getModulePublishState(module);
int publishType = behaviour.getPublishType(kind, deltaKind, modulePublishState);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2012-10-17 06:08:24 UTC (rev 44554)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2012-10-17 07:58:36 UTC (rev 44555)
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import java.util.HashMap;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.viewers.CellEditor;
@@ -139,6 +140,7 @@
// Combo strings - TODO extract to messages
private static final String ALL = "All";
+ private static final String DEPLOYABLE = "Deployable";
private static final String DEPLOYED = "Deployed";
private static final String BY_MODNAME = "By Module Name";
private static final String BY_MODTYPE = "By Module Type";
@@ -763,7 +765,7 @@
Label comboLabel = new Label(root, SWT.NULL);
comboLabel.setText("Filter by:");
filterCombo = new Combo(root, SWT.READ_ONLY);
- filterCombo.setItems(new String[]{ALL, DEPLOYED, BY_MODNAME});
+ filterCombo.setItems(new String[]{ALL, DEPLOYABLE, DEPLOYED, BY_MODNAME});
filterCombo.select(0);
filterText = new Text(root, SWT.SINGLE |SWT.BORDER);
@@ -780,7 +782,7 @@
};
filterCombo.addModifyListener(ml);
filterText.addModifyListener(ml);
- filterCombo.select(1); // select DEPLOYED
+ filterCombo.select(1); // select DEPLOYABLE
return root;
}
@@ -875,18 +877,31 @@
return page.getPossibleModules();
if( filterCombo.getItem(filterCombo.getSelectionIndex()).equals(DEPLOYED))
return page.getServer().getModules();
- if( filterCombo.getItem(filterCombo.getSelectionIndex()).equals(BY_MODNAME)) {
+ else {
IModule[] mods = page.getPossibleModules();
- String txt = filterText.getText();
ArrayList<IModule> result = new ArrayList<IModule>();
- for( int i = 0; i < mods.length; i++) {
- if( mods[i].getName().startsWith(txt)) {
- result.add(mods[i]);
+ if( filterCombo.getItem(filterCombo.getSelectionIndex()).equals(DEPLOYABLE)) {
+ for( int i = 0; i < mods.length; i++) {
+ try {
+ IModule[] parent = page.getServer().getRootModules(mods[i], new NullProgressMonitor());
+ if( parent.length == 1 && parent[0] == mods[i]) {
+ result.add(mods[i]);
+ }
+ } catch(CoreException ce) {
+ ce.printStackTrace();
+ }
}
}
+ if( filterCombo.getItem(filterCombo.getSelectionIndex()).equals(BY_MODNAME)) {
+ String txt = filterText.getText();
+ for( int i = 0; i < mods.length; i++) {
+ if( mods[i].getName().contains(txt)) {
+ result.add(mods[i]);
+ }
+ }
+ }
return result.toArray(new IModule[result.size()]);
}
- return new Object[]{};
}
private class ModulePageLabelProvider implements ITableLabelProvider {
@@ -963,7 +978,10 @@
public static String getDefaultOutputName(IModule module) {
- return new Path(module.getName()).lastSegment() + PublishUtil.getSuffix(module.getModuleType().getId());
+ String lastSegment = new Path(module.getName()).lastSegment();
+ String suffix = PublishUtil.getSuffix(module.getModuleType().getId());
+ String ret = lastSegment.endsWith(suffix) ? lastSegment : lastSegment + suffix;
+ return ret;
}
protected static String getOutputFolderAndName(DeploymentModulePrefs modPref, IModule m) {
@@ -983,7 +1001,6 @@
metadataRadio, serverRadio, customRadio, currentSelection,
deployButton, tempDeployButton,zipDeployWTPProjects
};
- System.out.println("Setting enablement to " + enabled);
for( int i = 0; i < c.length; i++ ) {
if( c[i] != null && !c[i].isDisposed()) {
c[i].setEnabled(enabled);
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44554 - trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-17 02:08:24 -0400 (Wed, 17 Oct 2012)
New Revision: 44554
Modified:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk...
Log:
fix composites for trunk -- child count must match array of children (52); m2e-wtp-juno site is obsolete too
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk... 2012-10-17 05:57:20 UTC (rev 44553)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk... 2012-10-17 06:08:24 UTC (rev 44554)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1340940100000'/>
+<property name='p2.timestamp' value='1350454022000'/>
</properties>
<children size='52'>
@@ -71,8 +71,5 @@
<child location='../../../../staging.previous/jbosstools-4.0_trunk.component--ws/all/repo/'/>
<child location='../../../../staging.previous/xulrunner-1.9.2/all/repo/'/>
-<!-- JBIDE-12292 Use m2e-wtp dev builds -->
-<child location='../../../../staging/m2e-wtp-juno/all/repo/'/>
-
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk... 2012-10-17 05:57:20 UTC (rev 44553)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk... 2012-10-17 06:08:24 UTC (rev 44554)
@@ -7,7 +7,7 @@
get new time w/
date +%s000
-->
-<property name='p2.timestamp' value='1340940106000'/>
+<property name='p2.timestamp' value='1350454022000'/>
</properties>
<children size='52'>
@@ -71,8 +71,5 @@
<child location='../../../../staging.previous/jbosstools-4.0_trunk.component--ws/all/repo/'/>
<child location='../../../../staging.previous/xulrunner-1.9.2/all/repo/'/>
-<!-- JBIDE-12292 Use m2e-wtp dev builds -->
-<child location='../../../../staging/m2e-wtp-juno/all/repo/'/>
-
</children>
</repository>
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44553 - in trunk/download.jboss.org/jbosstools/builds/staging/_composite_: soa-tooling/3.4.juno and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-17 01:57:20 -0400 (Wed, 17 Oct 2012)
New Revision: 44553
Removed:
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
Log:
remove deprecated 3.4.juno folders
Deleted: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j... 2012-10-17 05:41:51 UTC (rev 44552)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j... 2012-10-17 05:57:20 UTC (rev 44553)
@@ -1,3 +0,0 @@
-This folder is deprecated as the Juno release will be called 4.0, not 3.4.
-
-Use ../4.0.juno/ instead.
Deleted: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j... 2012-10-17 05:41:51 UTC (rev 44552)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j... 2012-10-17 05:57:20 UTC (rev 44553)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools - Core - Staging Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1346506992000'/>
-</properties>
-<children size='1'>
-<child location='../4.0.juno/'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j... 2012-10-17 05:41:51 UTC (rev 44552)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/core/3.4.j... 2012-10-17 05:57:20 UTC (rev 44553)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools - Core - Staging Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1346506996000'/>
-</properties>
-<children size='1'>
-<child location='../4.0.juno/'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-17 05:41:51 UTC (rev 44552)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-17 05:57:20 UTC (rev 44553)
@@ -1,3 +0,0 @@
-This folder is deprecated as the Juno release will be called 4.0, not 3.4.
-
-Use ../4.0.juno/ instead.
Deleted: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-17 05:41:51 UTC (rev 44552)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-17 05:57:20 UTC (rev 44553)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools - SOA Tooling - Staging Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1346507065000'/>
-</properties>
-<children size='1'>
-<child location='../4.0.juno/'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin...
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-17 05:41:51 UTC (rev 44552)
+++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-10-17 05:57:20 UTC (rev 44553)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools - SOA Tooling - Staging Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<!--
- get new time w/
- date +%s000
--->
-<property name='p2.timestamp' value='1346507068000'/>
-</properties>
-<children size='1'>
-<child location='../4.0.juno/'/>
-</children>
-</repository>
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44552 - in trunk/build/aggregate/soa-site: features and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-17 01:41:51 -0400 (Wed, 17 Oct 2012)
New Revision: 44552
Modified:
trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.properties
trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.xml
trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/pom.xml
trunk/build/aggregate/soa-site/features/pom.xml
trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/META-INF/MANIFEST.MF
trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.properties
trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/pom.xml
trunk/build/aggregate/soa-site/plugins/pom.xml
trunk/build/aggregate/soa-site/pom.xml
trunk/build/aggregate/soa-site/site/index.html
trunk/build/aggregate/soa-site/site/jbosstools-directory.xml
trunk/build/aggregate/soa-site/site/pom.xml
trunk/build/aggregate/soa-site/site/site.xml
Log:
bump feature/plugin versions to match versions in JBT 4.0.0; add 'do not install' to feature and plugin descriptions/names so they can be filtered from the site (JBIDE-12389)
Modified: trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.properties
===================================================================
--- trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.properties 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.properties 2012-10-17 05:41:51 UTC (rev 44552)
@@ -15,7 +15,7 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=JBoss Central Discovery - SOA Tooling
+featureName=JBoss Central Discovery - SOA Tooling - do not install this feature
# "providerName" property - name of the company that provides the feature
providerName=JBoss by Red Hat
Modified: trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.xml
===================================================================
--- trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.xml 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/feature.xml 2012-10-17 05:41:51 UTC (rev 44552)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.central.discovery.soa-tooling.feature" label="%featureName" version="1.0.0.qualifier" provider-name="%featureName">
+<feature id="org.jboss.tools.central.discovery.soa-tooling.feature" label="%featureName" version="1.1.0.qualifier" provider-name="%featureName">
<description>
%description
</description>
Modified: trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/pom.xml 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/features/org.jboss.tools.central.discovery.soa-tooling.feature/pom.xml 2012-10-17 05:41:51 UTC (rev 44552)
@@ -4,10 +4,10 @@
<parent>
<groupId>org.jboss.tools.soa-tooling</groupId>
<artifactId>org.jboss.tools.soa-tooling.features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.central.discovery.soa-tooling.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: trunk/build/aggregate/soa-site/features/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/features/pom.xml 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/features/pom.xml 2012-10-17 05:41:51 UTC (rev 44552)
@@ -3,11 +3,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.site.soa-tooling.root</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.soa-tooling</groupId>
<artifactId>org.jboss.tools.soa-tooling.features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.central.discovery.soa-tooling.feature</module>
Modified: trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/META-INF/MANIFEST.MF
===================================================================
--- trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/META-INF/MANIFEST.MF 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/META-INF/MANIFEST.MF 2012-10-17 05:41:51 UTC (rev 44552)
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: %BundleVendor
+Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.central.discovery.soa-tooling;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Require-Bundle: org.jboss.tools.central,
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.core.runtime,
@@ -15,5 +15,5 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
-Bundle-Vendor: %BundleName
+Bundle-Vendor: %BundleVendor
Bundle-Activator: org.jboss.tools.central.discovery.JBossCentralDiscoveryActivator
Modified: trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.properties
===================================================================
--- trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.properties 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/plugin.properties 2012-10-17 05:41:51 UTC (rev 44552)
@@ -1,5 +1,5 @@
BundleVendor = JBoss by Red Hat
-BundleName = JBoss Central Discovery - SOA Tooling
+BundleName = JBoss Central Discovery - SOA Tooling - do not install this plugin
# nightly from trunk
#jboss.soa.update.url = http://download.jboss.org/jbosstools/updates/nightly/soa-tooling/trunk/
Modified: trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/pom.xml 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/plugins/org.jboss.tools.central.discovery.soa-tooling/pom.xml 2012-10-17 05:41:51 UTC (rev 44552)
@@ -4,10 +4,10 @@
<parent>
<groupId>org.jboss.tools.soa-tooling</groupId>
<artifactId>org.jboss.tools.soa-tooling.plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.central.discovery.soa-tooling</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/build/aggregate/soa-site/plugins/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/plugins/pom.xml 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/plugins/pom.xml 2012-10-17 05:41:51 UTC (rev 44552)
@@ -3,11 +3,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.site.soa-tooling.root</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.soa-tooling</groupId>
<artifactId>org.jboss.tools.soa-tooling.plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.central.discovery.soa-tooling</module>
Modified: trunk/build/aggregate/soa-site/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/pom.xml 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/pom.xml 2012-10-17 05:41:51 UTC (rev 44552)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.site.soa-tooling.root</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>JBoss Tools - SOA Tooling</name>
<packaging>pom</packaging>
<!-- This site build depends on both the Core and SOA Tooling composite sites, plus the usual upstream dependencies and TP.
Modified: trunk/build/aggregate/soa-site/site/index.html
===================================================================
--- trunk/build/aggregate/soa-site/site/index.html 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/site/index.html 2012-10-17 05:41:51 UTC (rev 44552)
@@ -35,7 +35,7 @@
<ol>
<li>To <a class="link"
href="http://www.jboss.org/tools/download/installation/update_4_0">install</a>
- from this site, start up Eclipse 3.7, then do:
+ from this site, start up Eclipse 4.2 (Juno), then do:
<ul>
<code><strong>Help > Install New Software... ></strong></code>
</ul>
@@ -82,10 +82,10 @@
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.savara.tools.feature_2.1.0.v20120419-2007-H492-Final.jar">org.jboss.savara.tools.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.bpel.feature_1.1.0.Alpha1-v20120916-1922-H872.jar">org.jboss.tools.bpel.feature</a>
</td>
<td>
-<span style="font-size:x-small">2.1.0.v20120419-2007-H492-Final</span>
+<span style="font-size:x-small">1.1.0.Alpha1-v20120916-1922-H872</span>
</td>
<td>
<span style="font-size:x-small">
@@ -97,59 +97,55 @@
#FFFFFF
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.bpel.feature_1.1.0.v20120419-0716-H736-Beta3.jar">org.jboss.tools.bpel.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.central.discovery.soa-tooling.feature_1.1.0.Beta2-v20121017-0533.jar">org.jboss.tools.central.discovery.soa-tooling.feature</a>
</td>
<td>
-<span style="font-size:x-small">1.1.0.v20120419-0716-H736-Beta3</span>
+<span style="font-size:x-small">1.1.0.Beta2-v20121017-0533</span>
</td>
-<td>
-<span style="font-size:x-small">
- |
- SOATools</span>
-</td>
+<td/>
</tr>
<tr style="background-color:
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.central.discovery.soa-tooling.feature_1.0.0.v20120419-2031-Beta3.jar">org.jboss.tools.central.discovery.soa-tooling.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.esb.feature_1.5.0.Alpha1-v20120917-2113.jar">org.jboss.tools.esb.feature</a>
</td>
<td>
-<span style="font-size:x-small">1.0.0.v20120419-2031-Beta3</span>
+<span style="font-size:x-small">1.5.0.Alpha1-v20120917-2113</span>
</td>
-<td/>
+<td>
+<span style="font-size:x-small">
+ |
+ SOADataServices</span>
+<span style="font-size:x-small">
+ |
+ SOATools</span>
+</td>
</tr>
<tr style="background-color:
#FFFFFF
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.esb.feature_1.5.0.v20120419-0729-H841-Beta3.jar">org.jboss.tools.esb.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.jbpm.common.feature_4.5.0.Alpha2-v20120919-1746.jar">org.jboss.tools.jbpm.common.feature</a>
</td>
<td>
-<span style="font-size:x-small">1.5.0.v20120419-0729-H841-Beta3</span>
+<span style="font-size:x-small">4.5.0.Alpha2-v20120919-1746</span>
</td>
-<td>
-<span style="font-size:x-small">
- |
- SOAPTools</span>
-<span style="font-size:x-small">
- |
- SOATools</span>
-</td>
+<td/>
</tr>
<tr style="background-color:
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.jbpm.common.feature_4.4.0.v20120419-2019-H716-Beta3.jar">org.jboss.tools.jbpm.common.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.jbpm.convert.feature_4.5.0.Alpha2-v20120919-1746.jar">org.jboss.tools.jbpm.convert.feature</a>
</td>
<td>
-<span style="font-size:x-small">4.4.0.v20120419-2019-H716-Beta3</span>
+<span style="font-size:x-small">4.5.0.Alpha2-v20120919-1746</span>
</td>
<td>
<span style="font-size:x-small">
|
- SOAPTools</span>
+ SOADataServices</span>
<span style="font-size:x-small">
|
SOATools</span>
@@ -159,15 +155,15 @@
#FFFFFF
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.jbpm.convert.feature_1.0.0.v20120419-2019-H716-Beta3.jar">org.jboss.tools.jbpm.convert.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.jbpm3.feature_4.5.0.Alpha2-v20120919-1746.jar">org.jboss.tools.jbpm3.feature</a>
</td>
<td>
-<span style="font-size:x-small">1.0.0.v20120419-2019-H716-Beta3</span>
+<span style="font-size:x-small">4.5.0.Alpha2-v20120919-1746</span>
</td>
<td>
<span style="font-size:x-small">
|
- SOAPTools</span>
+ SOADataServices</span>
<span style="font-size:x-small">
|
SOATools</span>
@@ -177,105 +173,87 @@
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.jbpm3.feature_3.2.1.v20120419-2019-H716-Beta3.jar">org.jboss.tools.jbpm3.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.modeshape.jcr.feature_3.0.0.Alpha2-v20120921-1611.jar">org.jboss.tools.modeshape.jcr.feature</a>
</td>
<td>
-<span style="font-size:x-small">3.2.1.v20120419-2019-H716-Beta3</span>
+<span style="font-size:x-small">3.0.0.Alpha2-v20120921-1611</span>
</td>
<td>
<span style="font-size:x-small">
|
- SOAPTools</span>
+ SOADataServices</span>
<span style="font-size:x-small">
|
- SOATools</span>
+ DataTools</span>
</td>
</tr>
<tr style="background-color:
#FFFFFF
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.modeshape.jcr.feature_1.1.0.v20120419-0704-H665-Beta3.jar">org.jboss.tools.modeshape.jcr.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.modeshape.rest.feature_3.0.0.Alpha2-v20120921-1611.jar">org.jboss.tools.modeshape.rest.feature</a>
</td>
<td>
-<span style="font-size:x-small">1.1.0.v20120419-0704-H665-Beta3</span>
+<span style="font-size:x-small">3.0.0.Alpha2-v20120921-1611</span>
</td>
<td>
<span style="font-size:x-small">
|
- SOAPTools</span>
+ SOADataServices</span>
<span style="font-size:x-small">
|
- GeneralTools</span>
+ DataTools</span>
</td>
</tr>
<tr style="background-color:
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.modeshape.rest.feature_1.1.0.v20120419-0704-H665-Beta3.jar">org.jboss.tools.modeshape.rest.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.runtime.drools.detector.feature_1.4.0.Alpha2-v20120918-2144.jar">org.jboss.tools.runtime.drools.detector.feature</a>
</td>
<td>
-<span style="font-size:x-small">1.1.0.v20120419-0704-H665-Beta3</span>
+<span style="font-size:x-small">1.4.0.Alpha2-v20120918-2144</span>
</td>
<td>
<span style="font-size:x-small">
|
- SOAPTools</span>
+ BusinessRules</span>
<span style="font-size:x-small">
|
- GeneralTools</span>
+ SOADataServices</span>
</td>
</tr>
<tr style="background-color:
#FFFFFF
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.runtime.drools.detector.feature_1.3.0.v20120419-1902-H255-Beta3.jar">org.jboss.tools.runtime.drools.detector.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.runtime.esb.detector.feature_1.4.0.Alpha2-v20120918-2144.jar">org.jboss.tools.runtime.esb.detector.feature</a>
</td>
<td>
-<span style="font-size:x-small">1.3.0.v20120419-1902-H255-Beta3</span>
+<span style="font-size:x-small">1.4.0.Alpha2-v20120918-2144</span>
</td>
<td>
<span style="font-size:x-small">
|
- BRMSTools</span>
-<span style="font-size:x-small">
- |
- SOAPTools</span>
+ SOADataServices</span>
</td>
</tr>
<tr style="background-color:
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.runtime.esb.detector.feature_1.3.0.v20120419-1902-H255-Beta3.jar">org.jboss.tools.runtime.esb.detector.feature</a>
+<a style="font-size:x-small" href="features/org.jboss.tools.runtime.jbpm.detector.feature_1.4.0.Alpha2-v20120918-2144.jar">org.jboss.tools.runtime.jbpm.detector.feature</a>
</td>
<td>
-<span style="font-size:x-small">1.3.0.v20120419-1902-H255-Beta3</span>
+<span style="font-size:x-small">1.4.0.Alpha2-v20120918-2144</span>
</td>
<td>
<span style="font-size:x-small">
|
- SOAPTools</span>
-</td>
-</tr>
-<tr style="background-color:
- #FFFFFF
- ">
-<td class="rowLine">
-<a style="font-size:x-small" href="features/org.jboss.tools.runtime.jbpm.detector.feature_1.3.0.v20120419-1902-H255-Beta3.jar">org.jboss.tools.runtime.jbpm.detector.feature</a>
-</td>
-<td>
-<span style="font-size:x-small">1.3.0.v20120419-1902-H255-Beta3</span>
-</td>
-<td>
+ BusinessRules</span>
<span style="font-size:x-small">
|
- BRMSTools</span>
-<span style="font-size:x-small">
- |
- SOAPTools</span>
+ SOADataServices</span>
</td>
</tr>
<tr style="background-color:#DDDDDD">
@@ -297,10 +275,10 @@
<td>
<span style="font-size:x-small">
|
- SOAPTools</span>
+ SOADataServices</span>
<span style="font-size:x-small">
|
- BRMSTools</span>
+ BusinessRules</span>
<span style="font-size:x-small">
|
SOATools</span>
@@ -321,10 +299,10 @@
<td>
<span style="font-size:x-small">
|
- SOAPTools</span>
+ SOADataServices</span>
<span style="font-size:x-small">
|
- BRMSTools</span>
+ BusinessRules</span>
<span style="font-size:x-small">
|
SOATools</span>
@@ -334,10 +312,10 @@
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.eclipse.uml2_3.2.1.v201109082252.jar">org.eclipse.uml2</a>
+<a style="font-size:x-small" href="features/org.eclipse.uml2_4.0.0.v20120604-0919.jar">org.eclipse.uml2</a>
</td>
<td>
-<span style="font-size:x-small">3.2.1.v201109082252</span>
+<span style="font-size:x-small">4.0.0.v20120604-0919</span>
</td>
<td/>
</tr>
@@ -345,6 +323,17 @@
#FFFFFF
">
<td class="rowLine">
+<a style="font-size:x-small" href="features/org.eclipse.zest_1.4.0.201206112118.jar">org.eclipse.zest</a>
+</td>
+<td>
+<span style="font-size:x-small">1.4.0.201206112118</span>
+</td>
+<td/>
+</tr>
+<tr style="background-color:
+ #EEEEEE
+ ">
+<td class="rowLine">
<a style="font-size:x-small" href="features/org.guvnor.tools.feature_5.3.1.Final.jar">org.guvnor.tools.feature</a>
</td>
<td>
@@ -353,14 +342,14 @@
<td>
<span style="font-size:x-small">
|
- SOAPTools</span>
+ SOADataServices</span>
<span style="font-size:x-small">
|
SOATools</span>
</td>
</tr>
<tr style="background-color:
- #EEEEEE
+ #FFFFFF
">
<td class="rowLine">
<a style="font-size:x-small" href="features/org.jbpm.eclipse.feature_5.3.1.Final.jar">org.jbpm.eclipse.feature</a>
@@ -371,14 +360,14 @@
<td>
<span style="font-size:x-small">
|
- BRMSTools</span>
+ BusinessRules</span>
<span style="font-size:x-small">
|
SOATools</span>
</td>
</tr>
<tr style="background-color:
- #FFFFFF
+ #EEEEEE
">
<td class="rowLine">
<a style="font-size:x-small" href="features/org.jbpm.eclipse.task.feature_5.3.1.Final.jar">org.jbpm.eclipse.task.feature</a>
@@ -389,20 +378,35 @@
<td>
<span style="font-size:x-small">
|
- BRMSTools</span>
+ BusinessRules</span>
<span style="font-size:x-small">
|
SOATools</span>
</td>
</tr>
<tr style="background-color:
+ #FFFFFF
+ ">
+<td class="rowLine">
+<a style="font-size:x-small" href="features/org.pi4soa.core.feature_3.1.2.v20121010-0826-H391-Beta2.jar">org.pi4soa.core.feature</a>
+</td>
+<td>
+<span style="font-size:x-small">3.1.2.v20121010-0826-H391-Beta2</span>
+</td>
+<td>
+<span style="font-size:x-small">
+ |
+ SOATools</span>
+</td>
+</tr>
+<tr style="background-color:
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.pi4soa.core.feature_3.1.2.v20120419-1955-H298-Beta2.jar">org.pi4soa.core.feature</a>
+<a style="font-size:x-small" href="features/org.savara.tools.feature_2.1.0.v20121016-1517-H632-Final.jar">org.savara.tools.feature</a>
</td>
<td>
-<span style="font-size:x-small">3.1.2.v20120419-1955-H298-Beta2</span>
+<span style="font-size:x-small">2.1.0.v20121016-1517-H632-Final</span>
</td>
<td>
<span style="font-size:x-small">
@@ -414,10 +418,10 @@
#FFFFFF
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.savara.tools.feature_2.1.0.v20120419-2007-H492-Final.jar">org.savara.tools.feature</a>
+<a style="font-size:x-small" href="features/org.savara.tools.incubator.feature_2.1.0.v20121016-1517-H632-Final.jar">org.savara.tools.incubator.feature</a>
</td>
<td>
-<span style="font-size:x-small">2.1.0.v20120419-2007-H492-Final</span>
+<span style="font-size:x-small">2.1.0.v20121016-1517-H632-Final</span>
</td>
<td>
<span style="font-size:x-small">
@@ -429,14 +433,17 @@
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.savara.tools.incubator.feature_2.1.0.v20120419-2007-H492-Final.jar">org.savara.tools.incubator.feature</a>
+<a style="font-size:x-small" href="features/org.switchyard.tools.editor.feature_0.6.0.v20121016-1802-H208-CI.jar">org.switchyard.tools.editor.feature</a>
</td>
<td>
-<span style="font-size:x-small">2.1.0.v20120419-2007-H492-Final</span>
+<span style="font-size:x-small">0.6.0.v20121016-1802-H208-CI</span>
</td>
<td>
<span style="font-size:x-small">
|
+ AbridgedTools</span>
+<span style="font-size:x-small">
+ |
SOATools</span>
</td>
</tr>
@@ -444,10 +451,10 @@
#FFFFFF
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.switchyard.tools.feature_0.5.0.v20120417-0712-H62-CI.jar">org.switchyard.tools.feature</a>
+<a style="font-size:x-small" href="features/org.switchyard.tools.feature_0.6.0.v20121016-1802-H208-CI.jar">org.switchyard.tools.feature</a>
</td>
<td>
-<span style="font-size:x-small">0.5.0.v20120417-0712-H62-CI</span>
+<span style="font-size:x-small">0.6.0.v20121016-1802-H208-CI</span>
</td>
<td>
<span style="font-size:x-small">
@@ -462,10 +469,10 @@
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.teiid.datatools.connectivity.feature_7.7.0.v20120419-0311-H1173-Final.jar">org.teiid.datatools.connectivity.feature</a>
+<a style="font-size:x-small" href="features/org.teiid.datatools.connectivity.feature_8.0.0.Final-v20121015-2014-H1866.jar">org.teiid.datatools.connectivity.feature</a>
</td>
<td>
-<span style="font-size:x-small">7.7.0.v20120419-0311-H1173-Final</span>
+<span style="font-size:x-small">8.0.0.Final-v20121015-2014-H1866</span>
</td>
<td>
<span style="font-size:x-small">
@@ -477,10 +484,10 @@
#FFFFFF
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.teiid.designer.feature_7.7.0.v20120419-0311-H1173-Final.jar">org.teiid.designer.feature</a>
+<a style="font-size:x-small" href="features/org.teiid.designer.feature_8.0.0.Final-v20121015-2014-H1866.jar">org.teiid.designer.feature</a>
</td>
<td>
-<span style="font-size:x-small">7.7.0.v20120419-0311-H1173-Final</span>
+<span style="font-size:x-small">8.0.0.Final-v20121015-2014-H1866</span>
</td>
<td>
<span style="font-size:x-small">
@@ -492,10 +499,10 @@
#EEEEEE
">
<td class="rowLine">
-<a style="font-size:x-small" href="features/org.teiid.designer.runtime.feature_7.7.0.v20120419-0311-H1173-Final.jar">org.teiid.designer.runtime.feature</a>
+<a style="font-size:x-small" href="features/org.teiid.designer.runtime.feature_8.0.0.Final-v20121015-2014-H1866.jar">org.teiid.designer.runtime.feature</a>
</td>
<td>
-<span style="font-size:x-small">7.7.0.v20120419-0311-H1173-Final</span>
+<span style="font-size:x-small">8.0.0.Final-v20121015-2014-H1866</span>
</td>
<td>
<span style="font-size:x-small">
Modified: trunk/build/aggregate/soa-site/site/jbosstools-directory.xml
===================================================================
--- trunk/build/aggregate/soa-site/site/jbosstools-directory.xml 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/site/jbosstools-directory.xml 2012-10-17 05:41:51 UTC (rev 44552)
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<directory xmlns="http://www.eclipse.org/mylyn/discovery/directory/">
-<entry url="plugins/org.jboss.tools.central.discovery.soa-tooling_1.0.0.v20120419-2031-Beta3.jar" permitCategories="true"/>
+<entry url="plugins/org.jboss.tools.central.discovery.soa-tooling_1.1.0.Beta2-v20121017-0533.jar" permitCategories="true"/>
</directory>
Modified: trunk/build/aggregate/soa-site/site/pom.xml
===================================================================
--- trunk/build/aggregate/soa-site/site/pom.xml 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/site/pom.xml 2012-10-17 05:41:51 UTC (rev 44552)
@@ -4,9 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.site</artifactId>
- <version>0.0.2-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <artifactId>org.jboss.tools.site.soa-tooling.root</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.soa-tooling.site</artifactId>
@@ -117,4 +116,5 @@
<enabled>true</enabled>
</releases>
</repository>
+ </repositories>
</project>
Modified: trunk/build/aggregate/soa-site/site/site.xml
===================================================================
--- trunk/build/aggregate/soa-site/site/site.xml 2012-10-17 05:39:49 UTC (rev 44551)
+++ trunk/build/aggregate/soa-site/site/site.xml 2012-10-17 05:41:51 UTC (rev 44552)
@@ -35,9 +35,11 @@
<feature url="features/org.savara.tools.incubator.feature_0.0.0.jar" id="org.savara.tools.incubator.feature" version="0.0.0">
<category name="SOATools" />
</feature>
+ <!-- no longer on savara site?
<feature url="features/org.jboss.savara.tools.feature_0.0.0.jar" id="org.jboss.savara.tools.feature" version="0.0.0">
<category name="SOATools" />
</feature>
+ -->
<feature url="features/org.jboss.tools.esb.feature_0.0.0.jar" id="org.jboss.tools.esb.feature" version="0.0.0">
<category name="SOADataServices" />
12 years, 2 months
- 1
- 0
JBoss Tools SVN: r44551 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-10-17 01:39:49 -0400 (Wed, 17 Oct 2012)
New Revision: 44551
Modified:
trunk/build/parent/pom.xml
Log:
switch to new SwitchYard 0.6.0-friendly requirement composite -- TODO: replace links to 3rd party sites w/ local mirrors
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-10-17 05:39:41 UTC (rev 44550)
+++ trunk/build/parent/pom.xml 2012-10-17 05:39:49 UTC (rev 44551)
@@ -68,7 +68,7 @@
<!-- 3. URL of latest JBT SOA requirements composite mirror -->
<!-- TODO: JBIDE-11121 - remove this when we have a SOA TP site instead -->
<!-- TODO: don't forget to update this in ../aggregate/soa*/associate.properties too (2 files)! -->
- <jboss-requirements-composite-soa-tooling-mirror>http://download.jboss.org/jbosstools/updates/juno/soa-tooling/SR0/</jboss-requirements-composite-soa-tooling-mirror>
+ <jboss-requirements-composite-soa-tooling-mirror>http://download.jboss.org/jbosstools/updates/juno/soa-tooling/SR0a/</jboss-requirements-composite-soa-tooling-mirror>
<!-- 4. published aggregate update sites go here, for consumption by QE
and downstream JBDS builds -->
12 years, 2 months
- 1
- 0