diff -Nru visualvm-1.2.1/debian/changelog visualvm-1.2.2/debian/changelog --- visualvm-1.2.1/debian/changelog 2010-04-21 13:36:17.000000000 +0100 +++ visualvm-1.2.2/debian/changelog 2010-04-21 13:36:18.000000000 +0100 @@ -1,3 +1,11 @@ +visualvm (1.2.2-0ubuntu1) lucid; urgency=low + + * New upstream version, to build with netbeans-6.8. LP: #560138. + * Depend on libnb-platform11-java. + * Build-depend on libnb-apisupport1-java. + + -- Matthias Klose Wed, 21 Apr 2010 14:09:51 +0200 + visualvm (1.2.1-0ubuntu3) lucid; urgency=low * debian/control: Really use Depends instead of Build-Depends. diff -Nru visualvm-1.2.1/debian/control visualvm-1.2.2/debian/control --- visualvm-1.2.1/debian/control 2010-04-21 13:36:17.000000000 +0100 +++ visualvm-1.2.2/debian/control 2010-04-21 13:36:18.000000000 +0100 @@ -2,13 +2,13 @@ Section: java Priority: extra Maintainer: Matthias Klose -Build-Depends: debhelper (>= 6), openjdk-6-jdk, ant-optional, libnb-platform-devel-java (>= 6.7) -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 6), openjdk-6-jdk, ant-optional, libnb-platform-devel-java (>= 6.8), libnb-apisupport1-java +Standards-Version: 3.8.4 Homepage: https://visualvm.dev.java.net/ Package: visualvm Architecture: any -Depends: openjdk-6-jdk | java6-sdk, libnb-platform10-java, ${shlibs:Depends}, ${misc:Depends} +Depends: openjdk-6-jdk | java6-sdk, libnb-platform11-java, ${shlibs:Depends}, ${misc:Depends} Description: All-in-One Java Troubleshooting Tool VisualVM is a visual tool integrating several commandline JDK tools and lightweight profiling capabilities. Designed for both production diff -Nru visualvm-1.2.1/debian/copyright visualvm-1.2.2/debian/copyright --- visualvm-1.2.1/debian/copyright 2010-04-21 13:36:17.000000000 +0100 +++ visualvm-1.2.2/debian/copyright 2010-04-21 13:36:18.000000000 +0100 @@ -1,8 +1,9 @@ This package was debianized by Matthias Klose on Wed, 01 Oct 2008 10:31:06 +0000. -It was downloaded from https://visualvm.dev.java.net/ - http://icedtea.classpath.org/visualvm/ +It was downloaded from + https://visualvm.dev.java.net/files/documents/7163/146746/visualvm_122-src.tar.gz + https://visualvm.dev.java.net/files/documents/7163/149581/netbeans-profiler-visualvm_release68.tar.gz Upstream Authors: diff -Nru visualvm-1.2.1/debian/rules visualvm-1.2.2/debian/rules --- visualvm-1.2.1/debian/rules 2010-04-21 13:36:17.000000000 +0100 +++ visualvm-1.2.2/debian/rules 2010-04-21 13:36:18.000000000 +0100 @@ -10,22 +10,21 @@ d = debian/visualvm v_api = 1 -v_plat = 10 -v_ide = 11 +v_plat = 11 export JAVA_HOME = /usr/lib/jvm/java-6-openjdk ANT = $(JAVA_HOME)/bin/java -classpath /usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/java/ant-nodeps.jar:/usr/share/java/xml-commons-resolver-1.1.jar:$(JAVA_HOME)/lib/tools.jar -Dant.home=/usr/share/ant org.apache.tools.ant.Main -Dcompile.debug=true -Dcompile.optimize=true -NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release67.tar.gz -VISUALVM_SRC_ZIP = visualvm_121-src.tar.gz +NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release68.tar.gz +VISUALVM_SRC_ZIP = visualvm_122-src.tar.gz SYSTEM_NETBEANS_DIR = /usr/share/netbeans ifneq (,$(filter $(DEB_HOST_ARCH), amd64)) - jfluid_buildscript = sh -x ./buildnative-linux64-15.sh + jfluid_buildscript = sh -x ./buildnative-linux64.sh arch_dir = linux-amd64 else - jfluid_buildscript = sh -x ./buildnative-linux-15.sh + jfluid_buildscript = sh -x ./buildnative-linux.sh arch_dir = linux endif @@ -70,10 +69,11 @@ cd netbeans && \ set -e; \ - for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler; do \ + for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler profiler.oql; do \ echo "Building in netbeans/$$dir ..."; \ - $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091020 \ - -Dnetbeans.dest.dir=$(CURDIR)/netbeans/nbbuild/netbeans_visualvm -f $$dir/build.xml; \ + $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091221 \ + -Dnetbeans.dest.dir=$(CURDIR)/netbeans/nbbuild/netbeans_visualvm \ + -f $$dir/build.xml; \ done touch $@ diff -Nru visualvm-1.2.1/ide/launcher/netbeans.clusters visualvm-1.2.2/ide/launcher/netbeans.clusters --- visualvm-1.2.1/ide/launcher/netbeans.clusters 2009-05-25 08:46:26.000000000 +0100 +++ visualvm-1.2.2/ide/launcher/netbeans.clusters 2009-11-23 20:52:50.000000000 +0000 @@ -1,17 +1,17 @@ # platform cluster first -platform10 +platform11 # application cluster second -nb6.7 +nb6.8 # ergonomics cluster if present -ergonomics1 +ergonomics2 # and now the rest -ide11 -java2 +ide12 +java3 xml2 apisupport1 webcommon1 websvccommon1 -enterprise5 +enterprise6 mobility8 profiler3 ruby2 @@ -22,8 +22,9 @@ identity2 uml6 harness -cnd2 -dlight1 -groovy1 +cnd3 +dlight2 +groovy2 extra javafx2 +javacard1 diff -Nru visualvm-1.2.1/lib.profiler/build.xml visualvm-1.2.2/lib.profiler/build.xml --- visualvm-1.2.1/lib.profiler/build.xml 2009-07-28 07:52:48.000000000 +0100 +++ visualvm-1.2.2/lib.profiler/build.xml 2009-12-10 14:50:52.000000000 +0000 @@ -2,7 +2,7 @@ - - - - -]> - @@ -64,10 +57,6 @@ - - - - @@ -112,29 +101,13 @@ - - - - - - - - - - - - - - - You have stray *.class files in ${basedir}/antsrc which you must remove. - Probably you failed to clean your sources before updating. Try: ant clean - - + + @@ -165,25 +138,6 @@ - - - - - - - - - - - - - - - - - - - @@ -195,10 +149,7 @@ - - - @@ -263,64 +214,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - @@ -340,199 +238,6 @@ - - <?xml version="1.0" encoding="UTF-8"?> -<changes> - - - - </changes> - - - - - - - - - - <?xml version="1.0" encoding="UTF-8"?> -<apis> - - - - </apis> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The org-openide-util/javadoc.css has to exist as we are refering to - it from to master module javadoc pages. If it does not anymore, update - the javadoctools/export*.xsl templates. - - - - - - - - - - - - - - -NetBeans API Index - - - - - - - - - -<H2>Frame Alert</H2> -<P> -This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. -Link to <A HREF="overview-summary.html">Non-frame version.</A> - - - -]]> - &properties; - - - - - &replaces; - - - - - - - - - - - - - - - - - - - - - - - - &disallowed-links; - - - @@ -583,15 +288,7 @@ - - - - - - - - - + NetBeans dev build ------------------ Number: ${buildnumber} @@ -599,7 +296,8 @@ Branding: Branch: trunk Tag: -${hg.id.line} +Hg ID: ${hg.id} + @@ -608,8 +306,8 @@ description="Create a complete build including a ZIP distribution (but do not try it)."> - - + + @@ -697,7 +395,7 @@ - + @@ -721,6 +419,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -735,7 +462,7 @@ - + @@ -1510,6 +1237,11 @@ + + + + + @@ -1821,6 +1553,7 @@ + @@ -1884,7 +1617,7 @@ - + @@ -1894,8 +1627,12 @@ + + + + @@ -2021,8 +1758,11 @@ + + + - + diff -Nru visualvm-1.2.1/nbbuild/cluster-description.properties visualvm-1.2.2/nbbuild/cluster-description.properties --- visualvm-1.2.1/nbbuild/cluster-description.properties 2009-05-25 08:48:26.000000000 +0100 +++ visualvm-1.2.2/nbbuild/cluster-description.properties 2009-11-23 20:55:00.000000000 +0000 @@ -1,6 +1,6 @@ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common diff -Nru visualvm-1.2.1/nbbuild/cluster.properties visualvm-1.2.2/nbbuild/cluster.properties --- visualvm-1.2.1/nbbuild/cluster.properties 2009-07-28 07:52:49.000000000 +0100 +++ visualvm-1.2.2/nbbuild/cluster.properties 2009-12-10 14:50:52.000000000 +0000 @@ -1,7 +1,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. # -# Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved. # # The contents of this file are subject to the terms of either the GNU # General Public License Version 2 only ("GPL") or the Common @@ -52,9 +52,10 @@ clusters.config.standard.list=\ ${clusters.config.basic.list},\ nb.cluster.enterprise,\ + nb.cluster.groovy,\ nb.cluster.mobility,\ nb.cluster.identity,\ - nb.cluster.webcommon,\ + nb.cluster.javafx,\ nb.cluster.ergonomics # ergonomics must be last @@ -63,7 +64,6 @@ nb.cluster.cnd,\ nb.cluster.dlight,\ nb.cluster.php,\ - nb.cluster.groovy,\ ${clusters.config.standard.list} # ergonomics must be last @@ -71,7 +71,6 @@ ${clusters.config.platform.list},\ nb.cluster.ide,\ nb.cluster.php,\ - nb.cluster.webcommon,\ nb.cluster.websvccommon,\ nb.cluster.nb @@ -84,7 +83,6 @@ nb.cluster.nb,\ nb.cluster.ide,\ nb.cluster.ruby,\ - nb.cluster.webcommon,\ nb.cluster.websvccommon clusters.config.python.list=\ @@ -117,8 +115,7 @@ clusters.config.enterprise.list=\ ${clusters.config.java.list},\ - nb.cluster.enterprise,\ - nb.cluster.webcommon + nb.cluster.enterprise clusters.config.soa.list=\ ${clusters.config.java.list},\ @@ -152,6 +149,7 @@ clusters.config.stableuc.list=\ ${clusters.config.full.list},\ + nb.cluster.python,\ nb.cluster.soa,\ nb.cluster.uml,\ nb.cluster.visualweb,\ @@ -172,6 +170,12 @@ nb.cluster.javafx,\ nb.cluster.nb +clusters.config.javacard.list=\ + ${clusters.config.basic.list},\ + nb.cluster.ide,\ + nb.cluster.java,\ + nb.cluster.javacard + clusters.extra.list=\ nb.cluster.testtools @@ -179,7 +183,7 @@ ${clusters.extra.list},\ ${clusters.config.full.list} -nb.cluster.platform.dir=platform10 +nb.cluster.platform.dir=platform11 nb.cluster.platform.depends= nb.cluster.platform=\ api.annotations.common,\ @@ -240,8 +244,15 @@ validation.nb.cluster.platform=\ o.n.core,\ core.windows,\ - javahelp,\ - ide.kit + javahelp + +nb.cluster.javafx.sources=javafx +nb.cluster.javafx= +nb.cluster.javafx.dir=javafx2 +nb.cluster.javafx.depends=\ + nb.cluster.platform,\ + nb.cluster.ide,\ + nb.cluster.apisupport nb.cluster.testtools.dir=testtools nb.cluster.testtools.depends=\ @@ -251,8 +262,10 @@ nb.cluster.testtools=\ contrib/jemmysupport -nb.cluster.ide.dir=ide11 -nb.cluster.ide.depends=nb.cluster.platform +nb.cluster.ide.dir=ide12 +nb.cluster.ide.depends=\ + nb.cluster.platform,\ + nb.cluster.harness nb.cluster.ide=\ api.debugger,\ api.java.classpath,\ @@ -260,7 +273,7 @@ bugtracking,\ bugtracking.bridge,\ bugzilla,\ - classfile,\ + core.browser,\ core.ide,\ csl.api,\ css.editor,\ @@ -278,6 +291,7 @@ defaults,\ diff,\ editor,\ + editor.actions,\ editor.bookmarks,\ editor.bracesmatching,\ editor.codetemplates,\ @@ -301,6 +315,7 @@ editor.util,\ extbrowser,\ extexecution,\ + extexecution.destroy,\ glassfish.common,\ gototest,\ gsf,\ @@ -323,9 +338,9 @@ javascript.hints,\ javascript.kit,\ javascript.refactoring,\ + jellytools.ide,\ jumpto,\ kenai,\ - kenai.collab,\ kenai.ui,\ languages,\ languages.diff,\ @@ -347,6 +362,7 @@ libs.jaxb,\ libs.jsch,\ libs.jvyamlb,\ + libs.jzlib,\ libs.lucene,\ libs.smack,\ libs.svnClientAdapter,\ @@ -380,6 +396,8 @@ spi.tasklist,\ spi.viewmodel,\ subversion,\ + swing.validation,\ + target.iterator,\ tasklist.kit,\ tasklist.projectint,\ tasklist.todo,\ @@ -389,6 +407,7 @@ utilities,\ utilities.project,\ versioning,\ + versioning.indexingbridge,\ versioning.system.cvss,\ versioning.util,\ web.client.tools.api,\ @@ -397,6 +416,7 @@ xml.axi,\ xml.catalog,\ xml.core,\ + xml.jaxb.api,\ xml.lexer,\ xml.multiview,\ xml.retriever,\ @@ -409,12 +429,15 @@ xml.xam,\ xml.xdm,\ xsl +validation.nb.cluster.ide=\ + ide.kit -nb.cluster.java.dir=java2 +nb.cluster.java.dir=java3 nb.cluster.java.depends=\ nb.cluster.ide,\ nb.cluster.platform,\ - nb.cluster.websvccommon + nb.cluster.websvccommon,\ + nb.cluster.harness nb.cluster.java=\ ant.browsetask,\ ant.debugger,\ @@ -424,6 +447,7 @@ api.debugger.jpda,\ api.java,\ beans,\ + classfile,\ dbschema,\ debugger.jpda,\ debugger.jpda.ant,\ @@ -440,6 +464,7 @@ i18n,\ i18n.form,\ j2ee.core.utilities,\ + j2ee.eclipselink,\ j2ee.jpa.refactoring,\ j2ee.jpa.verification,\ j2ee.metadata,\ @@ -457,7 +482,6 @@ java.guards,\ java.helpset,\ java.hints,\ - java.hints.analyzer,\ java.j2seplatform,\ java.j2seproject,\ java.kit,\ @@ -471,7 +495,10 @@ java.sourceui,\ javadoc,\ javawebstart,\ + jellytools,\ + jellytools.java,\ junit,\ + kenai.maven,\ libs.cglib,\ libs.javacapi,\ libs.javacimpl,\ @@ -550,13 +577,13 @@ apisupport.refactoring,\ maven.apisupport -nb.cluster.enterprise.dir=enterprise5 +nb.cluster.enterprise.dir=enterprise6 nb.cluster.enterprise.depends=\ nb.cluster.java,\ - nb.cluster.webcommon,\ nb.cluster.ide,\ nb.cluster.profiler,\ - nb.cluster.platform + nb.cluster.platform,\ + nb.cluster.harness nb.cluster.enterprise=\ api.web.webmodule,\ el.lexer,\ @@ -568,6 +595,7 @@ j2ee.archive,\ j2ee.clientproject,\ j2ee.common,\ + j2ee.core,\ j2ee.dd,\ j2ee.dd.webservice,\ j2ee.ddloaders,\ @@ -588,6 +616,8 @@ j2ee.weblogic9,\ j2eeapis,\ j2eeserver,\ + javaee.api,\ + jellytools.enterprise,\ jsp.lexer,\ libs.commons_fileupload,\ libs.glassfish_logging,\ @@ -595,6 +625,7 @@ maven.j2ee,\ maven.jaxws,\ maven.samples,\ + profiler.j2ee,\ projectimport.eclipse.web,\ servletjspapi,\ spring.webmvc,\ @@ -604,14 +635,15 @@ web.core.syntax,\ web.debug,\ web.examples,\ - web.fake,\ web.freeform,\ web.helpset,\ web.jsf,\ + web.jsf.editor,\ web.jsf.kit,\ web.jsf.navigation,\ web.jsf12,\ web.jsf12ri,\ + web.jsf20,\ web.jspparser,\ web.jstl11,\ web.kit,\ @@ -646,20 +678,19 @@ websvc.wsstack.jaxws,\ websvc.wsstackapi -nb.cluster.ergonomics.dir=ergonomics1 +nb.cluster.ergonomics.dir=ergonomics2 nb.cluster.ergonomics.depends=nb.cluster.ide,nb.cluster.platform nb.cluster.ergonomics=\ ide.ergonomics validation.nb.cluster.ergonomics=\ ide.ergonomics -nb.cluster.nb.dir=nb6.7 +nb.cluster.nb.dir=nb6.8 nb.cluster.nb.depends=nb.cluster.ide,nb.cluster.harness nb.cluster.nb=\ autoupdate.pluginimporter,\ ide.branding,\ ide.branding.kit,\ - jellytools,\ lib.uihandler,\ o.n.upgrader,\ registration,\ @@ -673,6 +704,7 @@ nb.cluster.harness.depends=nb.cluster.platform nb.cluster.harness=\ apisupport.harness,\ + apisupport.tc.cobertura,\ jellytools.platform,\ jemmy,\ nbjunit,\ @@ -686,7 +718,8 @@ lib.profiler.charts,\ lib.profiler.common,\ lib.profiler.ui,\ - profiler + profiler,\ + profiler.oql validation.nb.cluster.profiler=\ profiler @@ -694,10 +727,10 @@ nb.cluster.php.depends=\ nb.cluster.platform,\ nb.cluster.ide,\ - nb.cluster.webcommon,\ nb.cluster.websvccommon nb.cluster.php=\ libs.javacup,\ + php.api.phpmodule,\ php.dbgp,\ php.editor,\ php.help,\ @@ -705,11 +738,12 @@ php.project,\ php.refactoring,\ php.samples,\ + php.symfony,\ websvc.saas.codegen.php validation.nb.cluster.php=\ php.editor -nb.cluster.groovy.dir=groovy1 +nb.cluster.groovy.dir=groovy2 nb.cluster.groovy.depends=\ nb.cluster.platform,\ nb.cluster.ide,\ @@ -727,10 +761,11 @@ nb.cluster.ruby.dir=ruby2 nb.cluster.ruby.depends=\ nb.cluster.platform,\ - nb.cluster.webcommon,\ - nb.cluster.ide + nb.cluster.ide,\ + nb.cluster.harness nb.cluster.ruby=\ glassfish.jruby,\ + jellytools.ruby,\ libs.jrubyparser,\ libs.yydebug,\ o.jruby,\ @@ -1018,22 +1053,24 @@ # uml.requirements.doorsprovider,\ # uml.requirements.xmlrequirements,\ -nb.cluster.cnd.dir=cnd2 +nb.cluster.cnd.dir=cnd3 nb.cluster.cnd.depends=\ + nb.cluster.harness,\ nb.cluster.platform,\ nb.cluster.dlight,\ nb.cluster.ide nb.cluster.cnd=\ - asm,\ cnd,\ cnd.antlr,\ cnd.api.model,\ cnd.api.project,\ cnd.api.remote,\ cnd.apt,\ + cnd.asm,\ cnd.callgraph,\ cnd.classview,\ cnd.completion,\ + cnd.debugger.common,\ cnd.debugger.gdb,\ cnd.discovery,\ cnd.dwarfdiscovery,\ @@ -1058,33 +1095,44 @@ cnd.repository,\ cnd.repository.api,\ cnd.utils,\ + jellytools.cnd,\ lib.terminalemulator validation.nb.cluster.cnd=\ cnd.kit -nb.cluster.dlight.dir=dlight1 +nb.cluster.dlight.dir=dlight2 nb.cluster.dlight.depends=\ nb.cluster.platform,\ nb.cluster.ide nb.cluster.dlight=\ dlight,\ + dlight.annotationsupport,\ + dlight.collector.procfs,\ dlight.collector.stdout,\ dlight.core.stack,\ dlight.core.ui,\ dlight.cpu,\ + dlight.db.derby,\ dlight.db.h2,\ - dlight.derby.support,\ dlight.dtrace,\ + dlight.extras,\ + dlight.fops,\ dlight.indicators,\ dlight.kit,\ dlight.management,\ dlight.memory,\ + dlight.msa,\ + dlight.msa.support,\ dlight.nativeexecution,\ dlight.perfan,\ + dlight.procfs,\ dlight.spi,\ dlight.sync,\ + dlight.threadmap.support,\ + dlight.threads,\ dlight.tools,\ + dlight.toolsui,\ dlight.util,\ dlight.visualizers @@ -1093,29 +1141,16 @@ nb.cluster.stableuc.depends=${clusters.config.full.list} nb.cluster.stableuc=\ apisupport.apidocs,\ - c.s.collablet,\ - c.s.collablet.moxc,\ clearcase,\ - collab.channel.chat,\ - collab.channel.chat.html,\ - collab.channel.chat.java,\ - collab.channel.chat.text,\ - collab.channel.chat.xml,\ - collab.channel.filesharing,\ - collab.channel.output,\ - collab.kit,\ - collab.provider.im,\ - collab.ui,\ - javascript.libraries,\ - javascript.libraries.jquery,\ - javascript.libraries.prototype,\ - javascript.libraries.scriptaculous,\ + core.browser.xulrunner,\ + core.browser.xulrunner.win,\ + db.mysql.sakila,\ jconsole,\ + jira,\ jmx,\ jmx.common,\ - languages.refactoring,\ + libs.jira,\ libs.svnjavahlwin32,\ - libs.xmlbeans,\ loadgenerator,\ o.apache.jmeter.kit,\ o.apache.jmeter.module,\ @@ -1124,12 +1159,8 @@ o.n.bluej.ui,\ profiler.loadgen,\ projectimport.jbuilder,\ - ruby.themes,\ uihandler.interactive,\ - visualweb.compatibilitykit,\ - visualweb.libs.rowset,\ - web.libraries.jsf1102,\ - websvc.axis2,\ + web.facelets010114,\ websvc.jaxrpc,\ websvc.jaxrpc16,\ websvc.jaxrpckit,\ @@ -1141,6 +1172,18 @@ nb.cluster.experimental.depends=${clusters.config.full.list} nb.cluster.experimental=\ ${nb.cluster.stableuc},\ + c.s.collablet,\ + c.s.collablet.moxc,\ + collab.channel.chat,\ + collab.channel.chat.html,\ + collab.channel.chat.java,\ + collab.channel.chat.text,\ + collab.channel.chat.xml,\ + collab.channel.filesharing,\ + collab.channel.output,\ + collab.kit,\ + collab.provider.im,\ + collab.ui,\ contrib/accelerators.terminal,\ contrib/ant.freeform.samples,\ contrib/api.workqueues,\ @@ -1152,6 +1195,7 @@ contrib/autoproject.java,\ contrib/autoproject.profiler,\ contrib/autoproject.web,\ + contrib/autosave,\ contrib/c.ericsson.otp.erlang,\ contrib/c.s.fortress,\ contrib/codetemplatetools,\ @@ -1166,6 +1210,7 @@ contrib/explorefromhere,\ contrib/extraupdatecenters,\ contrib/folder2html,\ + contrib/formatmany,\ contrib/fortress.editing,\ contrib/genericnavigator,\ contrib/glassfish.v3enable,\ @@ -1181,7 +1226,6 @@ contrib/j2ee.geronimo2,\ contrib/j2ee.oc4j,\ contrib/j2ee.sun.ws7,\ - contrib/java.gotoimpl,\ contrib/java.srclessopen,\ contrib/javahints,\ contrib/languages.execution,\ @@ -1200,6 +1244,7 @@ contrib/mount,\ contrib/nborgsourcebrowse,\ contrib/o.n.contrib.debuggerretry,\ + contrib/o.n.erdbeans,\ contrib/o.n.tasklistapi,\ contrib/omnidebugger,\ contrib/performance.insane,\ @@ -1210,12 +1255,14 @@ contrib/remotefs,\ contrib/remotefs.ui,\ contrib/scala.console,\ + contrib/scala.core,\ contrib/scala.debugger,\ contrib/scala.debugger.projects,\ - contrib/scala.editing,\ + contrib/scala.editor,\ contrib/scala.kit,\ contrib/scala.platform,\ contrib/scala.project,\ + contrib/scala.refactoring,\ contrib/scala.stdplatform,\ contrib/scanondemand,\ contrib/selenium,\ @@ -1249,39 +1296,30 @@ contrib/websvc.saas.services.rtm,\ contrib/whichproject,\ contrib/xtc,\ - db.mysql.sakila,\ + core.browser.xulrunner.linux,\ + core.browser.xulrunner.macosx,\ + core.browser.xulrunner.solaris,\ j2ee.websphere6,\ j2me.cdc.platform.bdj,\ j2me.cdc.project.bdj,\ - libs.wag,\ - wag.codegen,\ - wag.codegen.java,\ - wag.kit,\ - wag.manager,\ + javascript.libraries,\ + javascript.libraries.jquery,\ + javascript.libraries.prototype,\ + javascript.libraries.scriptaculous,\ + languages.refactoring,\ + libs.xmlbeans,\ + ruby.themes,\ + visualweb.compatibilitykit,\ + visualweb.libs.rowset,\ web.jsf.extensions,\ + web.libraries.jsf1102,\ + webpreview,\ + websvc.axis2,\ websvc.rest.wadl.design,\ websvc.rest.wadl.model # XXX fails to build (depends on visualweb cluster): contrib/visualweb.samples.postrel # XXX broken after javascript.editing changes: contrib/languages.ejs -nb.cluster.javafx.dir=javafx2 -nb.cluster.javafx.depends=${clusters.config.full.list} -nb.cluster.javafx=\ - contrib/javafx.debug,\ - contrib/javafx.editor,\ - contrib/javafx.fxd,\ - contrib/javafx.fxd.lib,\ - contrib/javafx.kit,\ - contrib/javafx.lexer,\ - contrib/javafx.lib,\ - contrib/javafx.platform,\ - contrib/javafx.profiler,\ - contrib/javafx.project,\ - contrib/javafx.source,\ - contrib/javafx.userlib -# contrib/javafx.graphicssample,\ -# contrib/javafx.weather2 - nb.cluster.webcommon.dir=webcommon1 nb.cluster.webcommon.depends=\ nb.cluster.ide,\ @@ -1315,3 +1353,24 @@ websvc.saas.services.zillow,\ websvc.saas.services.zvents,\ websvc.saas.ui + +nb.cluster.javacard.dir=javacard1 +nb.cluster.javacard.depends=\ + nb.cluster.ide,\ + nb.cluster.platform,\ + nb.cluster.java +nb.cluster.javacard=\ + javacard.apdu.io,\ + javacard.apdufile,\ + javacard.common,\ + javacard.console,\ + javacard.filemodels,\ + javacard.kit,\ + javacard.platform.ui,\ + javacard.project,\ + javacard.ri.bundle,\ + javacard.ri.platform,\ + javacard.spi,\ + properties.based.dataobjects,\ + simple.project.templates,\ + swing.customizerlayout diff -Nru visualvm-1.2.1/nbbuild/default-properties.xml visualvm-1.2.2/nbbuild/default-properties.xml --- visualvm-1.2.1/nbbuild/default-properties.xml 2009-05-25 08:48:26.000000000 +0100 +++ visualvm-1.2.2/nbbuild/default-properties.xml 2009-11-23 20:55:00.000000000 +0000 @@ -2,7 +2,7 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/JUmGD4Xn1D/visualvm-1.2.1/nbbuild/external/apitest.jar and /tmp/p3d1HD9Azc/visualvm-1.2.2/nbbuild/external/apitest.jar differ diff -Nru visualvm-1.2.1/nbbuild/external/binaries-list visualvm-1.2.2/nbbuild/external/binaries-list --- visualvm-1.2.1/nbbuild/external/binaries-list 2009-05-25 08:48:26.000000000 +0100 +++ visualvm-1.2.2/nbbuild/external/binaries-list 2009-11-23 20:55:00.000000000 +0000 @@ -1 +1 @@ -32000040779275479C6F3105641F2132BD5C5462 apitest.jar +EABC47C780C61A7E46EECD089319C392D68AF867 apitest.jar diff -Nru visualvm-1.2.1/nbbuild/external/findbugs/build.xml visualvm-1.2.2/nbbuild/external/findbugs/build.xml --- visualvm-1.2.1/nbbuild/external/findbugs/build.xml 2009-05-25 08:48:26.000000000 +0100 +++ visualvm-1.2.2/nbbuild/external/findbugs/build.xml 2009-11-23 20:55:00.000000000 +0000 @@ -2,7 +2,7 @@ + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <?xml version="1.0" encoding="UTF-8"?> + <changes> + + + + </changes> + + + + + + + + + <?xml version="1.0" encoding="UTF-8"?> + <apis> + + + + </apis> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The org-openide-util/javadoc.css has to exist as we are referring to + it from master module Javadoc pages. If it does not anymore, update + the export*.xsl templates. + + + + + + + + + + + + + + + NetBeans API Index + + + + + + + + + + <h2>Frame Alert</h2> + <p> + This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. + Link to <a href="overview-summary.html">Non-frame version.</a> + </p> + + + +]]> + + &properties; + + + + + &replaces; + + + + + + + + + + + + + + + + + + &disallowed-links; + + + + diff -Nru visualvm-1.2.1/nbbuild/javadoctools/disallowed-links.xml visualvm-1.2.2/nbbuild/javadoctools/disallowed-links.xml --- visualvm-1.2.1/nbbuild/javadoctools/disallowed-links.xml 2009-05-25 08:48:26.000000000 +0100 +++ visualvm-1.2.2/nbbuild/javadoctools/disallowed-links.xml 2009-11-23 20:55:01.000000000 +0000 @@ -2,7 +2,7 @@ @@ -61,9 +62,6 @@ - - - @@ -84,7 +82,7 @@ - + diff -Nru visualvm-1.2.1/nbbuild/javadoctools/export2apichanges.xsl visualvm-1.2.2/nbbuild/javadoctools/export2apichanges.xsl --- visualvm-1.2.1/nbbuild/javadoctools/export2apichanges.xsl 2009-06-16 20:56:09.000000000 +0100 +++ visualvm-1.2.2/nbbuild/javadoctools/export2apichanges.xsl 2009-12-04 09:45:48.000000000 +0000 @@ -72,7 +72,7 @@

NetBeans API Changes since Last Release

-

Version 6.7

+

Version 6.8

@@ -105,8 +105,9 @@ release 5.0, release 5.5, release 6.0, - release 6.1, and - release 6.5. + release 6.1, + release 6.5, and + release 6.7. diff -Nru visualvm-1.2.1/nbbuild/javadoctools/export2html.xsl visualvm-1.2.2/nbbuild/javadoctools/export2html.xsl --- visualvm-1.2.1/nbbuild/javadoctools/export2html.xsl 2009-06-16 20:56:09.000000000 +0100 +++ visualvm-1.2.2/nbbuild/javadoctools/export2html.xsl 2009-12-04 09:45:48.000000000 +0000 @@ -67,7 +67,7 @@

NetBeans API List

-

Version 6.7

+

Version 6.8

@@ -101,11 +101,12 @@ NetBeans one is free to choose the set of modules and their APIs to satisfy one's needs.

- This is a list of APIs for NetBeans 6.7, if you want to see + This is a list of APIs for NetBeans 6.8 version, if you want to see a list of APIs for a particular version, you may want to go to: