October 2012 - jbosstools-commits

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> - </p> <table border="0" cellpadding="10" cellspacing="0">

12 years, 3 months

1
0
0 / 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

12 years, 3 months

1
0
0 / 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

12 years, 3 months

1
0
0 / 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);

12 years, 3 months

1
0
0 / 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; }

12 years, 3 months

1
0
0 / 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> +  + <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>

12 years, 3 months

1
0
0 / 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>();

12 years, 3 months

1
0
0 / 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); } } }

12 years, 3 months

1
0
0 / 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> +  + <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> +  +  <id>applejdk</id> <activation> <property> @@ -650,29 +675,31 @@ </profile> <profile> - <id>osx</id> - <activation> - <os> - <family>mac</family> - </os> - </activation> - <properties> -  - <platformSystemProperties> -XstartOnFirstThread </platformSystemProperties> - </properties> -  - <repositories> - <repository> - <id>jbosstools-target-site</id> - <url>${jbosstools-target-site}</url> +  + <id>osx</id> + <activation> + <os> + <family>mac</family> + </os> + </activation> + <properties> +  + <platformSystemProperties> -XstartOnFirstThread </platformSystemProperties> + </properties> +  +  + <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>

12 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r44220 - in branches/jbosstools-4.0.0.Alpha2/build: util/cleanup and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-10-02 11:12:53 -0400 (Tue, 02 Oct 2012) New Revision: 44220 Modified: branches/jbosstools-4.0.0.Alpha2/build/publish/promote.sh branches/jbosstools-4.0.0.Alpha2/build/publish/publish.sh branches/jbosstools-4.0.0.Alpha2/build/util/cleanup/jbosstools-cleanup.sh Log: backport changes to promote, publish, and cleanup scripts from trunk so we're consistent in the 40x branch Modified: branches/jbosstools-4.0.0.Alpha2/build/publish/promote.sh =================================================================== --- branches/jbosstools-4.0.0.Alpha2/build/publish/promote.sh 2012-10-02 14:58:07 UTC (rev 44219) +++ branches/jbosstools-4.0.0.Alpha2/build/publish/promote.sh 2012-10-02 15:12:53 UTC (rev 44220) @@ -3,40 +3,48 @@ # these should not need to change DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/ -PARENT_FOLDER=soa-tooling/ OPERATION=COPY -# develoment or stable -BUILD_TYPE=$1 +if [[ $# -lt 1 ]]; then + echo "Usage : $0 -BUILD_TYPE build_type -TARGET_PLATFORM target_platform -PROJECT_NAME project_name -TARGET_FOLDER target_folder -SOURCE_PATH source_path" + echo "Example: $0 -BUILD_TYPE integration -TARGET_PLATFORM juno -PROJECT_NAME base -TARGET_FOLDER as_4.0.juno -SOURCE_PATH jbosstools-4.0_stable_branch.component--as/all/repo" + echo "Example: $0 -BUILD_TYPE integration -TARGET_PLATFORM juno -PROJECT_NAME base -TARGET_FOLDER archives_4.0.juno -SOURCE_PATH jbosstools-4.0_stable_branch.component--archives/all/repo" + echo "Example: $0 -BUILD_TYPE integration -TARGET_PLATFORM juno -PROJECT_NAME base -TARGET_FOLDER jmx_4.0.juno -SOURCE_PATH jbosstools-4.0_stable_branch.component--jmx/all/repo" + echo "Example: $0 -BUILD_TYPE development -TARGET_PLATFORM juno -PROJECT_NAME modeshape -TARGET_FOLDER 3.3.0.Beta3 -SOURCE_PATH modeshape-tools-continuous/all/repo" + echo "Example: $0 -BUILD_TYPE stable -TARGET_PLATFORM indigo -PROJECT_NAME switchyard -TARGET_FOLDER 0.5.0.Final -SOURCE_PATH SwitchYard-Tools/eclipse" + exit 1 +fi -# indigo, juno, kepler, ... -TARGET_PLATFORM=$2 +# read commandline args +while [[ "$#" -gt 0 ]]; do + case $1 in + '-SOURCE_PATH') SOURCE_PATH="$2"; shift 1;; # jbosstools-4.0_stable_branch.component--as/all/repo, modeshape-tools-continuous/all/repo, SwitchYard-Tools/eclipse -# 0.5.0.Beta3, 0.6.0.Final, ... -TARGET_FOLDER=$3 + '-BUILD_TYPE') BUILD_TYPE="$2"; shift 1;; # integration, develoment or stable + '-TARGET_PLATFORM') TARGET_PLATFORM="$2"; shift 1;; # indigo, juno, kepler, ... + '-PARENT_FOLDER') PARENT_FOLDER="$2"; shift 1;; # soa-tooling, core + '-PROJECT_NAME') PROJECT_NAME="$2"; shift 1;; # switchyard, modeshape, droolsjbpm, ... + '-TARGET_FOLDER') TARGET_FOLDER="$2"; shift 1;; # 0.5.0.Beta3, 0.6.0.Final, ... + esac + shift 1 +done -# switchyard, modeshape, droolsjbpm, ... -PROJECT_NAME=$4 - -# should be ${JOB_NAME}/all/repo, but may also be something else, eg., for SwitchYard-Tools, use ${JOB_NAME}/eclipse -if [[ ${JOB_NAME} ]]; then PUBLISH_PATH=${JOB_NAME//-publish}; PUBLISH_PATH=${PUBLISH_PATH//-promote}/all/repo; fi -if [[ $5 ]]; then PUBLISH_PATH=$5; fi - -if [[ $4 ]]; then +if [[ ${PROJECT_NAME} ]]; then echo "mkdir ${BUILD_TYPE}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/ echo "mkdir ${BUILD_TYPE}/${TARGET_PLATFORM}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/ echo "mkdir ${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/ - echo "mkdir ${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/ + echo "mkdir ${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME}" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/ if [[ ${OPERATION} == "MOVE" ]]; then - echo -e "rename builds/staging/${PUBLISH_PATH} updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME}/${TARGET_FOLDER}" | sftp ${DESTINATION} + echo -e "rename builds/staging/${SOURCE_PATH} updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME}/${TARGET_FOLDER}" | sftp ${DESTINATION} else - rsync -arzq --protocol=28 ${DESTINATION}/builds/staging/${PUBLISH_PATH}/* ${WORKSPACE}/${JOB_NAME}/ - rsync -arzq --protocol=28 --delete ${WORKSPACE}/${JOB_NAME}/* ${DESTINATION}/updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}${PROJECT_NAME}/${TARGET_FOLDER}/ + rsync -arzq --protocol=28 ${DESTINATION}/builds/staging/${SOURCE_PATH}/* ${WORKSPACE}/${JOB_NAME}/ + rsync -arzq --protocol=28 --delete ${WORKSPACE}/${JOB_NAME}/* ${DESTINATION}/updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME}/${TARGET_FOLDER}/ fi - echo "Site promoted by ${OPERATION} to: http://download.jboss.org/jbosstools/updates/${BUILD_TYPE}/${TARGET_PLATF..." -else - echo "Usage : $0 \${BUILD_TYPE} \${TARGET_PLATFORM} \${TARGET_FOLDER} \${PROJECT_NAME} [PUBLISH_PATH]" - echo "Example: $0 development juno 3.3.0.Beta3 modeshape" - echo "Example: $0 stable indigo 0.5.0.Final switchyard ${JOB_NAME}/eclipse" - exit 1 + echo "Site promoted by ${OPERATION} to: http://download.jboss.org/jbosstools/updates/${BUILD_TYPE}/${TARGET_PLATF..." fi + +# JBIDE-12662: regenerate composite metadata in updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}/${PROJECT_NAME} folder for all children +wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst... --no-check-certificate +chmod +x jbosstools-cleanup.sh +./jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}" --regen-metadata-only +rm -f jbosstools-cleanup.sh Modified: branches/jbosstools-4.0.0.Alpha2/build/publish/publish.sh =================================================================== --- branches/jbosstools-4.0.0.Alpha2/build/publish/publish.sh 2012-10-02 14:58:07 UTC (rev 44219) +++ branches/jbosstools-4.0.0.Alpha2/build/publish/publish.sh 2012-10-02 15:12:53 UTC (rev 44220) @@ -2,7 +2,7 @@ # Hudson script used to publish Tycho-built p2 update sites # NOTE: sources MUST be checked out into ${WORKSPACE}/sources -# to use timestamp when naming dirs instead of ${BUILD_ID}-H${BUILD_NUMBER}, use: +# to use timestamp when naming dirs instead of ${BUILD_ID}-B${BUILD_NUMBER}, use: # BUILD_ID=2010-08-31_19-16-10; timestamp=$(echo $BUILD_ID | tr -d "_-"); timestamp=${timestamp:0:12}; echo $timestamp; # 201008311916 #set up tmpdir @@ -20,7 +20,7 @@ # releases get named differently than snapshots if [[ ${RELEASE} == "Yes" ]]; then - ZIPSUFFIX="${BUILD_ID}-H${BUILD_NUMBER}" + ZIPSUFFIX="${BUILD_ID}-B${BUILD_NUMBER}" else ZIPSUFFIX="SNAPSHOT" fi @@ -75,6 +75,9 @@ bl=${STAGINGDIR}/logs/BUILDLOG.txt rm -f ${bl}; wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl} --timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused --no-check-certificate +# calculate BUILD_ALIAS from parent pom version as recorded in the build log, eg., from org/jboss/tools/parent/4.0.0.Alpha2-SNAPSHOT get Alpha2 +BUILD_ALIAS=$(cat ${bl} | grep "org/jboss/tools/parent/" | head -1 | sed -e "s#.\+org/jboss/tools/parent/$.\+$/$maven-metadata.xml\|parent.\+$#\1#" | sed -e "s#-SNAPSHOT##" | sed -e "s#[0-9].[0-9].[0-9].##") + # JBDS-1361 - fetch XML and then sed it into plain text wgetParams="--timeout=900 --wait=10 --random-wait --tries=30 --retry-connrefused --no-check-certificate --server-response" rl=${STAGINGDIR}/logs/REVISION @@ -97,10 +100,11 @@ echo "UNKNOWN REVISION(S)" > ${rl}.txt fi -METAFILE="${BUILD_ID}-H${BUILD_NUMBER}.txt" +METAFILE="${BUILD_ID}-B${BUILD_NUMBER}.txt" touch ${STAGINGDIR}/logs/${METAFILE} METAFILE=build.properties +echo "BUILD_ALIAS = ${BUILD_ALIAS}" >> ${STAGINGDIR}/logs/${METAFILE} echo "JOB_NAME = ${JOB_NAME}" >> ${STAGINGDIR}/logs/${METAFILE} echo "BUILD_NUMBER = ${BUILD_NUMBER}" >> ${STAGINGDIR}/logs/${METAFILE} echo "BUILD_ID = ${BUILD_ID}" >> ${STAGINGDIR}/logs/${METAFILE} @@ -279,7 +283,7 @@ export JAVA_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "jdk1.6.0_*" | sort | tail -1) export M2_HOME=$(find /qa/tools/opt -maxdepth 1 -mindepth 1 -type d -name "apache-maven-3.0.*" | sort | tail -1) - ${M2_HOME}/bin/mvn -q -B install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} + ${M2_HOME}/bin/mvn -q -B install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -DBUILD_ALIAS=${BUILD_ALIAS} mv target/index.html ${STAGINGDIR}/index.html; rm -fr target popd >/dev/null fi @@ -319,7 +323,7 @@ # if an aggregate build, put output elsewhere on disk if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then - echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > $tmpdir/latestBuild.html + echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-B${BUILD_NUMBER}/\">" > $tmpdir/latestBuild.html if [[ ${PUBLISHPATHSUFFIX} ]]; then date # create folders if not already there @@ -328,17 +332,17 @@ else mkdir -p $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX} fi - date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/ + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-B${BUILD_NUMBER}/ # sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead - # echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/ - pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null + # echo -e "rm latest\nln ${BUILD_ID}-B${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/ + pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-B${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null date; rsync -arzq --protocol=28 --delete $tmpdir/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/ else date; rsync -arzq --protocol=28 --delete $tmpdir/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/ # sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead - # echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/ - pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null - date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/ + # echo -e "rm latest\nln ${BUILD_ID}-B${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/ + pushd $tmpdir >/dev/null; ln -s ${BUILD_ID}-B${BUILD_NUMBER} latest; rsync --protocol=28 -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null + date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-B${BUILD_NUMBER}/ fi rm -f $tmpdir/latestBuild.html #else @@ -482,7 +486,7 @@ # regenerate http://download.jboss.org/jbosstools/builds/nightly/*/*/composite*.xml files for up to 5 builds, cleaning anything older than 5 days old wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/jbosst... --no-check-certificate chmod +x jbosstools-cleanup.sh - ./jbosstools-cleanup.sh 5 5 + ./jbosstools-cleanup.sh --keep 5 --age-to-delete 5 --childFolderSuffix /all/repo/ rm -f jbosstools-cleanup.sh fi Modified: branches/jbosstools-4.0.0.Alpha2/build/util/cleanup/jbosstools-cleanup.sh =================================================================== --- branches/jbosstools-4.0.0.Alpha2/build/util/cleanup/jbosstools-cleanup.sh 2012-10-02 14:58:07 UTC (rev 44219) +++ branches/jbosstools-4.0.0.Alpha2/build/util/cleanup/jbosstools-cleanup.sh 2012-10-02 15:12:53 UTC (rev 44220) @@ -10,10 +10,41 @@ echo "Logfile: $log" | tee -a $log echo "" | tee -a $log -#commandline options so we can call this by itself using `jbosstools-cleanup.sh 1 2` or call it from within publish.sh using `jbosstools-cleanup.sh 5 5` -if [[ $1 ]] && [[ $1 -gt 0 ]]; then numbuildstokeep=$1; else numbuildstokeep=1; fi # number of builds to keep per branch -if [[ $2 ]] && [[ $2 -gt 0 ]]; then threshholdwhendelete=$2; else threshholdwhendelete=2; fi # age at which a build is available for delete +# commandline options so we can call it from jbosstools-cleanup Jenkins job using +# `jbosstools-cleanup.sh -k 1 -a 2 -S /all/repo/` +# or call it from within publish.sh using +# `jbosstools-cleanup.sh -k 5 -a 5 -S /all/repo/` +# or call it from within promote.sh using +# `jbosstools-cleanup.sh --dirs-to-scan "updates/${BUILD_TYPE}/${TARGET_PLATFORM}/${PARENT_FOLDER}" --regen-metadata-only` +#defauls +numbuildstokeep=1000 # keep X builds per branch +threshholdwhendelete=365 # purge builds more than X days old +dirsToScan="builds/nightly/core builds/nightly/coretests builds/nightly/soa-tooling builds/nightly/soatests builds/nightly/webtools" +delete=1 # if 1, files will be deleted. if 0, files will be listed for delete but not actually removed +checkTimeStamps=1 # if 1, check for timestamped folders, eg., 2012-09-30_04-01-36-H5622 and deduce the age from name. if 0, skip name-to-age parsing and delete nothing +childFolderSuffix="/" # for component update sites, set to "/"; for aggregate builds (not update sites) use "/all/repo/" + +if [[ $# -lt 1 ]]; then + echo "Usage: $0 [-k num-builds-to-keep] [-a num-days-at-which-to-delete] [-d dirs-to-scan] [--regen-metadata-only] [--childFolderSuffix /all/repo/]" + echo "Example (Jenkins job): $0 --keep 1 --age-to-delete 2 --childFolderSuffix /all/repo/" + echo "Example (publish.sh): $0 -k 5 -a 5 -S /all/repo/" + echo "Example (promote.sh): $0 --dirs-to-scan 'updates/integration/indigo/soa-tooling/' --regen-metadata-only" + exit 1; +fi + +# read commandline args +while [[ "$#" -gt 0 ]]; do + case $1 in + '-k'|'--keep') numbuildstokeep="$2"; shift 1;; + '-a'|'--age-to-delete') threshholdwhendelete="$2"; shift 1;; + '-d'|'--dirs-to-scan') dirsToScan="$2"; shift 1;; + '-M'|'--regen-metadata-only') delete=0; checkTimeStamps=0; shift 0;; + '-S'|'--childFolderSuffix') childFolderSuffix="$2" + esac + shift 1 +done + getSubDirs () { getSubDirsReturn=""; @@ -32,7 +63,7 @@ dirs=$(sftp -b $tmp tools(a)filemgmt.jboss.org 2>/dev/null) i=0 for c in $dirs; do - if [[ $i -gt 2 ]] && [[ $c != "sftp>" ]] && [[ ${c##*.} != "" ]]; then # valid dir + if [[ $i -gt 2 ]] && [[ $c != "sftp>" ]] && [[ ${c##*.} != "" ]] && [[ ${c##*/*.*ml} != "" ]]; then # valid dir; exclude *.xml, *.html files getSubDirsReturn=$getSubDirsReturn" "$c fi (( i++ )) @@ -43,12 +74,12 @@ # Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch clean () { - type=$1 # nightly or release + type=$1 # builds/nightly or updates/development/juno/soa-tooling, etc. numkeep=$2 # number of builds to keep per branch - threshhold=$3 # age at which a build is available for delete + threshhold=$3 # purge builds more than $threshhold days old echo "Check for $type builds more than $threshhold days old; keep minimum $numkeep builds per branch" | tee -a $log - getSubDirs /downloads_htdocs/tools/builds/$type/ 0 + getSubDirs /downloads_htdocs/tools/$type/ 0 subdirs=$getSubDirsReturn for sd in $subdirs; do getSubDirs $sd 1 @@ -56,39 +87,45 @@ #echo $subsubdirs tmp=`mktemp` for ssd in $subsubdirs; do - if [[ ${ssd##$sd/201*} == "" ]]; then # a build dir + if [[ ${ssd##$sd/201*} == "" ]] || [[ $checkTimeStamps -eq 0 ]]; then # a build dir buildid=${ssd##*/}; echo $buildid >> $tmp fi done - newest=$(cat $tmp | sort -r | head -$numkeep) # keep these - all=$(cat $tmp | sort -r) # check these - rm -f $tmp - for dd in $all; do - keep=0; - # sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})/\1-\2-\3\ \4:\5/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## OLD FOLDER FORMAT - sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-H(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT - (( day = now - sec )) - (( day = day / 3600 / 24 )) - for n in $newest; do - if [[ $dd == $n ]] || [[ $day -le $threshhold ]]; then - keep=1 + if [[ $checkTimeStamps -eq 1 ]]; then + newest=$(cat $tmp | sort -r | head -$numkeep) # keep these + all=$(cat $tmp | sort -r) # check these + rm -f $tmp + for dd in $all; do + keep=0; + # sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})/\1-\2-\3\ \4:\5/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## OLD FOLDER FORMAT + sec=$(date -d "$(echo $dd | perl -pe "s/(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2})-(\d{2})-H(\d+)/\1-\2-\3\ \4:\5:\6/")" +%s) # convert buildID (folder) to timestamp, then to # seconds since epoch ## NEW FOLDER FORMAT + (( day = now - sec )) + (( day = day / 3600 / 24 )) + for n in $newest; do + if [[ $dd == $n ]] || [[ $day -le $threshhold ]]; then + keep=1 + fi + done + if [[ $keep -eq 0 ]]; then + echo -n "- $sd/$dd (${day}d)... " | tee -a $log + if [[ $delete -eq 1 ]]; then + if [[ $USER == "hudson" ]]; then + # can't delete the dir, but can at least purge its contents + rm -fr /tmp/$dd; mkdir /tmp/$dd; pushd /tmp/$dd >/dev/null + rsync --rsh=ssh --protocol=28 -r --delete . tools@filemgmt.jboss.org:$sd/$dd 2>&1 | tee -a $log + echo -e "rmdir $dd" | sftp tools@filemgmt.jboss.org:$sd/ + popd >/dev/null; rm -fr /tmp/$dd + fi + echo "" | tee -a $log + else + echo " SKIPPED." + fi + else + echo "+ $sd/$dd (${day}d)" | tee -a $log fi done - if [[ $keep -eq 0 ]]; then - echo -n "- $sd/$dd (${day}d)... " | tee -a $log - if [[ $USER == "hudson" ]]; then - # can't delete the dir, but can at least purge its contents - rm -fr /tmp/$dd; mkdir /tmp/$dd; pushd /tmp/$dd >/dev/null - rsync --rsh=ssh --protocol=28 -r --delete . tools@filemgmt.jboss.org:$sd/$dd 2>&1 | tee -a $log - echo -e "rmdir $dd" | sftp tools@filemgmt.jboss.org:$sd/ - popd >/dev/null; rm -fr /tmp/$dd - fi - echo "" | tee -a $log - else - echo "+ $sd/$dd (${day}d)" | tee -a $log - fi - done + fi # generate metadata in the nightly/core/trunk/ folder to composite the remaining sites into one getSubDirs $sd 1; #return #getSubDirsReturn @@ -96,7 +133,7 @@ #echo $subsubdirs tmp=`mktemp` for ssd in $subsubdirs; do - if [[ ${ssd##$sd/201*} == "" ]]; then # a build dir + if [[ ${ssd##$sd/201*} == "" ]] || [[ $checkTimeStamps -eq 0 ]]; then # a build dir buildid=${ssd##*/}; echo $buildid >> $tmp fi @@ -108,8 +145,9 @@ if [[ $getListSizeReturn -gt 0 ]]; then echo "Generate metadata for ${getListSizeReturn} subdir(s) in $sd/" | tee -a $log mkdir -p /tmp/cleanup-fresh-metadata/ - regenCompositeMetadata "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml" - regenCompositeMetadata "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml" + siteName=${sd##*/downloads_htdocs/tools/} + regenCompositeMetadata "$siteName" "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml" + regenCompositeMetadata "$siteName" "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml" rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/ rm -fr /tmp/cleanup-fresh-metadata/ else @@ -133,18 +171,19 @@ #regen metadata for remaining subdirs in this folder regenCompositeMetadata () { - subsubdirs=$1 - countChildren=$2 - fileType=$3 - fileName=$4 + siteName=$1 + subsubdirs=$2 + countChildren=$3 + fileType=$4 + fileName=$5 now=$(date +%s000) echo "<?xml version='1.0' encoding='UTF-8'?><?compositeArtifactRepository version='1.0.0'?> -<repository name='JBoss Tools Builds - ${type}' type='${fileType}' version='1.0.0'> +<repository name='JBoss Tools Builds - ${siteName}' type='${fileType}' version='1.0.0'> <properties size='2'><property name='p2.timestamp' value='${now}'/><property name='p2.compressed' value='true'/></properties> <children size='${countChildren}'>" > ${fileName} for ssd in $subsubdirs; do - echo "<child location='${ssd}/all/repo/'/>" >> ${fileName} + echo "<child location='${ssd}${childFolderSuffix}'/>" >> ${fileName} done echo "</children> </repository> @@ -152,6 +191,6 @@ } # now that we have all the methods and vars defined, let's do some cleaning! -for dir in nightly/core nightly/coretests nightly/soa-tooling nightly/soatests nightly/webtools; do +for dir in $dirsToScan; do clean $dir $numbuildstokeep $threshholdwhendelete done

12 years, 3 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2012