JBoss Tools SVN: r44240 - in trunk/documentation/whatsnew: examples and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-03 10:14:48 -0400 (Wed, 03 Oct 2012)
New Revision: 44240
Added:
trunk/documentation/whatsnew/examples/examples-news-4.0.0.Alpha2.html
trunk/documentation/whatsnew/examples/images/archetypes_blank.png
trunk/documentation/whatsnew/examples/images/archetypes_select_runtime.png
Modified:
trunk/documentation/whatsnew/index.html
trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html
Log:
N&N for examples
Added: trunk/documentation/whatsnew/examples/examples-news-4.0.0.Alpha2.html
===================================================================
--- trunk/documentation/whatsnew/examples/examples-news-4.0.0.Alpha2.html (rev 0)
+++ trunk/documentation/whatsnew/examples/examples-news-4.0.0.Alpha2.html 2012-10-03 14:14:48 UTC (rev 44240)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Examples 4.0.0.Alpha2 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>Examples 4.0.0.Alpha2 What's New</h1>
+<p align="right"><a
+href="../vpe/vpe-news-4.0.0.Alpha2.html">< Visual Editor</a> <a href="../index.html"> Main Index ></a>
+</p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Project Examples</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <a name="wizard" id="wizard"></a><b>Revamped Wizard for Maven Archetypes</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>For project examples based on Maven archetypes, we now rely on the <a href="JBIDE-12472">JBoss Developer Framework Stacks</a> descriptor
+ to provide the most appropriate version of an archetype, depending on the target runtime you select.
+ </p>
+ <p>
+ This also allows us to provide "blank" versions of archetypes, if you prefer to start creating project with no demo code.
+ You can see what archetype version is used when checking "Create a blank project".
+ This option is currently only available for the Java EE and Java EE Web projects, but we will be able to enable it for other project
+ types in the near future.
+
+ </p>
+ <img src="images/archetypes_blank.png" alt="new blank archetype"/>
+ <p>If the recommended runtime is not configured in your workspace, you now have the possibility of choosing the version you want to download
+ </p>
+ <img src="images/archetypes_select_runtime.png" alt="Select runtime"/>
+
+ <p><small>related JIRAs : <a href="https://issues.jboss.org/browse/JBIDE-12472">JBIDE-12472</a>,
+ <a href="https://issues.jboss.org/browse/JBIDE-12166">JBIDE-12166</a>, <a href="https://issues.jboss.org/browse/JBIDE-12254">JBIDE-12254</a> </small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
Added: trunk/documentation/whatsnew/examples/images/archetypes_blank.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/examples/images/archetypes_blank.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/examples/images/archetypes_select_runtime.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/examples/images/archetypes_select_runtime.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2012-10-03 13:54:08 UTC (rev 44239)
+++ trunk/documentation/whatsnew/index.html 2012-10-03 14:14:48 UTC (rev 44240)
@@ -56,6 +56,7 @@
<p><a href="openshift/openshift-news-2.4.0.Alpha2.html">OpenShift Tools</a></p>
<p><a href="usage/usage-news-4.0.0.Alpha2.html">Usage</a></p>
<p><a href="vpe/vpe-news-4.0.0.Alpha2.html">Visual Page Editor/BrowserSim</a></p>
+ <p><a href="examples/examples-news-4.0.0.Alpha2.html">Project Examples</a></p>
</td>
</tr>
<tr>
Modified: trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html 2012-10-03 13:54:08 UTC (rev 44239)
+++ trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html 2012-10-03 14:14:48 UTC (rev 44240)
@@ -26,7 +26,7 @@
<p align="right">
<a href="../usage/usage-news-4.0.0.Alpha2.html"><
Usage</a>
-<a href="../index.html">Main Index ></a>
+<a href="../examples/examples-news-4.0.0.Alpha2.html">Project Examples ></a>
</p>
<table border="0" cellpadding="10" cellspacing="0">
11 years, 6 months
JBoss Tools SVN: r44239 - trunk/tests/scripts/installation-updates/src/main/groovy.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-10-03 09:54:08 -0400 (Wed, 03 Oct 2012)
New Revision: 44239
Modified:
trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy
Log:
Fix installFromCentral to support the jboss.discovery.directory.url parameter
Modified: trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy
===================================================================
--- trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy 2012-10-03 13:40:16 UTC (rev 44238)
+++ trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy 2012-10-03 13:54:08 UTC (rev 44239)
@@ -77,7 +77,7 @@
void installFromCentral(String discoveryUrl, File eclipseHome, String productName) {
println("Installing content from " + discoveryUrl);
String report = "TEST-install-" + new SimpleDateFormat("yyyyMMddh-hmm").format(new Date()) + ".xml";
- runSWTBotInstallRoutine(eclipseHome, productName, "", "org.jboss.tools.tests.installation.InstallFromCentralTest");
+ runSWTBotInstallRoutine(eclipseHome, productName, "-Djboss.discovery.directory.url" + discoveryUrl, "org.jboss.tools.tests.installation.InstallFromCentralTest");
}
// Check for updates
11 years, 6 months
JBoss Tools SVN: r44238 - trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-03 09:40:16 -0400 (Wed, 03 Oct 2012)
New Revision: 44238
Removed:
trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/ResourceCleaner.java
Log:
Remove unnecessary ResourceCleaner, now that we use m2e-wtp's
Deleted: trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/ResourceCleaner.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/ResourceCleaner.java 2012-10-03 12:50:06 UTC (rev 44237)
+++ trunk/maven/plugins/org.jboss.tools.maven.jbosspackaging/src/org/jboss/tools/maven/jbosspackaging/configurators/ResourceCleaner.java 2012-10-03 13:40:16 UTC (rev 44238)
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *******************************************************************************/
-
-package org.jboss.tools.maven.jbosspackaging.configurators;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-/**
- * ResourceCleaner
- *
- * @author Fred Bricon
- */
-public class ResourceCleaner {
-
- private final IProject project;
-
- private Map<IFolder, Boolean> folders = new LinkedHashMap<IFolder, Boolean>();
-
- private Map<IFile, Boolean> files = new LinkedHashMap<IFile, Boolean>();
-
- private Set<IFolder> keepers = new HashSet<IFolder>();
-
- /**
- * @param project
- */
- public ResourceCleaner(IProject project) {
- this.project = project;
- }
-
- public ResourceCleaner(IProject project, IFolder ... foldersToKeep) {
- this.project = project;
- if (foldersToKeep != null) {
- for (IFolder folder : foldersToKeep) {
- if (folder != null) {
- keepers.add(folder);
- IContainer parent = folder.getParent();
- while (parent instanceof IFolder) {
- keepers.add((IFolder)parent);
- parent = parent.getParent();
- }
- }
- }
- }
- }
-
-
- public void addFolder(IPath folderPath, boolean deleteEmptyParents) {
- if (folderPath == null) {
- return;
- }
- addFolder(project.getFolder(folderPath), deleteEmptyParents);
- }
-
-
- public void addFolders(Collection<IPath> folderPaths) {
- if (folderPaths == null) {
- return;
- }
- for (IPath path : folderPaths) {
- addFolder(path, false);
- }
- }
-
- public void addFolder(IFolder folder, boolean deleteEmptyParents) {
- if (folder != null && !folder.exists()) {
- folders.put(folder, deleteEmptyParents);
- addInexistentParentFolders(folder);
- }
- }
-
- public void addFiles(IPath ... filePaths) {
- if (filePaths == null) {
- return;
- }
- for (IPath fileName : filePaths) {
- IFile fileToDelete = project.getFile(fileName);
- if (!fileToDelete.exists()) {
- files.put(fileToDelete, false);
- addInexistentParentFolders(fileToDelete);
- }
- }
- }
-
- public void cleanUp() throws CoreException {
- IProgressMonitor monitor = new NullProgressMonitor();
- for (IFile file : files.keySet()) {
- if (file.exists()) {
- file.delete(true, monitor);
- }
- }
- for (IFolder folder : folders.keySet()) {
- if (folder.exists() && folder.members().length == 0) {
- folder.delete(true, monitor);
- }
- }
- }
-
- protected void addInexistentParentFolders(IResource resource) {
- IContainer parent = resource.getParent();
- IFolder firstInexistentParent = null;
- while (parent instanceof IFolder) {
- if (keepers.contains(parent)
- || parent.exists()) {
- break;
- }
- firstInexistentParent = (IFolder)parent;
- parent = parent.getParent();
- }
- if (firstInexistentParent != null) {
- folders.put(firstInexistentParent, true);
- }
- }
-
-}
11 years, 6 months
JBoss Tools SVN: r44237 - in trunk/maven/plugins/org.jboss.tools.maven.conversion.ui: META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-03 08:50:06 -0400 (Wed, 03 Oct 2012)
New Revision: 44237
Added:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/AbstractReferenceConversionParticipant.java
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ComponentReferenceConversionParticipant.java
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ProjectClasspathConversionParticipant.java
Removed:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ClasspathConversionParticipant.java
Modified:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/plugin.xml
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/ConvertToMavenDependencyWizard.java
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java
Log:
JBIDE-12529 Use refactoring API to delete converted dependencies
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF 2012-10-03 12:25:41 UTC (rev 44236)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF 2012-10-03 12:50:06 UTC (rev 44237)
@@ -15,7 +15,9 @@
org.eclipse.m2e.core.ui;bundle-version="1.1.0",
org.jboss.tools.maven.core;bundle-version="1.4.0",
org.jboss.tools.maven.ui;bundle-version="1.4.0",
- org.eclipse.wst.common.emfworkbench.integration
+ org.eclipse.wst.common.emfworkbench.integration,
+ org.eclipse.ltk.core.refactoring,
+ org.eclipse.ltk.ui.refactoring
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %BundleVendor
Bundle-Localization: plugin
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/plugin.xml
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/plugin.xml 2012-10-03 12:25:41 UTC (rev 44236)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/plugin.xml 2012-10-03 12:50:06 UTC (rev 44237)
@@ -38,13 +38,13 @@
<extension
point="org.eclipse.m2e.core.projectConversionParticipants">
<projectConversionParticipant
- class="org.jboss.tools.maven.conversion.ui.internal.ClasspathConversionParticipant"
+ class="org.jboss.tools.maven.conversion.ui.internal.ProjectClasspathConversionParticipant"
id="org.jboss.tools.maven.conversion.ui.ClasspathConversionParticipant"
name="Classpath conversion participant"
nature="org.eclipse.jdt.core.javanature">
</projectConversionParticipant>
<projectConversionParticipant
- class="org.jboss.tools.maven.conversion.ui.internal.ClasspathConversionParticipant"
+ class="org.jboss.tools.maven.conversion.ui.internal.ComponentReferenceConversionParticipant"
id="org.jboss.tools.maven.conversion.ui.ModuleConversionParticipant"
name="EAR conversion participant"
nature="org.eclipse.wst.common.modulecore.ModuleCoreNature">
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/ConvertToMavenDependencyWizard.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/ConvertToMavenDependencyWizard.java 2012-10-03 12:25:41 UTC (rev 44236)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/ConvertToMavenDependencyWizard.java 2012-10-03 12:50:06 UTC (rev 44237)
@@ -14,7 +14,10 @@
import org.apache.maven.model.Dependency;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
+import org.eclipse.ltk.ui.refactoring.resource.DeleteResourcesWizard;
import org.jboss.tools.maven.conversion.core.ProjectDependency;
/**
@@ -29,11 +32,12 @@
private List<ProjectDependency> entries;
- IdentifyMavenDependencyPage identificationPage;
+ private IdentifyMavenDependencyPage identificationPage;
private List<Dependency> dependencies;
public ConvertToMavenDependencyWizard(IProject project, List<ProjectDependency> projectDependencies) {
+ System.err.println("New wizard");
this.project = project;
this.entries = projectDependencies;
String title = "Convert to Maven ";
@@ -50,8 +54,6 @@
public void addPages() {
identificationPage = new IdentifyMavenDependencyPage(project, entries);
addPage(identificationPage);
- //DependencyConversionPreviewPage page2 = new DependencyConversionPreviewPage("Foo");
- //addPage(page2);
}
@Override
@@ -67,14 +69,16 @@
dependencies = identificationPage.getDependencies();
if (identificationPage.isDeleteJars()) {
- /* actually only delete classpath entries */
- DeleteExistingJarsJob deleteJob = new DeleteExistingJarsJob(project, entries);
- deleteJob.schedule();
- try {
- deleteJob.join();//wait for job to finish to prevent bad concurrency issues
- } catch (InterruptedException e) {
- e.printStackTrace();
- //ignore
+ //Only delete jars that are directly under a project's hierarchy
+ IResource[] resourcesToDelete = identificationPage.getResourcesToDelete();
+ if (resourcesToDelete != null && resourcesToDelete.length > 0) {
+ DeleteResourcesWizard wizard = new DeleteResourcesWizard(resourcesToDelete);
+ try {
+ RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard);
+ op.run(getShell(), "Delete project relative jars");
+ } catch(InterruptedException e) {
+ // ignored
+ }
}
}
}
@@ -82,10 +86,8 @@
return true;
}
-
public List<Dependency> getDependencies() {
return dependencies;
}
-
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-10-03 12:25:41 UTC (rev 44236)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-10-03 12:50:06 UTC (rev 44237)
@@ -20,8 +20,13 @@
import java.util.concurrent.ConcurrentHashMap;
import org.apache.maven.model.Dependency;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
@@ -74,12 +79,6 @@
public class IdentifyMavenDependencyPage extends WizardPage {
- /*
- private static final String SOURCE_PROPERTY = "SOURCE_PROPERTY";
-
- private static final String DEPENDENCY_PROPERTY = "DEPENDENCY_PROPERTY";
- */
-
private static final int DEPENDENCY_COLUMN = 2;
private Map<ProjectDependency, Dependency> dependencyMap;
@@ -103,7 +102,7 @@
private Button deleteJarsBtn;
- private boolean deleteJars;
+ private boolean deleteJars = true;
private Button startIdentification;
@@ -265,7 +264,7 @@
@Override
public String getToolTipText(Object element) {
ProjectDependency projectDependency = (ProjectDependency) element;
- if (projectDependency.getDependencyKind() == DependencyKind.Project) {
+ if (projectDependency.getDependencyKind() != DependencyKind.Archive) {
return "";
}
try {
@@ -602,21 +601,30 @@
}
public List<Dependency> getDependencies() {
+ List<ProjectDependency> checkedProjectDependencies = getCheckedProjectDependencies();
+ List<Dependency> dependencies = new ArrayList<Dependency>(checkedProjectDependencies.size());
+ for (ProjectDependency projectDep : checkedProjectDependencies) {
+ Dependency d = dependencyMap.get(projectDep);
+ if (d != null) {
+ dependencies.add(d);
+ }
+ }
+ return dependencies;
+ }
+
+ public List<ProjectDependency> getCheckedProjectDependencies() {
if (dependenciesViewer == null || dependenciesViewer.getTable().isDisposed()) {
return Collections.emptyList();
}
Object[] selection = dependenciesViewer.getCheckedElements();
- List<Dependency> dependencies = new ArrayList<Dependency>(selection.length);
+ List<ProjectDependency> selectedDeps = new ArrayList<ProjectDependency>(selection.length);
for (Object o : selection) {
ProjectDependency projectDep = (ProjectDependency) o;
- Dependency d = dependencyMap.get(projectDep);
- if (d != null) {
- dependencies.add(d);
- }
+ selectedDeps.add(projectDep);
}
- return dependencies;
+ return selectedDeps;
}
-
+
public boolean isDeleteJars() {
return deleteJars;
}
@@ -678,4 +686,23 @@
job.cancel();
}
}
+
+ public IResource[] getResourcesToDelete() {
+ List<IResource> resources = new ArrayList<IResource>(dependencyMap.size());
+ IPath projectPath = project.getLocation();
+ IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+ for (ProjectDependency pd : dependencyMap.keySet()) {
+ if (pd.getDependencyKind() == DependencyKind.Archive) {
+ IPath p = pd.getPath();
+ if (projectPath.isPrefixOf(p)) {
+ p = p.removeFirstSegments(projectPath.segmentCount() -1);
+ }
+ IFile f = root.getFile(p);
+ if (f.exists() && project.equals(f.getProject())) {
+ resources.add(f);
+ }
+ }
+ }
+ return resources.toArray(new IResource[0]);
+ }
}
Copied: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/AbstractReferenceConversionParticipant.java (from rev 44218, trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ClasspathConversionParticipant.java)
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/AbstractReferenceConversionParticipant.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/AbstractReferenceConversionParticipant.java 2012-10-03 12:50:06 UTC (rev 44237)
@@ -0,0 +1,71 @@
+/*************************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.maven.conversion.ui.internal;
+
+import java.util.List;
+
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.m2e.core.project.conversion.AbstractProjectConversionParticipant;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.maven.conversion.core.DependencyCollector;
+import org.jboss.tools.maven.conversion.core.ProjectDependency;
+import org.jboss.tools.maven.conversion.ui.dialog.ConvertToMavenDependencyWizard;
+
+public abstract class AbstractReferenceConversionParticipant extends
+ AbstractProjectConversionParticipant {
+
+ private DependencyCollector dependencyCollector;
+
+ public AbstractReferenceConversionParticipant(DependencyCollector dependencyCollector) {
+ this.dependencyCollector = dependencyCollector;
+ }
+
+ @Override
+ public boolean accept(IProject project) throws CoreException {
+ return dependencyCollector != null && dependencyCollector.appliesTo(project);
+ }
+
+ @Override
+ public void convert(final IProject project, final Model model, final IProgressMonitor monitor)
+ throws CoreException {
+
+ if (dependencyCollector != null && dependencyCollector.appliesTo(project)) {
+ List<ProjectDependency> entries = dependencyCollector.collectDependencies(project);
+ if (entries == null || entries.isEmpty()) {
+ return;
+ }
+ final ConvertToMavenDependencyWizard conversionWizard = new ConvertToMavenDependencyWizard(project, entries);
+ Display.getDefault().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+ WizardDialog dialog = new WizardDialog(shell, conversionWizard);
+ if (dialog.open() == Window.OK) {
+ List<Dependency> dependencies = conversionWizard.getDependencies();
+ if (dependencies != null && !dependencies.isEmpty()) {
+ model.setDependencies(dependencies);
+ }
+ }
+ }
+ });
+ }
+ }
+
+}
Deleted: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ClasspathConversionParticipant.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ClasspathConversionParticipant.java 2012-10-03 12:25:41 UTC (rev 44236)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ClasspathConversionParticipant.java 2012-10-03 12:50:06 UTC (rev 44237)
@@ -1,72 +0,0 @@
-/*************************************************************************************
- * Copyright (c) 2012 Red Hat, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * JBoss by Red Hat - Initial implementation.
- ************************************************************************************/
-package org.jboss.tools.maven.conversion.ui.internal;
-
-import java.util.List;
-
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Model;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.m2e.core.project.conversion.AbstractProjectConversionParticipant;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.maven.conversion.core.DependencyCollector;
-import org.jboss.tools.maven.conversion.core.DependencyCollectorFactory;
-import org.jboss.tools.maven.conversion.core.ProjectDependency;
-import org.jboss.tools.maven.conversion.ui.dialog.ConvertToMavenDependencyWizard;
-
-public class ClasspathConversionParticipant extends
- AbstractProjectConversionParticipant {
-
- @Override
- public boolean accept(IProject project) throws CoreException {
- return getDependencyCollector(project) != null;
- }
-
- private DependencyCollector getDependencyCollector(IProject project) throws CoreException {
- return DependencyCollectorFactory.INSTANCE.getDependencyCollector(project);
- }
-
- @Override
- public void convert(final IProject project, final Model model, final IProgressMonitor monitor)
- throws CoreException {
-
- DependencyCollector dependencyCollector = getDependencyCollector(project);
- if (dependencyCollector != null) {
- List<ProjectDependency> entries = dependencyCollector.collectDependencies(project);
- if (entries == null || entries.isEmpty()) {
- return;
- }
- final ConvertToMavenDependencyWizard conversionWizard = new ConvertToMavenDependencyWizard(project, entries);
- Display.getDefault().syncExec(new Runnable() {
-
- @Override
- public void run() {
- // TODO Auto-generated method stub
- Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- WizardDialog dialog = new WizardDialog(shell, conversionWizard);
- if (dialog.open() == Window.OK) {
- List<Dependency> dependencies = conversionWizard.getDependencies();
- if (dependencies != null && !dependencies.isEmpty()) {
- model.setDependencies(dependencies);
- }
- }
- }
- });
- }
- }
-
-}
Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ComponentReferenceConversionParticipant.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ComponentReferenceConversionParticipant.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ComponentReferenceConversionParticipant.java 2012-10-03 12:50:06 UTC (rev 44237)
@@ -0,0 +1,11 @@
+package org.jboss.tools.maven.conversion.ui.internal;
+
+import org.jboss.tools.maven.conversion.core.internal.ComponentDependencyCollector;
+
+public class ComponentReferenceConversionParticipant extends AbstractReferenceConversionParticipant {
+
+ public ComponentReferenceConversionParticipant() {
+ super(new ComponentDependencyCollector());
+ }
+
+}
Added: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ProjectClasspathConversionParticipant.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ProjectClasspathConversionParticipant.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/internal/ProjectClasspathConversionParticipant.java 2012-10-03 12:50:06 UTC (rev 44237)
@@ -0,0 +1,11 @@
+package org.jboss.tools.maven.conversion.ui.internal;
+
+import org.jboss.tools.maven.conversion.core.internal.JavaDependencyCollector;
+
+public class ProjectClasspathConversionParticipant extends AbstractReferenceConversionParticipant {
+
+ public ProjectClasspathConversionParticipant() {
+ super(new JavaDependencyCollector());
+ }
+
+}
11 years, 6 months
JBoss Tools SVN: r44236 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-10-03 08:25:41 -0400 (Wed, 03 Oct 2012)
New Revision: 44236
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
Log:
Restored Editing tests
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2012-10-03 12:04:24 UTC (rev 44235)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2012-10-03 12:25:41 UTC (rev 44236)
@@ -157,7 +157,7 @@
getEditor().save();
}
-// @Test
+ @Test
public void actions() {
String service = "bbb";
addService(service);
11 years, 6 months
JBoss Tools SVN: r44235 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj: jpatest40 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-10-03 08:04:24 -0400 (Wed, 03 Oct 2012)
New Revision: 44235
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernate40/.classpath
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/jpatest40/.classpath
Log:
Classpath for hb4 related project updated
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernate40/.classpath
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernate40/.classpath 2012-10-03 12:03:26 UTC (rev 44234)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernate40/.classpath 2012-10-03 12:04:24 UTC (rev 44235)
@@ -2,17 +2,15 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="lib" path="/hibernatelib/connector/hsqldb.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/antlr-2.7.7.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/commons-collections-3.2.1.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-commons-annotations-4.0.1.Final.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-core-4.0.1.Final.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-entitymanager-4.0.1.Final.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-envers-4.0.1.Final.jar"/>
+ <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-core-4.1.7.Final.jar"/>
+ <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-entitymanager-4.1.7.Final.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/javassist-3.15.0-GA.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/jboss-logging-3.1.0.CR2.jar"/>
+ <classpathentry kind="lib" path="/hibernatelib/hibernate40/jboss-logging-3.1.0.GA.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/connector/hsqldb.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/jpatest40/.classpath
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/jpatest40/.classpath 2012-10-03 12:03:26 UTC (rev 44234)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/jpatest40/.classpath 2012-10-03 12:04:24 UTC (rev 44235)
@@ -6,16 +6,13 @@
<classpathentry kind="lib" path="/hibernatelib/connector/mysql-connector-java-5.1.13-bin.jar"/>
<classpathentry kind="lib" path="/hibernatelib/connector/postgresql-8.4-702.jdbc4.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/antlr-2.7.7.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/commons-collections-3.2.1.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-commons-annotations-4.0.1.Final.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-core-4.0.1.Final.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-entitymanager-4.0.1.Final.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-envers-4.0.1.Final.jar"/>
+ <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-core-4.1.7.Final.jar"/>
+ <classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-entitymanager-4.1.7.Final.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/javassist-3.15.0-GA.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/hibernate40/jboss-logging-3.1.0.CR2.jar"/>
+ <classpathentry kind="lib" path="/hibernatelib/hibernate40/jboss-logging-3.1.0.GA.jar"/>
<classpathentry kind="lib" path="/hibernatelib/hibernate40/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
- <classpathentry kind="lib" path="/hibernatelib/jpa2/javax.persistence_2.0.0.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
11 years, 6 months
JBoss Tools SVN: r44234 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-10-03 08:03:26 -0400 (Wed, 03 Oct 2012)
New Revision: 44234
Added:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-core-4.1.7.Final.jar
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-entitymanager-4.1.7.Final.jar
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/jboss-logging-3.1.0.GA.jar
Removed:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/commons-collections-3.2.1.jar
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-core-4.0.1.Final.jar
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-entitymanager-4.0.1.Final.jar
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-envers-4.0.1.Final.jar
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/jboss-logging-3.1.0.CR2.jar
Log:
hibernate4 updated to up-to-date (4.1.7) version in hb ui bot tests
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/commons-collections-3.2.1.jar
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-core-4.0.1.Final.jar
===================================================================
(Binary files differ)
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-core-4.1.7.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-core-4.1.7.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-entitymanager-4.0.1.Final.jar
===================================================================
(Binary files differ)
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-entitymanager-4.1.7.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-entitymanager-4.1.7.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/hibernate-envers-4.0.1.Final.jar
===================================================================
(Binary files differ)
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/jboss-logging-3.1.0.CR2.jar
===================================================================
(Binary files differ)
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/jboss-logging-3.1.0.GA.jar
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernatelib/hibernate40/jboss-logging-3.1.0.GA.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
11 years, 6 months
JBoss Tools SVN: r44233 - trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/publishing/defect.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-10-03 06:29:37 -0400 (Wed, 03 Oct 2012)
New Revision: 44233
Modified:
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/publishing/defect/RepublishDefectTest.java
Log:
JBIDE-12786 fix for inconsistant test results
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/publishing/defect/RepublishDefectTest.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/publishing/defect/RepublishDefectTest.java 2012-10-03 10:24:21 UTC (rev 44232)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/parametized/server/publishing/defect/RepublishDefectTest.java 2012-10-03 10:29:37 UTC (rev 44233)
@@ -34,26 +34,36 @@
@RunWith(value = Parameterized.class)
public class RepublishDefectTest extends AbstractPublishingTest {
+ public static int count = 1;
+
@Parameters
public static Collection<Object[]> params() {
return defaultData();
}
+ private int myCount;
public RepublishDefectTest(String serverType, String zip,
String deployLoc, String perMod) {
super(serverType, zip, deployLoc, perMod);
+ myCount = count;
+ count++;
}
protected void createProjects() throws Exception {
- IDataModel dm = CreateProjectOperationsUtility.getEARDataModel("ear", "thatContent", null, null, JavaEEFacetConstants.EAR_5, true);
+ IDataModel dm = CreateProjectOperationsUtility.getEARDataModel(ap("ear"), "thatContent", null, null, JavaEEFacetConstants.EAR_5, true);
OperationTestCase.runAndVerify(dm);
- IDataModel dyn1Model = CreateProjectOperationsUtility.getWebDataModel("d1", "ear", null, null, null, JavaEEFacetConstants.WEB_23, true);
+ IDataModel dyn1Model = CreateProjectOperationsUtility.getWebDataModel(ap("d1v"), ap("ear"), null, null, null, JavaEEFacetConstants.WEB_23, true);
OperationTestCase.runAndVerify(dyn1Model);
- IDataModel dyn2Model = CreateProjectOperationsUtility.getWebDataModel("d2", "ear", null, null, null, JavaEEFacetConstants.WEB_23, true);
+ IDataModel dyn2Model = CreateProjectOperationsUtility.getWebDataModel(ap("d2v"), ap("ear"), null, null, null, JavaEEFacetConstants.WEB_23, true);
OperationTestCase.runAndVerify(dyn2Model);
addModuleToServer(ServerUtil.getModule(findProject("ear")));
}
+ /* Append myCount as a suffix to this original*/
+ private String ap(String original) {
+ return original + myCount;
+ }
+
protected void completeSetUp() {
// Keep it local for REAL publishes
wc.setAttribute(IDeployableServer.SERVER_MODE, "local");
@@ -72,7 +82,7 @@
@Test
public void testJBIDE6184_Odd_Republish_Error() throws Exception {
- IModule[] ear = getModule(findProject("ear"));
+ IModule[] ear = getModule(findProject(ap("ear")));
// Create a temp server
addOrRemoveModuleWithPublish(ear, true);
@@ -86,20 +96,20 @@
addOrRemoveModuleWithPublish(ear, false);
assertFalse(earPath.toFile().exists());
- ResourceUtils.deleteProject("d1");
+ ResourceUtils.deleteProject(ap("d1v"));
// republish the ear
addOrRemoveModuleWithPublish(ear, true);
JBIDE6184EarHasDynProjs(earPath, false);
// recreate the war
- IDataModel dyn1Model = CreateProjectOperationsUtility.getWebDataModel("d1", "ear", null, null, null, JavaEEFacetConstants.WEB_23, true);
+ IDataModel dyn1Model = CreateProjectOperationsUtility.getWebDataModel(ap("d1v"), ap("ear"), null, null, null, JavaEEFacetConstants.WEB_23, true);
OperationTestCase.runAndVerify(dyn1Model);
server.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor());
JBIDE6184EarHasDynProjs(earPath, true);
}
- protected void JBIDE6184EarHasDynProjs(IPath earPath, boolean d1Present ) {
+ protected void JBIDE6184EarHasDynProjs(IPath earPath, boolean d1vPresent ) {
ArrayList<IPath> mustBePresent = new ArrayList<IPath>();
ArrayList<IPath> mustBeMissing = new ArrayList<IPath>();
@@ -107,18 +117,20 @@
mustBePresent.add(earPath.append("META-INF"));
mustBePresent.add(earPath.append("META-INF").append("application.xml"));
- ArrayList<IPath> tmp = d1Present ? mustBePresent : mustBeMissing;
- tmp.add(earPath.append("d1.war"));
- tmp.add(earPath.append("d1.war").append("WEB-INF"));
- tmp.add(earPath.append("d1.war").append("META-INF"));
- tmp.add(earPath.append("d1.war").append("META-INF").append("MANIFEST.MF"));
- tmp.add(earPath.append("d1.war").append("WEB-INF").append("web.xml"));
+ ArrayList<IPath> tmp = d1vPresent ? mustBePresent : mustBeMissing;
+ String d1WarName = ap("d1v") + ".war";
+ tmp.add(earPath.append(d1WarName));
+ tmp.add(earPath.append(d1WarName).append("WEB-INF"));
+ tmp.add(earPath.append(d1WarName).append("META-INF"));
+ tmp.add(earPath.append(d1WarName).append("META-INF").append("MANIFEST.MF"));
+ tmp.add(earPath.append(d1WarName).append("WEB-INF").append("web.xml"));
- mustBePresent.add(earPath.append("d2.war"));
- mustBePresent.add(earPath.append("d2.war").append("WEB-INF"));
- mustBePresent.add(earPath.append("d2.war").append("META-INF"));
- mustBePresent.add(earPath.append("d2.war").append("META-INF").append("MANIFEST.MF"));
- mustBePresent.add(earPath.append("d2.war").append("WEB-INF").append("web.xml"));
+ String d2WarName = ap("d2v") + ".war";
+ mustBePresent.add(earPath.append(d2WarName));
+ mustBePresent.add(earPath.append(d2WarName).append("WEB-INF"));
+ mustBePresent.add(earPath.append(d2WarName).append("META-INF"));
+ mustBePresent.add(earPath.append(d2WarName).append("META-INF").append("MANIFEST.MF"));
+ mustBePresent.add(earPath.append(d2WarName).append("WEB-INF").append("web.xml"));
verifyList(earPath, mustBePresent, true);
verifyList(earPath, mustBeMissing, false);
11 years, 6 months
JBoss Tools SVN: r44232 - in trunk/documentation/whatsnew: as and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-10-03 06:24:21 -0400 (Wed, 03 Oct 2012)
New Revision: 44232
Modified:
trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha2.html
trunk/documentation/whatsnew/index.html
trunk/documentation/whatsnew/openshift/openshift-news-2.4.0.Alpha2.html
trunk/documentation/whatsnew/usage/usage-news-4.0.0.Alpha2.html
trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html
Log:
fixed linking and put important news upfront
Modified: trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha2.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha2.html 2012-10-03 09:58:12 UTC (rev 44231)
+++ trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha2.html 2012-10-03 10:24:21 UTC (rev 44232)
@@ -22,7 +22,7 @@
<h1>JBoss AS Tools 4.0.0.Alpha2 What's New</h1>
<p align="right"><a href="../index.html">< Main Index</a> <a
-href="../cdi/cdi-news-4.0.0.Alpha2.html">CDI Tools></a></p>
+href="../openshift/openshift-news-2.4.0.Alpha2.html">OpenShift Tools></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2012-10-03 09:58:12 UTC (rev 44231)
+++ trunk/documentation/whatsnew/index.html 2012-10-03 10:24:21 UTC (rev 44232)
@@ -52,6 +52,7 @@
<td valign="top" align="left">
<p align="right"><b>4.0.0.Alpha2</b>
<td valign="top">
+ <p><a href="as/as-news-4.0.0.Alpha2.html">Server Tools</a></p>
<p><a href="openshift/openshift-news-2.4.0.Alpha2.html">OpenShift Tools</a></p>
<p><a href="usage/usage-news-4.0.0.Alpha2.html">Usage</a></p>
<p><a href="vpe/vpe-news-4.0.0.Alpha2.html">Visual Page Editor/BrowserSim</a></p>
Modified: trunk/documentation/whatsnew/openshift/openshift-news-2.4.0.Alpha2.html
===================================================================
--- trunk/documentation/whatsnew/openshift/openshift-news-2.4.0.Alpha2.html 2012-10-03 09:58:12 UTC (rev 44231)
+++ trunk/documentation/whatsnew/openshift/openshift-news-2.4.0.Alpha2.html 2012-10-03 10:24:21 UTC (rev 44232)
@@ -23,8 +23,9 @@
<body>
<h1>OpenShift 2.4.0.Alpha2 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a
- href="../as/as-news-4.0.0.Alpha2.html">Server Tools
+<p align="right"><a href="../as/as-news-4.0.0.Alpha2.html">< Server
+ Tools</a> <a
+ href="../usage/usage-news-4.0.0.Alpha2.html">Usage
></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
@@ -75,23 +76,34 @@
<tr>
<td colspan="2">
<hr />
- <h3>OpenShift Domain wizard</h3>
+ <h3>SSH Keys Management wizard</h3>
<hr />
</td>
</tr>
<tr>
<td valign="top" align="left">
- <b>Separated keys from domain creation</b>
+ <b>New SSH Keys management wizard</b>
</td>
<td valign="top" align="left">
- So far you had to provide your SSH when you created your domain. This was far from ideal since there was no way to add keys
- once you had your domain. We now provide a whole new wizard that is dedicated to managing your OpenShift keys.
- If you now create a domain you will only have to choose a name for it. There's no choosing a key any more.<br>
- A link in the bottom of the domain wizard allows you to get to the keys management wizard.
+ In Alpha2 we now added a whole new wizard that allows you to manage your ssh keys on OpenShift.
+ You'll get there from the context-menu in the OpenShift Explorer.
+ We also provide links to it when you create a domain or application.
<p>
- <img src="images/create-domain.png" alt="create a new domain" />
+ <img src="images/manage-ssh-keys.png" alt="manage your ssh keys" />
</p>
+ Once you are in the wizard you'll spot the public keys you already added to OpenShift.
<p>
+ <img src="images/keys-management-wizard.png" alt="add new public key" />
+ </p>
+ Buttons allow you to get to dialogs to create a whole new keypair or add your existing key:
+ <p>
+ <img src="images/add-new-key.png" alt="add new public key" />
+ </p>
+ <p>
+ <img src="images/add-existing-key.png" alt="add existing public key" />
+ </p>
+ The wizard of course also allows you to remove keys from OpenShift.
+ <p>
<small>
<a href="https://issues.jboss.org/browse/JBIDE-11912">Related Jira</a>
</small>
@@ -101,20 +113,21 @@
<tr>
<td colspan="2">
<hr />
- <h3>OpenShift application wizard</h3>
+ <h3>OpenShift Domain wizard</h3>
<hr />
</td>
</tr>
<tr>
<td valign="top" align="left">
- <b>Can't create if no public keys</b>
+ <b>Separated keys from domain creation</b>
</td>
<td valign="top" align="left">
- We'll check if you have any public SSH keys on OpenShift once you're up to create a new OpenShift application.
- We'll display an error if you haven't. A link allows you to get to the SSH management wizard where you can
- create and add the required key(s).
+ So far you had to provide your SSH when you created your domain. This was far from ideal since there was no way to add keys
+ once you had your domain. We now provide a whole new wizard that is dedicated to managing your OpenShift keys.
+ If you now create a domain you will only have to choose a name for it. There's no choosing a key any more.<br>
+ A link in the bottom of the domain wizard allows you to get to the keys management wizard.
<p>
- <img src="images/no-keys.png" alt="no ssh public key" />
+ <img src="images/create-domain.png" alt="create a new domain" />
</p>
<p>
<small>
@@ -126,40 +139,29 @@
<tr>
<td colspan="2">
<hr />
- <h3>SSH Keys Management wizard</h3>
+ <h3>OpenShift application wizard</h3>
<hr />
</td>
</tr>
<tr>
<td valign="top" align="left">
- <b>New SSH Keys management wizard</b>
+ <b>Can't create if no public keys</b>
</td>
<td valign="top" align="left">
- In Alpha2 we now added a whole new wizard that allows you to manage your ssh keys on OpenShift.
- You'll get there from the context-menu in the OpenShift Explorer.
- We also provide links to it when you create a domain or application.
+ We'll check if you have any public SSH keys on OpenShift once you're up to create a new OpenShift application.
+ We'll display an error if you haven't. A link allows you to get to the SSH management wizard where you can
+ create and add the required key(s).
<p>
- <img src="images/manage-ssh-keys.png" alt="manage your ssh keys" />
+ <img src="images/no-keys.png" alt="no ssh public key" />
</p>
- Once you are in the wizard you'll spot the public keys you already added to OpenShift.
<p>
- <img src="images/keys-management-wizard.png" alt="add new public key" />
- </p>
- Buttons allow you to get to dialogs to create a whole new keypair or add your existing key:
- <p>
- <img src="images/add-new-key.png" alt="add new public key" />
- </p>
- <p>
- <img src="images/add-existing-key.png" alt="add existing public key" />
- </p>
- The wizard of course also allows you to remove keys from OpenShift.
- <p>
<small>
<a href="https://issues.jboss.org/browse/JBIDE-11912">Related Jira</a>
</small>
</p>
</td>
</tr>
+
</table>
</body>
Modified: trunk/documentation/whatsnew/usage/usage-news-4.0.0.Alpha2.html
===================================================================
--- trunk/documentation/whatsnew/usage/usage-news-4.0.0.Alpha2.html 2012-10-03 09:58:12 UTC (rev 44231)
+++ trunk/documentation/whatsnew/usage/usage-news-4.0.0.Alpha2.html 2012-10-03 10:24:21 UTC (rev 44232)
@@ -23,7 +23,9 @@
<h1><span>Usage Reporting 4.0.0.Alpha2 What's New</span></h1>
<p align="right">
- <a href="../index.html">< Main Index</a>
+ <a href="../openshift/openshift-news-2.4.0.Alpha2.html"><
+OpenShift</a> <a
+href="../vpe/vpe-news-4.0.0.Alpha2.html">Visual Editor ></a>
</p>
<table border="0" cellpadding="10" cellspacing="0" width="100%">
<tr>
Modified: trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html 2012-10-03 09:58:12 UTC (rev 44231)
+++ trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html 2012-10-03 10:24:21 UTC (rev 44232)
@@ -24,7 +24,9 @@
<h1 style="text-align:left">Visual Page Editor/BrowserSim 4.0.0.Alpha2 What's New</h1>
<p align="right">
-<a href="../index.html">< Main Index</a>
+ <a href="../usage/usage-news-4.0.0.Alpha2.html"><
+Usage</a>
+<a href="../index.html">Main Index ></a>
</p>
<table border="0" cellpadding="10" cellspacing="0">
11 years, 6 months
JBoss Tools SVN: r44231 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-10-03 05:58:12 -0400 (Wed, 03 Oct 2012)
New Revision: 44231
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java
Log:
NPE JBIDE-12769
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java 2012-10-03 09:53:16 UTC (rev 44230)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java 2012-10-03 09:58:12 UTC (rev 44231)
@@ -172,8 +172,10 @@
}
addContextMenuContributions(node, manager);
}
- } else if( ProjectArchivesCommonView.getInstance().getCurrentProject() != null ){
- manager.add(newPackageManager);
+ } else {
+ ProjectArchivesCommonView v = ProjectArchivesCommonView.getInstance();
+ if( v != null && v.getCurrentProject() != null )
+ manager.add(newPackageManager);
}
}
11 years, 6 months