JBoss Tools SVN: r44429 - trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-10-11 08:43:44 -0400 (Thu, 11 Oct 2012)
New Revision: 44429
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
Log:
Jenkins debugging
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-10-11 11:30:47 UTC (rev 44428)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-10-11 12:43:44 UTC (rev 44429)
@@ -25,7 +25,7 @@
//TODO When testing new build try it with type=ServerType.EAP !!!!
-@Require(clearProjects=false,server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.JbossAS))
+@Require(clearProjects=false,server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.ALL))
public class CreateProjectsWithServerTest extends SWTTestExt{
@BeforeClass
12 years, 3 months
JBoss Tools SVN: r44428 - trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-10-11 07:30:47 -0400 (Thu, 11 Oct 2012)
New Revision: 44428
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java
Log:
Jenkins debugging.
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java 2012-10-11 11:22:41 UTC (rev 44427)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java 2012-10-11 11:30:47 UTC (rev 44428)
@@ -75,6 +75,7 @@
fail("Unable to select Java 1.7 in Project Facets");
}else{
facetsShell.bot().list().select("1.7");
+ facetsShell.bot().list().pressShortcut(SWT.CR, SWT.LF);
}
}
/**
12 years, 3 months
JBoss Tools SVN: r44427 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: psuchy
Date: 2012-10-11 07:22:41 -0400 (Thu, 11 Oct 2012)
New Revision: 44427
Modified:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/RuntimeDetectionTestCase.java
Log:
Test debugging on jenkins (MacOS) - open preferences dialog problem
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-10-11 10:27:33 UTC (rev 44426)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/RuntimeDetectionPreferencesDialog.java 2012-10-11 11:22:41 UTC (rev 44427)
@@ -30,6 +30,8 @@
public SearchingForRuntimesDialog addPath(final String path){
RuntimeUIActivator.getDefault().getModel().addRuntimePath(new RuntimePath(path));
+
+ // ↓ MacOSX cannot open preferences dialog for the first time - trying to resolve
new WaitWhile(new JobIsRunning());
cancel();
new WaitWhile(new JobIsRunning());
@@ -40,6 +42,7 @@
open();
}
new WaitWhile(new JobIsRunning());
+
return new SearchingForRuntimesDialog();
}
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/RuntimeDetectionTestCase.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/RuntimeDetectionTestCase.java 2012-10-11 10:27:33 UTC (rev 44426)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/RuntimeDetectionTestCase.java 2012-10-11 11:22:41 UTC (rev 44427)
@@ -4,9 +4,14 @@
import static org.hamcrest.Matchers.is;
import org.jboss.reddeer.eclipse.wst.server.ui.RuntimePreferencePage;
+import org.jboss.reddeer.swt.condition.JobIsRunning;
+import org.jboss.reddeer.swt.exception.WidgetNotAvailableException;
+import org.jboss.reddeer.swt.wait.WaitWhile;
import org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences.RuntimeDetectionPreferencesDialog;
import org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences.SeamPreferencesDialog;
import org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences.SearchingForRuntimesDialog;
+import org.jboss.tools.runtime.core.model.RuntimePath;
+import org.jboss.tools.runtime.ui.RuntimeUIActivator;
/**
* Provides useful methods that can be used by its descendants.
@@ -24,7 +29,18 @@
protected SearchingForRuntimesDialog addPath(String path){
runtimeDetectionPreferences = new RuntimeDetectionPreferencesDialog();
- runtimeDetectionPreferences.open();
+ RuntimeUIActivator.getDefault().getModel().addRuntimePath(new RuntimePath(path));
+
+ // ↓ MacOSX cannot open preferences dialog for the first time - trying to resolve
+ new WaitWhile(new JobIsRunning());
+ try{
+ runtimeDetectionPreferences.open();
+ }catch(WidgetNotAvailableException ex){
+ new WaitWhile(new JobIsRunning());
+ runtimeDetectionPreferences.open();
+ }
+ new WaitWhile(new JobIsRunning());
+
runtimeDetectionPreferences.addPath(path);
return runtimeDetectionPreferences.search();
}
12 years, 3 months
JBoss Tools SVN: r44426 - in trunk/build/tycho-plugins/repository-utils/src/main: resources and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-10-11 06:27:33 -0400 (Thu, 11 Oct 2012)
New Revision: 44426
Modified:
trunk/build/tycho-plugins/repository-utils/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java
trunk/build/tycho-plugins/repository-utils/src/main/resources/index.html
trunk/build/tycho-plugins/repository-utils/src/main/resources/web/site.css
Log:
JBIDE-12660: Easier customization
Modified: trunk/build/tycho-plugins/repository-utils/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java
===================================================================
--- trunk/build/tycho-plugins/repository-utils/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java 2012-10-11 10:27:06 UTC (rev 44425)
+++ trunk/build/tycho-plugins/repository-utils/src/main/java/org/jboss/tools/tycho/sitegenerator/GenerateRepositoryFacadeMojo.java 2012-10-11 10:27:33 UTC (rev 44426)
@@ -66,7 +66,7 @@
* Generates a JBoss-friendly facade and files for this p2 repo
*
* @goal generate-repository-facade
- *
+ *
* @phase package
*/
public class GenerateRepositoryFacadeMojo extends AbstractTychoPackagingMojo {
@@ -81,26 +81,26 @@
* @readonly
*/
private MavenProject project;
-
+
/**
* Additional symbols, to replace in files
*
* @parameter
*/
private Map<String, String> symbols;
-
+
/**
* template folder for HTML contents
* @parameter
*/
private File siteTemplateFolder;
-
+
/**
* Additional sites to add to repo associateSites
- * @parameter
+ * @parameter
*/
private List<String> associateSites;
-
+
/**
* name of the file in ${siteTemplateFolder} to use as template for index.html
* @parameter default-value="index.html"
@@ -113,12 +113,12 @@
return;
}
- if (symbols == null) {
- symbols = new HashMap<String, String>();
+ if (this.symbols == null) {
+ this.symbols = new HashMap<String, String>();
}
// TODO populate default symbols: ${update.site.name} & ${update.site.description}
-
- File outputRepository = new File(project.getBuild().getDirectory(), "repository");
+
+ File outputRepository = new File(this.project.getBuild().getDirectory(), "repository");
File outputSiteXml = generateSiteXml(outputRepository);
generateSiteProperties(outputRepository, outputSiteXml);
generateJBossToolsDirectoryXml(outputRepository);
@@ -128,8 +128,8 @@
} catch (Exception ex) {
throw new MojoExecutionException("Error while altering content.jar",ex);
}
-
-
+
+
File repoZipFile = new File(project.getBuild().getDirectory(), project.getArtifactId() + "-" + project.getVersion() + ".zip");
repoZipFile.delete();
try {
@@ -141,7 +141,7 @@
} catch (Exception ex) {
throw new MojoExecutionException("Could not create " + repoZipFile.getName(), ex);
}
-
+
}
private void generateWebStuff(File outputRepository, File outputSiteXml)
@@ -160,8 +160,8 @@
} catch (Exception ex) {
throw new MojoExecutionException("Error occured while generating 'site.properties'", ex);
}
-
-
+
+
try {
copyTemplateResources(outputRepository);
} catch (Exception ex) {
@@ -219,7 +219,7 @@
} catch (Exception ex) {
throw new MojoExecutionException("Error occured while generating 'site.properties'", ex);
}
-
+
try {
copyTemplateResources(outputRepository);
} catch (Exception ex) {
@@ -234,7 +234,7 @@
if (!categoryFile.isFile()) {
throw new MojoExecutionException("Missing 'category.xml file'");
}
-
+
UpdateSite site = null;
try {
site = UpdateSite.read(categoryFile);
@@ -309,7 +309,7 @@
done = true;
}
}
- // .close and .closeEntry raise exception:
+ // .close and .closeEntry raise exception:
// https://issues.apache.org/bugzilla/show_bug.cgi?id=3862
ZipOutputStream outContentStream = new ZipOutputStream(new FileOutputStream(contentJar));
ZipEntry contentXmlEntry = new ZipEntry("content.xml");
@@ -318,16 +318,16 @@
Transformer transformer = tFactory.newTransformer();
DOMSource source = new DOMSource(contentDoc);
StreamResult result = new StreamResult(outContentStream);
- transformer.transform(source, result);
+ transformer.transform(source, result);
outContentStream.closeEntry();
outContentStream.close();
}
private void alterIndexFile(File outputSite) throws FileNotFoundException, IOException {
- File templateFile = new File(outputSite, indexName);
+ File templateFile = new File(outputSite, this.indexName);
FileInputStream fis = new FileInputStream(templateFile);
String htmlFile = IOUtil.toString(fis, "UTF-8");
- for (Entry<String, String> entry : symbols.entrySet()) {
+ for (Entry<String, String> entry : this.symbols.entrySet()) {
String key = entry.getKey();
if (!key.startsWith("${")) {
key = "${" + key + "}";
@@ -336,17 +336,25 @@
}
FileOutputStream out = new FileOutputStream(templateFile);
out.write(htmlFile.getBytes("UTF-8"));
+ fis.close();
out.close();
}
-
- private void copyTemplateResources(File outputSite) throws IOException {
- if (siteTemplateFolder != null) {
- FileUtils.copyDirectory(siteTemplateFolder, outputSite);
+
+ private void copyTemplateResources(File outputSite) throws IOException, MojoExecutionException {
+ if (this.siteTemplateFolder != null) {
+ if (!this.siteTemplateFolder.isDirectory()) {
+ throw new MojoExecutionException("'siteTemplateFolder' not correctly set. " + this.siteTemplateFolder.getAbsolutePath() + " is not a directory");
+ }
+ FileUtils.copyDirectoryStructure(this.siteTemplateFolder, outputSite);
+ if (!new File(this.siteTemplateFolder, this.indexName).isFile()) {
+ // copy default index
+ InputStream indexStream = getClass().getResourceAsStream("/index.html");
+ FileUtils.copyStreamToFile(new RawInputStreamFacade(indexStream), new File(outputSite, this.indexName));
+ indexStream.close();
+ }
} else {
- // load from resources
InputStream indexStream = getClass().getResourceAsStream("/index.html");
- indexName = "index.html";
- FileUtils.copyStreamToFile(new RawInputStreamFacade(indexStream), new File(outputSite, "index.html"));
+ FileUtils.copyStreamToFile(new RawInputStreamFacade(indexStream), new File(outputSite, this.indexName));
indexStream.close();
File webFolder = new File(outputSite, "web");
if (!webFolder.exists()) {
Modified: trunk/build/tycho-plugins/repository-utils/src/main/resources/index.html
===================================================================
--- trunk/build/tycho-plugins/repository-utils/src/main/resources/index.html 2012-10-11 10:27:06 UTC (rev 44425)
+++ trunk/build/tycho-plugins/repository-utils/src/main/resources/index.html 2012-10-11 10:27:33 UTC (rev 44426)
@@ -1,17 +1,13 @@
<html>
<head>
<title>${update.site.name} - ${update.site.description} Update Site${update.site.version}</title>
-<style>
-@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
-</style>
+<link rel="stylesheet" type="text/css" href="web/site.css">
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
<center>
-<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
- cellspacing="0" cellpadding="0" width="920" class="bodyText">
+<table cellspacing="0" cellpadding="0" class="table">
<tr>
- <td colspan="3"><img
- src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ <td colspan="3" class="td_header"> </td>
</tr>
<tr>
<td>      </td>
@@ -44,8 +40,8 @@
<li>When the site loads, select the features to install,
or click the <code><strong>Select All</strong></code> button.</li>
<li>To properly resolve all dependencies, check
- <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
-
+ <ul><code><strong>[x] Contact all update sites during install to find required software</strong></code></ul>
+
<li>Click <code><strong>Next</strong></code>, agree to the license
terms, and install.</li>
Modified: trunk/build/tycho-plugins/repository-utils/src/main/resources/web/site.css
===================================================================
--- trunk/build/tycho-plugins/repository-utils/src/main/resources/web/site.css 2012-10-11 10:27:06 UTC (rev 44425)
+++ trunk/build/tycho-plugins/repository-utils/src/main/resources/web/site.css 2012-10-11 10:27:33 UTC (rev 44426)
@@ -9,10 +9,17 @@
color: #1778be;
}
+.table {
+ margin-top: 0px;
+ margin-left: 0px;
+ width: 920px;
+}
+
.bodyText {
font-family: sans-serif;
font-size: 9pt;
color: #000000;
+ width: 100%
}
.sub-header {
@@ -62,6 +69,11 @@
color: #187dc6;
}
+.td_header {
+ background: url("https://www.jboss.org/dms/tools/images/tools-banner.png") 0 no-repeat;
+ height: 100px;
+}
+
.column-header {
font-size:small;
}
12 years, 3 months
JBoss Tools SVN: r44425 - in trunk/maven: plugins/org.jboss.tools.maven.core/META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-11 06:27:06 -0400 (Thu, 11 Oct 2012)
New Revision: 44425
Added:
trunk/maven/plugins/org.jboss.tools.maven.core/lib/jboss-dmr-1.1.1.Final.jar
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/identification/MavenCentralIdentifier.java
trunk/maven/tests/org.jboss.tools.maven.common.test/resources/groovy-jsr223-2.0.4.jar
trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/MavenCentralIdentifierTest.java
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/.classpath
trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.core/build.properties
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/identification/FileIdentificationManager.java
trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/AbstractIdentificationTest.java
trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/FileIdentificationManagerTest.java
Log:
JBIDE-12702 query search.maven.org as a last resort to identify jars
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/.classpath
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/.classpath 2012-10-11 09:47:00 UTC (rev 44424)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/.classpath 2012-10-11 10:27:06 UTC (rev 44425)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="lib/jboss-dmr-1.1.1.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/nexus-indexer-lucene-rest-api-client.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-10-11 09:47:00 UTC (rev 44424)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-10-11 10:27:06 UTC (rev 44425)
@@ -37,4 +37,5 @@
org.jboss.tools.maven.core.repositories,
org.jboss.tools.maven.core.xpl
Bundle-ClassPath: lib/nexus-indexer-lucene-rest-api-client.jar,
+ lib/jboss-dmr-1.1.1.Final.jar,
.
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/build.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/build.properties 2012-10-11 09:47:00 UTC (rev 44424)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/build.properties 2012-10-11 10:27:06 UTC (rev 44425)
@@ -6,4 +6,5 @@
poms/,\
plugin.properties,\
about.html,\
- lib/nexus-indexer-lucene-rest-api-client.jar
+ lib/nexus-indexer-lucene-rest-api-client.jar,\
+ lib/jboss-dmr-1.1.1.Final.jar
Added: trunk/maven/plugins/org.jboss.tools.maven.core/lib/jboss-dmr-1.1.1.Final.jar
===================================================================
(Binary files differ)
Property changes on: trunk/maven/plugins/org.jboss.tools.maven.core/lib/jboss-dmr-1.1.1.Final.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/identification/FileIdentificationManager.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/identification/FileIdentificationManager.java 2012-10-11 09:47:00 UTC (rev 44424)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/identification/FileIdentificationManager.java 2012-10-11 10:27:06 UTC (rev 44425)
@@ -47,6 +47,9 @@
addArtifactIdentifier(new MavenPropertiesIdentifier());
addArtifactIdentifier(new NexusIndexIdentifier());
addArtifactIdentifier(new NexusRepositoryIdentifier());
+ //JBIDE-12702 Add Maven Central identifier last. Even though it's faster,
+ //we don't want to pound that public service too hard
+ addArtifactIdentifier(new MavenCentralIdentifier());
}
public synchronized void addArtifactIdentifier(ArtifactIdentifier identifier) {
Added: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/identification/MavenCentralIdentifier.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/identification/MavenCentralIdentifier.java (rev 0)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/identification/MavenCentralIdentifier.java 2012-10-11 10:27:06 UTC (rev 44425)
@@ -0,0 +1,171 @@
+/*************************************************************************************
+ * Copyright (c) 2008-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.core.internal.identification;
+
+import static org.jboss.tools.maven.core.identification.IdentificationUtil.getSHA1;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+
+import org.codehaus.plexus.util.IOUtil;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.m2e.core.embedder.ArtifactKey;
+import org.eclipse.osgi.util.NLS;
+import org.jboss.dmr.ModelNode;
+
+public class MavenCentralIdentifier extends AbstractArtifactIdentifier {
+
+
+ private String SHA1_SEARCH_QUERY = "http://search.maven.org/solrsearch/select?q=1:%22{0}%22&rows=1&wt=json";
+
+ private String NAME_VERSION_SEARCH_QUERY = "http://search.maven.org/solrsearch/select?q=a:%22{0}%22%20AND%20v:%22{1}%...";
+
+ @Deprecated
+ public ArtifactKey identify(File file) throws CoreException {
+ return identify(file, null);
+ }
+
+ public ArtifactKey identify(File file, IProgressMonitor monitor) throws CoreException {
+ ArtifactKey key = sha1Search(file, monitor);
+ if (key == null) {
+ System.out.println("Can't identify "+file + " falling back on name+version search" );
+ key = nameVersionSearch(file, monitor);
+ }
+ return key;
+ }
+
+ private ArtifactKey sha1Search(File file, IProgressMonitor monitor) {
+ if (monitor == null) {
+ monitor = new NullProgressMonitor();
+ }
+ if (monitor.isCanceled()) {
+ return null;
+ }
+ String sha1;
+ try {
+ sha1 = getSHA1(file);
+ } catch (Exception e) {
+ return null;
+ }
+ String searchUrl = NLS.bind(SHA1_SEARCH_QUERY, sha1);
+ return find(searchUrl);
+ }
+
+ private ArtifactKey nameVersionSearch(File file, IProgressMonitor monitor) {
+
+ JarFile jar = null;
+ Manifest manifest = null;
+ try {
+ jar = new JarFile(file);
+ manifest = jar.getManifest();
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } finally {
+ if (jar != null) {
+ try {
+ jar.close();
+ } catch (Exception e) {
+ //Ignore
+ }
+ }
+ }
+ if (manifest == null) {
+ return null;
+ }
+
+ String version = manifest.getMainAttributes().getValue("Implementation-Version");
+ String name = manifest.getMainAttributes().getValue("Bundle-SymbolicName");
+ if (version == null || version.trim().isEmpty() || name == null || name.trim().isEmpty()) {
+ return null;
+ }
+ if (monitor == null) {
+ monitor = new NullProgressMonitor();
+ }
+ if (monitor.isCanceled()) {
+ return null;
+ }
+
+ String searchUrl = NLS.bind(NAME_VERSION_SEARCH_QUERY, name, version);
+ return find(searchUrl);
+ }
+
+
+
+ private ArtifactKey find(String searchUrl) {
+ HttpURLConnection connection = null;//TODO use eclipse connections to handle proxies
+ InputStream is = null;
+ try {
+ connection = (HttpURLConnection) new URL(searchUrl).openConnection();
+ connection.setConnectTimeout(5*1000);
+ connection.connect();
+ int status = connection.getResponseCode();
+ switch (status) {
+ case 200:
+ case 201: {
+ is = connection.getInputStream();
+ ModelNode modelNode = ModelNode.fromJSONStream(is);
+ if (modelNode.isDefined()) {
+ return extractKey(modelNode);
+ }
+ }
+ default:
+
+ }
+ } catch (UnknownHostException uhe) {
+ System.err.println("Can't connect to search.maven.org:"+ uhe.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ IOUtil.close(is);
+ if (connection != null) {
+ connection.disconnect();
+ }
+ }
+ return null;
+ }
+
+ private ArtifactKey extractKey(ModelNode modelNode) {
+ ModelNode response = modelNode.get("response");
+ if (response != null) {
+ int num = response.get("numFound").asInt();
+ if (num > 0) {
+ ModelNode docs = response.get("docs");
+ if (docs.isDefined()) {
+ String a = null, g = null, v = null;
+ for (ModelNode n : docs.asList()) {
+ if (n.hasDefined("a")
+ && n.hasDefined("g")
+ && n.hasDefined("v")) {
+ a = n.get("a").asString();
+ g = n.get("g").asString();
+ v = n.get("v").asString();
+ if (a != null && g != null && v != null) {
+ return new ArtifactKey(g, a, v, null);
+ }
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+}
Added: trunk/maven/tests/org.jboss.tools.maven.common.test/resources/groovy-jsr223-2.0.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/maven/tests/org.jboss.tools.maven.common.test/resources/groovy-jsr223-2.0.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/AbstractIdentificationTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/AbstractIdentificationTest.java 2012-10-11 09:47:00 UTC (rev 44424)
+++ trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/AbstractIdentificationTest.java 2012-10-11 10:27:06 UTC (rev 44425)
@@ -1,3 +1,13 @@
+/*************************************************************************************
+ * Copyright (c) 2008-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.core.identification;
import java.io.File;
@@ -10,12 +20,14 @@
protected File arquillian;//Has maven properties
protected File junit;//Has no maven properties
protected File jansi;//Has multiple maven properties
+ protected File groovy_jsr223;//only has manifest info
@Before
public void initFiles() {
junit = new File("resources/junit_4_10.jar");
arquillian = new File("resources/arquillian-core-spi.jar");
jansi = new File("resources/jansi-1.6.jar");
+ groovy_jsr223 = new File("resources/groovy-jsr223-2.0.4.jar");
}
@After
@@ -23,6 +35,7 @@
junit = null;
arquillian = null;
jansi = null;
+ groovy_jsr223 = null;
}
Modified: trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/FileIdentificationManagerTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/FileIdentificationManagerTest.java 2012-10-11 09:47:00 UTC (rev 44424)
+++ trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/FileIdentificationManagerTest.java 2012-10-11 10:27:06 UTC (rev 44425)
@@ -1,6 +1,17 @@
+/*************************************************************************************
+ * Copyright (c) 2008-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.core.identification;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import java.io.File;
import java.util.Collections;
@@ -47,13 +58,13 @@
new ArtifactIdentifier() {
@Override
public ArtifactKey identify(File file) throws CoreException {
- return new ArtifactKey("junit", "junit", "4.10", null);
+ return identify(file, null);
}
@Override
public ArtifactKey identify(File file, IProgressMonitor monitor) throws CoreException {
// TODO Auto-generated method stub
- return null;
+ return new ArtifactKey("junit", "junit", "4.10", null);
}
}
);
Added: trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/MavenCentralIdentifierTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/MavenCentralIdentifierTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.common.test/src/org/jboss/tools/maven/core/identification/MavenCentralIdentifierTest.java 2012-10-11 10:27:06 UTC (rev 44425)
@@ -0,0 +1,35 @@
+/*************************************************************************************
+ * Copyright (c) 2008-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.core.identification;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.eclipse.m2e.core.embedder.ArtifactKey;
+import org.jboss.tools.maven.core.internal.identification.MavenCentralIdentifier;
+import org.junit.Test;
+
+public class MavenCentralIdentifierTest extends AbstractIdentificationTest {
+
+ @Test
+ public void testIdentify() throws Exception {
+ MavenCentralIdentifier identifier = new MavenCentralIdentifier();
+ ArtifactKey key;
+
+ key = identifier.identify(groovy_jsr223, null);
+ assertNotNull("groovy-jsr223 was not identifed", key);
+ assertEquals("groovy-jsr223", key.getArtifactId());
+ assertEquals("org.codehaus.groovy", key.getGroupId());
+ assertEquals("2.0.4", key.getVersion());
+ }
+
+
+}
12 years, 3 months
JBoss Tools SVN: r44424 - trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-10-11 05:47:00 -0400 (Thu, 11 Oct 2012)
New Revision: 44424
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java
Log:
Jenkins debugging
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java 2012-10-11 09:08:31 UTC (rev 44423)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithJava7Test.java 2012-10-11 09:47:00 UTC (rev 44424)
@@ -27,7 +27,12 @@
}else{
setupProject((projectName==null) ? formText : projectName, true, true);
}
- assertNull("There should be no errors in Problems view", ProblemsView.getErrorsNode(bot));
+ if (ProblemsView.getErrorsNode(bot) != null){
+ for (String error : ProblemsView.getErrorsNode(bot).getNodes()) {
+ log.error("Found error in Problems View: "+error);
+ }
+ fail("There should be no errors in Problems view");
+ }
}
private void setupMultiProject(String formText){
12 years, 3 months
JBoss Tools SVN: r44423 - in trunk/archives: tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-10-11 05:08:31 -0400 (Thu, 11 Oct 2012)
New Revision: 44423
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBMarshallTest.java
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBUnmarshallTest.java
Log:
JBIDE-12813 to trunk
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2012-10-11 08:50:57 UTC (rev 44422)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XMLBinding.java 2012-10-11 09:08:31 UTC (rev 44423)
@@ -31,6 +31,7 @@
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveImpl;
+import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbProperties.PropertiesExt;
/**
@@ -99,9 +100,8 @@
XMLMemento root = XMLMemento.createWriteRoot("packages"); //$NON-NLS-1$
root.putString("version", new Double(element.getVersion()).toString()); //$NON-NLS-1$
List packagesToAdd = element.getChildren(XbPackage.class);
- List props = element.getChildren(XbProperties.class);
marshallAddPackages(root, nullSafe(packagesToAdd));
- marshallAddProperties(root, nullSafe(props));
+ marshallAddProperties(root, element.getProperties());
try{
String s = root.saveToString();
writer.write(s);
@@ -137,7 +137,7 @@
addFileset(childMemento, nullSafe(childXb.getChildren(XbFileSet.class)));
addLibFileset(childMemento, nullSafe(childXb.getChildren(XbLibFileSet.class)));
addFolders(childMemento, nullSafe(childXb.getChildren(XbFolder.class)));
- marshallAddProperties(childMemento, nullSafe(childXb.getChildren(XbProperties.class)));
+ marshallAddProperties(childMemento, childXb.getProperties());
}
}
@@ -155,7 +155,7 @@
addFileset(childMemento, nullSafe(childXb.getChildren(XbFileSet.class)));
addLibFileset(childMemento, nullSafe(childXb.getChildren(XbLibFileSet.class)));
addFolders(childMemento, nullSafe(childXb.getChildren(XbFolder.class)));
- marshallAddProperties(childMemento, nullSafe(childXb.getChildren(XbProperties.class)));
+ marshallAddProperties(childMemento, childXb.getProperties());
}
}
@@ -175,7 +175,7 @@
fsMemento.putString("excludes", fsXb.getExcludes()); //$NON-NLS-1$
fsMemento.putString("inWorkspace",new Boolean(fsXb.isInWorkspace()).toString()); //$NON-NLS-1$
fsMemento.putString("flatten", new Boolean(fsXb.isFlatten()).toString()); //$NON-NLS-1$
- marshallAddProperties(fsMemento, nullSafe(fsXb.getChildren(XbProperties.class)));
+ marshallAddProperties(fsMemento, fsXb.getProperties());
}
}
@@ -186,22 +186,23 @@
XbLibFileSet fsXb = (XbLibFileSet)i.next();
if( !isEmpty(fsXb.getId()))
fsMemento.putString("name", fsXb.getId()); //$NON-NLS-1$
- marshallAddProperties(fsMemento, nullSafe(fsXb.getChildren(XbProperties.class)));
+ marshallAddProperties(fsMemento, fsXb.getProperties());
}
}
- private static void marshallAddProperties(XMLMemento memento, List properties) {
+ private static void marshallAddProperties(XMLMemento memento, XbProperties properties) {
// should only have one "properties"
- XbProperties propsObj = properties.size() == 0 ? null : (XbProperties)properties.get(0);
XMLMemento props = (XMLMemento)memento.createChild("properties"); //$NON-NLS-1$
- if( propsObj != null ) {
- List indivProps = propsObj.getAllChildren();
- Iterator j = indivProps.iterator();
+ if( properties != null ) {
+ PropertiesExt ext = properties.getProperties();
+ Set<Object> set = ext.keySet();
+ Iterator j = set.iterator();
while(j.hasNext()) {
- XbProperty prop = (XbProperty)j.next();
+ String prop = (String)j.next();
+ String value = ext.getProperty(prop);
XMLMemento propMemento = (XMLMemento) props.createChild("property"); //$NON-NLS-1$
- propMemento.putString("name", prop.getName()); //$NON-NLS-1$
- propMemento.putString("value", prop.getValue()); //$NON-NLS-1$
+ propMemento.putString("name", prop); //$NON-NLS-1$
+ propMemento.putString("value", value); //$NON-NLS-1$
}
}
}
@@ -217,7 +218,7 @@
}
}
- protected static XbPackages unmarshal (final InputStream in,
+ public static XbPackages unmarshal (final InputStream in,
final IProgressMonitor monitor) throws XbException {
XMLMemento root = XMLMemento.createReadRoot(in);
if( root == null ) {
@@ -293,7 +294,7 @@
// properties
IMemento[] propertiesChild = packageChildren[i].getChildren("properties"); //$NON-NLS-1$
if( propertiesChild != null && propertiesChild.length == 1)
- unmarshallProperties(packs, propertiesChild[0]);
+ unmarshallProperties(pack, propertiesChild[0]);
packs.addChild(pack);
}
@@ -376,7 +377,7 @@
}
private static void unmarshallProperties(XbPackageNodeWithProperties node, IMemento propNode) throws XbException {
XbProperties propsWrapper = new XbProperties();
- node.addChild(propsWrapper);
+ node.setProperties(propsWrapper);
String[] names = ((XMLMemento)propNode).getChildNames();
Set<String> set = new TreeSet<String>();
set.addAll(Arrays.asList(names));
@@ -397,7 +398,7 @@
throw new XbException(new Exception("Element 'property' contains unknown attribute key")); //$NON-NLS-1$
p.setName(name);
p.setValue(val);
- propsWrapper.addChild(p);
+ propsWrapper.addProperty(p);
}
}
}
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2012-10-11 08:50:57 UTC (rev 44422)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/ArchivesTestSuite.java 2012-10-11 09:08:31 UTC (rev 44423)
@@ -20,6 +20,7 @@
import org.jboss.ide.eclipse.archives.test.model.ModelCreationTest;
import org.jboss.ide.eclipse.archives.test.model.ModelTruezipBridgeTest;
import org.jboss.ide.eclipse.archives.test.model.ModelUtilTest;
+import org.jboss.ide.eclipse.archives.test.model.ReadWriteTest;
import org.jboss.ide.eclipse.archives.test.model.XBMarshallTest;
import org.jboss.ide.eclipse.archives.test.model.XBUnmarshallTest;
import org.jboss.ide.eclipse.archives.test.projects.InnerZipResourceTimestampTest;
@@ -38,6 +39,7 @@
suite.addTestSuite(ArchivesCoreTest.class);
suite.addTestSuite(XBMarshallTest.class);
suite.addTestSuite(XBUnmarshallTest.class);
+ suite.addTestSuite(ReadWriteTest.class);
suite.addTestSuite(TruezipUtilTest.class);
suite.addTestSuite(ModelUtilTest.class);
suite.addTestSuite(DirectoryScannerTest.class);
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBMarshallTest.java
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBMarshallTest.java 2012-10-11 08:50:57 UTC (rev 44422)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBMarshallTest.java 2012-10-11 09:08:31 UTC (rev 44423)
@@ -111,7 +111,7 @@
}
}
}
- protected String writeToString(XbPackages packs, boolean shouldPass) {
+ public static String writeToString(XbPackages packs, boolean shouldPass) {
XbException e = null;
try {
return XMLBinding.serializePackages(packs, new NullProgressMonitor());
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBUnmarshallTest.java
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBUnmarshallTest.java 2012-10-11 08:50:57 UTC (rev 44422)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBUnmarshallTest.java 2012-10-11 09:08:31 UTC (rev 44423)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.ide.eclipse.archives.test.model;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.net.URL;
import java.util.List;
@@ -188,10 +191,14 @@
* Utility
*/
- protected XbPackages parse(String file, boolean shouldSucceed, String failMsg) {
+ public XbPackages parse(String file, boolean shouldSucceed, String failMsg) {
+ File f = archiveDescriptors.append(file).toFile();
+ return parseFromFile(f, shouldSucceed, failMsg );
+ }
+ public static XbPackages parseFromFile(File f, boolean shouldSucceed, String failMsg) {
XbPackages packs = null;
try {
- packs = XMLBinding.unmarshal(archiveDescriptors.append(file).toFile(), new NullProgressMonitor());
+ packs = XMLBinding.unmarshal(f, new NullProgressMonitor());
} catch( XbException e ) {
if( shouldSucceed )
fail(failMsg + " - " + e.getMessage());
@@ -202,6 +209,21 @@
return packs;
}
+ public static XbPackages parseFromString(String xml, boolean shouldSucceed, String failMsg) {
+ XbPackages packs = null;
+ ByteArrayInputStream is = new ByteArrayInputStream(xml.getBytes());
+ try {
+ packs = XMLBinding.unmarshal(is, new NullProgressMonitor());
+ } catch( XbException e ) {
+ if( shouldSucceed )
+ fail(failMsg + " - " + e.getMessage());
+ return packs;
+ }
+ if( !shouldSucceed )
+ fail(failMsg);
+ return packs;
+ }
+
protected String failedMissingRequiredAtt(String att) {
return "File parsed while missing a required attribute: " + att;
}
12 years, 3 months
JBoss Tools SVN: r44422 - in workspace/snjeza/org.jboss.tools.arquillian.updatesite: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-10-11 04:50:57 -0400 (Thu, 11 Oct 2012)
New Revision: 44422
Added:
workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.2.201210111049.jar
workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.2.201210111049.jar
workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.2.201210111049.jar
Removed:
workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.2.201209251457.jar
workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.2.201209251457.jar
workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.2.201209251457.jar
Modified:
workspace/snjeza/org.jboss.tools.arquillian.updatesite/artifacts.jar
workspace/snjeza/org.jboss.tools.arquillian.updatesite/content.jar
workspace/snjeza/org.jboss.tools.arquillian.updatesite/site.xml
Log:
Adding the Run/Debug As Arquillian action
Modified: workspace/snjeza/org.jboss.tools.arquillian.updatesite/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/org.jboss.tools.arquillian.updatesite/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.2.201209251457.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.2.201210111049.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.arquillian.updatesite/features/org.jboss.tools.arquillian.feature_1.0.2.201210111049.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.2.201209251457.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.2.201210111049.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.core_1.0.2.201210111049.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.2.201209251457.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.2.201210111049.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.arquillian.updatesite/plugins/org.jboss.tools.arquillian.ui_1.0.2.201210111049.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/org.jboss.tools.arquillian.updatesite/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.arquillian.updatesite/site.xml 2012-10-11 08:43:36 UTC (rev 44421)
+++ workspace/snjeza/org.jboss.tools.arquillian.updatesite/site.xml 2012-10-11 08:50:57 UTC (rev 44422)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.arquillian.feature_1.0.2.qualifier.jar" id="org.jboss.tools.arquillian.feature" version="1.0.2.qualifier">
+ <feature url="features/org.jboss.tools.arquillian.feature_1.0.2.201210111049.jar" id="org.jboss.tools.arquillian.feature" version="1.0.2.201210111049">
<category name="org.jboss.tools.arquillian"/>
</feature>
<category-def name="org.jboss.tools.arquillian" label="Arquillian Support"/>
12 years, 3 months
JBoss Tools SVN: r44421 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-10-11 04:43:36 -0400 (Thu, 11 Oct 2012)
New Revision: 44421
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java
Log:
simple NPE when shutting down workspace...
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2012-10-11 08:19:12 UTC (rev 44420)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2012-10-11 08:43:36 UTC (rev 44421)
@@ -72,7 +72,11 @@
public void dispose() {
super.dispose();
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().removePostSelectionListener(selectionListener);
+ try {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().removePostSelectionListener(selectionListener);
+ } catch(NullPointerException npe) {
+ // Seriously ignore, don't feel like 5 null checks
+ }
PrefsInitializer.removeListener(this);
}
12 years, 3 months
