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);
}
}
13 years
- 1
- 0
JBoss Tools SVN: r44230 - in trunk/documentation/whatsnew: vpe and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-10-03 05:53:16 -0400 (Wed, 03 Oct 2012)
New Revision: 44230
Modified:
trunk/documentation/whatsnew/index.html
trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html
Log:
https://issues.jboss.org/browse/JBIDE-12680 - Visual Editor Component N&N update for Alpha2
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2012-10-03 09:36:28 UTC (rev 44229)
+++ trunk/documentation/whatsnew/index.html 2012-10-03 09:53:16 UTC (rev 44230)
@@ -54,6 +54,7 @@
<td valign="top">
<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>
</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 09:36:28 UTC (rev 44229)
+++ trunk/documentation/whatsnew/vpe/vpe-news-4.0.0.Alpha2.html 2012-10-03 09:53:16 UTC (rev 44230)
@@ -25,7 +25,6 @@
<p align="right">
<a href="../index.html">< Main Index</a>
-<!--a href="../hibernate/hibernate-news-4.0.0.Alpha2.html">Hibernate Tools ></a-->
</p>
<table border="0" cellpadding="10" cellspacing="0">
13 years
- 1
- 0
JBoss Tools SVN: r44229 - in trunk/documentation/whatsnew/as: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-10-03 05:36:28 -0400 (Wed, 03 Oct 2012)
New Revision: 44229
Added:
trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha2.html
trunk/documentation/whatsnew/as/images/astools-4.0.0.alpha2-download.png
Modified:
trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha1.html
Log:
n&n for alpha2
Modified: trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha1.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha1.html 2012-10-03 06:30:14 UTC (rev 44228)
+++ trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha1.html 2012-10-03 09:36:28 UTC (rev 44229)
@@ -2,7 +2,7 @@
<head>
<link rel="stylesheet" href="../whatsnew.css">
-<title>JBoss AS Tools 3.3.0.Beta1 News</title>
+<title>JBoss AS Tools 4.0.0.Alpha1 News</title>
<script type="text/javascript">
var _gaq = _gaq || [];
@@ -19,7 +19,7 @@
<body>
-<h1>JBoss AS Tools 4.0.0.Beta1 What's New</h1>
+<h1>JBoss AS Tools 4.0.0.Alpha1 What's New</h1>
<p align="right"><a href="../index.html">< Main Index</a> <a
href="../cdi/cdi-news-4.0.0.Alpha1.html">CDI Tools></a></p>
Added: trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha2.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha2.html (rev 0)
+++ trunk/documentation/whatsnew/as/as-news-4.0.0.Alpha2.html 2012-10-03 09:36:28 UTC (rev 44229)
@@ -0,0 +1,177 @@
+<html>
+
+<head>
+<link rel="stylesheet" href="../whatsnew.css">
+<title>JBoss AS Tools 4.0.0.Alpha2 News</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>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>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Downloading JBoss Runtimes</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>New Runtime Wizard allows app-server downloads</b></p>
+ </td>
+ <td align="top">
+ <p>
+ The new runtime wizard now links in with the runtime component's ability to download an application server runtime and initialize the server that corresponds to it. The dialog will be filtered to only show runtimes that match the server runtime being created.
+ </p>
+ <p><img src="images/astools-4.0.0.alpha2-download.png"/></p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-6116">Related Jira</a>
+ </small><br/>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Disable deployment option changes when artifacts are already deployed</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Editor page becomes disabled</b></p>
+ </td>
+ <td align="top">
+ <p>
+ Users never should be changing the deployment locations of already-deployed
+ artifacts. This might cause the tools to deploy multiple copies in different locations
+ due to architectural issues. However, enough users were doing this that it was decided to
+ disable changes to a server's deployment settings unless a server was fully synchronized
+ with no modules deployed. This will help users to undeploy relevant modules first before
+ making these changes.
+ </p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-11982">Related Jira</a>
+ </small><br/>
+ </p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Deployment of zipped artifacts sent file twice</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Performance Improvement</b></p>
+ </td>
+ <td align="top">
+ <p>
+ It was discovered that zipped deployment was sending the same file over the wire twice. This has been fixed.
+ </p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-12362">Related Jira</a>
+ </small><br/>
+ </p>
+ </td>
+ </tr>
+
+
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>New Fileset Wizard Preview Broken</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>UI Fix</b></p>
+ </td>
+ <td align="top">
+ <p>
+ Due to a regression during heavy refactors, the preview dialog of a new fileset wizard,
+ which is in charge of showing the first dozen or so files that match the given pattern,
+ stopped showing results. This has been fixed, and matching elements will now be shown as always.
+ </p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-12659">Related Jira</a>
+ </small><br/>
+ </p>
+ </td>
+ </tr>
+
+
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Project Archives Fixes</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Easy enablement / disablement </b></p>
+ </td>
+ <td align="top">
+ <p>
+ Enablement and disablement of project archives has been simplified. Now, simply
+ right-click on your project, and select Configure -> Add Project Archives Support
+ or Remove. This gives a more easy front end to users looking to enable or disable this
+ feature of their project.
+ </p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-11927">Related Jira</a>
+ </small><br/>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Project Archives View doesn't clear after project deletion </b></p>
+ </td>
+ <td align="top">
+ <p>
+ Projects with the Project Archvies features were not being fully removed from the
+ model or the UI after the project was deleted. This has been fixed by adding a deletion
+ participant and ensuring that the view has the proper checks in it during the workspace change
+ to clear the view properly.
+ </p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-12494">Related Jira</a>
+ </small><br/>
+ </p>
+ </td>
+ </tr>
+
+<hr />
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/as/images/astools-4.0.0.alpha2-download.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/as/images/astools-4.0.0.alpha2-download.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
13 years
- 1
- 0
JBoss Tools SVN: r44228 - trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-10-03 02:30:14 -0400 (Wed, 03 Oct 2012)
New Revision: 44228
Modified:
trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java
Log:
fix for compilation errors in cenral tests
Modified: trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java 2012-10-03 04:42:48 UTC (rev 44227)
+++ trunk/central/tests/org.jboss.tools.central.test/src/org/jboss/tools/central/test/CentralTest.java 2012-10-03 06:30:14 UTC (rev 44228)
@@ -63,7 +63,7 @@
if (welcomeView != null) {
page.hideView(welcomeView);
}
- editor = JBossCentralActivator.getJBossCentralEditor();
+ editor = JBossCentralActivator.getJBossCentralEditor(true);
}
@AfterClass
13 years
- 1
- 0
JBoss Tools SVN: r44226 - 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-02 23:45:53 -0400 (Tue, 02 Oct 2012)
New Revision: 44226
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
Log:
Commented out actions test - running locally until resolved
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-02 22:04:39 UTC (rev 44225)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2012-10-03 03:45:53 UTC (rev 44226)
@@ -157,7 +157,7 @@
getEditor().save();
}
- @Test
+// @Test
public void actions() {
String service = "bbb";
addService(service);
13 years
- 1
- 0
JBoss Tools SVN: r44225 - trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-10-02 18:04:39 -0400 (Tue, 02 Oct 2012)
New Revision: 44225
Modified:
trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/EclipseJavaUtil.java
Log:
JBIDE-12771
https://issues.jboss.org/browse/JBIDE-12771
Added comment to EclipseJavaUtil.findType() and removed code that tries to find type in package roots when IJavaProject.findType() fails.
Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/EclipseJavaUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2012-10-02 17:13:46 UTC (rev 44224)
+++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/EclipseJavaUtil.java 2012-10-02 22:04:39 UTC (rev 44225)
@@ -78,7 +78,24 @@
}
static Map<String, Map<String, IType>> typeCache = new Hashtable<String, Map<String,IType>>();
-
+
+ /**
+ * Returns IType found in a Java project by its qualified name.
+ * The cache is used that is should be cleared explicitly by
+ * TypeResolutionCache.getInstance().clear();
+ * Currently, it is done by KBBuilder so that this method works fine for all clients that
+ * request only projects with KB nature. Otherwise, non-existent object may be
+ * returned from the cache.
+ *
+ * Now, it is not clear if the search over package roots,
+ * fulfilled when IJavaProject.findType(String) fails, makes sense.
+ * There are neither tests nor use-cases that would support the need of it.
+ *
+ * @param javaProject
+ * @param qualifiedName
+ * @return
+ * @throws JavaModelException
+ */
public static IType findType(IJavaProject javaProject, String qualifiedName) throws JavaModelException {
if(qualifiedName == null || qualifiedName.length() == 0) return null;
Map<String, IType> cache = typeCache.get(javaProject.getElementName());
@@ -91,19 +108,23 @@
}
IType type = javaProject.findType(qualifiedName);
if(type != null) return register(cache, qualifiedName, type);
- int dot = qualifiedName.lastIndexOf('.');
- String packageName = (dot < 0) ? "" : qualifiedName.substring(0, dot); //$NON-NLS-1$
- String shortName = qualifiedName.substring(dot + 1);
- IPackageFragmentRoot[] rs = javaProject.getPackageFragmentRoots();
- for (int i = 0; i < rs.length; i++) {
- IPackageFragment f = rs[i].getPackageFragment(packageName);
- if(f == null || !f.exists()) continue;
- ICompilationUnit[] us = f.getCompilationUnits();
- for (int j = 0; j < us.length; j++) {
- IType t = us[j].getType(shortName);
- if(t != null && t.exists()) return register(cache, qualifiedName, t);;
- }
- }
+
+ //TODO Either provide use-case that justifies the
+ // direct search over roots when IJavaProject.findType(String) fails
+ // or remove this obsolete code.
+// int dot = qualifiedName.lastIndexOf('.');
+// String packageName = (dot < 0) ? "" : qualifiedName.substring(0, dot); //$NON-NLS-1$
+// String shortName = qualifiedName.substring(dot + 1);
+// IPackageFragmentRoot[] rs = javaProject.getPackageFragmentRoots();
+// for (int i = 0; i < rs.length; i++) {
+// IPackageFragment f = rs[i].getPackageFragment(packageName);
+// if(f == null || !f.exists()) continue;
+// ICompilationUnit[] us = f.getCompilationUnits();
+// for (int j = 0; j < us.length; j++) {
+// IType t = us[j].getType(shortName);
+// if(t != null && t.exists()) return register(cache, qualifiedName, t);
+// }
+// }
return null;
}
13 years
- 1
- 0
JBoss Tools SVN: r44224 - in trunk/maven/tests: org.jboss.tools.maven.conversion.test and 46 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-02 13:13:46 -0400 (Tue, 02 Oct 2012)
New Revision: 44224
Added:
trunk/maven/tests/org.jboss.tools.maven.conversion.test/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/.classpath
trunk/maven/tests/org.jboss.tools.maven.conversion.test/.project
trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.jdt.core.prefs
trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.m2e.core.prefs
trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/MANIFEST.MF
trunk/maven/tests/org.jboss.tools.maven.conversion.test/build.properties
trunk/maven/tests/org.jboss.tools.maven.conversion.test/plugin_customization.ini
trunk/maven/tests/org.jboss.tools.maven.conversion.test/pom.xml
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.project
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.m2e.core.prefs
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.component
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/ant-1.8.4.jar
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/lib/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/lib/commons-cli-1.2.jar
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/otherlib/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/otherlib/commons-logging-1.1.1.jar
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.classpath
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.project
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.jdt.core.prefs
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.m2e.core.prefs
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/pom.xml
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/main/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/main/java/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/main/resources/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/test/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/test/java/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/test/resources/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/MANIFEST.MF
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.properties
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.xml
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/test-classes/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.classpath
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.project
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/.jsdtscope
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.jdt.core.prefs
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.component
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/MANIFEST.MF
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-1.8.4.jar
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-antlr-1.8.4.jar
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-junit-1.8.4.jar
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/build/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/build/classes/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/src/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.classpath
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.project
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/.jsdtscope
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.jdt.core.prefs
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.m2e.core.prefs
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.component
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/MANIFEST.MF
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/WEB-INF/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/WEB-INF/lib/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/pom.xml
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/src/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/classes/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.properties
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.xml
trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/test-classes/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/
trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/AbstractMavenConversionTest.java
trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/ProjectDependencyCollectorTest.java
Modified:
trunk/maven/tests/pom.xml
Log:
JBIDE-12527 : test convert War/EAR references
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/.classpath
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/.classpath (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.classpath 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <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"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/.project
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/.project (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.project 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.maven.conversion.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.jdt.core.prefs 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.m2e.core.prefs 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,5 @@
+#Mon Nov 28 08:59:23 CET 2011
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: JBoss Maven Conversion Tests
+Bundle-SymbolicName: org.jboss.tools.maven.conversion.test;singleton:=true
+Bundle-Version: 1.4.0.qualifier
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.junit;bundle-version="4.8.0",
+ org.jboss.tools.maven.core,
+ org.jboss.tools.maven.conversion.ui,
+ org.jboss.tools.common,
+ org.jboss.tools.tests,
+ org.eclipse.m2e.tests.common;bundle-version="1.0.0",
+ org.eclipse.ui.ide,
+ org.eclipse.m2e.wtp;bundle-version="0.16.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/build.properties
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/build.properties (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/build.properties 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/plugin_customization.ini
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/plugin_customization.ini (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/plugin_customization.ini 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,2 @@
+org.eclipse.m2e.core/eclipse.m2.updateIndexes=false
+org.jboss.tools.central/showJBossCentralOnStartup=false
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/pom.xml 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.maven</groupId>
+ <artifactId>tests</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.maven.tests</groupId>
+ <artifactId>org.jboss.tools.maven.conversion.test</artifactId>
+
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <useUIHarness>true</useUIHarness>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.project
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.project (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.project 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ear</name>
+ <comment></comment>
+ <projects>
+ <project>z</project>
+ <project>web</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.m2e.core.prefs 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.component 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="ear-0.0.1-SNAPSHOT">
+ <wb-resource deploy-path="/" source-path="/EarContent" tag="defaultRootSource"/>
+ <dependent-module archiveName="commons-logging-1.1.1.jar" deploy-path="/lib" handle="module:/classpath/lib/ear/otherlib/commons-logging-1.1.1.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="web.war" deploy-path="/" handle="module:/resource/web/web">
+ <dependent-object/>
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="junit-4.10.jar" deploy-path="/" handle="module:/classpath/var/M2_REPO/junit/junit/4.10/junit-4.10.jar">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ </wb-module>
+</project-modules>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="jst.ear"/>
+ <installed facet="jst.ear" version="6.0"/>
+</faceted-project>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/ant-1.8.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/ant-1.8.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/lib/commons-cli-1.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/lib/commons-cli-1.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/otherlib/commons-logging-1.1.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/otherlib/commons-logging-1.1.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.classpath
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.classpath (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.classpath 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.6">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.project
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.project (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.project 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>util</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.jdt.core.prefs 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.m2e.core.prefs 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/pom.xml 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,20 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>util</groupId>
+ <artifactId>util</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ <configuration>
+ <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ -->
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/MANIFEST.MF (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Built-By: Fred Bricon
+Build-Jdk: 1.7.0_05
+Created-By: Maven Integration for Eclipse
+
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.properties
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.properties (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.properties 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,7 @@
+#Generated by Maven Integration for Eclipse
+#Tue Oct 02 18:02:04 CEST 2012
+version=0.0.1-SNAPSHOT
+groupId=util
+m2e.projectName=util
+m2e.projectLocation=D\:\\workspaces\\runtime-jbt-hostedmode3\\util
+artifactId=util
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.xml 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,6 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>util</groupId>
+ <artifactId>util</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.classpath
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.classpath (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.classpath 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/util"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.project
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.project (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.project 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>war</name>
+ <comment></comment>
+ <projects>
+ <project>util</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/.jsdtscope
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/.jsdtscope (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/.jsdtscope 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.jdt.core.prefs 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.component 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="war">
+ <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <dependent-module archiveName="util.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/util/util">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <property name="context-root" value="war"/>
+ <property name="java-output-path" value="/war/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="jst.web"/>
+ <fixed facet="java"/>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-1.8.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-1.8.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-antlr-1.8.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-antlr-1.8.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-junit-1.8.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-junit-1.8.4.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.classpath
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.classpath (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.classpath 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.project
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.project (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.project 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>web</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/.jsdtscope
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/.jsdtscope (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/.jsdtscope 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.jdt.core.prefs 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.m2e.core.prefs
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.m2e.core.prefs (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.m2e.core.prefs 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.component 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="web">
+ <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+ <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="web"/>
+ <property name="java-output-path" value="/web/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="jst.web"/>
+ <fixed facet="java"/>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+ <installed facet="jst.web" version="2.5"/>
+</faceted-project>
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/pom.xml 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>web</groupId>
+ <artifactId>web</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <warSourceDirectory>WebContent</warSourceDirectory>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Build-Jdk: 1.7.0_05
+Built-By: Fred Bricon
+Created-By: Maven Integration for Eclipse
+
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.properties
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.properties (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.properties 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,7 @@
+#Generated by Maven Integration for Eclipse
+#Tue Oct 02 17:06:17 CEST 2012
+version=0.0.1-SNAPSHOT
+groupId=web
+m2e.projectName=web
+m2e.projectLocation=D\:\\workspaces\\runtime-jbt-hostedmode3\\web
+artifactId=web
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.xml 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>web</groupId>
+ <artifactId>web</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <warSourceDirectory>WebContent</warSourceDirectory>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/AbstractMavenConversionTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/AbstractMavenConversionTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/AbstractMavenConversionTest.java 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,51 @@
+/*************************************************************************************
+ * Copyright (c) 2008-2011 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.tests;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase;
+import org.jboss.tools.common.util.FileUtil;
+
+public abstract class AbstractMavenConversionTest extends
+ AbstractMavenProjectTestCase {
+
+ protected String toString(File file) {
+ return FileUtil.readFile(file);
+ }
+
+ protected String toString(IFile file) {
+ return FileUtil.getContentFromEditorOrFile(file);
+ }
+
+ protected void assertHasError(IProject project, String errorMessage) {
+ try {
+ for (IMarker m : findErrorMarkers(project)) {
+ String message = (String)m.getAttribute(IMarker.MESSAGE);
+ if (errorMessage.equals(message)){
+ return;
+ }
+ }
+ } catch (CoreException e) {
+ fail(e.getMessage());
+ }
+ fail("Error Message '"+ errorMessage +"' was not found on "+project.getName());
+ }
+
+ protected static String getMessage(IMarker marker) throws CoreException {
+ return (String)marker.getAttribute(IMarker.MESSAGE);
+ }
+
+}
Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/ProjectDependencyCollectorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/ProjectDependencyCollectorTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/ProjectDependencyCollectorTest.java 2012-10-02 17:13:46 UTC (rev 44224)
@@ -0,0 +1,63 @@
+package org.jboss.tools.maven.conversion.tests;
+
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.m2e.core.MavenPlugin;
+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.junit.Test;
+
+@SuppressWarnings("restriction")
+public class ProjectDependencyCollectorTest extends AbstractMavenConversionTest {
+
+ @Test
+ public void testCollectEarDependencies() throws Exception {
+ IProject web = createExisting("web", "projects/conversion/web");
+ IProject ear = createExisting("ear", "projects/conversion/ear");
+ waitForJobsToComplete();
+
+ DependencyCollector collector = DependencyCollectorFactory.INSTANCE.getDependencyCollector(ear);
+ assertNotNull(collector);
+ List<ProjectDependency> deps = collector.collectDependencies(ear);
+ assertEquals(5, deps.size());
+ //archive reference
+ assertEquals("/ear/otherlib/commons-logging-1.1.1.jar", deps.get(0).getPath().toPortableString());
+ //project reference
+ assertEquals(web.getFullPath() , deps.get(1).getPath());
+
+ //library reference
+ File localRepo = MavenPlugin.getRepositoryRegistry().getLocalRepository().getBasedir();
+ String junitLocation = localRepo.getAbsolutePath().replace('\\', '/')+"/junit/junit/4.10/junit-4.10.jar";
+ assertEquals(junitLocation, deps.get(2).getPath().toPortableString());
+
+ //jar not in lib
+ assertEquals("/ear/EarContent/ant-1.8.4.jar" , deps.get(3).getPath().toPortableString());
+ //jar in lib
+ assertEquals("/ear/EarContent/lib/commons-cli-1.2.jar", deps.get(4).getPath().toPortableString());
+
+ }
+
+
+ @Test
+ public void testCollectWarDependencies() throws Exception {
+ IProject util = createExisting("util", "projects/conversion/util");
+ IProject war = createExisting("war", "projects/conversion/war");
+ waitForJobsToComplete();
+
+ DependencyCollector collector = DependencyCollectorFactory.INSTANCE.getDependencyCollector(war);
+ assertNotNull(collector);
+ List<ProjectDependency> deps = collector.collectDependencies(war);
+ assertEquals(4, deps.size());
+
+ String baseDir = war.getLocation().toPortableString();
+
+ assertEquals(baseDir+"/WebContent/WEB-INF/lib/ant-1.8.4.jar", deps.get(0).getPath().toPortableString());
+ assertEquals(baseDir+"/WebContent/WEB-INF/lib/ant-antlr-1.8.4.jar", deps.get(1).getPath().toPortableString());
+ assertEquals(baseDir+"/WebContent/WEB-INF/lib/ant-junit-1.8.4.jar", deps.get(2).getPath().toPortableString());
+ assertEquals(util.getFullPath(), deps.get(3).getPath());
+ }
+
+}
Modified: trunk/maven/tests/pom.xml
===================================================================
--- trunk/maven/tests/pom.xml 2012-10-02 17:10:35 UTC (rev 44223)
+++ trunk/maven/tests/pom.xml 2012-10-02 17:13:46 UTC (rev 44224)
@@ -14,6 +14,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.maven.configurators.tests</module>
+ <module>org.jboss.tools.maven.conversion.test</module>
<module>org.jboss.tools.maven.common.test</module>
<module>org.jboss.tools.maven.profiles.test</module>
<module>org.jboss.tools.maven.ui.bot.test</module>
13 years
- 1
- 0
JBoss Tools SVN: r44223 - in trunk/maven/plugins/org.jboss.tools.maven.conversion.ui: src/org/jboss/tools/maven/conversion/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-02 13:10:35 -0400 (Tue, 02 Oct 2012)
New Revision: 44223
Modified:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollectorFactory.java
Log:
JBIDE-12527 : convert EAR references
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-02 16:38:31 UTC (rev 44222)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF 2012-10-02 17:10:35 UTC (rev 44223)
@@ -19,7 +19,8 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %BundleVendor
Bundle-Localization: plugin
-Export-Package: org.jboss.tools.maven.conversion.ui,
+Export-Package: org.jboss.tools.maven.conversion.core,
+ org.jboss.tools.maven.conversion.ui,
org.jboss.tools.maven.conversion.ui.dialog,
org.jboss.tools.maven.conversion.ui.handlers
Bundle-ActivationPolicy: lazy
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollectorFactory.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollectorFactory.java 2012-10-02 16:38:31 UTC (rev 44222)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/core/DependencyCollectorFactory.java 2012-10-02 17:10:35 UTC (rev 44223)
@@ -20,7 +20,7 @@
public class DependencyCollectorFactory {
- public static DependencyCollectorFactory INSTANCE = new DependencyCollectorFactory();
+ public static final DependencyCollectorFactory INSTANCE = new DependencyCollectorFactory();
Set<DependencyCollector> dependencyCollectors = new HashSet<DependencyCollector>();
13 years
- 1
- 0
JBoss Tools SVN: r44222 - trunk/tests/scripts/installation-updates/src/main/groovy.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-10-02 12:38:31 -0400 (Tue, 02 Oct 2012)
New Revision: 44222
Modified:
trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy
Log:
JBIDE-12717: Fail earlier
Modified: trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy
===================================================================
--- trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy 2012-10-02 15:55:02 UTC (rev 44221)
+++ trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy 2012-10-02 16:38:31 UTC (rev 44222)
@@ -67,6 +67,7 @@
return;
} else {
println("Failed to install. Read " + report + " for details and see screenshots/")
+ System.exit(1);
}
}
}
13 years
- 1
- 0
JBoss Tools SVN: r44221 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-10-02 11:55:02 -0400 (Tue, 02 Oct 2012)
New Revision: 44221
Modified:
trunk/build/parent/pom.xml
Log:
JBIDE-12773: Added jenkins.target profile
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-10-02 15:12:53 UTC (rev 44220)
+++ trunk/build/parent/pom.xml 2012-10-02 15:55:02 UTC (rev 44221)
@@ -580,6 +580,31 @@
</build>
</profile>
+ <!-- Target platform file pointing at a single update site located
+ from Jenkins filesystem (mirrored unified.target for performances) -->
+ <profile>
+ <id>jenkins.target</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <target>
+ <artifact>
+ <groupId>org.jboss.tools.target-platforms</groupId>
+ <artifactId>jenkins</artifactId>
+ <version>${JBT_VERSION}.${BUILD_ALIAS}-SNAPSHOT</version>
+ <classifier>jenkins</classifier>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<!-- To use this profile, must have first created a local.target file,
which points to a local repo. You can do this by hand or generate it from
multiple.target using: cd ~/trunk/build/target-platform; ant See also the
@@ -636,7 +661,7 @@
</profile>
<profile>
- <!-- JBIDE-12455 -->
+ <!-- JBIDE-12455 , necessary because of XulRunner doesn't support 64bits OSX -->
<id>applejdk</id>
<activation>
<property>
@@ -650,29 +675,31 @@
</profile>
<profile>
- <id>osx</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
- <platformSystemProperties> -XstartOnFirstThread </platformSystemProperties>
- </properties>
- <!-- This is required to have it working by default under mac osx for swtbot tests -->
- <repositories>
- <repository>
- <id>jbosstools-target-site</id>
- <url>${jbosstools-target-site}</url>
+ <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=388084 -->
+ <id>osx</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+ <platformSystemProperties> -XstartOnFirstThread </platformSystemProperties>
+ </properties>
+ <!-- This is required to have it working by default under mac osx for swtbot tests -->
+ <!-- Or better is to use "-Posx,default" -->
+ <repositories>
+ <repository>
+ <id>jbosstools-target-site</id>
+ <url>${jbosstools-target-site}</url>
<layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
</profile>
@@ -700,6 +727,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>coverage</id>
<activation>
13 years
- 1
- 0