# HG changeset patch # User Thomas Wuerthinger # Date 1387576896 -3600 # Node ID cdde71dc5381b131e4920453028218eee6651c43 # Parent 1d53e766f71a99ec0ee529693e9d86d856c8f811 Move IGV to NetBeans platform 7.4 to support also JDK8. diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml Fri Dec 20 23:01:36 2013 +0100 @@ -4,13 +4,6 @@ *** EDIT ../build.xml INSTEAD *** --> - - - - - - - You must set 'suite.dir' to point to your containing module suite @@ -23,21 +16,13 @@ - - - - - - - - - - + + - + diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties --- a/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties Fri Dec 20 23:01:36 2013 +0100 @@ -1,5 +1,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=09ba2a87 -nbproject/build-impl.xml.script.CRC32=e4293f0e -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1 +nbproject/build-impl.xml.script.CRC32=19fb08e0 +nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.62.1 diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/Graal/build.xml --- a/src/share/tools/IdealGraphVisualizer/Graal/build.xml Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graal/build.xml Fri Dec 20 23:01:36 2013 +0100 @@ -1,8 +1,8 @@ - - - - - - Builds, tests, and runs the project com.sun.hotspot.igv.graal. - - + + + + + + Builds, tests, and runs the project com.sun.hotspot.igv.graal. + + diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/Graal/nbproject/build-impl.xml --- a/src/share/tools/IdealGraphVisualizer/Graal/nbproject/build-impl.xml Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graal/nbproject/build-impl.xml Fri Dec 20 23:01:36 2013 +0100 @@ -1,45 +1,30 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + You must set 'suite.dir' to point to your containing module suite + + + + + + + + + + + + + + + + + + + + + diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/Graal/nbproject/genfiles.properties --- a/src/share/tools/IdealGraphVisualizer/Graal/nbproject/genfiles.properties Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/Graal/nbproject/genfiles.properties Fri Dec 20 23:01:36 2013 +0100 @@ -1,8 +1,8 @@ -build.xml.data.CRC32=79002a09 -build.xml.script.CRC32=3534d355 -build.xml.stylesheet.CRC32=a56c6a5b@2.47.1 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=79002a09 -nbproject/build-impl.xml.script.CRC32=2867f2d5 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1 +build.xml.data.CRC32=79002a09 +build.xml.script.CRC32=3534d355 +build.xml.stylesheet.CRC32=a56c6a5b@2.62.1 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. +nbproject/build-impl.xml.data.CRC32=79002a09 +nbproject/build-impl.xml.script.CRC32=7ac2ee25 +nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.62.1 diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml --- a/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml Fri Dec 20 23:01:36 2013 +0100 @@ -4,13 +4,6 @@ *** EDIT ../build.xml INSTEAD *** --> - - - - - - - You must set 'suite.dir' to point to your containing module suite @@ -23,21 +16,13 @@ - - - - - - - - - - + + - + diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties --- a/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties Fri Dec 20 23:01:36 2013 +0100 @@ -1,5 +1,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=5a0e591e -nbproject/build-impl.xml.script.CRC32=61516e53 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1 +nbproject/build-impl.xml.script.CRC32=4c38ce23 +nbproject/build-impl.xml.stylesheet.CRC32=e50cf570@2.62.1 diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml --- a/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/build-impl.xml Fri Dec 20 23:01:36 2013 +0100 @@ -4,13 +4,6 @@ *** EDIT ../build.xml INSTEAD *** --> - - - - - - - You must set 'suite.dir' to point to your containing module suite @@ -23,21 +16,13 @@ - - - - - - - - - - + + - + diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties --- a/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/SelectionCoordinator/nbproject/genfiles.properties Fri Dec 20 23:01:36 2013 +0100 @@ -1,5 +1,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=13553862 -nbproject/build-impl.xml.script.CRC32=3db87c68 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1 +nbproject/build-impl.xml.script.CRC32=5dca457e +nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.62.1 diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties --- a/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties Fri Dec 20 23:01:36 2013 +0100 @@ -5,7 +5,7 @@ # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=3c2c6126 nbproject/build-impl.xml.script.CRC32=b26e57e5 -nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.47.1 +nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.62.1 nbproject/platform.xml.data.CRC32=3c2c6126 -nbproject/platform.xml.script.CRC32=db9e1f43 -nbproject/platform.xml.stylesheet.CRC32=df8ac4dd@2.47.1 +nbproject/platform.xml.script.CRC32=6dcbd131 +nbproject/platform.xml.stylesheet.CRC32=4e1f53d4@2.62.1 diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/nbproject/platform.properties --- a/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties Fri Dec 20 23:01:36 2013 +0100 @@ -1,24 +1,12 @@ -nbplatform.active=default -bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/netbeans/harness/tasks.jar -autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/7.1.1/uc/final/distribution/catalog.xml.gz -suite.dir=${basedir} -nbplatform.active.dir=${suite.dir}/nbplatform -nbplatform.default.netbeans.dest.dir=${suite.dir}/nbplatform -nbplatform.default.harness.dir=${nbplatform.default.netbeans.dest.dir}/harness -harness.dir=${nbplatform.active.dir}/harness cluster.path=\ ${nbplatform.active.dir}/ide:\ ${nbplatform.active.dir}/platform disabled.modules=\ - com.jcraft.jsch,\ - com.jcraft.jzlib,\ org.apache.commons.codec,\ org.apache.commons.httpclient,\ org.apache.commons.io,\ org.apache.commons.lang,\ - org.apache.commons.logging,\ org.apache.ws.commons.util,\ - org.apache.xml.resolver,\ org.apache.xmlrpc,\ org.eclipse.core.contenttype,\ org.eclipse.core.jobs,\ @@ -34,48 +22,30 @@ org.eclipse.mylyn.bugzilla.core,\ org.eclipse.mylyn.commons.core,\ org.eclipse.mylyn.commons.net,\ + org.eclipse.mylyn.commons.repositories.core,\ org.eclipse.mylyn.commons.xmlrpc,\ org.eclipse.mylyn.tasks.core,\ - org.mozilla.rhino.patched,\ + org.eclipse.mylyn.wikitext.confluence.core,\ + org.eclipse.mylyn.wikitext.core,\ + org.eclipse.mylyn.wikitext.textile.core,\ org.netbeans.api.debugger,\ - org.netbeans.api.java.classpath,\ - org.netbeans.api.xml,\ org.netbeans.core.browser,\ - org.netbeans.core.execution,\ - org.netbeans.core.ide,\ - org.netbeans.core.io.ui,\ - org.netbeans.core.multiview,\ - org.netbeans.core.nativeaccess,\ - org.netbeans.core.osgi,\ - org.netbeans.lib.cvsclient,\ - org.netbeans.lib.terminalemulator,\ - org.netbeans.libs.antlr3.runtime,\ - org.netbeans.libs.bytelist,\ + org.netbeans.core.browser.webview,\ org.netbeans.libs.commons_net,\ - org.netbeans.libs.freemarker,\ org.netbeans.libs.git,\ org.netbeans.libs.ini4j,\ - org.netbeans.libs.jaxb,\ - org.netbeans.libs.jsr223,\ - org.netbeans.libs.junit4,\ - org.netbeans.libs.jvyamlb,\ - org.netbeans.libs.lucene,\ + org.netbeans.libs.jsch.agentproxy,\ + org.netbeans.libs.json_simple,\ org.netbeans.libs.smack,\ org.netbeans.libs.svnClientAdapter,\ org.netbeans.libs.svnClientAdapter.javahl,\ org.netbeans.libs.svnClientAdapter.svnkit,\ org.netbeans.libs.swingx,\ - org.netbeans.libs.xerces,\ - org.netbeans.modules.autoupdate.services,\ - org.netbeans.modules.autoupdate.ui,\ org.netbeans.modules.bugtracking,\ org.netbeans.modules.bugtracking.bridge,\ org.netbeans.modules.bugzilla,\ - org.netbeans.modules.core.kit,\ - org.netbeans.modules.csl.api,\ - org.netbeans.modules.css.editor,\ - org.netbeans.modules.css.lib,\ - org.netbeans.modules.css.visual,\ + org.netbeans.modules.code.analysis,\ + org.netbeans.modules.css.prep,\ org.netbeans.modules.db,\ org.netbeans.modules.db.core,\ org.netbeans.modules.db.dataview,\ @@ -86,124 +56,66 @@ org.netbeans.modules.db.sql.editor,\ org.netbeans.modules.db.sql.visualeditor,\ org.netbeans.modules.dbapi,\ - org.netbeans.modules.defaults,\ org.netbeans.modules.derby,\ - org.netbeans.modules.dlight.nativeexecution,\ - org.netbeans.modules.dlight.terminal,\ - org.netbeans.modules.editor.bookmarks,\ - org.netbeans.modules.editor.bracesmatching,\ - org.netbeans.modules.editor.codetemplates,\ - org.netbeans.modules.editor.completion,\ - org.netbeans.modules.editor.guards,\ + org.netbeans.modules.editor.global.format,\ org.netbeans.modules.editor.indent.project,\ - org.netbeans.modules.editor.kit,\ - org.netbeans.modules.editor.macros,\ - org.netbeans.modules.editor.structure,\ - org.netbeans.modules.extbrowser,\ - org.netbeans.modules.extexecution,\ - org.netbeans.modules.extexecution.destroy,\ - org.netbeans.modules.favorites,\ + org.netbeans.modules.extexecution.impl,\ org.netbeans.modules.git,\ - org.netbeans.modules.glassfish.common,\ org.netbeans.modules.gototest,\ org.netbeans.modules.gsf.codecoverage,\ org.netbeans.modules.gsf.testrunner,\ - org.netbeans.modules.html,\ - org.netbeans.modules.html.editor,\ - org.netbeans.modules.html.editor.lib,\ - org.netbeans.modules.html.lexer,\ - org.netbeans.modules.html.parser,\ - org.netbeans.modules.html.validation,\ - org.netbeans.modules.httpserver,\ + org.netbeans.modules.html.angular,\ + org.netbeans.modules.html.knockout,\ org.netbeans.modules.hudson,\ org.netbeans.modules.hudson.git,\ org.netbeans.modules.hudson.mercurial,\ org.netbeans.modules.hudson.subversion,\ org.netbeans.modules.hudson.tasklist,\ - org.netbeans.modules.ide.kit,\ - org.netbeans.modules.image,\ - org.netbeans.modules.javascript.editing,\ - org.netbeans.modules.javascript.hints,\ - org.netbeans.modules.javascript.kit,\ - org.netbeans.modules.javascript.refactoring,\ + org.netbeans.modules.hudson.ui,\ org.netbeans.modules.jellytools.ide,\ - org.netbeans.modules.jumpto,\ - org.netbeans.modules.keyring.impl,\ org.netbeans.modules.languages,\ - org.netbeans.modules.languages.diff,\ - org.netbeans.modules.languages.manifest,\ - org.netbeans.modules.languages.yaml,\ org.netbeans.modules.lexer.nbbridge,\ org.netbeans.modules.localhistory,\ org.netbeans.modules.mercurial,\ - org.netbeans.modules.netbinox,\ - org.netbeans.modules.parsing.api,\ - org.netbeans.modules.parsing.lucene,\ - org.netbeans.modules.print.editor,\ + org.netbeans.modules.mylyn.util,\ + org.netbeans.modules.notifications,\ + org.netbeans.modules.parsing.ui,\ org.netbeans.modules.project.ant,\ - org.netbeans.modules.project.libraries,\ - org.netbeans.modules.projectui,\ org.netbeans.modules.projectui.buildmenu,\ - org.netbeans.modules.projectuiapi,\ - org.netbeans.modules.properties,\ org.netbeans.modules.properties.syntax,\ - org.netbeans.modules.refactoring.api,\ org.netbeans.modules.schema2beans,\ org.netbeans.modules.server,\ - org.netbeans.modules.servletapi,\ org.netbeans.modules.spellchecker,\ org.netbeans.modules.spellchecker.apimodule,\ org.netbeans.modules.spellchecker.bindings.htmlxml,\ org.netbeans.modules.spellchecker.bindings.properties,\ org.netbeans.modules.spellchecker.dictionary_en,\ org.netbeans.modules.spellchecker.kit,\ - org.netbeans.modules.spi.actions,\ org.netbeans.modules.subversion,\ org.netbeans.modules.swing.validation,\ org.netbeans.modules.target.iterator,\ - org.netbeans.modules.tasklist.kit,\ - org.netbeans.modules.tasklist.projectint,\ - org.netbeans.modules.tasklist.todo,\ - org.netbeans.modules.tasklist.ui,\ - org.netbeans.modules.terminal,\ - org.netbeans.modules.usersguide,\ - org.netbeans.modules.utilities,\ + org.netbeans.modules.team.commons,\ + org.netbeans.modules.team.ide,\ org.netbeans.modules.utilities.project,\ org.netbeans.modules.versioning,\ + org.netbeans.modules.versioning.core,\ org.netbeans.modules.versioning.indexingbridge,\ + org.netbeans.modules.versioning.masterfs,\ org.netbeans.modules.versioning.system.cvss.installer,\ + org.netbeans.modules.versioning.ui,\ org.netbeans.modules.versioning.util,\ - org.netbeans.modules.web.client.tools.api,\ - org.netbeans.modules.web.common,\ - org.netbeans.modules.web.indent,\ - org.netbeans.modules.xml,\ - org.netbeans.modules.xml.axi,\ - org.netbeans.modules.xml.catalog,\ - org.netbeans.modules.xml.core,\ - org.netbeans.modules.xml.jaxb.api,\ - org.netbeans.modules.xml.lexer,\ + org.netbeans.modules.web.webkit.debugging,\ org.netbeans.modules.xml.multiview,\ - org.netbeans.modules.xml.retriever,\ - org.netbeans.modules.xml.schema.completion,\ - org.netbeans.modules.xml.schema.model,\ - org.netbeans.modules.xml.tax,\ - org.netbeans.modules.xml.text,\ - org.netbeans.modules.xml.tools,\ - org.netbeans.modules.xml.wsdl.model,\ - org.netbeans.modules.xml.xam,\ - org.netbeans.modules.xml.xdm,\ - org.netbeans.modules.xsl,\ org.netbeans.spi.debugger.ui,\ - org.netbeans.spi.editor.hints,\ - org.netbeans.spi.navigator,\ - org.netbeans.spi.palette,\ - org.netbeans.spi.tasklist,\ org.netbeans.spi.viewmodel,\ - org.netbeans.swing.dirchooser,\ - org.openide.compat,\ - org.openide.execution,\ - org.openide.options,\ - org.openide.util.enumerations + org.openidex.util +nbplatform.active.dir=${suite.dir}/nbplatform +nbplatform.default.netbeans.dest.dir=${suite.dir}/nbplatform +nbplatform.default.harness.dir=${nbplatform.default.netbeans.dest.dir}/harness +bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastSuccessfulBuild/artifact/nbbuild/netbeans/harness/tasks.jar +autoupdate.catalog.url=http://updates.netbeans.org/netbeans/updates/7.4/uc/final/distribution/catalog.xml.gz +suite.dir=${basedir} +nbplatform.active=default ## Not disabled because of NetBeans bug 206347: ## Applications not using OSGi don't start on NbP 7.1 # org.netbeans.core.netigso,\ diff -r 1d53e766f71a -r cdde71dc5381 src/share/tools/IdealGraphVisualizer/nbproject/platform.xml --- a/src/share/tools/IdealGraphVisualizer/nbproject/platform.xml Fri Dec 20 10:57:33 2013 +0100 +++ b/src/share/tools/IdealGraphVisualizer/nbproject/platform.xml Fri Dec 20 23:01:36 2013 +0100 @@ -17,7 +17,7 @@ - +