till pushed to visualvm (f22). "2015-04-13: Retired orphaned package, because it was orphaned for more than six weeks."
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 18:27:06 UTC 2015
>From 21cd04f5ef76e3e28555887db567a59841310902 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource at till.name>
Date: Mon, 13 Apr 2015 20:26:41 +0200
Subject: 2015-04-13: Retired orphaned package, because it was orphaned for
more than six weeks.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a5dc48f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-/build.jar.tar.gz
-/netbeans-profiler-visualvm_release69.tar.gz
-/visualvm_13-src.tar.gz
-/visualvm_harness-1.0.tar.gz
-/netbeans-profiler-visualvm_release691.tar.gz
-/visualvm_131-src.tar.gz
-/visualvm_harness-1.1.tar.gz
-/visualvm_harness-1.1pre.tar.gz
-/visualvm_132-src.tar.gz
-/visualvm_harness-1.2.tar.gz
-/visualvm_harness-1.3.tar.gz
-/netbeans-profiler-visualvm_release701.tar.gz
-/visualvm_133-src.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..9263c07
--- /dev/null
+++ b/dead.package
@@ -0,0 +1,2 @@
+2015-04-13: Retired orphaned package, because it was orphaned for more than six weeks.
+
diff --git a/sources b/sources
deleted file mode 100644
index 67045d0..0000000
--- a/sources
+++ /dev/null
@@ -1,3 +0,0 @@
-f20ac820e11aa221186f7f1ba0604b80 visualvm_harness-1.3.tar.gz
-034a19d68e68a7d875b38be4a474695e netbeans-profiler-visualvm_release701.tar.gz
-c9d7f0e9ad54785cd122b78b1c712742 visualvm_133-src.tar.gz
diff --git a/visualvm-1.3.3-icons.patch b/visualvm-1.3.3-icons.patch
deleted file mode 100644
index 067dfd2..0000000
--- a/visualvm-1.3.3-icons.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -up visualvm_harness-1.3/Makefile.am.icons visualvm_harness-1.3/Makefile.am
---- visualvm_harness-1.3/Makefile.am.icons 2011-12-14 13:03:25.000000000 +0200
-+++ visualvm_harness-1.3/Makefile.am 2011-12-15 20:57:48.257565436 +0200
-@@ -241,6 +241,9 @@ install-exec-local:
- mkdir -p $(DESTDIR)$(sysconfdir)
- mkdir -p $(DESTDIR)$(libdir)/visualvm/visualvm
- mkdir -p $(DESTDIR)$(datadir)/applications
-+ for i in 16 24 32 48; do \
-+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/apps; \
-+ done
- cat visualvm/launcher/visualvm | \
- sed "s:APPNAME=\`basename.*\`:APPNAME=visualvm:" | \
- sed "s:\$$BASEDIR/etc:$(sysconfdir):" | \
-@@ -256,6 +259,9 @@ install-exec-local:
- cp -r visualvm/build/cluster/* $(DESTDIR)$(libdir)/visualvm/visualvm
- cp -r netbeans/nbbuild/netbeans_visualvm/$(PROFILER) $(DESTDIR)$(libdir)/visualvm
- cp visualvm.desktop $(DESTDIR)$(datadir)/applications
-+ for i in 16 24 32 48; do \
-+ cp visualvm/startup/src/com/sun/tools/visualvm/modules/startup/resources/icon$$i.png $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/apps/visualvm.png; \
-+ done
-
- uninstall-local:
- rm -f $(DESTDIR)$(bindir)/jvisualvm
-@@ -263,6 +269,7 @@ uninstall-local:
- rm -f $(DESTDIR)$(sysconfdir)/visualvm.clusters
- rm -rf $(DESTDIR)$(libdir)/visualvm
- rm -f $(DESTDIR)$(datadir)/applications/visualvm.desktop
-+ rm -f $(DESTDIR)$(datadir)/icons/hicolor/*x*/apps/visualvm.png
-
- download-netbeans-profiler: stamps/download-netbeans-profiler.stamp
-
-diff -up visualvm_harness-1.3/Makefile.in.icons visualvm_harness-1.3/Makefile.in
---- visualvm_harness-1.3/Makefile.in.icons 2011-12-14 13:05:47.000000000 +0200
-+++ visualvm_harness-1.3/Makefile.in 2011-12-15 20:57:48.258565529 +0200
-@@ -685,6 +685,9 @@ install-exec-local:
- mkdir -p $(DESTDIR)$(sysconfdir)
- mkdir -p $(DESTDIR)$(libdir)/visualvm/visualvm
- mkdir -p $(DESTDIR)$(datadir)/applications
-+ for i in 16 24 32 48; do \
-+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/apps; \
-+ done
- cat visualvm/launcher/visualvm | \
- sed "s:APPNAME=\`basename.*\`:APPNAME=visualvm:" | \
- sed "s:\$$BASEDIR/etc:$(sysconfdir):" | \
-@@ -700,6 +703,9 @@ install-exec-local:
- cp -r visualvm/build/cluster/* $(DESTDIR)$(libdir)/visualvm/visualvm
- cp -r netbeans/nbbuild/netbeans_visualvm/$(PROFILER) $(DESTDIR)$(libdir)/visualvm
- cp visualvm.desktop $(DESTDIR)$(datadir)/applications
-+ for i in 16 24 32 48; do \
-+ cp visualvm/startup/src/com/sun/tools/visualvm/modules/startup/resources/icon$$i.png $(DESTDIR)$(datadir)/icons/hicolor/$${i}x$${i}/apps/visualvm.png; \
-+ done
-
- uninstall-local:
- rm -f $(DESTDIR)$(bindir)/jvisualvm
-@@ -707,6 +713,7 @@ uninstall-local:
- rm -f $(DESTDIR)$(sysconfdir)/visualvm.clusters
- rm -rf $(DESTDIR)$(libdir)/visualvm
- rm -f $(DESTDIR)$(datadir)/applications/visualvm.desktop
-+ rm -f $(DESTDIR)$(datadir)/icons/hicolor/*x*/apps/visualvm.png
-
- download-netbeans-profiler: stamps/download-netbeans-profiler.stamp
-
diff --git a/visualvm-ant-1.9.patch b/visualvm-ant-1.9.patch
deleted file mode 100644
index 4a2557f..0000000
--- a/visualvm-ant-1.9.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/CheckModuleConfigs.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/CheckModuleConfigs.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/CheckModuleConfigs.java 2011-04-18 17:20:50.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/CheckModuleConfigs.java 2013-06-23 21:19:00.485397000 +0100
-@@ -94,7 +94,7 @@
- }
- File clusterPropertiesFile = new File(nbroot, "nbbuild" + File.separatorChar + "cluster.properties");
- @SuppressWarnings("unchecked")
-- Map<String,String> properties = getProject().getProperties();
-+ Map<String,Object> properties = getProject().getProperties();
- Map<String,Set<String>> clusters = loadModuleClusters(properties, clusterPropertiesFile);
- Set<String> allClusterModules = new TreeSet<String>();
- for (Set<String> s : clusters.values()) {
-@@ -119,12 +119,12 @@
- // Verify sorting and overlaps:
- Pattern clusterNamePat = Pattern.compile("nb\\.cluster\\.([^.]+)");
- Map<String,List<String>> allClusters = new HashMap<String,List<String>>();
-- for (Map.Entry<String,String> clusterDef : properties.entrySet()) {
-+ for (Map.Entry<String,Object> clusterDef : properties.entrySet()) {
- Matcher m = clusterNamePat.matcher(clusterDef.getKey());
- if (!m.matches()) {
- continue;
- }
-- allClusters.put(m.group(1), splitToList(clusterDef.getValue(), clusterDef.getKey()));
-+ allClusters.put(m.group(1), splitToList(clusterDef.getValue().toString(), clusterDef.getKey()));
- }
- allClusters.get("experimental").removeAll(allClusters.get("stableuc")); // intentionally a superset
- for (Map.Entry<String,List<String>> entry : allClusters.entrySet()) {
-@@ -176,19 +176,19 @@
- return set;
- }
-
-- private Map<String,Set<String>> loadModuleClusters(Map<String,String> clusterProperties, File clusterPropertiesFile) {
-+ private Map<String,Set<String>> loadModuleClusters(Map<String,Object> clusterProperties, File clusterPropertiesFile) {
- String fullConfig = "clusters.config.full.list";
-- String l = clusterProperties.get(fullConfig);
-+ Object l = clusterProperties.get(fullConfig);
- if (l == null) {
- throw new BuildException(clusterPropertiesFile + ": no definition for clusters.config.full.list");
- }
- Map<String,Set<String>> clusters = new TreeMap<String,Set<String>>();
-- for (String cluster : splitToSet(l, fullConfig)) {
-+ for (String cluster : splitToSet(l.toString(), fullConfig)) {
- l = clusterProperties.get(cluster);
- if (l == null) {
- throw new BuildException(clusterPropertiesFile + ": no definition for " + cluster);
- }
-- clusters.put(cluster, new TreeSet<String>(splitToSet(l, fullConfig)));
-+ clusters.put(cluster, new TreeSet<String>(splitToSet(l.toString(), fullConfig)));
- }
- return clusters;
- }
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ExportedAPICondition.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ExportedAPICondition.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ExportedAPICondition.java 2011-04-18 17:20:50.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ExportedAPICondition.java 2013-06-23 21:10:35.014079000 +0100
-@@ -61,12 +61,12 @@
-
- public boolean eval() throws BuildException {
- @SuppressWarnings("unchecked")
-- Hashtable<String,String> props = getProject().getProperties();
-+ Hashtable<String,Object> props = getProject().getProperties();
- if (props.get("public.packages").equals("-")) {
- log("No exported packages", Project.MSG_VERBOSE);
- return false;
- }
-- String friends = props.get("friends");
-+ Object friends = props.get("friends");
- if (friends == null) {
- log("Public API", Project.MSG_VERBOSE);
- return true;
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/InsertModuleAllTargets.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/InsertModuleAllTargets.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/InsertModuleAllTargets.java 2011-04-18 17:20:50.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/InsertModuleAllTargets.java 2013-06-23 21:20:54.103914000 +0100
-@@ -97,19 +97,19 @@
- return;
- }
- @SuppressWarnings("unchecked")
-- Hashtable<String,String> props = prj.getProperties();
-+ Hashtable<String,Object> props = prj.getProperties();
-
- if (checkModules) {
- boolean missingModules = false;
-- String[] clusters = props.get("nb.clusters.list").split(", *");
-- String nb_all = props.get("nb_all");
-+ String[] clusters = props.get("nb.clusters.list").toString().split(", *");
-+ Object nb_all = props.get("nb_all");
- if (nb_all == null)
- throw new BuildException("Can't file 'nb_all' property, probably not in the NetBeans build system");
-- File nbRoot = new File(nb_all);
-+ File nbRoot = new File(nb_all.toString());
- for( String cluster: clusters) {
- if (props.get(cluster) == null)
- throw new BuildException("Cluster '"+cluster+"' has got empty list of modules. Check configuration of that cluster.",getLocation());
-- String[] clusterModules = props.get(cluster).split(", *");
-+ String[] clusterModules = props.get(cluster).toString().split(", *");
- for( String module: clusterModules) {
- File moduleBuild = new File(nbRoot, module + File.separator + "build.xml");
- if (!moduleBuild.exists() || !moduleBuild.isFile()) {
-@@ -119,18 +119,18 @@
- }
- }
- if (missingModules) {
-- String clusterConfig = props.get("cluster.config");
-- throw new BuildException("Some modules according your cluster config '" + clusterConfig + "' are missing from checkout, see messages above.",getLocation());
-+ Object clusterConfig = props.get("cluster.config");
-+ throw new BuildException("Some modules according your cluster config '" + clusterConfig.toString() + "' are missing from checkout, see messages above.",getLocation());
- }
- }
-
- Map<String,String> clustersOfModules = new HashMap<String,String>();
-- for (Map.Entry<String,String> pair : props.entrySet()) {
-+ for (Map.Entry<String,Object> pair : props.entrySet()) {
- String cluster = pair.getKey();
- if (!cluster.startsWith("nb.cluster.") || cluster.endsWith(".depends") || cluster.endsWith(".dir")) {
- continue;
- }
-- for (String module : pair.getValue().split(", *")) {
-+ for (String module : pair.getValue().toString().split(", *")) {
- clustersOfModules.put(module, cluster);
- }
- }
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/LayerIndex.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/LayerIndex.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/LayerIndex.java 2011-08-01 08:57:48.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/LayerIndex.java 2013-06-23 21:11:57.545457000 +0100
-@@ -73,12 +73,15 @@
- import java.util.zip.ZipEntry;
- import java.util.zip.ZipException;
- import java.util.zip.ZipFile;
-+
- import javax.xml.parsers.SAXParserFactory;
-+
- import org.apache.tools.ant.BuildException;
- import org.apache.tools.ant.DirectoryScanner;
- import org.apache.tools.ant.Project;
- import org.apache.tools.ant.Task;
- import org.apache.tools.ant.types.FileSet;
-+import org.apache.tools.ant.types.Resource;
- import org.apache.tools.ant.types.ResourceCollection;
- import org.apache.tools.ant.types.resources.ZipResource;
- import org.xml.sax.Attributes;
-@@ -111,7 +114,7 @@
- }
-
- private String resourceId;
-- private List<ZipResource> resources;
-+ private List<Resource> resources;
- /** If this parameter is provided, then this tasks creates a resource
- * composed from all the layerfiles and makes it accessible under this refId
- * @param id the refId to associate the collection with
-@@ -361,7 +364,7 @@
- }
- }
-
-- private static final class ZipArray extends ArrayList<ZipResource>
-+ private static final class ZipArray extends ArrayList<Resource>
- implements ResourceCollection {
- public boolean isFilesystemOnly() {
- return false;
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java 2011-10-20 13:43:27.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ModuleListParser.java 2013-06-23 22:03:14.246264000 +0100
-@@ -116,28 +116,29 @@
- /**
- * Find all NBM projects in a root, possibly from cache.
- */
-- private static Map<String,Entry> scanNetBeansOrgSources(File root, Map<String,String> properties, Project project) throws IOException {
-+ private static Map<String,Entry> scanNetBeansOrgSources(File root, Map<String,Object> properties, Project project) throws IOException {
- Map<String,Entry> entries = SOURCE_SCAN_CACHE.get(root);
- if (entries == null) {
- // Similar to #62221: if just invoked from a module in standard clusters, only scan those clusters (faster):
- Set<String> standardModules = new HashSet<String>();
- boolean doFastScan = false;
-- String basedir = properties.get("basedir");
-+ Object basedir = properties.get("basedir");
- if (basedir != null) {
-- File basedirF = new File(basedir);
-- String clusterList = properties.get("nb.clusters.list");
-- if (clusterList == null) {
-- String config = properties.get("cluster.config");
-+ File basedirF = new File(basedir.toString());
-+ Object clusterListObj = properties.get("nb.clusters.list");
-+ if (clusterListObj == null) {
-+ Object config = properties.get("cluster.config");
- if (config != null) {
-- clusterList = properties.get("clusters.config." + config + ".list");
-+ clusterListObj = properties.get("clusters.config." + config.toString() + ".list");
- }
- }
-- if (clusterList != null) {
-- StringTokenizer tok = new StringTokenizer(clusterList, ", ");
-+ if (clusterListObj != null) {
-+ StringTokenizer tok = new StringTokenizer(clusterListObj.toString(), ", ");
- while (tok.hasMoreTokens()) {
- String clusterName = tok.nextToken();
-- String moduleList = properties.get(clusterName);
-- if (moduleList != null) {
-+ Object moduleListObj = properties.get(clusterName);
-+ if (moduleListObj != null) {
-+ String moduleList = moduleListObj.toString();
- // Hack to treat libs.junit4 as if it were in platform for purposes of building, yet build to another cluster.
- if (clusterName.equals("nb.cluster.platform")) {
- moduleList += ",libs.junit4";
-@@ -278,7 +279,7 @@
- /**
- * Check a single dir to see if it is an NBM project, and if so, register it.
- */
-- private static boolean scanPossibleProject(File dir, Map<String,Entry> entries, Map<String,String> properties,
-+ private static boolean scanPossibleProject(File dir, Map<String,Entry> entries, Map<String,Object> properties,
- String path, ModuleType moduleType, Project project, Map<File,Long[]> timestampsAndSizes) throws IOException {
- File nbproject = new File(dir, "nbproject");
- File projectxml = new File(nbproject, "project.xml");
-@@ -374,18 +375,21 @@
- assert path != null;
- // Find the associated cluster.
- // first try direct mapping in nbbuild/netbeans/moduleCluster.properties
-- String clusterDir = properties.get(path + ".dir");
-- if (clusterDir != null) {
-+ Object clusterDirObj = properties.get(path + ".dir");
-+ String clusterDir = null;
-+ if (clusterDirObj != null) {
-+ clusterDir = clusterDirObj.toString();
- clusterDir = clusterDir.substring(clusterDir.lastIndexOf('/') + 1);
- } else {
- // not found, try indirect nbbuild/cluster.properties
-- for (Map.Entry<String, String> entry : properties.entrySet()) {
-- String val = entry.getValue();
-+ for (Map.Entry<String, Object> entry : properties.entrySet()) {
-+ String val = entry.getValue().toString();
- String[] modules = val.split(", *");
- if (Arrays.asList(modules).contains(path)) {
- String key = entry.getKey();
-- clusterDir = properties.get(key + ".dir");
-- if (clusterDir != null) {
-+ clusterDirObj = properties.get(key + ".dir");
-+ if (clusterDirObj != null) {
-+ clusterDir = clusterDirObj.toString();
- faketask.setName("cluster.dir");
- faketask.setValue(clusterDir);
- faketask.execute();
-@@ -440,10 +444,10 @@
- File origBin = null;
- if (binaryOrigin != null) {
- String reltext = XMLUtil.findText(binaryOrigin);
-- String nball = properties.get("nb_all");
-+ Object nball = properties.get("nb_all");
- if (nball != null) {
- faketask.setName("nb_all");
-- faketask.setValue(nball);
-+ faketask.setValue(nball.toString());
- faketask.execute();
- }
- fakeproj.setBaseDir(dir);
-@@ -630,13 +634,13 @@
- }
- }
-
-- private static Map<String,Entry> scanSuiteSources(Map<String,String> properties, Project project) throws IOException {
-- File basedir = new File(properties.get("basedir"));
-- String suiteDir = properties.get("suite.dir");
-+ private static Map<String,Entry> scanSuiteSources(Map<String,Object> properties, Project project) throws IOException {
-+ File basedir = new File(properties.get("basedir").toString());
-+ Object suiteDir = properties.get("suite.dir");
- if (suiteDir == null) {
- throw new IOException("No definition of suite.dir in " + basedir);
- }
-- File suite = FileUtils.getFileUtils().resolveFile(basedir, suiteDir);
-+ File suite = FileUtils.getFileUtils().resolveFile(basedir, suiteDir.toString());
- if (!suite.isDirectory()) {
- throw new IOException("No such suite " + suite);
- }
-@@ -655,7 +659,7 @@
- return entries;
- }
-
-- private static void doScanSuite(Map<String,Entry> entries, File suite, Map<String,String> properties, Project project) throws IOException {
-+ private static void doScanSuite(Map<String,Entry> entries, File suite, Map<String,Object> properties, Project project) throws IOException {
- Project fakeproj = new Project();
- fakeproj.setBaseDir(suite); // in case ${basedir} is used somewhere
- Property faketask = new Property();
-@@ -680,9 +684,9 @@
- }
- }
-
-- private static Entry scanStandaloneSource(Map<String,String> properties, Project project) throws IOException {
-+ private static Entry scanStandaloneSource(Map<String,Object> properties, Project project) throws IOException {
- if (properties.get("project") == null) return null; //Not a standalone module
-- File basedir = new File(properties.get("project"));
-+ File basedir = new File(properties.get("project").toString());
- Entry entry = STANDALONE_SCAN_CACHE.get(basedir);
- if (entry == null) {
- Map<String,Entry> entries = new HashMap<String,Entry>();
-@@ -717,16 +721,16 @@
- * @param type the type of project
- * @param project a project ref, only for logging (may be null with no loss of semantics)
- */
-- public ModuleListParser(Map<String,String> properties, ModuleType type, Project project) throws IOException {
-- String nball = properties.get("nb_all");
-- File basedir = new File(properties.get("basedir"));
-+ public ModuleListParser(Map<String,Object> properties, ModuleType type, Project project) throws IOException {
-+ Object nball = properties.get("nb_all");
-+ File basedir = new File(properties.get("basedir").toString());
- final FileUtils fu = FileUtils.getFileUtils();
-
- if (type != ModuleType.NB_ORG) {
- // add extra clusters
-- String suiteDirS = properties.get("suite.dir");
-- boolean hasSuiteDir = suiteDirS != null && suiteDirS.length() > 0;
-- String clusterPath = properties.get("cluster.path.final");
-+ Object suiteDirS = properties.get("suite.dir");
-+ boolean hasSuiteDir = suiteDirS != null && suiteDirS.toString().length() > 0;
-+ Object clusterPath = properties.get("cluster.path.final");
- File[] clusters = null;
-
- if (clusterPath != null) {
-@@ -734,10 +738,10 @@
- if (hasSuiteDir) {
- // resolve suite modules against fake suite project
- Project fakeproj = new Project();
-- fakeproj.setBaseDir(new File(suiteDirS));
-- clustersS = Path.translatePath(fakeproj, clusterPath);
-+ fakeproj.setBaseDir(new File(suiteDirS.toString()));
-+ clustersS = Path.translatePath(fakeproj, clusterPath.toString());
- } else {
-- clustersS = Path.translatePath(project, clusterPath);
-+ clustersS = Path.translatePath(project, clusterPath.toString());
- }
- clusters = new File[clustersS.length];
- if (clustersS != null && clustersS.length > 0) {
-@@ -768,17 +772,17 @@
- }
- } else {
- // netbeans.org module.
-- String buildS = properties.get("netbeans.dest.dir");
-+ Object buildS = properties.get("netbeans.dest.dir");
- if (buildS == null) {
- throw new IOException("No definition of netbeans.dest.dir in " + basedir);
- }
- // Resolve against basedir, and normalize ../ sequences and so on in case they are used.
- // Neither operation is likely to be needed, but just in case.
-- File build = fu.normalize(fu.resolveFile(basedir, buildS).getAbsolutePath());
-+ File build = fu.normalize(fu.resolveFile(basedir, buildS.toString()).getAbsolutePath());
- if (nball == null) {
-- throw new IOException("You must declare either <suite-component/> or <standalone/> for an external module in " + new File(properties.get("basedir")));
-+ throw new IOException("You must declare either <suite-component/> or <standalone/> for an external module in " + new File(properties.get("basedir").toString()));
- }
-- if (!build.equals(new File(new File(nball, "nbbuild"), "netbeans"))) {
-+ if (!build.equals(new File(new File(nball.toString(), "nbbuild"), "netbeans"))) {
- // Potentially orphaned module to be built against specific binaries, plus perhaps other source deps.
- if (!build.isDirectory()) {
- throw new IOException("No such netbeans.dest.dir: " + build);
-@@ -794,9 +798,9 @@
- if (e != null) {
- entries.put(e.getCnb(), e);
- }
-- entries.putAll(scanNetBeansOrgSources(new File(nball), properties, project));
-+ entries.putAll(scanNetBeansOrgSources(new File(nball.toString()), properties, project));
- } else {
-- entries = scanNetBeansOrgSources(new File(nball), properties, project);
-+ entries = scanNetBeansOrgSources(new File(nball.toString()), properties, project);
- }
- }
- }
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ModuleTestDependencies.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ModuleTestDependencies.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ModuleTestDependencies.java 2011-10-20 13:43:27.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ModuleTestDependencies.java 2013-06-23 21:12:52.349708000 +0100
-@@ -91,11 +91,11 @@
- public @Override void execute() throws BuildException {
- try {
- @SuppressWarnings("unchecked")
-- Hashtable<String,String> props = getProject().getProperties();
-+ Hashtable<String,Object> props = getProject().getProperties();
- ModuleListParser mlp = new ModuleListParser(props, ModuleType.NB_ORG, getProject());
- SortedMap<String,SortedSet<String>> deps = new TreeMap<String,SortedSet<String>>();
- SortedMap<String,SortedSet<String>> reverseDeps = reverseOutput != null ? new TreeMap<String,SortedSet<String>>() : null;
-- File nball = new File(props.get("nb_all"));
-+ File nball = new File(props.get("nb_all").toString());
- for (ModuleListParser.Entry entry : mlp.findAll()) {
- String myCnb = entry.getCnb();
- String myCluster = entry.getClusterName();
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java 2011-10-20 13:43:27.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java 2013-06-23 21:15:31.877440000 +0100
-@@ -447,7 +447,7 @@
- moduleRunClassPathProperty != null ||
- testTypes.size() > 0) {
- @SuppressWarnings("unchecked")
-- Hashtable<String,String> properties = getProject().getProperties();
-+ Hashtable<String,Object> properties = getProject().getProperties();
- properties.put("project", moduleProject.getAbsolutePath());
- modules = new ModuleListParser(properties, getModuleType(pDoc), getProject());
- ModuleListParser.Entry myself = modules.findByCodeNameBase(cnb);
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/RefreshDependencyVersions.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/RefreshDependencyVersions.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/RefreshDependencyVersions.java 2011-04-18 17:20:50.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/RefreshDependencyVersions.java 2013-06-23 21:13:34.633902000 +0100
-@@ -121,7 +121,7 @@
-
- validateInjectedDependencies(injectDeps);
-
-- @SuppressWarnings("unchecked") Map<String,String> properties = getProject().getProperties();
-+ @SuppressWarnings("unchecked") Map<String,Object> properties = getProject().getProperties();
- ModuleListParser listParser;
- try {
- listParser = new ModuleListParser(properties, ModuleType.NB_ORG, getProject());
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java 2011-05-16 18:42:27.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/ShorterPaths.java 2013-06-23 21:13:44.672948000 +0100
-@@ -183,7 +183,7 @@
-
- // copy extra unit.test.properties
- @SuppressWarnings("unchecked")
-- Map<String, String> properties = getProject().getProperties();
-+ Map<String, Object> properties = getProject().getProperties();
- StringBuffer outProp = new StringBuffer();
- for (String name : properties.keySet()) {
- if (name.matches("test-(unit|qa-functional)-sys-prop\\..+")) {
-diff -ur netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/Sigtest.java netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/Sigtest.java
---- netbeans-profiler-visualvm_release701/nbbuild/antsrc/org/netbeans/nbbuild/Sigtest.java 2011-04-18 17:20:50.000000000 +0100
-+++ netbeans-profiler-visualvm_release701-patched/nbbuild/antsrc/org/netbeans/nbbuild/Sigtest.java 2013-06-23 21:14:22.257121000 +0100
-@@ -51,6 +51,7 @@
- import java.net.URLClassLoader;
- import java.util.StringTokenizer;
- import java.util.zip.ZipFile;
-+
- import org.apache.tools.ant.BuildException;
- import org.apache.tools.ant.Project;
- import org.apache.tools.ant.Task;
-@@ -296,7 +297,7 @@
- setM(task, "setPackages", String.class, packages);
- setM(task, "setVersion", String.class, version);
-
-- Class<?> actionType = url.loadClass("org.netbeans.apitest.Sigtest$ActionType");
-+ Class<? extends EnumeratedAttribute> actionType = (Class<? extends EnumeratedAttribute>) url.loadClass("org.netbeans.apitest.Sigtest$ActionType");
- setM(task, "setAction", EnumeratedAttribute.getInstance(actionType, action.getValue()));
-
- Path path = getM(task, "createClasspath", Path.class);
diff --git a/visualvm.spec b/visualvm.spec
deleted file mode 100644
index 8e83c89..0000000
--- a/visualvm.spec
+++ /dev/null
@@ -1,226 +0,0 @@
-%global dwnldurl http://icedtea.classpath.org/download/visualvm/
-%global visualvmharnessver 1.3
-
-Name: visualvm
-Version: 1.3.3
-Release: %{visualvmharnessver}.7%{?dist}.3
-Summary: Lightweight profiler that integrates many command-line JDK tools
-
-Group: Development/Tools
-License: GPLv2 and GPLv2+ and (GPLv2 with exceptions or CDDL)
-URL: http://visualvm.java.net/
-Source0: %{dwnldurl}/visualvm_harness-%{visualvmharnessver}.tar.gz
-Source1: %{dwnldurl}/visualvm_133-src.tar.gz
-Source2: %{dwnldurl}/netbeans-profiler-visualvm_release701.tar.gz
-Patch0: visualvm-1.3.3-icons.patch
-Patch1: visualvm-ant-1.9.patch
-
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: wget
-BuildRequires: java >= 1.6.0
-BuildRequires: java-devel >= 1.6.0
-BuildRequires: apache-commons-logging
-BuildRequires: desktop-file-utils
-BuildRequires: netbeans-platform >= 6.9-1
-BuildRequires: netbeans-platform-harness
-
-Requires: netbeans-platform >= 6.9-1
-Requires: java >= 1.6.0
-Requires: java-devel >= 1.6.0
-
-Conflicts: java-1.6.0-openjdk <= 1:1.6.0.0-47
-
-
-%description
-VisualVM is a visual tool integrating several command-line JDK tools and
-lightweight profiling capabilities. Designed for both production and
-development time use, it further enhances the capability of monitoring and
-performance analysis for the Java SE platform.
-
-
-%prep
-%setup -q -n visualvm_harness-%{visualvmharnessver}
-%patch0 -p1
-
-# Patch profiler to build against ant 1.9
-mkdir netbeans && tar xzf %{SOURCE2} -C netbeans
-pushd netbeans
-%patch1 -p1 -b.orig
-popd
-
-%build
-autoreconf -i -f
-./configure --prefix=/usr \
- --with-visualvm-zip=%{SOURCE1} \
- --with-visualvm-version=%{version} \
- --sysconfdir=/etc \
- --libdir=%{_libdir} \
- --datadir=%{_datadir}
-
-# We patched the profiler, so touch file to prevent checksum failure
-mkdir -p stamps
-touch stamps/download-netbeans-profiler.stamp
-touch stamps/extract-netbeans-profiler.stamp
-
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-#silence rpmlint for necessary empty files
-find $RPM_BUILD_ROOT/%{_libdir}/visualvm/visualvm/config/Modules/ -type f -empty | while read FILE; do echo "
-" > $FILE;done
-
-echo "
-" > $RPM_BUILD_ROOT/%{_libdir}/visualvm/profiler/.lastModified
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-%files
-%defattr(-,root,root,-)
-%attr(0755,root,root) %{_bindir}/jvisualvm
-%{_libdir}/visualvm/
-%config(noreplace) /etc/visualvm.conf
-%config(noreplace) /etc/visualvm.clusters
-%{_datadir}/applications/visualvm.desktop
-%{_datadir}/icons/hicolor/*x*/apps/visualvm.png
-%doc README
-%doc INSTALL
-%doc COPYING
-
-
-%changelog
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-1.3.7.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-1.3.7.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-1.3.7.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sun Jun 23 2013 Mat Booth <fedora at matbooth.co.uk> - 1.3.3-1.3.7
-- Patch to allow building against ant 1.9
-
-* Sun Jun 23 2013 Mat Booth <fedora at matbooth.co.uk> - 1.3.3-1.3.6
-- Correct upstream URL
-- Fix mixed use of spaces and tabs
-- Fix bogus changelog dates
-- Remove spurious dep on netbeans-apisupport, fixes #914563
-
-* Tue Apr 23 2013 Jiri Vanek <jvanek at redhat.com> - 1.3.3-1.3.5
-- fixed versioning
-- added autoreconf
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-1.3.1.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-1.3.1.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu May 03 2012 Jiri Vanek <jvanek at redhat.com> - 1.3.3-1.3.2
-- jakarta-commons-logging repalced by apache-commons-logging
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-1.3.1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sat Dec 17 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.3.3-1.3.1
-- Use app specific icon (#549903).
-
-* Wed Dec 14 2011 Jiri Vanek <jvanek at redhat.com> - 1.3.3-1.3.0
-- updated for hearness 1.3
-
-* Mon Mar 21 2011 Jiri Vanek <jvanek at redhat.com> - 1.3.2-1.2.8
-- updated for hearness 1.2
-
-* Tue Mar 8 2011 Jiri Vanek <jvanek at redhat.com> - 1.3.2-1.2.7
-- updated for vm 1.3.2
-
-* Wed Feb 2 2011 Jiri Vanek <jvanek at redhat.com> - 1.3.1-1.1.6
-- fixed requires for java-devel, fixed conflicts version
-
-* Tue Feb 1 2011 Jiri Vanek <jvanek at redhat.com> - 1.3.1-1.1.5
-- fixed requires for java-devel, fixed conflicts version
-
-* Wed Jan 12 2011 Jiri Vanek <jvanek at redhat.com> - 1.3.1-1.1.4
-- release extended for harness version
-
-* Wed Jan 12 2011 Jiri Vanek <jvanek at redhat.com> - 1.3.1-3
-- updated to harens 1.1
-
-* Wed Nov 24 2010 Jiri Vanek <jvanek at redhat.com> - 1.3.1-2
-- updated to harens 1.1pre
-- removed file-changes fixed by upstream.
-
-* Wed Nov 24 2010 Jiri Vanek <jvanek at redhat.com> - 1.3.1-1
-- updated to harens 1.1, profiler 6.9.1 and visualvm 1.3.1
-- removed build of bundled jar - already fixed upstream
-
-* Wed Nov 24 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-10
-- resolves 667314
-
-* Wed Nov 24 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-9
-- updated license
-
-* Tue Nov 23 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-8
-- application moved from prefix to libdir/name
-- removed fc15 from conficts, and increased release number of conflicted openjdk.
-
-* Mon Nov 22 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-7
-- removed /etc symlink
-- patched jvisualvm luncher to follow to /etc instead of prefix/etc
-
-* Tue Nov 16 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-6
-- all simlinks and last modified moved from to install
-
-* Tue Nov 16 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-5
-- repaired missing slash at platform
-
-* Mon Nov 15 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-4
-- added symlinks for: etc, profiler, platform, visualvm
-- sed and renaming of visualvm script
-
-* Wed Oct 6 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-3
-- fixed license file
-- hacked empty files
-- repaired .lastModified file to be tuched in post
-- (rev 6)remove ./lastModified in postun
-- (rev 5)removed and rebuilded build.jar from nb (proof of rebuilding)
-- noarch added, and removed -caused error "arch dependent binaries in noarch package"
-- (rev 4)fixed define->global macro
-- (rev1 )added --sysconfdir=/etc to .configure
-- (rev1 ) --sysconfdir=/etc is not working, _libdir/visualvm/etc/visualvm.conf and _libdir/visualvm/etc/visualvm.clusters moved to /etc, visualvm/etc/ removed
-- (rev 2) added owenership for lib[64]/visualvm/
-- (rev 7) sed moved from install to build. Seams to have no evil efect to functionality
-- (rev 3) removed _prefix/jvm/java-openjdk-jvisualvm/bin/jvisualvm and _prefix/jvm/java-openjdk-jvisualvm/share/visualvm.desktop (then jvm dir becomes empty - delete also. Both script and desktop file are before placed to right places.
-- {_prefix}/jvm/java-openjdk-jvisualvm changed to {_prefix}
-
-* Wed Oct 6 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-2
-- fixed noreplace config files
-- applied patch visualvm-debuginfo
-
-
-* Thu Sep 30 2010 Jiri Vanek <jvanek at redhat.com> - 1.3-1
-- fixed installpath out of poor /user
-- fixed missing requirments
-
-
-* Thu Sep 16 2010 Deepak Bhole <dbhole at redhat.com> - 1.3-0
-- Initial build.
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/visualvm.git/commit/?h=f22&id=21cd04f5ef76e3e28555887db567a59841310902
More information about the scm-commits
mailing list