JBoss Tools SVN: r35742 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-17 20:18:54 -0400 (Mon, 17 Oct 2011)
New Revision: 35742
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java
Log:
JBIDE-9918
https://issues.jboss.org/browse/JBIDE-9918
Jar modification is fired to builders.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-10-18 00:17:27 UTC (rev 35741)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-10-18 00:18:54 UTC (rev 35742)
@@ -77,6 +77,7 @@
for (int i = 0; i < paths.size(); i++) {
String p = paths.get(i);
if(!requestForLoad(p)) continue;
+ removedPaths.add(new Path(p));
String fileName = new File(p).getName();
if(EclipseResourceUtil.SYSTEM_JAR_SET.contains(fileName)) continue;
@@ -261,4 +262,11 @@
}
return result;
}
+
+ public synchronized void libraryChanged(String path) {
+ super.libraryChanged(path);
+ removedPaths.add(new Path(path));
+ project.getExtensionManager().pathRemoved(path);
+ }
+
}
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r35741 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test: src/org/jboss/tools/cdi/seam/core/test/international and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-17 20:17:27 -0400 (Mon, 17 Oct 2011)
New Revision: 35741
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/a.empty
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/a.jar
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/BundleModelTest.java
Log:
JBIDE-9918
https://issues.jboss.org/browse/JBIDE-9918
Test added with jar modification.
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/a.empty
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/a.empty
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/a.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/SeamCoreTest/WebContent/WEB-INF/lib/a.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/BundleModelTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/BundleModelTest.java 2011-10-17 23:16:21 UTC (rev 35740)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/BundleModelTest.java 2011-10-18 00:17:27 UTC (rev 35741)
@@ -34,6 +34,24 @@
assertEquals("About this example application", value.getValue());
}
+ public void testIncrementalBuildAtJarModification() throws Exception {
+ IBundleModel bundleModel = BundleModelFactory.getBundleModel(getTestProject());
+ assertNotNull(bundleModel);
+
+ Set<String> bundles = bundleModel.getAllAvailableBundles();
+ assertTrue(bundles.contains("test1.xxm"));
+
+ String path = "WebContent/WEB-INF/lib/a.jar";
+ String empty = "WebContent/WEB-INF/lib/a.empty";
+
+ GenericBeanValidationTest.writeFile(getTestProject(), empty, path);
+
+ bundleModel = BundleModelFactory.getBundleModel(getTestProject());
+ assertNotNull(bundleModel);
+ bundles = bundleModel.getAllAvailableBundles();
+ assertFalse(bundles.contains("test1.xxm"));
+ }
+
public void testIncrementalBuildAtAddRemoveExtension() throws Exception {
IBundleModel originalBundleModel = BundleModelFactory.getBundleModel(getTestProject());
assertNotNull(originalBundleModel);
@@ -57,4 +75,5 @@
assertTrue(bundles.contains(string));
}
}
+
}
\ No newline at end of file
13 years, 2 months
JBoss Tools SVN: r35740 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-17 19:16:21 -0400 (Mon, 17 Oct 2011)
New Revision: 35740
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java
Log:
JBIDE-9918
https://issues.jboss.org/browse/JBIDE-9918
Jar modification is fired to builders.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java 2011-10-17 23:11:28 UTC (rev 35739)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java 2011-10-17 23:16:21 UTC (rev 35740)
@@ -12,6 +12,7 @@
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -49,47 +50,47 @@
allBundles = copy.allBundles;
}
- public void clean() {
- synchronized(bundles) {
- bundles.clear();
- }
- synchronized (allBundles) {
- allBundles.clear();
- }
+ public synchronized void clean() {
+ bundles.clear();
+ allBundles.clear();
}
- public void clean(IPath path) {
+ public synchronized void clean(IPath path) {
Set<XModelObject> bs = null;
- synchronized(bundles) {
- bs = bundles.remove(path);
- }
+ bs = bundles.remove(path);
if(bs != null) {
- synchronized (allBundles) {
- allBundles.removeAll(bs);
- }
+ allBundles.removeAll(bs);
}
}
- public void addDefinitions(BundleFileSet fileSet) {
+ public synchronized void addDefinitions(BundleFileSet fileSet) {
for (IPath path: fileSet.getAllPaths()) {
+ clean(path);
Set<XModelObject> bs = fileSet.getBundles(path);
- synchronized(bundles) {
- bundles.put(path, bs);
+ bundles.put(path, bs);
+ allBundles.addAll(bs);
+ }
+ }
+
+ synchronized Set<XModelObject> getBundles() {
+ //filter out obsolete objects.
+ Iterator<XModelObject> i = allBundles.iterator();
+ while(i.hasNext()) {
+ if(!i.next().isActive()) {
+ i.remove();
}
- synchronized (allBundles) {
- allBundles.addAll(bs);
- }
}
+ return allBundles;
}
- public Set<XModelObject> getAllBundles() {
+ public synchronized Set<XModelObject> getAllBundles() {
Set<XModelObject> result = new HashSet<XModelObject>();
- result.addAll(allBundles);
+ result.addAll(getBundles());
Set<CDICoreNature> ns = root.getProject().getCDIProjects(true);
for (CDICoreNature n: ns) {
CDISeamInternationalExtension extension = CDISeamInternationalExtension.getExtension(n);
if(extension != null) {
- result.addAll(extension.getContext().allBundles);
+ result.addAll(extension.getContext().getBundles());
}
}
return result;
13 years, 2 months
JBoss Tools SVN: r35739 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: project/ext and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-17 19:11:28 -0400 (Mon, 17 Oct 2011)
New Revision: 35739
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/LibsListener.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java
Log:
JBIDE-9918
https://issues.jboss.org/browse/JBIDE-9918
Jar modification is fired to builders.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2011-10-17 22:01:57 UTC (rev 35738)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2011-10-17 23:11:28 UTC (rev 35739)
@@ -191,6 +191,7 @@
}
super.set(XModelObjectConstants.XML_ATTR_NAME, name);
super.set("EXTENSION", extension); //$NON-NLS-1$
+ safeChangeTimeStamp();
fireObjectChanged(null);
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2011-10-17 22:01:57 UTC (rev 35738)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2011-10-17 23:11:28 UTC (rev 35739)
@@ -119,6 +119,9 @@
loaded = false;
loaded2 = false;
fire = true;
+ if(getParent() instanceof FileSystemsImpl) {
+ ((FileSystemsImpl)getParent()).getLibs().libraryChanged(this);
+ }
fireStructureChanged(3, null);
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2011-10-17 22:01:57 UTC (rev 35738)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2011-10-17 23:11:28 UTC (rev 35739)
@@ -194,6 +194,9 @@
XModelObject o = object.getChildByPath(jsname);
if(o != null) {
fss.remove(o);
+ if(o instanceof JarSystemImpl) {
+ ((JarSystemImpl)o).update();
+ }
} else {
o = object.getModel().createModelObject(libEntity, null);
o.setAttributeValue(XModelObjectConstants.ATTR_NAME, jsname);
@@ -241,15 +244,15 @@
}
void fire() {
- LibsListener[] ls = null;
- synchronized(this) {
- ls = listeners.toArray(new LibsListener[0]);
- }
- if(ls != null) for (LibsListener listener: ls) {
+ for (LibsListener listener: getListeners()) {
listener.pathsChanged(paths);
}
}
+ private synchronized LibsListener[] getListeners() {
+ return listeners.toArray(new LibsListener[0]);
+ }
+
int classpathVersion = 0;
int pathsVersion = -1;
int fsVersion = -1;
@@ -285,6 +288,12 @@
return projects.contains(p.getName());
}
+ public void libraryChanged(JarSystemImpl jar) {
+ for (LibsListener listener: getListeners()) {
+ listener.libraryChanged(jar.getLocation());
+ }
+ }
+
}
class LibraryNames {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/LibsListener.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/LibsListener.java 2011-10-17 22:01:57 UTC (rev 35738)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/LibsListener.java 2011-10-17 23:11:28 UTC (rev 35739)
@@ -19,4 +19,5 @@
*/
public interface LibsListener {
public void pathsChanged(List<String> paths);
+ public void libraryChanged(String path);
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java 2011-10-17 22:01:57 UTC (rev 35738)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java 2011-10-17 23:11:28 UTC (rev 35739)
@@ -128,4 +128,11 @@
}
}
+ public void libraryChanged(String path) {
+ synchronized (this) {
+ libsModified = true;
+ processedPaths.remove(path);
+ }
+ }
+
}
13 years, 2 months
JBoss Tools SVN: r35738 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-10-17 18:01:57 -0400 (Mon, 17 Oct 2011)
New Revision: 35738
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
Log:
JBIDE-9368 Dashboard(s) for easy news aggregation, twitter and easy additional/3rd party plugin installation and project template/creation
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-10-17 20:20:41 UTC (rev 35737)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-10-17 22:01:57 UTC (rev 35738)
@@ -373,7 +373,7 @@
private void createTutorialsSection(FormToolkit toolkit, Composite parent) {
- tutorialsSection = createSection(toolkit, parent, "Project Examples", ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE);
+ tutorialsSection = createSection(toolkit, parent, "Project Examples", ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED);
GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
//gd.widthHint = 350;
//gd.heightHint = 100;
@@ -610,7 +610,7 @@
}
public void createDocumentationSection(FormToolkit toolkit, Composite parent) {
- documentationSection = createSection(toolkit, parent, "Documentation", ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE);
+ documentationSection = createSection(toolkit, parent, "Documentation", ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED);
GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
//gd.widthHint = 350;
//gd.heightHint = 100;
13 years, 2 months
JBoss Tools SVN: r35737 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-17 16:20:41 -0400 (Mon, 17 Oct 2011)
New Revision: 35737
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SeamConfigInjectedPointHyperlinkDetector.java
Log:
Updated in order to work with binary files https://issues.jboss.org/browse/JBIDE-9764
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-10-17 19:39:03 UTC (rev 35736)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-10-17 20:20:41 UTC (rev 35737)
@@ -15,8 +15,8 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.ICodeAssist;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IField;
@@ -43,7 +43,6 @@
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
-import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.generic.GenericClassBean;
import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
@@ -67,27 +66,19 @@
if (input == null)
return null;
- if (input.getResource() == null || input.getResource().getProject() == null)
- return null;
-
document= textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
IRegion wordRegion= JavaWordFinder.findWord(document, offset);
if (wordRegion == null)
return null;
- IFile file = null;
+ IProject project = null;
- try {
- IResource resource = input.getCorrespondingResource();
- if (resource instanceof IFile)
- file = (IFile) resource;
- } catch (JavaModelException e) {
- CDIExtensionsPlugin.log(e);
- }
+ project = input.getJavaProject().getProject();
- if(file == null)
+ if(project == null)
return null;
- CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(file.getProject());
+
+ CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(project);
if(cdiNature == null)
return null;
@@ -113,7 +104,7 @@
}
}
- findInjectedBeans(cdiNature, elements[0], position, file, hyperlinks);
+ findInjectedBeans(cdiNature, elements[0], position, input.getPath(), hyperlinks);
if (hyperlinks != null && !hyperlinks.isEmpty()) {
return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size()]);
@@ -124,14 +115,14 @@
return null;
}
- protected void findInjectedBeans(CDICoreNature nature, IJavaElement element, int offset, IFile file, ArrayList<IHyperlink> hyperlinks){
+ protected void findInjectedBeans(CDICoreNature nature, IJavaElement element, int offset, IPath path, ArrayList<IHyperlink> hyperlinks){
ICDIProject cdiProject = nature.getDelegate();
if(cdiProject == null) {
return;
}
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Set<IBean> beans = cdiProject.getBeans(path);
Set<IInjectionPoint> injectionPoints = findInjectionPoints(beans, element, offset);
if(injectionPoints.isEmpty()) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SeamConfigInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SeamConfigInjectedPointHyperlinkDetector.java 2011-10-17 19:39:03 UTC (rev 35736)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/SeamConfigInjectedPointHyperlinkDetector.java 2011-10-17 20:20:41 UTC (rev 35737)
@@ -15,7 +15,7 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.jboss.tools.cdi.core.CDICoreNature;
@@ -30,14 +30,14 @@
public class SeamConfigInjectedPointHyperlinkDetector extends GenericInjectedPointHyperlinkDetector {
- protected void findInjectedBeans(CDICoreNature nature, IJavaElement element, int offset, IFile file, ArrayList<IHyperlink> hyperlinks){
+ protected void findInjectedBeans(CDICoreNature nature, IJavaElement element, int offset, IPath path, ArrayList<IHyperlink> hyperlinks){
ICDIProject cdiProject = nature.getDelegate();
if(cdiProject == null) {
return;
}
- Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
+ Set<IBean> beans = cdiProject.getBeans(path);
Set<IInjectionPoint> injectionPoints = GenericInjectedPointHyperlinkDetector.findInjectionPoints(beans, element, offset);
if(injectionPoints.isEmpty()) {
13 years, 2 months
JBoss Tools SVN: r35736 - trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-10-17 15:39:03 -0400 (Mon, 17 Oct 2011)
New Revision: 35736
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java
Log:
JBDS-1889 - Now checking for juddi-client-3.1.2.jar as well as 3.1.0 and 3.1.1 when seeing if the runtime includes ESB 4.10
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java 2011-10-17 19:35:23 UTC (rev 35735)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java 2011-10-17 19:39:03 UTC (rev 35736)
@@ -23,6 +23,7 @@
private final static String JUDDI_CLIENT_JAR_31 = "juddi-client-3.1.0.jar";
private final static String JUDDI_CLIENT_JAR_311 = "juddi-client-3.1.1.jar";
+ private final static String JUDDI_CLIENT_JAR_312 = "juddi-client-3.1.2.jar";
public boolean isValidESBRuntime(String location, String version, String configuration){
List<String> jarNames = new ArrayList<String>();
@@ -32,7 +33,7 @@
}
return jarNames.contains(ROSETTA_JAR) &&
- (jarNames.contains(JUDDI_CLIENT_JAR_31) || jarNames.contains(JUDDI_CLIENT_JAR_311));
+ (jarNames.contains(JUDDI_CLIENT_JAR_31) || jarNames.contains(JUDDI_CLIENT_JAR_311) || jarNames.contains(JUDDI_CLIENT_JAR_312));
}
13 years, 2 months
JBoss Tools SVN: r35735 - in branches/jbosstools-3.2.x/esb/plugins: org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-10-17 15:35:23 -0400 (Mon, 17 Oct 2011)
New Revision: 35735
Added:
branches/jbosstools-3.2.x/esb/plugins/.project
Modified:
branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java
Log:
JBDS-1889 - Now checking for juddi-client-3.1.2.jar as well as 3.1.0 and 3.1.1 when seeing if the runtime includes ESB 4.10
Added: branches/jbosstools-3.2.x/esb/plugins/.project
===================================================================
--- branches/jbosstools-3.2.x/esb/plugins/.project (rev 0)
+++ branches/jbosstools-3.2.x/esb/plugins/.project 2011-10-17 19:35:23 UTC (rev 35735)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>plugins</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Property changes on: branches/jbosstools-3.2.x/esb/plugins/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java
===================================================================
--- branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java 2011-10-17 18:06:37 UTC (rev 35734)
+++ branches/jbosstools-3.2.x/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_410.java 2011-10-17 19:35:23 UTC (rev 35735)
@@ -23,6 +23,7 @@
private final static String JUDDI_CLIENT_JAR_31 = "juddi-client-3.1.0.jar";
private final static String JUDDI_CLIENT_JAR_311 = "juddi-client-3.1.1.jar";
+ private final static String JUDDI_CLIENT_JAR_312 = "juddi-client-3.1.2.jar";
public boolean isValidESBRuntime(String location, String version, String configuration){
List<String> jarNames = new ArrayList<String>();
@@ -32,7 +33,7 @@
}
return jarNames.contains(ROSETTA_JAR) &&
- (jarNames.contains(JUDDI_CLIENT_JAR_31) || jarNames.contains(JUDDI_CLIENT_JAR_311));
+ (jarNames.contains(JUDDI_CLIENT_JAR_31) || jarNames.contains(JUDDI_CLIENT_JAR_311) || jarNames.contains(JUDDI_CLIENT_JAR_312));
}
13 years, 2 months
JBoss Tools SVN: r35734 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-17 14:06:37 -0400 (Mon, 17 Oct 2011)
New Revision: 35734
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java
Log:
[JBIDE-9890] fixed selected cartridge not being stored/restored from prefs & correctly initialized when empty
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-10-17 17:24:28 UTC (rev 35733)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-10-17 18:06:37 UTC (rev 35734)
@@ -102,19 +102,20 @@
}
return null;
}
- })
- , new UpdateValueStrategy().setAfterGetValidator(
+ }).setAfterGetValidator(
new IValidator() {
@Override
public IStatus validate(Object value) {
- if (!(value instanceof ICartridge)) {
+ if (!(value instanceof String)
+ || ((String) value).length() == 0) {
return ValidationStatus.error("You have to select a type");
} else {
return ValidationStatus.ok();
}
}
- }).setConverter(new Converter(ICartridge.class, String.class) {
+ })
+ , new UpdateValueStrategy().setConverter(new Converter(ICartridge.class, String.class) {
@Override
public Object convert(Object fromObject) {
@@ -135,7 +136,6 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
-
model.loadCartridges();
} catch (OpenshiftException e) {
return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, "Could not load cartridges", e);
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-10-17 17:24:28 UTC (rev 35733)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java 2011-10-17 18:06:37 UTC (rev 35734)
@@ -11,7 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue;
@@ -32,7 +32,7 @@
private IUser user;
private String name;
- private Collection<ICartridge> cartridges = new ArrayList<ICartridge>();
+ private List<ICartridge> cartridges = new ArrayList<ICartridge>();
private ICartridge selectedCartridge;
private StringPreferenceValue selectedCartridgePreference;
@@ -41,16 +41,23 @@
this.selectedCartridgePreference = new StringPreferenceValue(
"org.jboss.tools.openshift.express.internal.ui.wizard.NewApplicationWizard.selectedCartridge",
OpenshiftUIActivator.PLUGIN_ID);
- initSelectedCartridge();
}
- private void initSelectedCartridge() {
+ private ICartridge initSelectedCartridge() {
String selectedCartridgeName = selectedCartridgePreference.get();
+ if (getSelectedCartridge() != null) {
+ selectedCartridgeName = getSelectedCartridge().getName();
+ }
if (selectedCartridgeName == null
|| selectedCartridgeName.length() == 0) {
- selectedCartridge = ICartridge.JBOSSAS_7;
+ selectedCartridgeName = ICartridge.JBOSSAS_7.getName();
}
- this.selectedCartridge = getCartridgeByName(selectedCartridgeName);
+ ICartridge selectedCartridge = getCartridgeByName(selectedCartridgeName);
+ if (selectedCartridge == null
+ && getCartridges().size() > 0) {
+ selectedCartridge = getCartridges().get(0);
+ }
+ return selectedCartridge;
}
public String getName() {
@@ -65,11 +72,12 @@
setCartridges(user.getCartridges());
}
- public void setCartridges(Collection<ICartridge> cartridges) {
+ public void setCartridges(List<ICartridge> cartridges) {
firePropertyChange(PROPERTY_CARTRIDGES, this.cartridges, this.cartridges = cartridges);
+ setSelectedCartridge(initSelectedCartridge());
}
- public Collection<ICartridge> getCartridges() {
+ public List<ICartridge> getCartridges() {
return cartridges;
}
@@ -78,7 +86,9 @@
}
public void setSelectedCartridge(ICartridge cartridge) {
- selectedCartridgePreference.store(cartridge.getName());
+ if (cartridge != null) {
+ selectedCartridgePreference.store(cartridge.getName());
+ }
firePropertyChange(PROPERTY_SELECTED_CARTRIDGE, selectedCartridge, this.selectedCartridge = cartridge);
}
@@ -101,7 +111,8 @@
try {
return user.getApplicationByName(name) != null;
} catch (OpenshiftException e) {
- // TODO proper logging
+ OpenshiftUIActivator.log(
+ OpenshiftUIActivator.createErrorStatus("Could not get application by name", e));
return false;
}
}
13 years, 2 months
JBoss Tools SVN: r35733 - in trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui: dialogs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-10-17 13:24:28 -0400 (Mon, 17 Oct 2011)
New Revision: 35733
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/actions/DownloadRuntimeAction.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/DownloadRuntimeViewerDialog.java
Log:
Fixed compilation problems
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/actions/DownloadRuntimeAction.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/actions/DownloadRuntimeAction.java 2011-10-17 16:40:31 UTC (rev 35732)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/actions/DownloadRuntimeAction.java 2011-10-17 17:24:28 UTC (rev 35733)
@@ -56,7 +56,8 @@
@Override
public void run() {
Assert.isNotNull(runtimeId);
- DownloadRuntime runtime = RuntimeCoreActivator.getDefault().getDownloadJBossRuntimes().get(runtimeId);
+ // FIXME
+ DownloadRuntime runtime = RuntimeCoreActivator.getDefault().getDownloadRuntimes().get(runtimeId);
DownloadRuntimeDialog dialog = new DownloadRuntimeDialog(getShell(), runtime);
dialog.open();
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/DownloadRuntimeViewerDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/DownloadRuntimeViewerDialog.java 2011-10-17 16:40:31 UTC (rev 35732)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/DownloadRuntimeViewerDialog.java 2011-10-17 17:24:28 UTC (rev 35733)
@@ -50,7 +50,8 @@
super(parentShell);
setShellStyle(SWT.CLOSE | SWT.MAX | SWT.TITLE | SWT.BORDER
| SWT.RESIZE | getDefaultOrientation());
- downloadRuntimes = RuntimeCoreActivator.getDefault().getDownloadJBossRuntimes();
+ // FIXME
+ downloadRuntimes = RuntimeCoreActivator.getDefault().getDownloadRuntimes();
}
@Override
13 years, 2 months