modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java | 17 +++++++---
1 file changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 6c6c686ebef1683d66264a618ce51db95b4ffa3d
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 9 14:29:15 2012 -0600
[BZ 772722] Update the CSP server side plugin for remote package sources to use SHA256 for version and save the actual version information in the display version field.
diff --git a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java b/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java
index 5fb03b2..a30bfab 100644
--- a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java
+++ b/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java
@@ -159,14 +159,22 @@ public class RssFeedParser {
// Technically, this is a check for installable patches. But for now, that's the same as a cumulative
// patch
if (softwareType.equals(RSS_SOFTWARE_TYPE_BUGFIX) && instructionCompatibilityVersion != null) {
- String version = parseCumulativePatchVersion(packageName);
- if (version == null) {
- log.error("Could not parse version for package: " + packageName);
+ String displayVersion = parseCumulativePatchVersion(packageName);
+ if (displayVersion == null) {
+ log.error("Could not parse version for package: " + packageName + ". Package skipped.");
continue;
}
+ if (patch.getSha256() == null) {
+ log.error("Could not parse SHA256 for package: " + packageName + ". Package skipped.");
+ continue;
+ }
+
+ String version = "[sha256=" + patch.getSha256() + "]";
+
ContentProviderPackageDetailsKey key = new ContentProviderPackageDetailsKey(packageName, version,
- PACKAGE_TYPE_CUMULATIVE_PATCH, ARCHITECTURE, RESOURCE_TYPE_JBOSS_AS, getPluginName(version));
+ PACKAGE_TYPE_CUMULATIVE_PATCH, ARCHITECTURE, RESOURCE_TYPE_JBOSS_AS,
+ getPluginName(displayVersion));
// If this package is already known to the server, don't add it as a new package
// Remove from the map; entries still in the map will be returned as deleted packages
@@ -187,6 +195,7 @@ public class RssFeedParser {
packageDetails.setLocation(patch.getAutomatedDownloadUrl());
packageDetails.setMD5(patch.getMd5());
packageDetails.setSHA256(patch.getSha256());
+ packageDetails.setDisplayVersion(displayVersion);
packageDetails.setShortDescription(patch.getShortDescription());
packageDetails.setLongDescription(patch.getLongDescription());
1
0
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/BaseDispatchAction.java | 8 +++++
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/HubForm.java | 15 +++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 3871e81650431314c4ec2bdc8ec26616e1483a7b
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 9 21:09:19 2012 +0100
BZ 771747 - escape <,",>,&,',/ to prevent html injection attacks
(cherry picked from commit faa248bc6499c6dbbfb06fd7e141f01371ae1e36)
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/BaseDispatchAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/BaseDispatchAction.java
index eca5a91..414fdb3 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/BaseDispatchAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/BaseDispatchAction.java
@@ -72,6 +72,14 @@ public abstract class BaseDispatchAction extends DispatchAction {
throw new ServletException("dispatch parameter [" + parameter + "] not found");
}
+ name = name
+ .replaceAll("&","&")
+ .replaceAll("<","<")
+ .replaceAll(">",">")
+ .replaceAll("\"",""")
+ .replaceAll("'","'")
+ .replaceAll("/","/");
+
// look up the dispatch method
String methodName = getKeyMethodMap().getProperty(name);
if (methodName == null) {
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/HubForm.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/HubForm.java
index 8db0d6a..e1914f2 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/HubForm.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/HubForm.java
@@ -129,7 +129,20 @@ public abstract class HubForm extends BaseValidatorForm {
}
public void setKeywords(String keywords) {
- this.keywords = keywords;
+ if (keywords==null) {
+ this.keywords=null;
+ return;
+ }
+
+ this.keywords = keywords
+ .replaceAll("&","&")
+ .replaceAll("<","<")
+ .replaceAll("\"",""")
+ .replaceAll(">",">")
+ .replaceAll("'","'")
+ .replaceAll("/","/");
+
+
}
public String getKeywords() {
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 23 +++++++---
1 file changed, 18 insertions(+), 5 deletions(-)
New commits:
commit ac2391109a7b141312f95595341a7dabed4551a4
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Jan 9 15:23:50 2012 -0500
[BZ 771984] is appears that trying to concurrently update a subject's user preferences fails when one of the updates involves inserting a new property. The problem appears from the GWT client, so at the GWT servlet layer, we will now ensure that no two GWT requests can concurrently update a subject.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
index b790b79..e175134 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java
@@ -36,6 +36,7 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
private static final long serialVersionUID = 1L;
private SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+ private Object subjectLock = new Object(); // used to lock out concurrent subject updates
public void createPrincipal(String username, String password) throws RuntimeException {
try {
@@ -57,7 +58,7 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
public Subject createSubject(Subject subjectToCreate, String password) throws RuntimeException {
try {
return SerialUtility.prepare(subjectManager.createSubject(getSessionSubject(), subjectToCreate, password),
- "SubjectManager.createSubject");
+ "SubjectManager.createSubjectPW");
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
@@ -89,8 +90,12 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
public Subject updateSubject(Subject subjectToModify) throws RuntimeException {
try {
- Subject subject = SerialUtility.prepare(subjectManager.updateSubject(getSessionSubject(), subjectToModify),
- "SubjectManager.updateSubject");
+ Subject sessionSubject = getSessionSubject();
+ Subject modifiedSubject;
+ synchronized (subjectLock) {
+ modifiedSubject = subjectManager.updateSubject(sessionSubject, subjectToModify);
+ }
+ Subject subject = SerialUtility.prepare(modifiedSubject, "SubjectManager.updateSubject");
// Clear the prefs for this subject from the user prefs cache that portal-war uses, in case we just
// changed any prefs; otherwise the cache would contain stale prefs.
SubjectPreferencesCache.getInstance().clearConfiguration(subject.getId());
@@ -102,8 +107,16 @@ public class SubjectGWTServiceImpl extends AbstractGWTServiceImpl implements Sub
public Subject updateSubject(Subject subjectToModify, String newPassword) throws RuntimeException {
try {
- return SerialUtility.prepare(subjectManager
- .updateSubject(getSessionSubject(), subjectToModify, newPassword), "SubjectManager.updateSubject");
+ Subject sessionSubject = getSessionSubject();
+ Subject modifiedSubject;
+ synchronized (subjectLock) {
+ modifiedSubject = subjectManager.updateSubject(sessionSubject, subjectToModify, newPassword);
+ }
+ Subject subject = SerialUtility.prepare(modifiedSubject, "SubjectManager.updateSubjectPW");
+ // Clear the prefs for this subject from the user prefs cache that portal-war uses, in case we just
+ // changed any prefs; otherwise the cache would contain stale prefs.
+ SubjectPreferencesCache.getInstance().clearConfiguration(subject.getId());
+ return subject;
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
1
0
09 Jan '12
modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java | 10 -
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java | 4
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java | 12 -
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java | 52 +------
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java | 6
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java | 68 +---------
modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java | 4
modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java | 5
8 files changed, 44 insertions(+), 117 deletions(-)
New commits:
commit db47058e566110e079a50e82a731652864db6fae
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 9 14:03:04 2012 -0600
[BZ 772722] Updates for the url remote repository server side plugin. SHA256 is now used for checksum and version.
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java
index 48361cb..43c7d3a 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java
@@ -33,7 +33,7 @@ public class FullRemotePackageInfo extends RemotePackageInfo {
private final ContentProviderPackageDetails details;
public FullRemotePackageInfo(URL url, ContentProviderPackageDetails details) {
- super(details.getLocation(), url, details.getMD5());
+ super(details.getLocation(), url, details.getSHA256());
this.details = details;
// the metadata provided let's us know our package type
@@ -53,7 +53,7 @@ public class FullRemotePackageInfo extends RemotePackageInfo {
StringBuilder str = new StringBuilder("FullRemotePackageInfo: ");
str.append("location=[").append(this.getLocation());
str.append("], url=[").append(this.getUrl());
- str.append("], md5=[").append(this.getMD5());
+ str.append("], sha256=[").append(this.getSHA256());
if (this.getSupportedPackageType() != null) {
str.append("], supportedPackageType=[").append(this.getSupportedPackageType().packageTypeName);
str.append(",").append(this.getSupportedPackageType().architectureName);
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java
index a512ec3..71f7fdb 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java
@@ -23,13 +23,13 @@ import java.net.URL;
public class RemotePackageInfo {
private String location; // the path of the package relative to the root URL
private URL url;
- private String md5;
+ private String sha256;
private SupportedPackageType supportedPackageType;
- public RemotePackageInfo(String location, URL url, String md5) {
+ public RemotePackageInfo(String location, URL url, String sha256) {
this.location = location;
this.url = url;
- this.md5 = md5;
+ this.sha256 = sha256;
this.supportedPackageType = null; // we don't know it
}
@@ -41,8 +41,8 @@ public class RemotePackageInfo {
return this.url;
}
- public String getMD5() {
- return this.md5;
+ public String getSHA256() {
+ return this.sha256;
}
/**
@@ -63,7 +63,7 @@ public class RemotePackageInfo {
StringBuilder str = new StringBuilder("RemotePackageInfo: ");
str.append("location=[").append(this.location);
str.append("], url=[").append(this.url);
- str.append("], md5=[").append(this.md5);
+ str.append("], sha256=[").append(this.sha256);
if (this.supportedPackageType != null) {
str.append("], supportedPackageType=[").append(this.supportedPackageType.packageTypeName);
str.append(",").append(this.supportedPackageType.architectureName);
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java
index 8a22062..4e92cc1 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java
@@ -20,17 +20,17 @@ package org.rhq.enterprise.server.plugins.url;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.net.URL;
-import java.security.MessageDigest;
import java.util.HashMap;
import java.util.Map;
+import org.rhq.core.util.MessageDigestGenerator;
+
/**
- * Parses the simple index txt file whose format is simply "location|md5" where location
+ * Parses the simple index txt file whose format is simply "location|sha256" where location
* is a relative filepath where the file is found on the content source.
*
* @author John Mazzitelli
@@ -38,7 +38,6 @@ import java.util.Map;
public class SimpleIndexParser implements IndexParser {
public Map<String, RemotePackageInfo> parse(InputStream indexStream, UrlProvider contentSource) throws Exception {
-
Map<String, RemotePackageInfo> fileList = new HashMap<String, RemotePackageInfo>();
BufferedReader reader = new BufferedReader(new InputStreamReader(indexStream));
@@ -47,11 +46,11 @@ public class SimpleIndexParser implements IndexParser {
line = (line.length() > 1) ? line.substring(1) : ""; // we don't want a leading slash
}
if (line.length() > 0) {
- String[] locationAndMd5 = line.split("\\|");
- // if the line doesn't have location|md5, we silently skip it
- if (locationAndMd5.length == 2) {
- URL locationUrl = new URL(contentSource.getRootUrl().toString() + locationAndMd5[0]);
- RemotePackageInfo rpi = new RemotePackageInfo(locationAndMd5[0], locationUrl, locationAndMd5[1]);
+ String[] locationAndSHA256 = line.split("\\|");
+ // if the line doesn't have location|sha256, we silently skip it
+ if (locationAndSHA256.length == 2) {
+ URL locationUrl = new URL(contentSource.getRootUrl().toString() + locationAndSHA256[0]);
+ RemotePackageInfo rpi = new RemotePackageInfo(locationAndSHA256[0], locationUrl, locationAndSHA256[1]);
fileList.put(rpi.getLocation(), rpi);
}
}
@@ -103,40 +102,11 @@ public class SimpleIndexParser implements IndexParser {
} else if (!file.getCanonicalPath().equals(new File(root, "content-index.txt").getCanonicalPath())) {
// determine the relative location of the file
String location = file.getCanonicalPath().substring(root.getCanonicalPath().length() + 1);
-
- // we need the MD5 of the file
- String md5;
- FileInputStream is = null;
- try {
- MessageDigest messageDigest = MessageDigest.getInstance("MD5");
- is = new FileInputStream(file);
-
- byte[] bytes = new byte[1024];
- int len;
- while ((len = is.read(bytes, 0, bytes.length)) != -1) {
- messageDigest.update(bytes, 0, len);
- }
-
- bytes = messageDigest.digest();
- StringBuffer sb = new StringBuffer(bytes.length * 2);
-
- for (int i = 0; i < bytes.length; i++) {
- int hi = (bytes[i] >> 4) & 0xf;
- int lo = bytes[i] & 0xf;
- sb.append(Character.forDigit(hi, 16));
- sb.append(Character.forDigit(lo, 16));
- }
- md5 = sb.toString();
- } finally {
- if (is != null) {
- is.close();
- }
- }
+ MessageDigestGenerator messageDigestGenerator = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String sha256 = messageDigestGenerator.calcDigestString(file);
// write the line in the index file
- indexWriter.println(location.replace('\\', '/') + '|' + md5);
+ indexWriter.println(location.replace('\\', '/') + '|' + sha256);
}
-
- return;
}
}
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java
index c229a2b..9c4a182 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java
@@ -315,9 +315,9 @@ public class UrlProvider implements ContentProvider, PackageSource {
}
if (pkg == null) {
- String md5 = rpi.getMD5();
+ String sha256 = rpi.getSHA256();
String name = new File(rpi.getLocation()).getName();
- String version = md5; // very crude, but we don't know the "real" version so use md5 as the next best thing
+ String version = "[sha256=" + sha256 + "]";
String packageTypeName = supportedPackageType.packageTypeName;
String architectureName = supportedPackageType.architectureName;
String resourceTypeName = supportedPackageType.resourceTypeName;
@@ -332,7 +332,7 @@ public class UrlProvider implements ContentProvider, PackageSource {
pkg.setFileSize(new Long(urlConn.getContentLength()));
pkg.setDisplayName(name);
pkg.setFileName(name);
- pkg.setMD5(md5);
+ pkg.setSHA256(sha256);
pkg.setLocation(rpi.getLocation());
pkg.setShortDescription(null);
}
diff --git a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java
index a988f2d..1ecde5a 100644
--- a/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java
+++ b/modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java
@@ -20,12 +20,10 @@ package org.rhq.enterprise.server.plugins.url;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.net.URL;
-import java.security.MessageDigest;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -49,6 +47,7 @@ import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.util.MessageDigestGenerator;
import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetails;
import org.rhq.enterprise.server.plugin.pc.content.ContentProviderPackageDetailsKey;
import org.rhq.enterprise.server.xmlschema.XmlSchemas;
@@ -123,8 +122,9 @@ public class XmlIndexParser implements IndexParser {
PackageDetailsKeyType keyType = pkg.getPackageDetailsKey();
try {
- ContentProviderPackageDetailsKey key = new ContentProviderPackageDetailsKey(keyType.getName(), keyType
- .getVersion(), keyType.getPackageTypeName(), keyType.getArchitectureName(), keyType
+ String version = "[sha256=" + pkg.getSha256() + "]";
+ ContentProviderPackageDetailsKey key = new ContentProviderPackageDetailsKey(keyType.getName(), version,
+ keyType.getPackageTypeName(), keyType.getArchitectureName(), keyType
.getResourceTypeName(), keyType.getResourceTypePlugin());
ContentProviderPackageDetails details = new ContentProviderPackageDetails(key);
details.setDisplayName(pkg.getDisplayName());
@@ -135,7 +135,6 @@ public class XmlIndexParser implements IndexParser {
details.setFileName(pkg.getFileName());
details.setFileSize(pkg.getFileSize());
details.setFileCreatedDate(pkg.getFileCreatedDate());
- details.setMD5(pkg.getMd5());
details.setSHA256(pkg.getSha256());
details.setLicenseName(pkg.getLicenseName());
details.setLicenseVersion(pkg.getLicenseVersion());
@@ -293,12 +292,15 @@ public class XmlIndexParser implements IndexParser {
}
} else if (!file.getCanonicalPath().equals(new File(root, "content-index.xml").getCanonicalPath())) {
String relativeLocation = file.getCanonicalPath().substring(root.getCanonicalPath().length() + 1);
- String md5 = generateHash(file, "MD5");
- String sha256 = generateHash(file, "SHA-256");
+
+ MessageDigestGenerator messageDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256);
+ String sha256 = messageDigest.calcDigestString(file);
+
+ String version = "[sha256=" + sha256 + "]";
PackageDetailsKeyType detailsKeyType = new PackageDetailsKeyType();
detailsKeyType.setName(file.getName());
- detailsKeyType.setVersion(md5);
+ detailsKeyType.setVersion(version);
detailsKeyType.setPackageTypeName(packageTypeInfo.getPackageTypeName());
detailsKeyType.setArchitectureName(packageTypeInfo.getArchitectureName());
detailsKeyType.setResourceTypeName(packageTypeInfo.getResourceTypeName());
@@ -306,21 +308,11 @@ public class XmlIndexParser implements IndexParser {
PackageDetailsType detailsType = new PackageDetailsType();
detailsType.setPackageDetailsKey(detailsKeyType);
- //detailsType.setResourceVersions();
detailsType.setDisplayName(file.getName());
- detailsType.setDisplayVersion(md5);
- //detailsType.setShortDescription();
- //detailsType.setLongDescription();
- //detailsType.setClassification();
detailsType.setFileName(file.getName());
detailsType.setFileSize(file.length());
detailsType.setFileCreatedDate(file.lastModified());
- detailsType.setMd5(md5);
detailsType.setSha256(sha256);
- //detailsType.setLicenseName();
- //detailsType.setLicenseVersion();
- //detailsType.setMetadata();
- //detailsType.setExtraProperties();
detailsType.setLocation(relativeLocation);
list.add(detailsType);
@@ -328,44 +320,4 @@ public class XmlIndexParser implements IndexParser {
return;
}
-
- /**
- * Generates a hash code for the given file.
- * @param file the file whose contents is used to generate the hash
- * @param algorithm "MD5" or "SHA-256"
- * @return
- * @return the hash as a string
- * @throws Exception
- */
- protected static String generateHash(File file, String algorithm) throws Exception {
- String hash;
- FileInputStream is = null;
- try {
- MessageDigest messageDigest = MessageDigest.getInstance(algorithm);
- is = new FileInputStream(file);
-
- byte[] bytes = new byte[1024];
- int len;
- while ((len = is.read(bytes, 0, bytes.length)) != -1) {
- messageDigest.update(bytes, 0, len);
- }
-
- bytes = messageDigest.digest();
- StringBuffer sb = new StringBuffer(bytes.length * 2);
-
- for (int i = 0; i < bytes.length; i++) {
- int hi = (bytes[i] >> 4) & 0xf;
- int lo = bytes[i] & 0xf;
- sb.append(Character.forDigit(hi, 16));
- sb.append(Character.forDigit(lo, 16));
- }
- hash = sb.toString();
- } finally {
- if (is != null) {
- is.close();
- }
- }
-
- return hash;
- }
}
diff --git a/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java b/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java
index 50ed388..7798e93 100644
--- a/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java
+++ b/modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java
@@ -51,7 +51,7 @@ public class XmlIndexParserTest {
assert details instanceof FullRemotePackageInfo : "Bad class=" + details.getClass();
FullRemotePackageInfo fullDetails = (FullRemotePackageInfo) details;
assert "Mazzlocation".equals(fullDetails.getLocation()) : fullDetails.getLocation();
- assert "Mazzmd5".equals(fullDetails.getMD5()) : fullDetails.getMD5();
+ assert "Mazzsha256".equals(fullDetails.getSHA256()) : fullDetails.getSHA256();
assert new URL("http://root/url/Mazzlocation").equals(fullDetails.getUrl()) : fullDetails.getUrl();
assert "Mazzarchitecture-name".equals(fullDetails.getSupportedPackageType().architectureName) : fullDetails
.getSupportedPackageType().architectureName;
@@ -140,7 +140,7 @@ public class XmlIndexParserTest {
assert details instanceof FullRemotePackageInfo : "Bad class=" + details.getClass();
fullDetails = (FullRemotePackageInfo) details;
assert "WOTGORILLAlocation".equals(fullDetails.getLocation()) : fullDetails.getLocation();
- assert null == fullDetails.getMD5() : fullDetails.getMD5();
+ assert null == fullDetails.getSHA256() : fullDetails.getSHA256();
assert new URL("http://root/url/WOTGORILLAlocation").equals(fullDetails.getUrl()) : fullDetails.getUrl();
assert "WOTGORILLAarchitecture-name".equals(fullDetails.getSupportedPackageType().architectureName) : fullDetails
.getSupportedPackageType().architectureName;
commit 3898a8ab6eaead4bfb4303148082b63fa65dee5b
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Jan 9 13:32:23 2012 -0600
[BZ 772722] Fixes for Yum and disk remote content plugins to use SHA256 for the version and corretly set the display version.
diff --git a/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java b/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java
index 3155976..2c4e907 100644
--- a/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java
+++ b/modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java
@@ -234,14 +234,15 @@ public class DiskSource implements ContentProvider, PackageSource, RepoSource {
}
ContentFileInfo fileInfo = ContentFileInfoFactory.createContentFileInfo(file);
- String md5;
+ String sha256;
try {
- md5 = MessageDigestGenerator.getDigestString(file);
+ sha256 = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(file);
} catch (IOException e) {
throw new SyncException("Error digesting file", e);
}
String name = file.getName();
- String version = fileInfo.getVersion(md5);
+ String version = "[sha256=" + sha256 + "]";
+ String displayVersion = fileInfo.getVersion(null);
String packageTypeName = supportedPackageType.packageTypeName;
String architectureName = supportedPackageType.architectureName;
String resourceTypeName = supportedPackageType.resourceTypeName;
@@ -255,7 +256,8 @@ public class DiskSource implements ContentProvider, PackageSource, RepoSource {
pkg.setFileName(name);
pkg.setFileCreatedDate(file.lastModified());
pkg.setFileSize(file.length());
- pkg.setMD5(md5);
+ pkg.setSHA256(sha256);
+ pkg.setDisplayVersion(displayVersion);
pkg.setLocation(getRelativePath(file));
pkg.setShortDescription(fileInfo.getDescription(null));
diff --git a/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java b/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java
index 616dad4..2a31298 100644
--- a/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java
+++ b/modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java
@@ -219,7 +219,9 @@ public class Repo {
*/
private ContentProviderPackageDetails getDetails(Element p) throws Exception {
String name = p.getChildText("name", Repodata.yumns);
- String version = encodeVersion(p);
+ String displayVersion = encodeVersion(p);
+ String sha256 = p.getChildText("checksum", Repodata.yumns);
+ String version = "[sha256=" + sha256 + "]";
String arch = p.getChildText("arch", Repodata.yumns);
ContentProviderPackageDetailsKey key = new ContentProviderPackageDetailsKey(name, version, "rpm", arch,
"Linux", "Platforms");
@@ -233,6 +235,7 @@ public class Repo {
pkg.setFileCreatedDate(filedate(p));
pkg.setLicenseName(p.getChild("format", Repodata.yumns).getChildText("license", Repodata.rpmns));
pkg.setSHA256(p.getChildText("checksum", Repodata.yumns));
+ pkg.setDisplayVersion(displayVersion);
pkg.setLocation(location(p));
pkg.setMetadata(gzip(p));
return pkg;
1
0
[rhq] Branch 'lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs' - 35 commits - .classpath modules/core modules/enterprise modules/integration-tests modules/plugins
by lkrejci 09 Jan '12
by lkrejci 09 Jan '12
09 Jan '12
.classpath | 1
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java | 5
modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 54
modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java | 4
modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java | 3
modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java | 63
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml | 9
modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp | 5
modules/enterprise/gui/rest-war/src/main/webapp/index.html | 8
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js | 92
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js | 938 ++
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js | 835 ++
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js | 3135 ++++++----
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js | 454 -
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js | 61
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html | 184
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html | 228
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java | 237
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java | 87
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java | 60
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java | 100
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java | 105
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java | 52
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java | 254
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java | 75
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java | 187
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java | 69
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java | 96
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java | 85
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java | 33
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java | 212
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java | 76
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java | 71
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java | 185
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java | 81
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java | 104
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java | 94
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java | 46
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java | 195
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java | 59
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java | 145
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java | 180
modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt | 17
modules/enterprise/server/itests/pom.xml | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 267
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java | 67
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/NumericDataPoint.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/RHQErrorWrapper.java | 28
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java | 93
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java | 16
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java | 4
modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java | 6
modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java | 8
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java | 12
modules/plugins/jboss-as-7/d2d.sh | 2
modules/plugins/jboss-as-7/pom.xml | 15
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java | 26
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 35
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java | 6
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java | 269
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 10
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 19
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 63
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java | 9
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 57
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java | 57
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java | 4
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java | 8
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java | 27
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java | 2
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 418 -
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java | 30
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java | 47
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java | 61
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java | 3
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java | 133
modules/plugins/jboss-as-7/src/test/resources/host1.xml | 92
modules/plugins/jboss-as-7/src/test/resources/host2.xml | 91
modules/plugins/jboss-as-7/src/test/resources/standalone70.xml | 433 +
modules/plugins/jboss-as-7/src/test/resources/standalone71.xml | 453 +
modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 15
modules/plugins/jboss-as-7/src/test/resources/web.json | 62
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java | 13
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java | 2
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java | 4
103 files changed, 9943 insertions(+), 2266 deletions(-)
New commits:
commit 772e9d247e524071a86d6a25b8e1615ed77e9fcf
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 9 14:05:09 2012 +0100
Fixing the application of various decorators to JNDI contexts to support
contexts that implement more than 1 context interface (like LdapCtx which
implements both LdapContext and EventDirContext).
This should fix the RHQ's LDAP integration for good.
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
index 60e9bf6..3046af7 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
@@ -27,7 +27,7 @@ import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
@@ -37,6 +37,10 @@ import java.util.Set;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.event.EventDirContext;
+import javax.naming.ldap.LdapContext;
import javax.naming.spi.InitialContextFactory;
import javax.naming.spi.InitialContextFactoryBuilder;
@@ -45,16 +49,10 @@ import org.apache.commons.logging.LogFactory;
import org.jnp.interfaces.NamingContextFactory;
import org.rhq.jndi.context.AccessCheckingContextDecorator;
-import org.rhq.jndi.context.AccessCheckingDirContextDecorator;
-import org.rhq.jndi.context.AccessCheckingEventContextDecorator;
-import org.rhq.jndi.context.AccessCheckingEventDirContextDecorator;
-import org.rhq.jndi.context.AccessCheckingLdapContextDecorator;
-import org.rhq.jndi.context.ContextDecoratorPicker;
-import org.rhq.jndi.context.URLPreferringContextDecorator;
-import org.rhq.jndi.context.URLPreferringDirContextDecorator;
-import org.rhq.jndi.context.URLPreferringEventContextDecorator;
-import org.rhq.jndi.context.URLPreferringEventDirContextDecorator;
-import org.rhq.jndi.context.URLPreferringLdapContextDecorator;
+import org.rhq.jndi.context.AccessCheckingContextDecoratorSetContext;
+import org.rhq.jndi.context.ContextDecorator;
+import org.rhq.jndi.context.URLPreferringContextDecoratorSetContext;
+import org.rhq.jndi.util.DecoratorPicker;
/**
* This initial context factory builder is installed early on during the RHQ server startup
@@ -89,6 +87,17 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
*/
private static final String[] CHECKED_SCHEMES = { "java" };
+ private static final Set<Class<? extends Context>> SUPPORTED_CONTEXT_INTERFACES;
+
+ static {
+ SUPPORTED_CONTEXT_INTERFACES = new HashSet<Class<? extends Context>>();
+ SUPPORTED_CONTEXT_INTERFACES.add(Context.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(DirContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(EventContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(EventDirContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(LdapContext.class);
+ }
+
private static final Set<InetAddress> SERVER_BIND_IPS;
static {
SERVER_BIND_IPS = new HashSet<InetAddress>();
@@ -191,42 +200,31 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
}
private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
- return new DecoratingInitialContextFactory(original, Arrays.asList(
- getURLPreferringDecoratorPicker(), getAccessCheckingDecoratorPicker()));
- }
-
- private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
- return new DecoratingInitialContextFactory(original, Arrays.asList(
- getURLPreferringDecoratorPicker()));
+ ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+ pickers.add(getURLPreferringDecoratorPicker());
+ pickers.add(getAccessCheckingDecoratorPicker());
+
+ return new DecoratingInitialContextFactory(original, pickers);
}
- private static ContextDecoratorPicker getAccessCheckingDecoratorPicker() {
- ContextDecoratorPicker ret = new ContextDecoratorPicker();
-
- ret.setConstructorParameters(new Object[] { CHECKED_SCHEMES });
- ret.setConstructorParameterTypes(new Class<?>[] { String[].class });
+ private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
+ ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+ pickers.add(getURLPreferringDecoratorPicker());
- ret.getPossibleDecorators().add(AccessCheckingContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingDirContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingEventContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingEventDirContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingLdapContextDecorator.class);
+ return new DecoratingInitialContextFactory(original, pickers);
+ }
+ private static DecoratorPicker<Context, ContextDecorator> getAccessCheckingDecoratorPicker() {
+ DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+ ret.setContext(new AccessCheckingContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES, CHECKED_SCHEMES));
+
return ret;
}
- private static ContextDecoratorPicker getURLPreferringDecoratorPicker() {
- ContextDecoratorPicker ret = new ContextDecoratorPicker();
-
- ret.setConstructorParameters(null);
- ret.setConstructorParameterTypes(null);
-
- ret.getPossibleDecorators().add(URLPreferringContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringDirContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringEventContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringEventDirContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringLdapContextDecorator.class);
-
+ private static DecoratorPicker<Context, ContextDecorator> getURLPreferringDecoratorPicker() {
+ DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+ ret.setContext(new URLPreferringContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES));
+
return ret;
}
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
index 2414c98..19b30ea 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
@@ -19,45 +19,82 @@
package org.rhq.jndi;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
+import java.util.Set;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import org.rhq.jndi.context.ContextDecoratorPicker;
+import org.rhq.jndi.context.ContextDecorator;
+import org.rhq.jndi.util.DecoratorPicker;
+import org.rhq.jndi.util.DecoratingInvocationHandler;
/**
+ * This class implements an initial context factory that decorates the contexts
+ * returned from a "wrapped" initial factory passed to this class in the constructor.
+ * <p>
+ * The contexts returned from the wrapped initial factory are hidden behind a proxy
+ * that implements the intersection of interfaces from the <code>supportedContextInterfaces</code>
+ * constructor parameter and the actual interfaces the wrapped context implements.
+ * <p>
+ * The proxy method calls are handled using the {@link DecoratingInvocationHandler} which is initialized
+ * with the list of {@link DecoratorPicker pickers} that are used to intercept the method
+ * calls on the wrapped context.
+ *
+ * @see DecoratorPicker
+ * @see DecoratingInvocationHandler
*
- *
* @author Lukas Krejci
*/
public class DecoratingInitialContextFactory implements InitialContextFactory {
- private List<ContextDecoratorPicker> pickers;
+ List<DecoratorPicker<Context, ContextDecorator>> pickers;
private InitialContextFactory factory;
+ private Set<Class<? extends Context>> supportedContextInterfaces;
- public DecoratingInitialContextFactory(InitialContextFactory factory, List<ContextDecoratorPicker> decoratorPickers) {
+ public DecoratingInitialContextFactory(InitialContextFactory factory, List<DecoratorPicker<Context, ContextDecorator>> decoratorPickers) {
this.factory = factory;
this.pickers = decoratorPickers;
+ this.supportedContextInterfaces = new HashSet<Class<? extends Context>>();
+ for(DecoratorPicker<Context, ContextDecorator> picker : pickers) {
+ supportedContextInterfaces.addAll(picker.getContext().getSupportedInterfaces());
+ }
}
public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
Context ctx = factory.getInitialContext(environment);
- try {
- for(ContextDecoratorPicker picker : pickers) {
- ctx = picker.wrapInAppropriateDecorator(ctx);
- }
- } catch (IllegalArgumentException e) {
- NamingException ex = new NamingException();
- ex.initCause(ex);
-
- throw e;
- }
+ Set<Class<?>> implementedIfaces = getAllImplementedInterfaces(ctx.getClass());
+ Class<?>[] ii = new Class<?>[implementedIfaces.size()];
+ implementedIfaces.toArray(ii);
- return ctx;
+ return (Context) Proxy.newProxyInstance(ctx.getClass().getClassLoader(), ii, new DecoratingInvocationHandler<Context, ContextDecorator>(pickers, ctx));
+ }
+
+ private Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
+ HashSet<Class<?>> ret = new HashSet<Class<?>>();
+ getAllImplementedInterfaces(cls, ret);
+
+ ret.retainAll(supportedContextInterfaces);
+
+ return ret;
}
+ private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
+ Class<?>[] ifaces = cls.getInterfaces();
+
+ for (Class<?> iface : Arrays.asList(ifaces)) {
+ output.add(iface);
+ getAllImplementedInterfaces(iface, output);
+ }
+
+ if (cls.getSuperclass() != null) {
+ getAllImplementedInterfaces(cls.getSuperclass(), output);
+ }
+ }
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
new file mode 100644
index 0000000..284fd0c
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
@@ -0,0 +1,75 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.Constructor;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
+
+ private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
+ static {
+ HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
+ tmp.add(AccessCheckingContextDecorator.class);
+ tmp.add(AccessCheckingDirContextDecorator.class);
+ tmp.add(AccessCheckingEventContextDecorator.class);
+ tmp.add(AccessCheckingEventDirContextDecorator.class);
+ tmp.add(AccessCheckingLdapContextDecorator.class);
+
+ DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
+ }
+
+ private Set<Class<? extends Context>> supportedInterfaces;
+ private String[] checkedSchemes;
+
+ public AccessCheckingContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces, String... checkedSchemes) {
+ this.supportedInterfaces = supportedInterfaces;
+ this.checkedSchemes = checkedSchemes;
+ }
+
+ public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
+ Constructor<? extends ContextDecorator> ctor = decoratorClass.getConstructor(String[].class);
+
+ return ctor.newInstance((Object)checkedSchemes);
+ }
+
+ public Set<Class<? extends Context>> getSupportedInterfaces() {
+ return supportedInterfaces;
+ }
+
+ public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
+ return DECORATOR_CLASSES;
+ }
+
+ public void init(ContextDecorator decorator, Context object) throws Exception {
+ decorator.init(object);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
deleted file mode 100644
index a088aa2..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-/**
- * @author Lukas Krejci
- */
-public class ContextDecoratorPicker {
-
- private Set<Class<? extends ContextDecorator>> possibleDecorators = new HashSet<Class<? extends ContextDecorator>>();
- private Class<?>[] constructorParameterTypes;
- private Object[] constructorParameters;
-
- public ContextDecoratorPicker() {
- }
-
- public ContextDecoratorPicker(Collection<? extends Class<? extends ContextDecorator>> c) {
- possibleDecorators.addAll(c);
- }
-
- public Set<Class<? extends ContextDecorator>> getPossibleDecorators() {
- return possibleDecorators;
- }
-
- public Class<?>[] getConstructorParameterTypes() {
- return constructorParameterTypes;
- }
-
- public void setConstructorParameterTypes(Class<?>[] constructorParameterTypes) {
- this.constructorParameterTypes = constructorParameterTypes;
- }
-
- public Object[] getConstructorParameters() {
- return constructorParameters;
- }
-
- public void setConstructorParameters(Object[] constructorParameters) {
- this.constructorParameters = constructorParameters;
- }
-
- public Context wrapInAppropriateDecorator(Context context) throws NamingException {
- Class<? extends ContextDecorator> cls = getMatchByInterfaces(context, possibleDecorators);
-
- if (cls == null) {
- throw new IllegalArgumentException("Could not find a matching context decorator for " + context.getClass() + " in " + this);
- }
-
- Constructor<? extends ContextDecorator> ctor = null;
- try {
- ctor = cls.getConstructor(constructorParameterTypes);
- ContextDecorator ctx = ctor.newInstance(constructorParameters);
-
- ctx.init(context);
-
- return ctx;
- } catch (SecurityException e) {
- throw new IllegalStateException("Could not instantiate a class through reflection.", e);
- } catch (NoSuchMethodException e) {
- throw new IllegalArgumentException(
- "Could not construct a context decorator - unable to find a constructor with parameters "
- + (constructorParameterTypes == null ? "[no parameters]" : Arrays.asList(constructorParameterTypes)) + " on class " + cls.getName(), e);
- } catch (IllegalArgumentException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- } catch (InstantiationException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- } catch (IllegalAccessException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- } catch (InvocationTargetException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- }
- }
-
- private static <T> Class<? extends T> getMatchByInterfaces(Object obj, Set<Class<? extends T>> classes) {
- Set<Class<?>> ifaces = getAllImplementedInterfaces(obj.getClass());
-
- Class<? extends T> match = null;
- int maxMatchCnt = Integer.MIN_VALUE;
-
- for(Class<? extends T> cls : classes) {
- int cnt = getBestMatchByIfaces(cls, ifaces);
- if (cnt > maxMatchCnt) {
- maxMatchCnt = cnt;
- match = cls;
- }
- }
-
- return match;
- }
-
- private static int getBestMatchByIfaces(Class<?> cls, Set<Class<?>> ifaces) {
- int ret = 0;
-
- //count how many interfaces from the supplied array the class implements
- for(Class<?> iface : ifaces) {
- if (iface.isAssignableFrom(cls)) {
- ++ret;
- } else {
- --ret;
- }
- }
-
- //that's not all - to get the best possible match, we need to take into account
- //the fact that the class might implement more than just the interfaces provided
- Set<Class<?>> clsIfaces = getAllImplementedInterfaces(cls);
-
- for(Class<?> clsIface : clsIfaces) {
- if (!(ifaces.contains(clsIface))) {
- --ret;
- }
- }
-
- return ret;
- }
-
- private static Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
- HashSet<Class<?>> ret = new HashSet<Class<?>>();
- getAllImplementedInterfaces(cls, ret);
-
- return ret;
- }
-
- private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
- Class<?>[] ifaces = cls.getInterfaces();
-
- for(Class<?> iface : Arrays.asList(ifaces)) {
- output.add(iface);
- getAllImplementedInterfaces(iface, output);
- }
-
- if (cls.getSuperclass() != null) {
- getAllImplementedInterfaces(cls.getSuperclass(), output);
- }
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
new file mode 100644
index 0000000..828cd74
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
@@ -0,0 +1,71 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
+
+ private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
+ static {
+ HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
+ tmp.add(URLPreferringContextDecorator.class);
+ tmp.add(URLPreferringDirContextDecorator.class);
+ tmp.add(URLPreferringEventContextDecorator.class);
+ tmp.add(URLPreferringEventDirContextDecorator.class);
+ tmp.add(URLPreferringLdapContextDecorator.class);
+
+ DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
+ }
+
+ private Set<Class<? extends Context>> supportedInterfaces;
+
+ public URLPreferringContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces) {
+ this.supportedInterfaces = supportedInterfaces;
+ }
+
+ public Set<Class<? extends Context>> getSupportedInterfaces() {
+ return supportedInterfaces;
+ }
+
+ public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
+ return DECORATOR_CLASSES;
+ }
+
+ public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
+ return decoratorClass.newInstance();
+ }
+
+ public void init(ContextDecorator decorator, Context object) throws Exception {
+ decorator.init(object);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
new file mode 100644
index 0000000..356a6e9
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
@@ -0,0 +1,46 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.List;
+
+public class DecoratingInvocationHandler<Type, Decorator extends Type> implements InvocationHandler {
+
+ private final List<DecoratorPicker<Type, Decorator>> pickers;
+ private Type object;
+
+ public DecoratingInvocationHandler(List<DecoratorPicker<Type, Decorator>> pickers, Type object) {
+ this.pickers = pickers;
+ this.object = object;
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ Type target = object;
+ Class<?> methodClass = method.getDeclaringClass();
+
+ for(DecoratorPicker<Type, Decorator> picker : pickers) {
+ target = picker.decorate(target, methodClass);
+ }
+
+ return method.invoke(target, args);
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
new file mode 100644
index 0000000..017d29f
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
@@ -0,0 +1,195 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Given as set of decorators extending given type, this class can pick
+ * the most appropriate set of decorators for a class or a method call.
+ * <p>
+ * To configure the decorator, one has to provide a {@link DecoratorSetContext} that
+ * is then used to obtain the list of
+ * {@link DecoratorSetContext#getSupportedInterfaces() supported interfaces}, which are
+ * all the interfaces that should be used for decorator resolution (i.e. all other interfaces
+ * that a class might implement are ignored during decorator resolution), the list of
+ * {@link DecoratorSetContext#getDecoratorClasses() decorator classes}, which is a list
+ * of decorators the picker can choose from and is also used to instantiate and initialize
+ * the decorators.
+ *
+ * @author Lukas Krejci
+ */
+public class DecoratorPicker<Type, Decorator extends Type> {
+
+ private DecoratorSetContext<Type, Decorator> context;
+
+ public DecoratorSetContext<Type, Decorator> getContext() {
+ return context;
+ }
+
+ public void setContext(DecoratorSetContext<Type, Decorator> decoratorSetContext) {
+ this.context = decoratorSetContext;
+ }
+
+ /**
+ * Returns a set of decorators applicable for given method. The set is established based
+ * on the declaring class of the method.
+ *
+ * @param method the method to inspect
+ * @return the set of decorators that can be used to wrap a method call
+ * @throws Exception
+ */
+ public Set<Decorator> getDecoratorsForMethod(Method method) throws Exception {
+ return getDecoratorsForClass_Private(method.getDeclaringClass());
+ }
+
+ /**
+ * Returns a set of decorators that can be used on instances of given class.
+ * @param cls the class to inspect
+ * @return
+ * @throws Exception
+ */
+ public Set<Decorator> getDecoratorsForClass(Class<? extends Type> cls) throws Exception {
+ return getDecoratorsForClass_Private(cls);
+ }
+
+ /**
+ * This method first establishes the set of decorators to use based on the class of the supplied
+ * object and then chains the decorators (in arbitrary order) with the supplied object at the
+ * "root" of the chain.
+ * <p>
+ * If a method is then called on the returned object, the methods of all the decorators are called
+ * in chain (each supposedly calling the next) and finally, at the end of the chain, the method on
+ * the original object (the one supplied to this method) is called.
+ * <p>
+ * Note that the above is only an intended behavior and actually depends on the implementation of
+ * the decorators that are resposinble for the chaining. Each decorator is initialized
+ * (@{link {@link DecoratorSetContext#init(Object, Object)} which should set it up for such chaining.
+ *
+ * @param object
+ * @return
+ * @throws Exception
+ */
+ public Type decorate(Type object) throws Exception {
+ Set<Decorator> decs = getDecoratorsForClass_Private(object.getClass());
+ Type ret = object;
+ for(Decorator d : decs) {
+ context.init(d, ret);
+ ret = d;
+ }
+
+ return ret;
+ }
+
+ /**
+ * Similar to {@link #decorate(Object)} but instead of the class of the object itself,
+ * uses the significantSuperClass as the basis for the decorator resolution.
+ * <p>
+ * This is important, because if the object implements two mutually incompatible sub-interfaces of <code>Type</code>,
+ * the chained decorators might fail to execute a method later on if the decorator depends on the upper part
+ * of the chain to implement certain sub-interface of <code>Type</code>.
+ *
+ * @param object the object to wrap in decorators
+ * @param significantSuperClass the class to base the decorator resolution on
+ * @return
+ * @throws Exception
+ */
+ public Type decorate(Type object, Class<?> significantSuperClass) throws Exception {
+ Set<Decorator> decs = getDecoratorsForClass_Private(significantSuperClass);
+ Type ret = object;
+ for(Decorator d : decs) {
+ context.init(d, ret);
+ ret = d;
+ }
+
+ return ret;
+ }
+
+ private Set<Decorator> getDecoratorsForClass_Private(Class<?> cls) throws Exception {
+ Set<Class<? extends Type>> ifaces = getNearestApplicableInterfaces(cls);
+
+ HashSet<Decorator> ret = new HashSet<Decorator>();
+
+ for (Class<? extends Type> iface : ifaces) {
+ for (Class<? extends Decorator> decClass : getMatch(iface)) {
+ ret.add(context.instantiate(decClass));
+ }
+ }
+
+ return ret;
+ }
+
+ private Set<Class<? extends Type>> getNearestApplicableInterfaces(Class<?> cls) {
+ List<Class<? extends Type>> ifaces = new ArrayList<Class<? extends Type>>(getAllApplicableInterfaces(cls));
+
+ //now compact the set to only contain the most concrete interfaces
+
+ Iterator<Class<? extends Type>> it = ifaces.iterator();
+ while (it.hasNext()) {
+ Class<? extends Type> c = it.next();
+
+ for (int i = 0; i < ifaces.size(); ++i) {
+ Class<? extends Type> nextC = ifaces.get(i);
+ if (!c.equals(nextC) && c.isAssignableFrom(nextC)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+
+ return new HashSet<Class<? extends Type>>(ifaces);
+ }
+
+ private Set<Class<? extends Type>> getAllApplicableInterfaces(Class<?> cls) {
+ Set<Class<? extends Type>> ifaces = new HashSet<Class<? extends Type>>();
+
+ for (Class<? extends Type> iface : context.getSupportedInterfaces()) {
+ if (iface.isAssignableFrom(cls)) {
+ ifaces.add(iface);
+ }
+ }
+
+ if (ifaces.isEmpty()) {
+ throw new IllegalArgumentException("Class " + cls
+ + " doesn't implement any of the applicable interfaces. Cannot find decorators for it.");
+ }
+
+ return ifaces;
+ }
+
+ private Set<Class<? extends Decorator>> getMatch(Class<?> targetIface) {
+
+ Set<Class<? extends Decorator>> ret = new HashSet<Class<? extends Decorator>>();
+
+ for (Class<? extends Decorator> cls : context.getDecoratorClasses()) {
+ if (Arrays.asList(cls.getInterfaces()).contains(targetIface)) {
+ ret.add(cls);
+ }
+ }
+
+ return ret;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
new file mode 100644
index 0000000..d7b1676
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
@@ -0,0 +1,59 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.util.Set;
+
+/**
+ * Implementations of this interface provide a context to the {@link DecoratorPicker}.
+ *
+ * @author Lukas Krejci
+ */
+public interface DecoratorSetContext<Type, Decorator> {
+
+ /**
+ * @return the set of interfaces that the decorators are able support.
+ * Usually this should be just a union of all interfaces the decorators implement
+ * but can be trimmed down.
+ */
+ Set<Class<? extends Type>> getSupportedInterfaces();
+
+ /**
+ * @return the set of all decorator classes in this set
+ */
+ Set<Class<? extends Decorator>> getDecoratorClasses();
+
+ /**
+ * Instantiates a new decorator of given class.
+ * @param decoratorClass
+ * @return
+ * @throws Exception
+ */
+ Decorator instantiate(Class<? extends Decorator> decoratorClass) throws Exception;
+
+ /**
+ * Initializes the decorator to decorate given object.
+ *
+ * @param decorator
+ * @param object
+ * @throws Exception on error
+ */
+ void init(Decorator decorator, Type object) throws Exception;
+}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
new file mode 100644
index 0000000..45ba114
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
@@ -0,0 +1,145 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.NamingManager;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class DecoratingInvocationHandlerTest {
+ private static final Set<String> INVOKED_METHODS = new HashSet<String>();
+
+ private static final InvocationHandler NOTE_TAKING_HANDLER = new InvocationHandler() {
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ INVOKED_METHODS.add(method.getName());
+
+ if ("hashCode".equals(method.getName())) {
+ return 0;
+ } else if ("equals".equals(method.getName())) {
+ return false;
+ }
+
+ return null;
+ }
+ };
+
+ private static Class<?>[] CONTEXT_INTERFACES;
+
+ public static class Factory implements InitialContextFactory {
+ public Context getInitialContext(Hashtable<?, ?> environment)
+ throws NamingException {
+
+ return (Context) Proxy.newProxyInstance(DecoratingInvocationHandlerTest.class.getClassLoader(), CONTEXT_INTERFACES, NOTE_TAKING_HANDLER);
+ }
+ }
+
+ private static class DummyInitialEventContext extends InitialContext implements EventContext {
+
+ /**
+ * @param environment
+ * @throws NamingException
+ */
+ public DummyInitialEventContext(Hashtable<?, ?> environment) throws NamingException {
+ super(environment);
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ ((EventContext)getDefaultInitCtx()).removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return ((EventContext)getDefaultInitCtx()).targetMustExist();
+ }
+
+
+ }
+
+ @BeforeClass
+ public void setBuilder() throws Exception {
+ NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
+ }
+
+ public void testSimpleDispatch() throws Exception {
+ INVOKED_METHODS.clear();
+ Properties env = new Properties();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
+
+ CONTEXT_INTERFACES = new Class<?>[] { Context.class };
+
+ InitialContext ctx = new InitialContext(env);
+
+ ctx.lookup("asdf");
+
+ assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
+ }
+
+ public void testMultiInterfaceDispatch() throws Exception {
+ INVOKED_METHODS.clear();
+ Properties env = new Properties();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
+
+ CONTEXT_INTERFACES = new Class<?>[] { EventContext.class, DirContext.class };
+
+ InitialContext ctx = new InitialContext(env);
+
+ ctx.lookup("asdf");
+
+ DummyInitialEventContext ectx = new DummyInitialEventContext(env);
+
+ ectx.addNamingListener("hodiny", 0, null);
+
+ assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
+ assert INVOKED_METHODS.contains("addNamingListener") : "The addNamingListener doesn't seem to have propagated to the actual context to be used.";
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
new file mode 100644
index 0000000..e2d7429
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
@@ -0,0 +1,180 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.ldap.LdapContext;
+
+import org.testng.annotations.Test;
+
+import org.rhq.jndi.util.DecoratorPicker;
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ * @author Lukas Krejci
+ */
+@Test
+public class DecoratorPickerTest {
+
+ private static final InvocationHandler DUMMY_HANDLER = new InvocationHandler() {
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ if ("hashCode".equals(method.getName())) {
+ return 0;
+ } else if ("equals".equals(method.getName())) {
+ return false;
+ }
+
+ return null;
+ }
+ };
+
+ private static final Class<?> TEST_OBJECT_CLASS1 = createProxyClass(Context.class);
+ private static final Class<?> TEST_OBJECT_CLASS2 = createProxyClass(DirContext.class);
+ private static final Class<?> TEST_OBJECT_CLASS3 = createProxyClass(LdapContext.class);
+ private static final Class<?> TEST_OBJECT_CLASS4 = createProxyClass(LdapContext.class, EventContext.class);
+ private static final Class<?> DECORATOR_CLASS1 = createProxyClass(Context.class);
+ private static final Class<?> DECORATOR_CLASS2 = createProxyClass(EventContext.class);
+ private static final Class<?> DECORATOR_CLASS3 = createProxyClass(LdapContext.class);
+ private static final Class<?> DECORATOR_CLASS4 = createProxyClass(DirContext.class);
+
+ public void testSimpleDecoratorIdentifiedByClass() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS1);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for Context class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], Context.class);
+ }
+
+ public void testSuperClassDecoratorHasPrecedenceOverSubClassDecorator() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ //this tests that the LdapContext isn't returned even though it subclasses the DirContext
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS2);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for DirContext class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], DirContext.class);
+ }
+
+ public void testSubClassDecoratorCorrectlyIdentified() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS3);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for LdapContext class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ public void testMultipleDecoratorsDetectable() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> decorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS4);
+ assertEquals(decorators.size(), 2,
+ "Exactly 2 decorators should have been found for a class implementing 2 interfaces.");
+
+ boolean ldapContextDecoratorFound = false;
+ boolean eventContextDecoratorFound = false;
+
+ for (Object d : decorators) {
+ if (LdapContext.class.isAssignableFrom(d.getClass())) {
+ ldapContextDecoratorFound = true;
+ continue; //just to make sure that somehow the decorator doesn't implement both
+ }
+ if (EventContext.class.isAssignableFrom(d.getClass())) {
+ eventContextDecoratorFound = true;
+ }
+ }
+
+ assertTrue(ldapContextDecoratorFound && eventContextDecoratorFound,
+ "The found decorators don't implement the desired interfaces.");
+ }
+
+ public void testDecoratorsIdentifiedByMethod() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> decorators =
+ picker.getDecoratorsForMethod(LdapContext.class.getMethod("getConnectControls", (Class<?>[]) null));
+ assertEquals(decorators.size(), 1,
+ "Expected exactly one decorator for method 'getConnectControls()' from LdapContext class");
+ assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ public void testMethodFromSubclassMatchesSubclassDecorator() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ //this is a method from the DirContext but we're asking for it from a class
+ //that implements also an LdapContext
+ //The LdapContext decorator also inherits from the DirContext decorator
+ //(by the virtue of LdapContext interface inheriting from the DirContext)
+ //The picker should therefore match the LdapContext decorator because its
+ //the "closest" one to the actual class.
+ Set<Object> decorators =
+ picker.getDecoratorsForMethod(TEST_OBJECT_CLASS3.getMethod("getSchemaClassDefinition",
+ new Class<?>[] { String.class }));
+ assertEquals(decorators.size(), 1,
+ "Expected exactly one decorator for method 'getSchemaClassDefinition(String)' from LdapContext class");
+ assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ private static Class<?> createProxyClass(Class<?>... ifaces) {
+ return Proxy.getProxyClass(DecoratorPickerTest.class.getClassLoader(), ifaces);
+ }
+
+ private static DecoratorPicker<Object, Object> createTestPicker() {
+ DecoratorPicker<Object, Object> picker = new DecoratorPicker<Object, Object>();
+
+ DecoratorSetContext<Object, Object> decSet = new DecoratorSetContext<Object, Object>() {
+
+ public Object instantiate(Class<? extends Object> decoratorClass) throws Exception {
+ Constructor<? extends Object> ctor = decoratorClass.getConstructor(InvocationHandler.class);
+ return ctor.newInstance(DUMMY_HANDLER);
+ }
+
+ public void init(Object decorator, Object object) throws Exception {
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set<Class<? extends Object>> getSupportedInterfaces() {
+ return new HashSet<Class<? extends Object>>(Arrays.asList(Context.class, EventContext.class,
+ LdapContext.class, DirContext.class));
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set<Class<? extends Object>> getDecoratorClasses() {
+ return new HashSet<Class<? extends Object>>(Arrays.asList(DECORATOR_CLASS1, DECORATOR_CLASS2, DECORATOR_CLASS3, DECORATOR_CLASS4));
+ }
+ };
+
+ picker.setContext(decSet);
+
+ return picker;
+ }
+}
commit d61a7d5a1852c017a75a13636d0f410b6d6a5dd4
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 9 11:07:36 2012 +0100
Add a graph where each days metrics consist of a certain color
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 7162c24..80472f6 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -29,6 +29,7 @@ an empty database (meaning resource ids and schedule ids starting at 10001).
<li><a href="whisker2.html">Multiple Whisker charts</a></li>
<li><a href="tree.html">Resource tree</a></li>
<li><a href="raw_graph.html">7 days of raw metrics as dot- or line- chart</a></li>
+ <li><a href="raw_graph7.html">7 days of raw metrics as dot- or line- chart - comparing daily values</a></li>
</ul>
</body>
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
new file mode 100644
index 0000000..62b2ec5
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
@@ -0,0 +1,228 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Raw mertic last 7 days</title>
+ <script type="text/javascript" src="js/d3.js"></script>
+ <script type="text/javascript" src="js/d3.layout.js"></script>
+ <script type="text/javascript" src="js/d3.time.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <style type="text/css">
+
+svg {
+ width: 960px;
+ height: 600px;
+ border: solid 1px #ccc;
+ font: 10px sans-serif;
+ shape-rendering: crispEdges;
+}
+.axis text
+{
+ fill: #333;
+ font-family: sans-serif;
+ font-size: 10px;
+}
+.axis .domain
+{
+ opacity: 0;
+}
+.tick
+{
+ stroke: #ccc;
+ stroke-dasharray: 1 5;
+}
+
+path {
+ stroke: steelblue;
+ stroke-width: 2;
+ fill: none;
+}
+
+line {
+ stroke: black;
+}
+
+ </style>
+ </head>
+ <body>
+ <h1 id="resId">Resource</h1>
+ <h2 id="header">Schedule</h2>
+<button id="dotsButton" onClick="transitionDots() ">Dots</button>
+<button id="lineButton" onClick="transitionLine()"/>Lines</button>
+<button id="bothButton" onClick="transitionBoth()"/>Both</button>
+
+ <div id="one"></div>
+ <script type="text/javascript">
+
+// Width and height of the chart to print
+var w = 960,
+ h = 600;
+
+// Get the platforms and then the first one
+$.getJSON('/rest/1/resource/platforms.json', function (json) {
+ var res = json[0];
+ var rid = res.resourceId;
+ $("#resId").text("Resource " + rid + " (" + res.resourceName + ")");
+
+ // Now get the metrical schedules of the platform
+ $.getJSON("/rest/1/resource/"+rid+"/schedules.json?type=metric", function (json2) {
+
+ // Take the first and render it
+ var schId = json2[0].scheduleId;
+ $("#header").text("Schedule " + schId + " (" + json2[0].scheduleName + "), base unit: " + json2[0].unit);
+
+
+// '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ d3.json(
+ '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ function (jsondata) {
+
+
+
+ var w = 960,
+ h = 600;
+ // compute min/max values for x and y a
+ var minVal = d3.min(jsondata,function(d) { return d.value;});
+ var maxVal = d3.max(jsondata,function(d) { return d.value;});
+ var minTsD = 0;
+ var maxTsD = 86400*1000;
+
+ var minTimestamp = d3.min(jsondata,function(d) { return d.timeStamp;});
+
+ var avg = d3.sum(jsondata,function(d) { return d.value;}) / jsondata.length;
+
+
+
+ WIDTH = w;
+ HEIGHT = h;
+ MARGINS = {top: 10, right: 10, bottom: 20, left: 10};
+
+ var xRange = d3.time.scale().range ([MARGINS.left, WIDTH - MARGINS.right]).domain([new Date(minTsD),new Date(maxTsD)]);
+ var yRange = d3.scale.linear().range ([HEIGHT - MARGINS.top, MARGINS.bottom]).domain([minVal, maxVal]);
+
+ // X axis range goes from lowest to highest timestamp
+ var x = d3.time.scale().domain([new Date(0),new Date(86400*1000)]).range([50, w-10]); // 50-> make room for label
+//var x = xRange;
+ var y = yRange;
+ // Y axis range goes from lowest to highest value
+ // var y = d3.scale.linear().domain([minVal, maxVal]).rangeRound([0, h]);
+ format = d3.time.format("%H:%M");
+
+
+ xAxis = d3.svg.axis() // generate an axis
+ .scale(x) // set the range of the axis
+ .tickSize(580) // height of the ticks
+ .tickSubdivide(true); // display ticks between text labels
+ yAxis = d3.svg.axis() // generate an axis
+ .scale(yRange) // set the range of the axis
+ .tickSize(3) // width of the ticks
+ .orient("right") // have the text labels on the right hand side
+ .tickFormat(d3.format("0e"))
+ .tickSubdivide(true); // display ticks between text labels
+
+// create the SVG
+ var svg = d3.select("body").append("svg:svg")
+ .attr("width", w)
+ .attr("height", h);
+
+// Create axes
+ svg.append("svg:g")
+ .attr("class","x axis")
+ .call(xAxis);
+
+ svg.append("svg:g")
+ .attr("class","y axis")
+ .attr("transform", "translate(" + (MARGINS.left) + ",0)")
+ .call(yAxis);
+
+ svg.append("svg:line")
+ .attr("x1","50")
+ .attr("x2","950")
+ .attr("y1",y(avg))
+ .attr("y2",y(avg))
+ .style("stroke","red")
+ .attr("style","stroke-dasharray:2 2; stroke:red")
+ ;
+
+// split the data into 7 data sets (1 per day)
+
+//var dat = d3.split(jsondata,function(d) { return (d.timeStamp-minTimestamp % 86400*1000) < 3*60*0000; });
+
+var colors = ["black","blue","green","cyan","red","orange","yellow"];
+var dat = putToBuckets(jsondata,7);
+
+for (day = 0 ; day < 7 ; day ++ ) {
+ var daydat = dat[day];
+ // Now lets "loop" over the data and show the dots
+ var lines = svg.append("svg:g").attr("class","linechart")
+ .attr("opacity","0");
+;
+ var dayMinTs = d3.min(daydat,function(d) { return d.timeStamp;});
+
+var line = d3.svg.line()
+ .x(function(d,i) { return x(d.timeStamp-dayMinTs); })
+ .y(function(d) { return y(d.value); })
+
+lines.append("svg:path").attr("d", line(daydat)).style("stroke",colors[day]);
+
+
+ var dot = svg.append("svg:g").attr("class","dotschart")
+ .selectAll("dot").data(jsondata)
+
+ dot.enter().append("svg:circle")
+ .attr("cx", function (d) {
+ return x(d.timeStamp-dayMinTs);
+ })
+ .attr("cy", function (d) {
+ return y(d.value);
+ })
+ .style("stroke", colors[day])
+ .attr("r", 1)
+
+}
+ });
+ })
+})
+
+function transitionDots() {
+ $(".linechart").attr("opacity",0);
+ $(".dotschart").attr("opacity",1);
+}
+
+function transitionLine() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",0);
+}
+function transitionBoth() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",1);
+}
+
+// put the data in d into n buckets
+function putToBuckets(data,n) {
+
+ var band = d3.extent(data,function(d){ return d.timeStamp;});
+ var bs = band[1] - band[0];
+// var bs = bs / n;
+ var bs = 86400*1000;
+
+console.log("bs : " + bs );
+console.log("min ts : " + band[0]);
+
+var dat = new Array(n);
+for (i = 0; i < n ; i++ ) {
+ dat[i]=new Array();
+}
+
+data.forEach(function (d) {
+ var diff = d.timeStamp-band[0];
+ var bucket = parseInt(diff / bs);
+console.log(d.timeStamp + ", " + diff + " buck : " + bucket);
+ dat[bucket].push(d);
+});
+
+return dat;
+}
+
+ </script>
+ </body>
+</html>
commit 9ada46462f71b39e160e215fce7b4676e2aadd87
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sun Jan 8 17:15:57 2012 +0100
Allow to also show lines and dots.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
index 598a0b8..44c42a5 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
@@ -46,8 +46,9 @@ line {
<body>
<h1 id="resId">Resource</h1>
<h2 id="header">Schedule</h2>
-<button id="dotsButton" onClick="transitionDots() ">Dots</button>
+<button id="dotsButton" onClick="transitionDots()">Dots</button>
<button id="lineButton" onClick="transitionLine()">Lines</button>
+<button id="bothButton" onClick="transitionBoth()">Both</button>
<div id="one"></div>
<script type="text/javascript">
@@ -174,6 +175,10 @@ function transitionLine() {
$(".linechart").attr("opacity",1);
$(".dotschart").attr("opacity",0);
}
+function transitionBoth() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",1);
+}
</script>
</body>
</html>
commit 3fa0177b1a7c943bd83291f35f4027c128f26984
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Jan 6 14:16:40 2012 +0100
Add an example of graphing raw data with D3.js as dots or lines.
Use D3 helpers for max/min, draw a line for the avg.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 9e96d76..7162c24 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -1,7 +1,7 @@
<html>
<body>
<h2>RHQ Rest API</h2>
-<b>Please note: the API is not stable at this point. Do not rely on it.</b><br/>
+<strong>Please note: the API is not stable at this point. Do not rely on it.</strong><br/>
Join us in making it great by providing feedback and contributions of code and examples
that use the api.
@@ -28,6 +28,7 @@ an empty database (meaning resource ids and schedule ids starting at 10001).
<li><a href="whisker.html">Whisker chart 1</a></li>
<li><a href="whisker2.html">Multiple Whisker charts</a></li>
<li><a href="tree.html">Resource tree</a></li>
+ <li><a href="raw_graph.html">7 days of raw metrics as dot- or line- chart</a></li>
</ul>
</body>
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
new file mode 100644
index 0000000..598a0b8
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
@@ -0,0 +1,179 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Raw mertic last 7 days</title>
+ <script type="text/javascript" src="js/d3.js"></script>
+ <script type="text/javascript" src="js/d3.layout.js"></script>
+ <script type="text/javascript" src="js/d3.time.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <style type="text/css">
+
+svg {
+ width: 960px;
+ height: 600px;
+ border: solid 1px #ccc;
+ font: 10px sans-serif;
+ shape-rendering: crispEdges;
+}
+.axis text
+{
+ fill: #333;
+ font-family: sans-serif;
+ font-size: 10px;
+}
+.axis .domain
+{
+ opacity: 0;
+}
+.tick
+{
+ stroke: #ccc;
+ stroke-dasharray: 1 5;
+}
+
+path {
+ stroke: steelblue;
+ stroke-width: 2;
+ fill: none;
+}
+
+line {
+ stroke: black;
+}
+
+ </style>
+ </head>
+ <body>
+ <h1 id="resId">Resource</h1>
+ <h2 id="header">Schedule</h2>
+<button id="dotsButton" onClick="transitionDots() ">Dots</button>
+<button id="lineButton" onClick="transitionLine()">Lines</button>
+
+ <div id="one"></div>
+ <script type="text/javascript">
+
+// Width and height of the chart to print
+var w = 960,
+ h = 600;
+
+// Get the platforms and then the first one
+$.getJSON('/rest/1/resource/platforms.json', function (json) {
+ var res = json[0];
+ var rid = res.resourceId;
+ $("#resId").text("Resource " + rid + " (" + res.resourceName + ")");
+
+ // Now get the metrical schedules of the platform
+ $.getJSON("/rest/1/resource/"+rid+"/schedules.json?type=metric", function (json2) {
+
+ // Take the first and render it
+ var schId = json2[0].scheduleId;
+ $("#header").text("Schedule " + schId + " (" + json2[0].scheduleName + "), base unit: " + json2[0].unit);
+
+ d3.json(
+ '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ function (jsondata) {
+
+ var w = 960,
+ h = 600;
+ // compute min/max values for x and y
+ var minVal = d3.min(jsondata,function(d) { return d.value;});
+ var maxVal = d3.max(jsondata,function(d) { return d.value;});
+ var minTsD = d3.min(jsondata,function(d) { return d.timeStamp;});
+ var maxTsD = d3.max(jsondata,function(d) { return d.timeStamp;});
+
+ var avg = d3.sum(jsondata,function(d) { return d.value;}) / jsondata.length;
+
+
+ WIDTH = w;
+ HEIGHT = h;
+ MARGINS = {top: 10, right: 10, bottom: 20, left: 10};
+
+ var xRange = d3.time.scale().range ([MARGINS.left, WIDTH - MARGINS.right]).domain([new Date(minTsD),new Date(maxTsD)]);
+ var yRange = d3.scale.linear().range ([HEIGHT - MARGINS.top, MARGINS.bottom]).domain([minVal, maxVal]);
+
+ // X axis range goes from lowest to highest timestamp
+ var x = d3.time.scale().domain([new Date(minTsD),new Date(maxTsD)]).range([50, w-10]); // 50-> make room for label
+ var y = yRange;
+ // Y axis range goes from lowest to highest value
+ // var y = d3.scale.linear().domain([minVal, maxVal]).rangeRound([0, h]);
+ format = d3.time.format("%H:%M");
+
+
+ xAxis = d3.svg.axis() // generate an axis
+ .scale(x) // set the range of the axis
+ .tickSize(580) // height of the ticks
+ .tickSubdivide(true); // display ticks between text labels
+ yAxis = d3.svg.axis() // generate an axis
+ .scale(yRange) // set the range of the axis
+ .tickSize(3) // width of the ticks
+ .orient("right") // have the text labels on the right hand side
+ .tickFormat(d3.format("0e"))
+ .tickSubdivide(true); // display ticks between text labels
+
+ // create the SVG
+ var svg = d3.select("body").append("svg:svg")
+ .attr("width", w)
+ .attr("height", h);
+
+ // Create axes
+ svg.append("svg:g")
+ .attr("class","x axis")
+ .call(xAxis);
+
+ svg.append("svg:g")
+ .attr("class","y axis")
+ .attr("transform", "translate(" + (MARGINS.left) + ",0)")
+ .call(yAxis);
+
+ // create horizontal line for avg
+ svg.append("svg:line")
+ .attr("x1","50")
+ .attr("x2","950")
+ .attr("y1",y(avg))
+ .attr("y2",y(avg))
+ .style("stroke","red")
+ .attr("style","stroke-dasharray:2 2; stroke:red")
+ ;
+
+
+ // Now lets "loop" over the data and show the dots
+ var lines = svg.append("svg:g").attr("class","linechart")
+ .attr("opacity","0");
+
+ var line = d3.svg.line()
+ .x(function(d,i) { return x(d.timeStamp); })
+ .y(function(d) { return y(d.value); });
+
+ lines.append("svg:path").attr("d", line(jsondata));
+
+
+ var dot = svg.append("svg:g").attr("class","dotschart")
+ .selectAll("dot").data(jsondata);
+
+ dot.enter().append("svg:circle")
+ .attr("cx", function (d) {
+ return x(d.timeStamp);
+ })
+ .attr("cy", function (d) {
+ return y(d.value);
+ })
+ .style("stroke", "blue")
+ .attr("r", 1)
+
+
+ });
+ })
+});
+
+function transitionDots() {
+ $(".linechart").attr("opacity",0);
+ $(".dotschart").attr("opacity",1);
+}
+
+function transitionLine() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",0);
+}
+ </script>
+ </body>
+</html>
commit 625f20d6922eaa4cad999cb583821a90ba9cef44
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jan 5 22:18:14 2012 +0100
Upgrade D3.js to version 2.7.1
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js
new file mode 100644
index 0000000..7565b83
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js
@@ -0,0 +1,92 @@
+(function(){d3.csv = function(url, callback) {
+ d3.text(url, "text/csv", function(text) {
+ callback(text && d3.csv.parse(text));
+ });
+};
+d3.csv.parse = function(text) {
+ var header;
+ return d3.csv.parseRows(text, function(row, i) {
+ if (i) {
+ var o = {}, j = -1, m = header.length;
+ while (++j < m) o[header[j]] = row[j];
+ return o;
+ } else {
+ header = row;
+ return null;
+ }
+ });
+};
+
+d3.csv.parseRows = function(text, f) {
+ var EOL = {}, // sentinel value for end-of-line
+ EOF = {}, // sentinel value for end-of-file
+ rows = [], // output rows
+ re = /\r\n|[,\r\n]/g, // field separator regex
+ n = 0, // the current line number
+ t, // the current token
+ eol; // is the current token followed by EOL?
+
+ re.lastIndex = 0; // work-around bug in FF 3.6
+
+ /** @private Returns the next token. */
+ function token() {
+ if (re.lastIndex >= text.length) return EOF; // special case: end of file
+ if (eol) { eol = false; return EOL; } // special case: end of line
+
+ // special case: quotes
+ var j = re.lastIndex;
+ if (text.charCodeAt(j) === 34) {
+ var i = j;
+ while (i++ < text.length) {
+ if (text.charCodeAt(i) === 34) {
+ if (text.charCodeAt(i + 1) !== 34) break;
+ i++;
+ }
+ }
+ re.lastIndex = i + 2;
+ var c = text.charCodeAt(i + 1);
+ if (c === 13) {
+ eol = true;
+ if (text.charCodeAt(i + 2) === 10) re.lastIndex++;
+ } else if (c === 10) {
+ eol = true;
+ }
+ return text.substring(j + 1, i).replace(/""/g, "\"");
+ }
+
+ // common case
+ var m = re.exec(text);
+ if (m) {
+ eol = m[0].charCodeAt(0) !== 44;
+ return text.substring(j, m.index);
+ }
+ re.lastIndex = text.length;
+ return text.substring(j);
+ }
+
+ while ((t = token()) !== EOF) {
+ var a = [];
+ while ((t !== EOL) && (t !== EOF)) {
+ a.push(t);
+ t = token();
+ }
+ if (f && !(a = f(a, n++))) continue;
+ rows.push(a);
+ }
+
+ return rows;
+};
+d3.csv.format = function(rows) {
+ return rows.map(d3_csv_formatRow).join("\n");
+};
+
+function d3_csv_formatRow(row) {
+ return row.map(d3_csv_formatValue).join(",");
+}
+
+function d3_csv_formatValue(text) {
+ return /[",\n]/.test(text)
+ ? "\"" + text.replace(/\"/g, "\"\"") + "\""
+ : text;
+}
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js
new file mode 100644
index 0000000..2b40252
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js
@@ -0,0 +1,938 @@
+(function(){d3.geo = {};
+
+var d3_geo_radians = Math.PI / 180;
+// TODO clip input coordinates on opposite hemisphere
+d3.geo.azimuthal = function() {
+ var mode = "orthographic", // or stereographic, gnomonic, equidistant or equalarea
+ origin,
+ scale = 200,
+ translate = [480, 250],
+ x0,
+ y0,
+ cy0,
+ sy0;
+
+ function azimuthal(coordinates) {
+ var x1 = coordinates[0] * d3_geo_radians - x0,
+ y1 = coordinates[1] * d3_geo_radians,
+ cx1 = Math.cos(x1),
+ sx1 = Math.sin(x1),
+ cy1 = Math.cos(y1),
+ sy1 = Math.sin(y1),
+ cc = mode !== "orthographic" ? sy0 * sy1 + cy0 * cy1 * cx1 : null,
+ c,
+ k = mode === "stereographic" ? 1 / (1 + cc)
+ : mode === "gnomonic" ? 1 / cc
+ : mode === "equidistant" ? (c = Math.acos(cc), c ? c / Math.sin(c) : 0)
+ : mode === "equalarea" ? Math.sqrt(2 / (1 + cc))
+ : 1,
+ x = k * cy1 * sx1,
+ y = k * (sy0 * cy1 * cx1 - cy0 * sy1);
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ azimuthal.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale,
+ p = Math.sqrt(x * x + y * y),
+ c = mode === "stereographic" ? 2 * Math.atan(p)
+ : mode === "gnomonic" ? Math.atan(p)
+ : mode === "equidistant" ? p
+ : mode === "equalarea" ? 2 * Math.asin(.5 * p)
+ : Math.asin(p),
+ sc = Math.sin(c),
+ cc = Math.cos(c);
+ return [
+ (x0 + Math.atan2(x * sc, p * cy0 * cc + y * sy0 * sc)) / d3_geo_radians,
+ Math.asin(cc * sy0 - (p ? (y * sc * cy0) / p : 0)) / d3_geo_radians
+ ];
+ };
+
+ azimuthal.mode = function(x) {
+ if (!arguments.length) return mode;
+ mode = x + "";
+ return azimuthal;
+ };
+
+ azimuthal.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ x0 = origin[0] * d3_geo_radians;
+ y0 = origin[1] * d3_geo_radians;
+ cy0 = Math.cos(y0);
+ sy0 = Math.sin(y0);
+ return azimuthal;
+ };
+
+ azimuthal.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return azimuthal;
+ };
+
+ azimuthal.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return azimuthal;
+ };
+
+ return azimuthal.origin([0, 0]);
+};
+// Derived from Tom Carden's Albers implementation for Protovis.
+// http://gist.github.com/476238
+// http://mathworld.wolfram.com/AlbersEqual-AreaConicProjection.html
+
+d3.geo.albers = function() {
+ var origin = [-98, 38],
+ parallels = [29.5, 45.5],
+ scale = 1000,
+ translate = [480, 250],
+ lng0, // d3_geo_radians * origin[0]
+ n,
+ C,
+ p0;
+
+ function albers(coordinates) {
+ var t = n * (d3_geo_radians * coordinates[0] - lng0),
+ p = Math.sqrt(C - 2 * n * Math.sin(d3_geo_radians * coordinates[1])) / n;
+ return [
+ scale * p * Math.sin(t) + translate[0],
+ scale * (p * Math.cos(t) - p0) + translate[1]
+ ];
+ }
+
+ albers.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale,
+ p0y = p0 + y,
+ t = Math.atan2(x, p0y),
+ p = Math.sqrt(x * x + p0y * p0y);
+ return [
+ (lng0 + t / n) / d3_geo_radians,
+ Math.asin((C - p * p * n * n) / (2 * n)) / d3_geo_radians
+ ];
+ };
+
+ function reload() {
+ var phi1 = d3_geo_radians * parallels[0],
+ phi2 = d3_geo_radians * parallels[1],
+ lat0 = d3_geo_radians * origin[1],
+ s = Math.sin(phi1),
+ c = Math.cos(phi1);
+ lng0 = d3_geo_radians * origin[0];
+ n = .5 * (s + Math.sin(phi2));
+ C = c * c + 2 * n * s;
+ p0 = Math.sqrt(C - 2 * n * Math.sin(lat0)) / n;
+ return albers;
+ }
+
+ albers.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = [+x[0], +x[1]];
+ return reload();
+ };
+
+ albers.parallels = function(x) {
+ if (!arguments.length) return parallels;
+ parallels = [+x[0], +x[1]];
+ return reload();
+ };
+
+ albers.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return albers;
+ };
+
+ albers.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return albers;
+ };
+
+ return reload();
+};
+
+// A composite projection for the United States, 960x500. The set of standard
+// parallels for each region comes from USGS, which is published here:
+// http://egsc.usgs.gov/isb/pubs/MapProjections/projections.html#albers
+// TODO allow the composite projection to be rescaled?
+d3.geo.albersUsa = function() {
+ var lower48 = d3.geo.albers();
+
+ var alaska = d3.geo.albers()
+ .origin([-160, 60])
+ .parallels([55, 65]);
+
+ var hawaii = d3.geo.albers()
+ .origin([-160, 20])
+ .parallels([8, 18]);
+
+ var puertoRico = d3.geo.albers()
+ .origin([-60, 10])
+ .parallels([8, 18]);
+
+ function albersUsa(coordinates) {
+ var lon = coordinates[0],
+ lat = coordinates[1];
+ return (lat > 50 ? alaska
+ : lon < -140 ? hawaii
+ : lat < 21 ? puertoRico
+ : lower48)(coordinates);
+ }
+
+ albersUsa.scale = function(x) {
+ if (!arguments.length) return lower48.scale();
+ lower48.scale(x);
+ alaska.scale(x * .6);
+ hawaii.scale(x);
+ puertoRico.scale(x * 1.5);
+ return albersUsa.translate(lower48.translate());
+ };
+
+ albersUsa.translate = function(x) {
+ if (!arguments.length) return lower48.translate();
+ var dz = lower48.scale() / 1000,
+ dx = x[0],
+ dy = x[1];
+ lower48.translate(x);
+ alaska.translate([dx - 400 * dz, dy + 170 * dz]);
+ hawaii.translate([dx - 190 * dz, dy + 200 * dz]);
+ puertoRico.translate([dx + 580 * dz, dy + 430 * dz]);
+ return albersUsa;
+ };
+
+ return albersUsa.scale(lower48.scale());
+};
+d3.geo.bonne = function() {
+ var scale = 200,
+ translate = [480, 250],
+ x0, // origin longitude in radians
+ y0, // origin latitude in radians
+ y1, // parallel latitude in radians
+ c1; // cot(y1)
+
+ function bonne(coordinates) {
+ var x = coordinates[0] * d3_geo_radians - x0,
+ y = coordinates[1] * d3_geo_radians - y0;
+ if (y1) {
+ var p = c1 + y1 - y, E = x * Math.cos(y) / p;
+ x = p * Math.sin(E);
+ y = p * Math.cos(E) - c1;
+ } else {
+ x *= Math.cos(y);
+ y *= -1;
+ }
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ bonne.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ if (y1) {
+ var c = c1 + y, p = Math.sqrt(x * x + c * c);
+ y = c1 + y1 - p;
+ x = x0 + p * Math.atan2(x, c) / Math.cos(y);
+ } else {
+ y *= -1;
+ x /= Math.cos(y);
+ }
+ return [
+ x / d3_geo_radians,
+ y / d3_geo_radians
+ ];
+ };
+
+ // 90° for Werner, 0° for Sinusoidal
+ bonne.parallel = function(x) {
+ if (!arguments.length) return y1 / d3_geo_radians;
+ c1 = 1 / Math.tan(y1 = x * d3_geo_radians);
+ return bonne;
+ };
+
+ bonne.origin = function(x) {
+ if (!arguments.length) return [x0 / d3_geo_radians, y0 / d3_geo_radians];
+ x0 = x[0] * d3_geo_radians;
+ y0 = x[1] * d3_geo_radians;
+ return bonne;
+ };
+
+ bonne.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return bonne;
+ };
+
+ bonne.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return bonne;
+ };
+
+ return bonne.origin([0, 0]).parallel(45);
+};
+d3.geo.equirectangular = function() {
+ var scale = 500,
+ translate = [480, 250];
+
+ function equirectangular(coordinates) {
+ var x = coordinates[0] / 360,
+ y = -coordinates[1] / 360;
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ equirectangular.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ return [
+ 360 * x,
+ -360 * y
+ ];
+ };
+
+ equirectangular.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return equirectangular;
+ };
+
+ equirectangular.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return equirectangular;
+ };
+
+ return equirectangular;
+};
+d3.geo.mercator = function() {
+ var scale = 500,
+ translate = [480, 250];
+
+ function mercator(coordinates) {
+ var x = coordinates[0] / 360,
+ y = -(Math.log(Math.tan(Math.PI / 4 + coordinates[1] * d3_geo_radians / 2)) / d3_geo_radians) / 360;
+ return [
+ scale * x + translate[0],
+ scale * Math.max(-.5, Math.min(.5, y)) + translate[1]
+ ];
+ }
+
+ mercator.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ return [
+ 360 * x,
+ 2 * Math.atan(Math.exp(-360 * y * d3_geo_radians)) / d3_geo_radians - 90
+ ];
+ };
+
+ mercator.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return mercator;
+ };
+
+ mercator.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return mercator;
+ };
+
+ return mercator;
+};
+function d3_geo_type(types, defaultValue) {
+ return function(object) {
+ return object && object.type in types ? types[object.type](object) : defaultValue;
+ };
+}
+/**
+ * Returns a function that, given a GeoJSON object (e.g., a feature), returns
+ * the corresponding SVG path. The function can be customized by overriding the
+ * projection. Point features are mapped to circles with a default radius of
+ * 4.5px; the radius can be specified either as a constant or a function that
+ * is evaluated per object.
+ */
+d3.geo.path = function() {
+ var pointRadius = 4.5,
+ pointCircle = d3_path_circle(pointRadius),
+ projection = d3.geo.albersUsa();
+
+ function path(d, i) {
+ if (typeof pointRadius === "function") {
+ pointCircle = d3_path_circle(pointRadius.apply(this, arguments));
+ }
+ return pathType(d) || null;
+ }
+
+ function project(coordinates) {
+ return projection(coordinates).join(",");
+ }
+
+ var pathType = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var path = [],
+ features = o.features,
+ i = -1, // features.index
+ n = features.length;
+ while (++i < n) path.push(pathType(features[i].geometry));
+ return path.join("");
+ },
+
+ Feature: function(o) {
+ return pathType(o.geometry);
+ },
+
+ Point: function(o) {
+ return "M" + project(o.coordinates) + pointCircle;
+ },
+
+ MultiPoint: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) path.push("M", project(coordinates[i]), pointCircle);
+ return path.join("");
+ },
+
+ LineString: function(o) {
+ var path = ["M"],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) path.push(project(coordinates[i]), "L");
+ path.pop();
+ return path.join("");
+ },
+
+ MultiLineString: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates.index
+ m; // subcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ m = subcoordinates.length;
+ path.push("M");
+ while (++j < m) path.push(project(subcoordinates[j]), "L");
+ path.pop();
+ }
+ return path.join("");
+ },
+
+ Polygon: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates.index
+ m; // subcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ if ((m = subcoordinates.length - 1) > 0) {
+ path.push("M");
+ while (++j < m) path.push(project(subcoordinates[j]), "L");
+ path[path.length - 1] = "Z";
+ }
+ }
+ return path.join("");
+ },
+
+ MultiPolygon: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates index
+ m, // subcoordinates.length
+ subsubcoordinates, // subcoordinates[j]
+ k, // subsubcoordinates index
+ p; // subsubcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ m = subcoordinates.length;
+ while (++j < m) {
+ subsubcoordinates = subcoordinates[j];
+ k = -1;
+ if ((p = subsubcoordinates.length - 1) > 0) {
+ path.push("M");
+ while (++k < p) path.push(project(subsubcoordinates[k]), "L");
+ path[path.length - 1] = "Z";
+ }
+ }
+ }
+ return path.join("");
+ },
+
+ GeometryCollection: function(o) {
+ var path = [],
+ geometries = o.geometries,
+ i = -1, // geometries index
+ n = geometries.length;
+ while (++i < n) path.push(pathType(geometries[i]));
+ return path.join("");
+ }
+
+ });
+
+ var areaType = path.area = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var area = 0,
+ features = o.features,
+ i = -1, // features.index
+ n = features.length;
+ while (++i < n) area += areaType(features[i]);
+ return area;
+ },
+
+ Feature: function(o) {
+ return areaType(o.geometry);
+ },
+
+ Polygon: function(o) {
+ return polygonArea(o.coordinates);
+ },
+
+ MultiPolygon: function(o) {
+ var sum = 0,
+ coordinates = o.coordinates,
+ i = -1, // coordinates index
+ n = coordinates.length;
+ while (++i < n) sum += polygonArea(coordinates[i]);
+ return sum;
+ },
+
+ GeometryCollection: function(o) {
+ var sum = 0,
+ geometries = o.geometries,
+ i = -1, // geometries index
+ n = geometries.length;
+ while (++i < n) sum += areaType(geometries[i]);
+ return sum;
+ }
+
+ }, 0);
+
+ function polygonArea(coordinates) {
+ var sum = area(coordinates[0]), // exterior ring
+ i = 0, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) sum -= area(coordinates[i]); // holes
+ return sum;
+ }
+
+ function polygonCentroid(coordinates) {
+ var polygon = d3.geom.polygon(coordinates[0].map(projection)), // exterior ring
+ area = polygon.area(),
+ centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1),
+ x = centroid[0],
+ y = centroid[1],
+ z = area,
+ i = 0, // coordinates index
+ n = coordinates.length;
+ while (++i < n) {
+ polygon = d3.geom.polygon(coordinates[i].map(projection)); // holes
+ area = polygon.area();
+ centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1);
+ x -= centroid[0];
+ y -= centroid[1];
+ z -= area;
+ }
+ return [x, y, 6 * z]; // weighted centroid
+ }
+
+ var centroidType = path.centroid = d3_geo_type({
+
+ // TODO FeatureCollection
+ // TODO Point
+ // TODO MultiPoint
+ // TODO LineString
+ // TODO MultiLineString
+ // TODO GeometryCollection
+
+ Feature: function(o) {
+ return centroidType(o.geometry);
+ },
+
+ Polygon: function(o) {
+ var centroid = polygonCentroid(o.coordinates);
+ return [centroid[0] / centroid[2], centroid[1] / centroid[2]];
+ },
+
+ MultiPolygon: function(o) {
+ var area = 0,
+ coordinates = o.coordinates,
+ centroid,
+ x = 0,
+ y = 0,
+ z = 0,
+ i = -1, // coordinates index
+ n = coordinates.length;
+ while (++i < n) {
+ centroid = polygonCentroid(coordinates[i]);
+ x += centroid[0];
+ y += centroid[1];
+ z += centroid[2];
+ }
+ return [x / z, y / z];
+ }
+
+ });
+
+ function area(coordinates) {
+ return Math.abs(d3.geom.polygon(coordinates.map(projection)).area());
+ }
+
+ path.projection = function(x) {
+ projection = x;
+ return path;
+ };
+
+ path.pointRadius = function(x) {
+ if (typeof x === "function") pointRadius = x;
+ else {
+ pointRadius = +x;
+ pointCircle = d3_path_circle(pointRadius);
+ }
+ return path;
+ };
+
+ return path;
+};
+
+function d3_path_circle(radius) {
+ return "m0," + radius
+ + "a" + radius + "," + radius + " 0 1,1 0," + (-2 * radius)
+ + "a" + radius + "," + radius + " 0 1,1 0," + (+2 * radius)
+ + "z";
+}
+/**
+ * Given a GeoJSON object, returns the corresponding bounding box. The bounding
+ * box is represented by a two-dimensional array: [[left, bottom], [right,
+ * top]], where left is the minimum longitude, bottom is the minimum latitude,
+ * right is maximum longitude, and top is the maximum latitude.
+ */
+d3.geo.bounds = function(feature) {
+ var left = Infinity,
+ bottom = Infinity,
+ right = -Infinity,
+ top = -Infinity;
+ d3_geo_bounds(feature, function(x, y) {
+ if (x < left) left = x;
+ if (x > right) right = x;
+ if (y < bottom) bottom = y;
+ if (y > top) top = y;
+ });
+ return [[left, bottom], [right, top]];
+};
+
+function d3_geo_bounds(o, f) {
+ if (o.type in d3_geo_boundsTypes) d3_geo_boundsTypes[o.type](o, f);
+}
+
+var d3_geo_boundsTypes = {
+ Feature: d3_geo_boundsFeature,
+ FeatureCollection: d3_geo_boundsFeatureCollection,
+ GeometryCollection: d3_geo_boundsGeometryCollection,
+ LineString: d3_geo_boundsLineString,
+ MultiLineString: d3_geo_boundsMultiLineString,
+ MultiPoint: d3_geo_boundsLineString,
+ MultiPolygon: d3_geo_boundsMultiPolygon,
+ Point: d3_geo_boundsPoint,
+ Polygon: d3_geo_boundsPolygon
+};
+
+function d3_geo_boundsFeature(o, f) {
+ d3_geo_bounds(o.geometry, f);
+}
+
+function d3_geo_boundsFeatureCollection(o, f) {
+ for (var a = o.features, i = 0, n = a.length; i < n; i++) {
+ d3_geo_bounds(a[i].geometry, f);
+ }
+}
+
+function d3_geo_boundsGeometryCollection(o, f) {
+ for (var a = o.geometries, i = 0, n = a.length; i < n; i++) {
+ d3_geo_bounds(a[i], f);
+ }
+}
+
+function d3_geo_boundsLineString(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ f.apply(null, a[i]);
+ }
+}
+
+function d3_geo_boundsMultiLineString(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ for (var b = a[i], j = 0, m = b.length; j < m; j++) {
+ f.apply(null, b[j]);
+ }
+ }
+}
+
+function d3_geo_boundsMultiPolygon(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ for (var b = a[i][0], j = 0, m = b.length; j < m; j++) {
+ f.apply(null, b[j]);
+ }
+ }
+}
+
+function d3_geo_boundsPoint(o, f) {
+ f.apply(null, o.coordinates);
+}
+
+function d3_geo_boundsPolygon(o, f) {
+ for (var a = o.coordinates[0], i = 0, n = a.length; i < n; i++) {
+ f.apply(null, a[i]);
+ }
+}
+// TODO breakAtDateLine?
+
+d3.geo.circle = function() {
+ var origin = [0, 0],
+ degrees = 90 - 1e-2,
+ radians = degrees * d3_geo_radians,
+ arc = d3.geo.greatArc().target(Object);
+
+ function circle() {
+ // TODO render a circle as a Polygon
+ }
+
+ function visible(point) {
+ return arc.distance(point) < radians;
+ }
+
+ circle.clip = function(d) {
+ arc.source(typeof origin === "function" ? origin.apply(this, arguments) : origin);
+ return clipType(d);
+ };
+
+ var clipType = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var features = o.features.map(clipType).filter(Object);
+ return features && (o = Object.create(o), o.features = features, o);
+ },
+
+ Feature: function(o) {
+ var geometry = clipType(o.geometry);
+ return geometry && (o = Object.create(o), o.geometry = geometry, o);
+ },
+
+ Point: function(o) {
+ return visible(o.coordinates) && o;
+ },
+
+ MultiPoint: function(o) {
+ var coordinates = o.coordinates.filter(visible);
+ return coordinates.length && {
+ type: o.type,
+ coordinates: coordinates
+ };
+ },
+
+ LineString: function(o) {
+ var coordinates = clip(o.coordinates);
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ MultiLineString: function(o) {
+ var coordinates = o.coordinates.map(clip).filter(function(d) { return d.length; });
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ Polygon: function(o) {
+ var coordinates = o.coordinates.map(clip);
+ return coordinates[0].length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ MultiPolygon: function(o) {
+ var coordinates = o.coordinates.map(function(d) { return d.map(clip); }).filter(function(d) { return d[0].length; });
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ GeometryCollection: function(o) {
+ var geometries = o.geometries.map(clipType).filter(Object);
+ return geometries.length && (o = Object.create(o), o.geometries = geometries, o);
+ }
+
+ });
+
+ function clip(coordinates) {
+ var i = -1,
+ n = coordinates.length,
+ clipped = [],
+ p0,
+ p1,
+ p2,
+ d0,
+ d1;
+
+ while (++i < n) {
+ d1 = arc.distance(p2 = coordinates[i]);
+ if (d1 < radians) {
+ if (p1) clipped.push(d3_geo_greatArcInterpolate(p1, p2)((d0 - radians) / (d0 - d1)));
+ clipped.push(p2);
+ p0 = p1 = null;
+ } else {
+ p1 = p2;
+ if (!p0 && clipped.length) {
+ clipped.push(d3_geo_greatArcInterpolate(clipped[clipped.length - 1], p1)((radians - d0) / (d1 - d0)));
+ p0 = p1;
+ }
+ }
+ d0 = d1;
+ }
+
+ if (p1 && clipped.length) {
+ d1 = arc.distance(p2 = clipped[0]);
+ clipped.push(d3_geo_greatArcInterpolate(p1, p2)((d0 - radians) / (d0 - d1)));
+ }
+
+ return resample(clipped);
+ }
+
+ // Resample coordinates, creating great arcs between each.
+ function resample(coordinates) {
+ var i = 0,
+ n = coordinates.length,
+ j,
+ m,
+ resampled = n ? [coordinates[0]] : coordinates,
+ resamples,
+ origin = arc.source();
+
+ while (++i < n) {
+ resamples = arc.source(coordinates[i - 1])(coordinates[i]).coordinates;
+ for (j = 0, m = resamples.length; ++j < m;) resampled.push(resamples[j]);
+ }
+
+ arc.source(origin);
+ return resampled;
+ }
+
+ circle.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ return circle;
+ };
+
+ circle.angle = function(x) {
+ if (!arguments.length) return degrees;
+ radians = (degrees = +x) * d3_geo_radians;
+ return circle;
+ };
+
+ // Precision is specified in degrees.
+ circle.precision = function(x) {
+ if (!arguments.length) return arc.precision();
+ arc.precision(x);
+ return circle;
+ };
+
+ return circle;
+}
+d3.geo.greatArc = function() {
+ var source = d3_geo_greatArcSource,
+ target = d3_geo_greatArcTarget,
+ precision = 6 * d3_geo_radians;
+
+ function greatArc() {
+ var a = typeof source === "function" ? source.apply(this, arguments) : source,
+ b = typeof target === "function" ? target.apply(this, arguments) : target,
+ i = d3_geo_greatArcInterpolate(a, b),
+ dt = precision / i.d,
+ t = 0,
+ coordinates = [a];
+ while ((t += dt) < 1) coordinates.push(i(t));
+ coordinates.push(b);
+ return {
+ type: "LineString",
+ coordinates: coordinates
+ };
+ }
+
+ // Length returned in radians; multiply by radius for distance.
+ greatArc.distance = function() {
+ var a = typeof source === "function" ? source.apply(this, arguments) : source,
+ b = typeof target === "function" ? target.apply(this, arguments) : target;
+ return d3_geo_greatArcInterpolate(a, b).d;
+ };
+
+ greatArc.source = function(x) {
+ if (!arguments.length) return source;
+ source = x;
+ return greatArc;
+ };
+
+ greatArc.target = function(x) {
+ if (!arguments.length) return target;
+ target = x;
+ return greatArc;
+ };
+
+ // Precision is specified in degrees.
+ greatArc.precision = function(x) {
+ if (!arguments.length) return precision / d3_geo_radians;
+ precision = x * d3_geo_radians;
+ return greatArc;
+ };
+
+ return greatArc;
+};
+
+function d3_geo_greatArcSource(d) {
+ return d.source;
+}
+
+function d3_geo_greatArcTarget(d) {
+ return d.target;
+}
+
+function d3_geo_greatArcInterpolate(a, b) {
+ var x0 = a[0] * d3_geo_radians, cx0 = Math.cos(x0), sx0 = Math.sin(x0),
+ y0 = a[1] * d3_geo_radians, cy0 = Math.cos(y0), sy0 = Math.sin(y0),
+ x1 = b[0] * d3_geo_radians, cx1 = Math.cos(x1), sx1 = Math.sin(x1),
+ y1 = b[1] * d3_geo_radians, cy1 = Math.cos(y1), sy1 = Math.sin(y1),
+ d = interpolate.d = Math.acos(Math.max(-1, Math.min(1, sy0 * sy1 + cy0 * cy1 * Math.cos(x1 - x0)))),
+ sd = Math.sin(d);
+
+ // From http://williams.best.vwh.net/avform.htm#Intermediate
+ function interpolate(t) {
+ var A = Math.sin(d - (t *= d)) / sd,
+ B = Math.sin(t) / sd,
+ x = A * cy0 * cx0 + B * cy1 * cx1,
+ y = A * cy0 * sx0 + B * cy1 * sx1,
+ z = A * sy0 + B * sy1;
+ return [
+ Math.atan2(y, x) / d3_geo_radians,
+ Math.atan2(z, Math.sqrt(x * x + y * y)) / d3_geo_radians
+ ];
+ }
+
+ return interpolate;
+}
+d3.geo.greatCircle = d3.geo.circle;
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js
new file mode 100644
index 0000000..d860c2b
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js
@@ -0,0 +1,835 @@
+(function(){d3.geom = {};
+/**
+ * Computes a contour for a given input grid function using the <a
+ * href="http://en.wikipedia.org/wiki/Marching_squares">marching
+ * squares</a> algorithm. Returns the contour polygon as an array of points.
+ *
+ * @param grid a two-input function(x, y) that returns true for values
+ * inside the contour and false for values outside the contour.
+ * @param start an optional starting point [x, y] on the grid.
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.contour = function(grid, start) {
+ var s = start || d3_geom_contourStart(grid), // starting point
+ c = [], // contour polygon
+ x = s[0], // current x position
+ y = s[1], // current y position
+ dx = 0, // next x direction
+ dy = 0, // next y direction
+ pdx = NaN, // previous x direction
+ pdy = NaN, // previous y direction
+ i = 0;
+
+ do {
+ // determine marching squares index
+ i = 0;
+ if (grid(x-1, y-1)) i += 1;
+ if (grid(x, y-1)) i += 2;
+ if (grid(x-1, y )) i += 4;
+ if (grid(x, y )) i += 8;
+
+ // determine next direction
+ if (i === 6) {
+ dx = pdy === -1 ? -1 : 1;
+ dy = 0;
+ } else if (i === 9) {
+ dx = 0;
+ dy = pdx === 1 ? -1 : 1;
+ } else {
+ dx = d3_geom_contourDx[i];
+ dy = d3_geom_contourDy[i];
+ }
+
+ // update contour polygon
+ if (dx != pdx && dy != pdy) {
+ c.push([x, y]);
+ pdx = dx;
+ pdy = dy;
+ }
+
+ x += dx;
+ y += dy;
+ } while (s[0] != x || s[1] != y);
+
+ return c;
+};
+
+// lookup tables for marching directions
+var d3_geom_contourDx = [1, 0, 1, 1,-1, 0,-1, 1,0, 0,0,0,-1, 0,-1,NaN],
+ d3_geom_contourDy = [0,-1, 0, 0, 0,-1, 0, 0,1,-1,1,1, 0,-1, 0,NaN];
+
+function d3_geom_contourStart(grid) {
+ var x = 0,
+ y = 0;
+
+ // search for a starting point; begin at origin
+ // and proceed along outward-expanding diagonals
+ while (true) {
+ if (grid(x,y)) {
+ return [x,y];
+ }
+ if (x === 0) {
+ x = y + 1;
+ y = 0;
+ } else {
+ x = x - 1;
+ y = y + 1;
+ }
+ }
+}
+/**
+ * Computes the 2D convex hull of a set of points using Graham's scanning
+ * algorithm. The algorithm has been implemented as described in Cormen,
+ * Leiserson, and Rivest's Introduction to Algorithms. The running time of
+ * this algorithm is O(n log n), where n is the number of input points.
+ *
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.hull = function(vertices) {
+ if (vertices.length < 3) return [];
+
+ var len = vertices.length,
+ plen = len - 1,
+ points = [],
+ stack = [],
+ i, j, h = 0, x1, y1, x2, y2, u, v, a, sp;
+
+ // find the starting ref point: leftmost point with the minimum y coord
+ for (i=1; i<len; ++i) {
+ if (vertices[i][1] < vertices[h][1]) {
+ h = i;
+ } else if (vertices[i][1] == vertices[h][1]) {
+ h = (vertices[i][0] < vertices[h][0] ? i : h);
+ }
+ }
+
+ // calculate polar angles from ref point and sort
+ for (i=0; i<len; ++i) {
+ if (i === h) continue;
+ y1 = vertices[i][1] - vertices[h][1];
+ x1 = vertices[i][0] - vertices[h][0];
+ points.push({angle: Math.atan2(y1, x1), index: i});
+ }
+ points.sort(function(a, b) { return a.angle - b.angle; });
+
+ // toss out duplicate angles
+ a = points[0].angle;
+ v = points[0].index;
+ u = 0;
+ for (i=1; i<plen; ++i) {
+ j = points[i].index;
+ if (a == points[i].angle) {
+ // keep angle for point most distant from the reference
+ x1 = vertices[v][0] - vertices[h][0];
+ y1 = vertices[v][1] - vertices[h][1];
+ x2 = vertices[j][0] - vertices[h][0];
+ y2 = vertices[j][1] - vertices[h][1];
+ if ((x1*x1 + y1*y1) >= (x2*x2 + y2*y2)) {
+ points[i].index = -1;
+ } else {
+ points[u].index = -1;
+ a = points[i].angle;
+ u = i;
+ v = j;
+ }
+ } else {
+ a = points[i].angle;
+ u = i;
+ v = j;
+ }
+ }
+
+ // initialize the stack
+ stack.push(h);
+ for (i=0, j=0; i<2; ++j) {
+ if (points[j].index !== -1) {
+ stack.push(points[j].index);
+ i++;
+ }
+ }
+ sp = stack.length;
+
+ // do graham's scan
+ for (; j<plen; ++j) {
+ if (points[j].index === -1) continue; // skip tossed out points
+ while (!d3_geom_hullCCW(stack[sp-2], stack[sp-1], points[j].index, vertices)) {
+ --sp;
+ }
+ stack[sp++] = points[j].index;
+ }
+
+ // construct the hull
+ var poly = [];
+ for (i=0; i<sp; ++i) {
+ poly.push(vertices[stack[i]]);
+ }
+ return poly;
+}
+
+// are three points in counter-clockwise order?
+function d3_geom_hullCCW(i1, i2, i3, v) {
+ var t, a, b, c, d, e, f;
+ t = v[i1]; a = t[0]; b = t[1];
+ t = v[i2]; c = t[0]; d = t[1];
+ t = v[i3]; e = t[0]; f = t[1];
+ return ((f-b)*(c-a) - (d-b)*(e-a)) > 0;
+}
+// Note: requires coordinates to be counterclockwise and convex!
+d3.geom.polygon = function(coordinates) {
+
+ coordinates.area = function() {
+ var i = 0,
+ n = coordinates.length,
+ a = coordinates[n - 1][0] * coordinates[0][1],
+ b = coordinates[n - 1][1] * coordinates[0][0];
+ while (++i < n) {
+ a += coordinates[i - 1][0] * coordinates[i][1];
+ b += coordinates[i - 1][1] * coordinates[i][0];
+ }
+ return (b - a) * .5;
+ };
+
+ coordinates.centroid = function(k) {
+ var i = -1,
+ n = coordinates.length - 1,
+ x = 0,
+ y = 0,
+ a,
+ b,
+ c;
+ if (!arguments.length) k = -1 / (6 * coordinates.area());
+ while (++i < n) {
+ a = coordinates[i];
+ b = coordinates[i + 1];
+ c = a[0] * b[1] - b[0] * a[1];
+ x += (a[0] + b[0]) * c;
+ y += (a[1] + b[1]) * c;
+ }
+ return [x * k, y * k];
+ };
+
+ // The Sutherland-Hodgman clipping algorithm.
+ coordinates.clip = function(subject) {
+ var input,
+ i = -1,
+ n = coordinates.length,
+ j,
+ m,
+ a = coordinates[n - 1],
+ b,
+ c,
+ d;
+ while (++i < n) {
+ input = subject.slice();
+ subject.length = 0;
+ b = coordinates[i];
+ c = input[(m = input.length) - 1];
+ j = -1;
+ while (++j < m) {
+ d = input[j];
+ if (d3_geom_polygonInside(d, a, b)) {
+ if (!d3_geom_polygonInside(c, a, b)) {
+ subject.push(d3_geom_polygonIntersect(c, d, a, b));
+ }
+ subject.push(d);
+ } else if (d3_geom_polygonInside(c, a, b)) {
+ subject.push(d3_geom_polygonIntersect(c, d, a, b));
+ }
+ c = d;
+ }
+ a = b;
+ }
+ return subject;
+ };
+
+ return coordinates;
+};
+
+function d3_geom_polygonInside(p, a, b) {
+ return (b[0] - a[0]) * (p[1] - a[1]) < (b[1] - a[1]) * (p[0] - a[0]);
+}
+
+// Intersect two infinite lines cd and ab.
+function d3_geom_polygonIntersect(c, d, a, b) {
+ var x1 = c[0], x2 = d[0], x3 = a[0], x4 = b[0],
+ y1 = c[1], y2 = d[1], y3 = a[1], y4 = b[1],
+ x13 = x1 - x3,
+ x21 = x2 - x1,
+ x43 = x4 - x3,
+ y13 = y1 - y3,
+ y21 = y2 - y1,
+ y43 = y4 - y3,
+ ua = (x43 * y13 - y43 * x13) / (y43 * x21 - x43 * y21);
+ return [x1 + ua * x21, y1 + ua * y21];
+}
+// Adapted from Nicolas Garcia Belmonte's JIT implementation:
+// http://blog.thejit.org/2010/02/12/voronoi-tessellation/
+// http://blog.thejit.org/assets/voronoijs/voronoi.js
+// See lib/jit/LICENSE for details.
+
+// Notes:
+//
+// This implementation does not clip the returned polygons, so if you want to
+// clip them to a particular shape you will need to do that either in SVG or by
+// post-processing with d3.geom.polygon's clip method.
+//
+// If any vertices are coincident or have NaN positions, the behavior of this
+// method is undefined. Most likely invalid polygons will be returned. You
+// should filter invalid points, and consolidate coincident points, before
+// computing the tessellation.
+
+/**
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygons [[[x1, y1], [x2, y2], …], …]
+ */
+d3.geom.voronoi = function(vertices) {
+ var polygons = vertices.map(function() { return []; });
+
+ d3_voronoi_tessellate(vertices, function(e) {
+ var s1,
+ s2,
+ x1,
+ x2,
+ y1,
+ y2;
+ if (e.a === 1 && e.b >= 0) {
+ s1 = e.ep.r;
+ s2 = e.ep.l;
+ } else {
+ s1 = e.ep.l;
+ s2 = e.ep.r;
+ }
+ if (e.a === 1) {
+ y1 = s1 ? s1.y : -1e6;
+ x1 = e.c - e.b * y1;
+ y2 = s2 ? s2.y : 1e6;
+ x2 = e.c - e.b * y2;
+ } else {
+ x1 = s1 ? s1.x : -1e6;
+ y1 = e.c - e.a * x1;
+ x2 = s2 ? s2.x : 1e6;
+ y2 = e.c - e.a * x2;
+ }
+ var v1 = [x1, y1],
+ v2 = [x2, y2];
+ polygons[e.region.l.index].push(v1, v2);
+ polygons[e.region.r.index].push(v1, v2);
+ });
+
+ // Reconnect the polygon segments into counterclockwise loops.
+ return polygons.map(function(polygon, i) {
+ var cx = vertices[i][0],
+ cy = vertices[i][1];
+ polygon.forEach(function(v) {
+ v.angle = Math.atan2(v[0] - cx, v[1] - cy);
+ });
+ return polygon.sort(function(a, b) {
+ return a.angle - b.angle;
+ }).filter(function(d, i) {
+ return !i || (d.angle - polygon[i - 1].angle > 1e-10);
+ });
+ });
+};
+
+var d3_voronoi_opposite = {"l": "r", "r": "l"};
+
+function d3_voronoi_tessellate(vertices, callback) {
+
+ var Sites = {
+ list: vertices
+ .map(function(v, i) {
+ return {
+ index: i,
+ x: v[0],
+ y: v[1]
+ };
+ })
+ .sort(function(a, b) {
+ return a.y < b.y ? -1
+ : a.y > b.y ? 1
+ : a.x < b.x ? -1
+ : a.x > b.x ? 1
+ : 0;
+ }),
+ bottomSite: null
+ };
+
+ var EdgeList = {
+ list: [],
+ leftEnd: null,
+ rightEnd: null,
+
+ init: function() {
+ EdgeList.leftEnd = EdgeList.createHalfEdge(null, "l");
+ EdgeList.rightEnd = EdgeList.createHalfEdge(null, "l");
+ EdgeList.leftEnd.r = EdgeList.rightEnd;
+ EdgeList.rightEnd.l = EdgeList.leftEnd;
+ EdgeList.list.unshift(EdgeList.leftEnd, EdgeList.rightEnd);
+ },
+
+ createHalfEdge: function(edge, side) {
+ return {
+ edge: edge,
+ side: side,
+ vertex: null,
+ "l": null,
+ "r": null
+ };
+ },
+
+ insert: function(lb, he) {
+ he.l = lb;
+ he.r = lb.r;
+ lb.r.l = he;
+ lb.r = he;
+ },
+
+ leftBound: function(p) {
+ var he = EdgeList.leftEnd;
+ do {
+ he = he.r;
+ } while (he != EdgeList.rightEnd && Geom.rightOf(he, p));
+ he = he.l;
+ return he;
+ },
+
+ del: function(he) {
+ he.l.r = he.r;
+ he.r.l = he.l;
+ he.edge = null;
+ },
+
+ right: function(he) {
+ return he.r;
+ },
+
+ left: function(he) {
+ return he.l;
+ },
+
+ leftRegion: function(he) {
+ return he.edge == null
+ ? Sites.bottomSite
+ : he.edge.region[he.side];
+ },
+
+ rightRegion: function(he) {
+ return he.edge == null
+ ? Sites.bottomSite
+ : he.edge.region[d3_voronoi_opposite[he.side]];
+ }
+ };
+
+ var Geom = {
+
+ bisect: function(s1, s2) {
+ var newEdge = {
+ region: {"l": s1, "r": s2},
+ ep: {"l": null, "r": null}
+ };
+
+ var dx = s2.x - s1.x,
+ dy = s2.y - s1.y,
+ adx = dx > 0 ? dx : -dx,
+ ady = dy > 0 ? dy : -dy;
+
+ newEdge.c = s1.x * dx + s1.y * dy
+ + (dx * dx + dy * dy) * .5;
+
+ if (adx > ady) {
+ newEdge.a = 1;
+ newEdge.b = dy / dx;
+ newEdge.c /= dx;
+ } else {
+ newEdge.b = 1;
+ newEdge.a = dx / dy;
+ newEdge.c /= dy;
+ }
+
+ return newEdge;
+ },
+
+ intersect: function(el1, el2) {
+ var e1 = el1.edge,
+ e2 = el2.edge;
+ if (!e1 || !e2 || (e1.region.r == e2.region.r)) {
+ return null;
+ }
+ var d = (e1.a * e2.b) - (e1.b * e2.a);
+ if (Math.abs(d) < 1e-10) {
+ return null;
+ }
+ var xint = (e1.c * e2.b - e2.c * e1.b) / d,
+ yint = (e2.c * e1.a - e1.c * e2.a) / d,
+ e1r = e1.region.r,
+ e2r = e2.region.r,
+ el,
+ e;
+ if ((e1r.y < e2r.y) ||
+ (e1r.y == e2r.y && e1r.x < e2r.x)) {
+ el = el1;
+ e = e1;
+ } else {
+ el = el2;
+ e = e2;
+ }
+ var rightOfSite = (xint >= e.region.r.x);
+ if ((rightOfSite && (el.side === "l")) ||
+ (!rightOfSite && (el.side === "r"))) {
+ return null;
+ }
+ return {
+ x: xint,
+ y: yint
+ };
+ },
+
+ rightOf: function(he, p) {
+ var e = he.edge,
+ topsite = e.region.r,
+ rightOfSite = (p.x > topsite.x);
+
+ if (rightOfSite && (he.side === "l")) {
+ return 1;
+ }
+ if (!rightOfSite && (he.side === "r")) {
+ return 0;
+ }
+ if (e.a === 1) {
+ var dyp = p.y - topsite.y,
+ dxp = p.x - topsite.x,
+ fast = 0,
+ above = 0;
+
+ if ((!rightOfSite && (e.b < 0)) ||
+ (rightOfSite && (e.b >= 0))) {
+ above = fast = (dyp >= e.b * dxp);
+ } else {
+ above = ((p.x + p.y * e.b) > e.c);
+ if (e.b < 0) {
+ above = !above;
+ }
+ if (!above) {
+ fast = 1;
+ }
+ }
+ if (!fast) {
+ var dxs = topsite.x - e.region.l.x;
+ above = (e.b * (dxp * dxp - dyp * dyp)) <
+ (dxs * dyp * (1 + 2 * dxp / dxs + e.b * e.b));
+
+ if (e.b < 0) {
+ above = !above;
+ }
+ }
+ } else /* e.b == 1 */ {
+ var yl = e.c - e.a * p.x,
+ t1 = p.y - yl,
+ t2 = p.x - topsite.x,
+ t3 = yl - topsite.y;
+
+ above = (t1 * t1) > (t2 * t2 + t3 * t3);
+ }
+ return he.side === "l" ? above : !above;
+ },
+
+ endPoint: function(edge, side, site) {
+ edge.ep[side] = site;
+ if (!edge.ep[d3_voronoi_opposite[side]]) return;
+ callback(edge);
+ },
+
+ distance: function(s, t) {
+ var dx = s.x - t.x,
+ dy = s.y - t.y;
+ return Math.sqrt(dx * dx + dy * dy);
+ }
+ };
+
+ var EventQueue = {
+ list: [],
+
+ insert: function(he, site, offset) {
+ he.vertex = site;
+ he.ystar = site.y + offset;
+ for (var i=0, list=EventQueue.list, l=list.length; i<l; i++) {
+ var next = list[i];
+ if (he.ystar > next.ystar ||
+ (he.ystar == next.ystar &&
+ site.x > next.vertex.x)) {
+ continue;
+ } else {
+ break;
+ }
+ }
+ list.splice(i, 0, he);
+ },
+
+ del: function(he) {
+ for (var i=0, ls=EventQueue.list, l=ls.length; i<l && (ls[i] != he); ++i) {}
+ ls.splice(i, 1);
+ },
+
+ empty: function() { return EventQueue.list.length === 0; },
+
+ nextEvent: function(he) {
+ for (var i=0, ls=EventQueue.list, l=ls.length; i<l; ++i) {
+ if (ls[i] == he) return ls[i+1];
+ }
+ return null;
+ },
+
+ min: function() {
+ var elem = EventQueue.list[0];
+ return {
+ x: elem.vertex.x,
+ y: elem.ystar
+ };
+ },
+
+ extractMin: function() {
+ return EventQueue.list.shift();
+ }
+ };
+
+ EdgeList.init();
+ Sites.bottomSite = Sites.list.shift();
+
+ var newSite = Sites.list.shift(), newIntStar;
+ var lbnd, rbnd, llbnd, rrbnd, bisector;
+ var bot, top, temp, p, v;
+ var e, pm;
+
+ while (true) {
+ if (!EventQueue.empty()) {
+ newIntStar = EventQueue.min();
+ }
+ if (newSite && (EventQueue.empty()
+ || newSite.y < newIntStar.y
+ || (newSite.y == newIntStar.y
+ && newSite.x < newIntStar.x))) { //new site is smallest
+ lbnd = EdgeList.leftBound(newSite);
+ rbnd = EdgeList.right(lbnd);
+ bot = EdgeList.rightRegion(lbnd);
+ e = Geom.bisect(bot, newSite);
+ bisector = EdgeList.createHalfEdge(e, "l");
+ EdgeList.insert(lbnd, bisector);
+ p = Geom.intersect(lbnd, bisector);
+ if (p) {
+ EventQueue.del(lbnd);
+ EventQueue.insert(lbnd, p, Geom.distance(p, newSite));
+ }
+ lbnd = bisector;
+ bisector = EdgeList.createHalfEdge(e, "r");
+ EdgeList.insert(lbnd, bisector);
+ p = Geom.intersect(bisector, rbnd);
+ if (p) {
+ EventQueue.insert(bisector, p, Geom.distance(p, newSite));
+ }
+ newSite = Sites.list.shift();
+ } else if (!EventQueue.empty()) { //intersection is smallest
+ lbnd = EventQueue.extractMin();
+ llbnd = EdgeList.left(lbnd);
+ rbnd = EdgeList.right(lbnd);
+ rrbnd = EdgeList.right(rbnd);
+ bot = EdgeList.leftRegion(lbnd);
+ top = EdgeList.rightRegion(rbnd);
+ v = lbnd.vertex;
+ Geom.endPoint(lbnd.edge, lbnd.side, v);
+ Geom.endPoint(rbnd.edge, rbnd.side, v);
+ EdgeList.del(lbnd);
+ EventQueue.del(rbnd);
+ EdgeList.del(rbnd);
+ pm = "l";
+ if (bot.y > top.y) {
+ temp = bot;
+ bot = top;
+ top = temp;
+ pm = "r";
+ }
+ e = Geom.bisect(bot, top);
+ bisector = EdgeList.createHalfEdge(e, pm);
+ EdgeList.insert(llbnd, bisector);
+ Geom.endPoint(e, d3_voronoi_opposite[pm], v);
+ p = Geom.intersect(llbnd, bisector);
+ if (p) {
+ EventQueue.del(llbnd);
+ EventQueue.insert(llbnd, p, Geom.distance(p, bot));
+ }
+ p = Geom.intersect(bisector, rrbnd);
+ if (p) {
+ EventQueue.insert(bisector, p, Geom.distance(p, bot));
+ }
+ } else {
+ break;
+ }
+ }//end while
+
+ for (lbnd = EdgeList.right(EdgeList.leftEnd);
+ lbnd != EdgeList.rightEnd;
+ lbnd = EdgeList.right(lbnd)) {
+ callback(lbnd.edge);
+ }
+}
+/**
+* @param vertices [[x1, y1], [x2, y2], …]
+* @returns triangles [[[x1, y1], [x2, y2], [x3, y3]], …]
+ */
+d3.geom.delaunay = function(vertices) {
+ var edges = vertices.map(function() { return []; }),
+ triangles = [];
+
+ // Use the Voronoi tessellation to determine Delaunay edges.
+ d3_voronoi_tessellate(vertices, function(e) {
+ edges[e.region.l.index].push(vertices[e.region.r.index]);
+ });
+
+ // Reconnect the edges into counterclockwise triangles.
+ edges.forEach(function(edge, i) {
+ var v = vertices[i],
+ cx = v[0],
+ cy = v[1];
+ edge.forEach(function(v) {
+ v.angle = Math.atan2(v[0] - cx, v[1] - cy);
+ });
+ edge.sort(function(a, b) {
+ return a.angle - b.angle;
+ });
+ for (var j = 0, m = edge.length - 1; j < m; j++) {
+ triangles.push([v, edge[j], edge[j + 1]]);
+ }
+ });
+
+ return triangles;
+};
+// Constructs a new quadtree for the specified array of points. A quadtree is a
+// two-dimensional recursive spatial subdivision. This implementation uses
+// square partitions, dividing each square into four equally-sized squares. Each
+// point exists in a unique node; if multiple points are in the same position,
+// some points may be stored on internal nodes rather than leaf nodes. Quadtrees
+// can be used to accelerate various spatial operations, such as the Barnes-Hut
+// approximation for computing n-body forces, or collision detection.
+d3.geom.quadtree = function(points, x1, y1, x2, y2) {
+ var p,
+ i = -1,
+ n = points.length;
+
+ // Type conversion for deprecated API.
+ if (n && isNaN(points[0].x)) points = points.map(d3_geom_quadtreePoint);
+
+ // Allow bounds to be specified explicitly.
+ if (arguments.length < 5) {
+ if (arguments.length === 3) {
+ y2 = x2 = y1;
+ y1 = x1;
+ } else {
+ x1 = y1 = Infinity;
+ x2 = y2 = -Infinity;
+
+ // Compute bounds.
+ while (++i < n) {
+ p = points[i];
+ if (p.x < x1) x1 = p.x;
+ if (p.y < y1) y1 = p.y;
+ if (p.x > x2) x2 = p.x;
+ if (p.y > y2) y2 = p.y;
+ }
+
+ // Squarify the bounds.
+ var dx = x2 - x1,
+ dy = y2 - y1;
+ if (dx > dy) y2 = y1 + dx;
+ else x2 = x1 + dy;
+ }
+ }
+
+ // Recursively inserts the specified point p at the node n or one of its
+ // descendants. The bounds are defined by [x1, x2] and [y1, y2].
+ function insert(n, p, x1, y1, x2, y2) {
+ if (isNaN(p.x) || isNaN(p.y)) return; // ignore invalid points
+ if (n.leaf) {
+ var v = n.point;
+ if (v) {
+ // If the point at this leaf node is at the same position as the new
+ // point we are adding, we leave the point associated with the
+ // internal node while adding the new point to a child node. This
+ // avoids infinite recursion.
+ if ((Math.abs(v.x - p.x) + Math.abs(v.y - p.y)) < .01) {
+ insertChild(n, p, x1, y1, x2, y2);
+ } else {
+ n.point = null;
+ insertChild(n, v, x1, y1, x2, y2);
+ insertChild(n, p, x1, y1, x2, y2);
+ }
+ } else {
+ n.point = p;
+ }
+ } else {
+ insertChild(n, p, x1, y1, x2, y2);
+ }
+ }
+
+ // Recursively inserts the specified point p into a descendant of node n. The
+ // bounds are defined by [x1, x2] and [y1, y2].
+ function insertChild(n, p, x1, y1, x2, y2) {
+ // Compute the split point, and the quadrant in which to insert p.
+ var sx = (x1 + x2) * .5,
+ sy = (y1 + y2) * .5,
+ right = p.x >= sx,
+ bottom = p.y >= sy,
+ i = (bottom << 1) + right;
+
+ // Recursively insert into the child node.
+ n.leaf = false;
+ n = n.nodes[i] || (n.nodes[i] = d3_geom_quadtreeNode());
+
+ // Update the bounds as we recurse.
+ if (right) x1 = sx; else x2 = sx;
+ if (bottom) y1 = sy; else y2 = sy;
+ insert(n, p, x1, y1, x2, y2);
+ }
+
+ // Create the root node.
+ var root = d3_geom_quadtreeNode();
+
+ root.add = function(p) {
+ insert(root, p, x1, y1, x2, y2);
+ };
+
+ root.visit = function(f) {
+ d3_geom_quadtreeVisit(f, root, x1, y1, x2, y2);
+ };
+
+ // Insert all points.
+ points.forEach(root.add);
+ return root;
+};
+
+function d3_geom_quadtreeNode() {
+ return {
+ leaf: true,
+ nodes: [],
+ point: null
+ };
+}
+
+function d3_geom_quadtreeVisit(f, node, x1, y1, x2, y2) {
+ if (!f(node, x1, y1, x2, y2)) {
+ var sx = (x1 + x2) * .5,
+ sy = (y1 + y2) * .5,
+ children = node.nodes;
+ if (children[0]) d3_geom_quadtreeVisit(f, children[0], x1, y1, sx, sy);
+ if (children[1]) d3_geom_quadtreeVisit(f, children[1], sx, y1, x2, sy);
+ if (children[2]) d3_geom_quadtreeVisit(f, children[2], x1, sy, sx, y2);
+ if (children[3]) d3_geom_quadtreeVisit(f, children[3], sx, sy, x2, y2);
+ }
+}
+
+function d3_geom_quadtreePoint(p) {
+ return {
+ x: p[0],
+ y: p[1]
+ };
+}
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
index bfbc7ee..77ee372 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
@@ -1,22 +1,26 @@
-(function(){d3 = {version: "1.29.1"}; // semver
-if (!Date.now) Date.now = function() {
+(function(){if (!Date.now) Date.now = function() {
return +new Date;
};
-if (!Object.create) Object.create = function(o) {
- /** @constructor */ function f() {}
- f.prototype = o;
- return new f;
-};
+try {
+ document.createElement("div").style.setProperty("opacity", 0, "");
+} catch (error) {
+ var d3_style_prototype = CSSStyleDeclaration.prototype,
+ d3_style_setProperty = d3_style_prototype.setProperty;
+ d3_style_prototype.setProperty = function(name, value, priority) {
+ d3_style_setProperty.call(this, name, value + "", priority);
+ };
+}
+d3 = {version: "2.7.1"}; // semver
var d3_array = d3_arraySlice; // conversion for NodeLists
-function d3_arrayCopy(psuedoarray) {
- var i = -1, n = psuedoarray.length, array = [];
- while (++i < n) array.push(psuedoarray[i]);
+function d3_arrayCopy(pseudoarray) {
+ var i = -1, n = pseudoarray.length, array = [];
+ while (++i < n) array.push(pseudoarray[i]);
return array;
}
-function d3_arraySlice(psuedoarray) {
- return Array.prototype.slice.call(psuedoarray);
+function d3_arraySlice(pseudoarray) {
+ return Array.prototype.slice.call(pseudoarray);
}
try {
@@ -24,21 +28,63 @@ try {
} catch(e) {
d3_array = d3_arrayCopy;
}
+
+var d3_arraySubclass = [].__proto__?
+
+// Until ECMAScript supports array subclassing, prototype injection works well.
+function(array, prototype) {
+ array.__proto__ = prototype;
+}:
+
+// And if your browser doesn't support __proto__, we'll use direct extension.
+function(array, prototype) {
+ for (var property in prototype) array[property] = prototype[property];
+};
+function d3_this() {
+ return this;
+}
d3.functor = function(v) {
return typeof v === "function" ? v : function() { return v; };
};
-// A getter-setter method that preserves the appropriate `this` context.
-d3.rebind = function(object, method) {
+// Copies a variable number of methods from source to target.
+d3.rebind = function(target, source) {
+ var i = 1, n = arguments.length, method;
+ while (++i < n) target[method = arguments[i]] = d3_rebind(target, source, source[method]);
+ return target;
+};
+
+// Method is assumed to be a standard D3 getter-setter:
+// If passed with no arguments, gets the value.
+// If passed with arguments, sets the value and returns the target.
+function d3_rebind(target, source, method) {
return function() {
- var x = method.apply(object, arguments);
- return arguments.length ? object : x;
+ var value = method.apply(source, arguments);
+ return arguments.length ? target : value;
};
-};
+}
d3.ascending = function(a, b) {
- return a < b ? -1 : a > b ? 1 : 0;
+ return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
};
d3.descending = function(a, b) {
- return b < a ? -1 : b > a ? 1 : 0;
+ return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
+};
+d3.mean = function(array, f) {
+ var n = array.length,
+ a,
+ m = 0,
+ i = -1,
+ j = 0;
+ if (arguments.length === 1) {
+ while (++i < n) if (d3_number(a = array[i])) m += (a - m) / ++j;
+ } else {
+ while (++i < n) if (d3_number(a = f.call(array, array[i], i))) m += (a - m) / ++j;
+ }
+ return j ? m : undefined;
+};
+d3.median = function(array, f) {
+ if (arguments.length > 1) array = array.map(f);
+ array = array.filter(d3_number);
+ return array.length ? d3.quantile(array.sort(d3.ascending), .5) : undefined;
};
d3.min = function(array, f) {
var i = -1,
@@ -68,6 +114,45 @@ d3.max = function(array, f) {
}
return a;
};
+d3.extent = function(array, f) {
+ var i = -1,
+ n = array.length,
+ a,
+ b,
+ c;
+ if (arguments.length === 1) {
+ while (++i < n && ((a = c = array[i]) == null || a != a)) a = c = undefined;
+ while (++i < n) if ((b = array[i]) != null) {
+ if (a > b) a = b;
+ if (c < b) c = b;
+ }
+ } else {
+ while (++i < n && ((a = c = f.call(array, array[i], i)) == null || a != a)) a = undefined;
+ while (++i < n) if ((b = f.call(array, array[i], i)) != null) {
+ if (a > b) a = b;
+ if (c < b) c = b;
+ }
+ }
+ return [a, c];
+};
+d3.random = {
+ normal: function(mean, deviation) {
+ if (arguments.length < 2) deviation = 1;
+ if (arguments.length < 1) mean = 0;
+ return function() {
+ var x, y, r;
+ do {
+ x = Math.random() * 2 - 1;
+ y = Math.random() * 2 - 1;
+ r = x * x + y * y;
+ } while (!r || r > 1);
+ return mean + deviation * x * Math.sqrt(-2 * Math.log(r) / r);
+ };
+ }
+};
+function d3_number(x) {
+ return x != null && !isNaN(x);
+}
d3.sum = function(array, f) {
var s = 0,
n = array.length,
@@ -90,6 +175,9 @@ d3.quantile = function(values, p) {
e = H - h;
return e ? v + e * (values[h] - v) : v;
};
+d3.transpose = function(matrix) {
+ return d3.zip.apply(d3, matrix);
+};
d3.zip = function() {
if (!(n = arguments.length)) return [];
for (var i = -1, m = d3.min(arguments, d3_zipLength), zips = new Array(m); ++i < m;) {
@@ -303,27 +391,19 @@ function d3_splitter(d) {
function d3_collapse(s) {
return s.replace(/(^\s+)|(\s+$)/g, "").replace(/\s+/g, " ");
}
-//
-// Note: assigning to the arguments array simultaneously changes the value of
-// the corresponding argument!
-//
-// TODO The `this` argument probably shouldn't be the first argument to the
-// callback, anyway, since it's redundant. However, that will require a major
-// version bump due to backwards compatibility, so I'm not changing it right
-// away.
-//
-function d3_call(callback) {
- callback.apply(this, (arguments[0] = this, arguments));
- return this;
-}
/**
* @param {number} start
* @param {number=} stop
* @param {number=} step
*/
d3.range = function(start, stop, step) {
- if (arguments.length === 1) { stop = start; start = 0; }
- if (step == null) step = 1;
+ if (arguments.length < 3) {
+ step = 1;
+ if (arguments.length < 2) {
+ stop = start;
+ start = 0;
+ }
+ }
if ((stop - start) / step == Infinity) throw new Error("infinite range");
var range = [],
i = -1,
@@ -336,7 +416,7 @@ d3.requote = function(s) {
return s.replace(d3_requote_re, "\\$&");
};
-var d3_requote_re = /[\\\^\$\*\+\?\[\]\(\)\.\{\}]/g;
+var d3_requote_re = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
d3.round = function(x, n) {
return n
? Math.round(x * Math.pow(10, n)) * Math.pow(10, -n)
@@ -344,9 +424,10 @@ d3.round = function(x, n) {
};
d3.xhr = function(url, mime, callback) {
var req = new XMLHttpRequest;
- if (arguments.length < 3) callback = mime;
+ if (arguments.length < 3) callback = mime, mime = null;
else if (mime && req.overrideMimeType) req.overrideMimeType(mime);
req.open("GET", url, true);
+ if (mime) req.setRequestHeader("Accept", mime);
req.onreadystatechange = function() {
if (req.readyState === 4) callback(req.status < 300 ? req : null);
};
@@ -387,66 +468,79 @@ d3.xml = function(url, mime, callback) {
}
d3.xhr(url, mime, ready);
};
-d3.ns = {
-
- prefix: {
- svg: "http://www.w3.org/2000/svg",
- xhtml: "http://www.w3.org/1999/xhtml",
- xlink: "http://www.w3.org/1999/xlink",
- xml: "http://www.w3.org/XML/1998/namespace",
- xmlns: "http://www.w3.org/2000/xmlns/"
- },
+var d3_nsPrefix = {
+ svg: "http://www.w3.org/2000/svg",
+ xhtml: "http://www.w3.org/1999/xhtml",
+ xlink: "http://www.w3.org/1999/xlink",
+ xml: "http://www.w3.org/XML/1998/namespace",
+ xmlns: "http://www.w3.org/2000/xmlns/"
+};
+d3.ns = {
+ prefix: d3_nsPrefix,
qualify: function(name) {
var i = name.indexOf(":");
- return i < 0 ? name : {
- space: d3.ns.prefix[name.substring(0, i)],
- local: name.substring(i + 1)
- };
+ return i < 0 ? (name in d3_nsPrefix
+ ? {space: d3_nsPrefix[name], local: name} : name)
+ : {space: d3_nsPrefix[name.substring(0, i)], local: name.substring(i + 1)};
}
-
};
-/** @param {...string} types */
-d3.dispatch = function(types) {
- var dispatch = {},
- type;
- for (var i = 0, n = arguments.length; i < n; i++) {
- type = arguments[i];
- dispatch[type] = d3_dispatch(type);
- }
+d3.dispatch = function() {
+ var dispatch = new d3_dispatch(),
+ i = -1,
+ n = arguments.length;
+ while (++i < n) dispatch[arguments[i]] = d3_dispatch_event();
return dispatch;
};
-function d3_dispatch(type) {
- var dispatch = {},
- listeners = [];
+function d3_dispatch() {}
- dispatch.add = function(listener) {
- for (var i = 0; i < listeners.length; i++) {
- if (listeners[i].listener == listener) return dispatch; // already registered
- }
- listeners.push({listener: listener, on: true});
- return dispatch;
- };
+d3_dispatch.prototype.on = function(type, listener) {
+ var i = type.indexOf("."),
+ name = "";
- dispatch.remove = function(listener) {
- for (var i = 0; i < listeners.length; i++) {
- var l = listeners[i];
- if (l.listener == listener) {
- l.on = false;
- listeners = listeners.slice(0, i).concat(listeners.slice(i + 1));
- break;
- }
+ // Extract optional namespace, e.g., "click.foo"
+ if (i > 0) {
+ name = type.substring(i + 1);
+ type = type.substring(0, i);
+ }
+
+ return arguments.length < 2
+ ? this[type].on(name)
+ : (this[type].on(name, listener), this);
+};
+
+function d3_dispatch_event() {
+ var listeners = [],
+ listenerByName = {};
+
+ function dispatch() {
+ var z = listeners, // defensive reference
+ i = -1,
+ n = z.length,
+ l;
+ while (++i < n) if (l = z[i].on) l.apply(this, arguments);
+ }
+
+ dispatch.on = function(name, listener) {
+ var l, i;
+
+ // return the current listener, if any
+ if (arguments.length < 2) return (l = listenerByName[name]) && l.on;
+
+ // remove the old listener, if any (with copy-on-write)
+ if (l = listenerByName[name]) {
+ l.on = null;
+ listeners = listeners.slice(0, i = listeners.indexOf(l)).concat(listeners.slice(i + 1));
+ delete listenerByName[name];
}
- return dispatch;
- };
- dispatch.dispatch = function() {
- var ls = listeners; // defensive reference
- for (var i = 0, n = ls.length; i < n; i++) {
- var l = ls[i];
- if (l.on) l.listener.apply(this, arguments);
+ // add the new listener, if any
+ if (listener) {
+ listeners.push(listenerByName[name] = {on: listener});
}
+
+ return dispatch;
};
return dispatch;
@@ -461,10 +555,11 @@ d3.format = function(specifier) {
comma = match[7],
precision = match[8],
type = match[9],
- percentage = false,
+ scale = 1,
+ suffix = "",
integer = false;
- if (precision) precision = precision.substring(1);
+ if (precision) precision = +precision.substring(1);
if (zfill) {
fill = "0"; // TODO align = "=";
@@ -473,22 +568,36 @@ d3.format = function(specifier) {
switch (type) {
case "n": comma = true; type = "g"; break;
- case "%": percentage = true; type = "f"; break;
- case "p": percentage = true; type = "r"; break;
- case "d": integer = true; precision = "0"; break;
+ case "%": scale = 100; suffix = "%"; type = "f"; break;
+ case "p": scale = 100; suffix = "%"; type = "r"; break;
+ case "d": integer = true; precision = 0; break;
+ case "s": scale = -1; type = "r"; break;
}
+ // If no precision is specified for r, fallback to general notation.
+ if (type == "r" && !precision) type = "g";
+
type = d3_format_types[type] || d3_format_typeDefault;
return function(value) {
- var number = percentage ? value * 100 : +value,
- negative = (number < 0) && (number = -number) ? "\u2212" : sign;
// Return the empty string for floats formatted as ints.
- if (integer && (number % 1)) return "";
+ if (integer && (value % 1)) return "";
+
+ // Convert negative to positive, and record the sign prefix.
+ var negative = (value < 0) && (value = -value) ? "\u2212" : sign;
- // Convert the input value to the desired precision.
- value = type(number, precision);
+ // Apply the scale, computing it from the value's exponent for si format.
+ if (scale < 0) {
+ var prefix = d3.formatPrefix(value, precision);
+ value *= prefix.scale;
+ suffix = prefix.symbol;
+ } else {
+ value *= scale;
+ }
+
+ // Convert to the desired precision.
+ value = type(value, precision);
// If the fill character is 0, the sign and group is applied after the fill.
if (zfill) {
@@ -505,9 +614,8 @@ d3.format = function(specifier) {
var length = value.length;
if (length < width) value = new Array(width - length + 1).join(fill) + value;
}
- if (percentage) value += "%";
- return value;
+ return value + suffix;
};
};
@@ -518,12 +626,13 @@ var d3_format_types = {
g: function(x, p) { return x.toPrecision(p); },
e: function(x, p) { return x.toExponential(p); },
f: function(x, p) { return x.toFixed(p); },
- r: function(x, p) {
- var n = 1 + Math.floor(1e-15 + Math.log(x) / Math.LN10);
- return d3.round(x, p - n).toFixed(Math.max(0, p - n));
- }
+ r: function(x, p) { return d3.round(x, p = d3_format_precision(x, p)).toFixed(Math.max(0, Math.min(20, p))); }
};
+function d3_format_precision(x, p) {
+ return p - (x ? 1 + Math.floor(Math.log(x + Math.pow(10, 1 + Math.floor(Math.log(x) / Math.LN10) - p)) / Math.LN10) : 1);
+}
+
function d3_format_typeDefault(x) {
return x + "";
}
@@ -536,6 +645,26 @@ function d3_format_group(value) {
while (i > 0) t.push(value.substring(i -= 3, i + 3));
return t.reverse().join(",") + f;
}
+var d3_formatPrefixes = ["y","z","a","f","p","n","μ","m","","k","M","G","T","P","E","Z","Y"].map(d3_formatPrefix);
+
+d3.formatPrefix = function(value, precision) {
+ var i = 0;
+ if (value) {
+ if (value < 0) value *= -1;
+ if (precision) value = d3.round(value, d3_format_precision(value, precision));
+ i = 1 + Math.floor(1e-12 + Math.log(value) / Math.LN10);
+ i = Math.max(-24, Math.min(24, Math.floor((i <= 0 ? i + 1 : i - 1) / 3) * 3));
+ }
+ return d3_formatPrefixes[8 + i / 3];
+};
+
+function d3_formatPrefix(d, i) {
+ return {
+ scale: Math.pow(10, (8 - i) * 3),
+ symbol: d
+ };
+}
+
/*
* TERMS OF USE - EASING EQUATIONS
*
@@ -598,9 +727,15 @@ d3.ease = function(name) {
var i = name.indexOf("-"),
t = i >= 0 ? name.substring(0, i) : name,
m = i >= 0 ? name.substring(i + 1) : "in";
- return d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1)));
+ return d3_ease_clamp(d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1))));
};
+function d3_ease_clamp(f) {
+ return function(t) {
+ return t <= 0 ? 0 : t >= 1 ? 1 : f(t);
+ };
+}
+
function d3_ease_reverse(f) {
return function(t) {
return 1 - f(1 - t);
@@ -628,7 +763,7 @@ function d3_ease_sin(t) {
}
function d3_ease_exp(t) {
- return t ? Math.pow(2, 10 * (t - 1)) - 1e-3 : 0;
+ return Math.pow(2, 10 * (t - 1));
}
function d3_ease_circle(t) {
@@ -659,6 +794,11 @@ function d3_ease_bounce(t) {
: 7.5625 * (t -= 2.625 / 2.75) * t + .984375;
}
d3.event = null;
+
+function d3_eventCancel() {
+ d3.event.stopPropagation();
+ d3.event.preventDefault();
+}
d3.interpolate = function(a, b) {
var i = d3.interpolators.length, f;
while (--i >= 0 && !(f = d3.interpolators[i](a, b)));
@@ -753,6 +893,10 @@ d3.interpolateString = function(a, b) {
};
};
+d3.interpolateTransform = function(a, b) {
+ return d3.interpolateString(d3.transform(a) + "", d3.transform(b) + "");
+};
+
d3.interpolateRgb = function(a, b) {
a = d3.rgb(a);
b = d3.rgb(b);
@@ -763,10 +907,10 @@ d3.interpolateRgb = function(a, b) {
bg = b.g - ag,
bb = b.b - ab;
return function(t) {
- return "rgb(" + Math.round(ar + br * t)
- + "," + Math.round(ag + bg * t)
- + "," + Math.round(ab + bb * t)
- + ")";
+ return "#"
+ + d3_rgb_hex(Math.round(ar + br * t))
+ + d3_rgb_hex(Math.round(ag + bg * t))
+ + d3_rgb_hex(Math.round(ab + bb * t));
};
};
@@ -823,34 +967,34 @@ d3.interpolateObject = function(a, b) {
};
}
-var d3_interpolate_number = /[-+]?(?:\d+\.\d+|\d+\.|\.\d+|\d+)(?:[eE][-]?\d+)?/g,
- d3_interpolate_rgb = {background: 1, fill: 1, stroke: 1};
+var d3_interpolate_number = /[-+]?(?:\d*\.?\d+)(?:[eE][-+]?\d+)?/g;
function d3_interpolateByName(n) {
- return n in d3_interpolate_rgb || /\bcolor\b/.test(n)
- ? d3.interpolateRgb
+ return n == "transform"
+ ? d3.interpolateTransform
: d3.interpolate;
}
d3.interpolators = [
d3.interpolateObject,
function(a, b) { return (b instanceof Array) && d3.interpolateArray(a, b); },
- function(a, b) { return (typeof b === "string") && d3.interpolateString(String(a), b); },
- function(a, b) { return (b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b)) && d3.interpolateRgb(String(a), b); },
- function(a, b) { return (typeof b === "number") && d3.interpolateNumber(+a, b); }
+ function(a, b) { return (typeof a === "string" || typeof b === "string") && d3.interpolateString(a + "", b + ""); },
+ function(a, b) { return (typeof b === "string" ? b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Rgb || b instanceof d3_Hsl) && d3.interpolateRgb(a, b); },
+ function(a, b) { return !isNaN(a = +a) && !isNaN(b = +b) && d3.interpolateNumber(a, b); }
];
function d3_uninterpolateNumber(a, b) {
- b = 1 / (b - (a = +a));
+ b = b - (a = +a) ? 1 / (b - a) : 0;
return function(x) { return (x - a) * b; };
}
function d3_uninterpolateClamp(a, b) {
- b = 1 / (b - (a = +a));
+ b = b - (a = +a) ? 1 / (b - a) : 0;
return function(x) { return Math.max(0, Math.min(1, (x - a) * b)); };
}
d3.rgb = function(r, g, b) {
return arguments.length === 1
- ? d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb)
+ ? (r instanceof d3_Rgb ? d3_rgb(r.r, r.g, r.b)
+ : d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb))
: d3_rgb(~~r, ~~g, ~~b);
};
@@ -875,17 +1019,17 @@ d3_Rgb.prototype.brighter = function(k) {
if (g && g < i) g = i;
if (b && b < i) b = i;
return d3_rgb(
- Math.min(255, Math.floor(r / k)),
- Math.min(255, Math.floor(g / k)),
- Math.min(255, Math.floor(b / k)));
+ Math.min(255, Math.floor(r / k)),
+ Math.min(255, Math.floor(g / k)),
+ Math.min(255, Math.floor(b / k)));
};
d3_Rgb.prototype.darker = function(k) {
k = Math.pow(0.7, arguments.length ? k : 1);
return d3_rgb(
- Math.max(0, Math.floor(k * this.r)),
- Math.max(0, Math.floor(k * this.g)),
- Math.max(0, Math.floor(k * this.b)));
+ Math.floor(k * this.r),
+ Math.floor(k * this.g),
+ Math.floor(k * this.b));
};
d3_Rgb.prototype.hsl = function() {
@@ -897,7 +1041,9 @@ d3_Rgb.prototype.toString = function() {
};
function d3_rgb_hex(v) {
- return v < 0x10 ? "0" + v.toString(16) : v.toString(16);
+ return v < 0x10
+ ? "0" + Math.max(0, v).toString(16)
+ : Math.min(255, v).toString(16);
}
function d3_rgb_parse(format, rgb, hsl) {
@@ -1134,7 +1280,8 @@ for (var d3_rgb_name in d3_rgb_names) {
}
d3.hsl = function(h, s, l) {
return arguments.length === 1
- ? d3_rgb_parse("" + h, d3_rgb_hsl, d3_hsl)
+ ? (h instanceof d3_Hsl ? d3_hsl(h.h, h.s, h.l)
+ : d3_rgb_parse("" + h, d3_rgb_hsl, d3_hsl))
: d3_hsl(+h, +s, +l);
};
@@ -1163,7 +1310,7 @@ d3_Hsl.prototype.rgb = function() {
};
d3_Hsl.prototype.toString = function() {
- return "hsl(" + this.h + "," + this.s * 100 + "%," + this.l * 100 + "%)";
+ return this.rgb().toString();
};
function d3_hsl_rgb(h, s, l) {
@@ -1194,906 +1341,859 @@ function d3_hsl_rgb(h, s, l) {
return d3_rgb(vv(h + 120), vv(h), vv(h - 120));
}
+function d3_selection(groups) {
+ d3_arraySubclass(groups, d3_selectionPrototype);
+ return groups;
+}
+
var d3_select = function(s, n) { return n.querySelector(s); },
- d3_selectAll = function(s, n) { return d3_array(n.querySelectorAll(s)); };
+ d3_selectAll = function(s, n) { return n.querySelectorAll(s); },
+ d3_selectRoot = document.documentElement,
+ d3_selectMatcher = d3_selectRoot.matchesSelector || d3_selectRoot.webkitMatchesSelector || d3_selectRoot.mozMatchesSelector || d3_selectRoot.msMatchesSelector || d3_selectRoot.oMatchesSelector,
+ d3_selectMatches = function(n, s) { return d3_selectMatcher.call(n, s); };
-// Use Sizzle, if available.
+// Prefer Sizzle, if available.
if (typeof Sizzle === "function") {
d3_select = function(s, n) { return Sizzle(s, n)[0]; };
d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
+ d3_selectMatches = Sizzle.matchesSelector;
}
-var d3_root = d3_selection([[document]]);
-d3_root[0].parentNode = document.documentElement;
-
-// TODO fast singleton implementation!
-d3.select = function(selector) {
- return typeof selector === "string"
- ? d3_root.select(selector)
- : d3_selection([[selector]]); // assume node
-};
+var d3_selectionPrototype = [];
-d3.selectAll = function(selector) {
- return typeof selector === "string"
- ? d3_root.selectAll(selector)
- : d3_selection([d3_array(selector)]); // assume node[]
+d3.selection = function() {
+ return d3_selectionRoot;
};
-function d3_selection(groups) {
-
- function select(select) {
- var subgroups = [],
- subgroup,
- subnode,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroup.push(subnode = select(node));
- if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
- } else {
- subgroup.push(null);
- }
- }
- }
- return d3_selection(subgroups);
- }
-
- function selectAll(selectAll) {
- var subgroups = [],
- subgroup,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroups.push(subgroup = selectAll(node));
- subgroup.parentNode = node;
- }
- }
- }
- return d3_selection(subgroups);
- }
-
- // TODO select(function)?
- groups.select = function(selector) {
- return select(function(node) {
- return d3_select(selector, node);
- });
- };
-
- // TODO selectAll(function)?
- groups.selectAll = function(selector) {
- return selectAll(function(node) {
- return d3_selectAll(selector, node);
- });
- };
-
- // TODO preserve null elements to maintain index?
- groups.filter = function(filter) {
- var subgroups = [],
- subgroup,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if ((node = group[i]) && filter.call(node, node.__data__, i)) {
- subgroup.push(node);
- }
- }
- }
- return d3_selection(subgroups);
- };
-
- groups.map = function(map) {
- var group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) node.__data__ = map.call(node, node.__data__, i);
- }
- }
- return groups;
- };
-
- // TODO data(null) for clearing data?
- groups.data = function(data, join) {
- var enter = [],
- update = [],
- exit = [];
-
- function bind(group, groupData) {
- var i = 0,
- n = group.length,
- m = groupData.length,
- n0 = Math.min(n, m),
- n1 = Math.max(n, m),
- updateNodes = [],
- enterNodes = [],
- exitNodes = [],
- node,
- nodeData;
-
- if (join) {
- var nodeByKey = {},
- keys = [],
- key,
- j = groupData.length;
-
- for (i = 0; i < n; i++) {
- key = join.call(node = group[i], node.__data__, i);
- if (key in nodeByKey) {
- exitNodes[j++] = node; // duplicate key
- } else {
- nodeByKey[key] = node;
- }
- keys.push(key);
- }
-
- for (i = 0; i < m; i++) {
- node = nodeByKey[key = join.call(groupData, nodeData = groupData[i], i)];
- if (node) {
- node.__data__ = nodeData;
- updateNodes[i] = node;
- enterNodes[i] = exitNodes[i] = null;
- } else {
- enterNodes[i] = d3_selection_enterNode(nodeData);
- updateNodes[i] = exitNodes[i] = null;
- }
- delete nodeByKey[key];
- }
-
- for (i = 0; i < n; i++) {
- if (keys[i] in nodeByKey) {
- exitNodes[i] = group[i];
- }
- }
+d3.selection.prototype = d3_selectionPrototype;
+d3_selectionPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ group,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selector(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = (group = this[j]).parentNode;
+ for (var i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroup.push(subnode = selector.call(node, node.__data__, i));
+ if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
} else {
- for (; i < n0; i++) {
- node = group[i];
- nodeData = groupData[i];
- if (node) {
- node.__data__ = nodeData;
- updateNodes[i] = node;
- enterNodes[i] = exitNodes[i] = null;
- } else {
- enterNodes[i] = d3_selection_enterNode(nodeData);
- updateNodes[i] = exitNodes[i] = null;
- }
- }
- for (; i < m; i++) {
- enterNodes[i] = d3_selection_enterNode(groupData[i]);
- updateNodes[i] = exitNodes[i] = null;
- }
- for (; i < n1; i++) {
- exitNodes[i] = group[i];
- enterNodes[i] = updateNodes[i] = null;
- }
- }
-
- enterNodes.parentNode
- = updateNodes.parentNode
- = exitNodes.parentNode
- = group.parentNode;
-
- enter.push(enterNodes);
- update.push(updateNodes);
- exit.push(exitNodes);
- }
-
- var i = -1,
- n = groups.length,
- group;
- if (typeof data === "function") {
- while (++i < n) {
- bind(group = groups[i], data.call(group, group.parentNode.__data__, i));
- }
- } else {
- while (++i < n) {
- bind(group = groups[i], data);
+ subgroup.push(null);
}
}
+ }
- var selection = d3_selection(update);
- selection.enter = function() {
- return d3_selectionEnter(enter);
- };
- selection.exit = function() {
- return d3_selection(exit);
- };
- return selection;
- };
+ return d3_selection(subgroups);
+};
- // TODO mask forEach? or rename for eachData?
- // TODO offer the same semantics for map, reduce, etc.?
- groups.each = function(callback) {
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- var node = group[i];
- if (node) callback.call(node, node.__data__, i);
- }
- }
- return groups;
+function d3_selection_selector(selector) {
+ return function() {
+ return d3_select(selector, this);
};
-
- function first(callback) {
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- var node = group[i];
- if (node) return callback.call(node, node.__data__, i);
+}
+d3_selectionPrototype.selectAll = function(selector) {
+ var subgroups = [],
+ subgroup,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selectorAll(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroups.push(subgroup = d3_array(selector.call(node, node.__data__, i)));
+ subgroup.parentNode = node;
}
}
- return null;
}
- groups.empty = function() {
- return !first(function() { return true; });
- };
+ return d3_selection(subgroups);
+};
- groups.node = function() {
- return first(function() { return this; });
+function d3_selection_selectorAll(selector) {
+ return function() {
+ return d3_selectAll(selector, this);
};
+}
+d3_selectionPrototype.attr = function(name, value) {
+ name = d3.ns.qualify(name);
+
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) {
+ var node = this.node();
+ return name.local
+ ? node.getAttributeNS(name.space, name.local)
+ : node.getAttribute(name);
+ }
- groups.attr = function(name, value) {
- name = d3.ns.qualify(name);
-
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(name.local
- ? function() { return this.getAttributeNS(name.space, name.local); }
- : function() { return this.getAttribute(name); });
- }
-
- /** @this {Element} */
- function attrNull() {
- this.removeAttribute(name);
- }
+ function attrNull() {
+ this.removeAttribute(name);
+ }
- /** @this {Element} */
- function attrNullNS() {
- this.removeAttributeNS(name.space, name.local);
- }
+ function attrNullNS() {
+ this.removeAttributeNS(name.space, name.local);
+ }
- /** @this {Element} */
- function attrConstant() {
- this.setAttribute(name, value);
- }
+ function attrConstant() {
+ this.setAttribute(name, value);
+ }
- /** @this {Element} */
- function attrConstantNS() {
- this.setAttributeNS(name.space, name.local, value);
- }
+ function attrConstantNS() {
+ this.setAttributeNS(name.space, name.local, value);
+ }
- /** @this {Element} */
- function attrFunction() {
- var x = value.apply(this, arguments);
- if (x == null) this.removeAttribute(name);
- else this.setAttribute(name, x);
- }
+ function attrFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.removeAttribute(name);
+ else this.setAttribute(name, x);
+ }
- /** @this {Element} */
- function attrFunctionNS() {
- var x = value.apply(this, arguments);
- if (x == null) this.removeAttributeNS(name.space, name.local);
- else this.setAttributeNS(name.space, name.local, x);
- }
+ function attrFunctionNS() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.removeAttributeNS(name.space, name.local);
+ else this.setAttributeNS(name.space, name.local, x);
+ }
- return groups.each(value == null
- ? (name.local ? attrNullNS : attrNull) : (typeof value === "function"
- ? (name.local ? attrFunctionNS : attrFunction)
- : (name.local ? attrConstantNS : attrConstant)));
- };
+ return this.each(value == null
+ ? (name.local ? attrNullNS : attrNull) : (typeof value === "function"
+ ? (name.local ? attrFunctionNS : attrFunction)
+ : (name.local ? attrConstantNS : attrConstant)));
+};
+d3_selectionPrototype.classed = function(name, value) {
+ var names = name.split(d3_selection_classedWhitespace),
+ n = names.length,
+ i = -1;
+ if (arguments.length > 1) {
+ while (++i < n) d3_selection_classed.call(this, names[i], value);
+ return this;
+ } else {
+ while (++i < n) if (!d3_selection_classed.call(this, names[i])) return false;
+ return true;
+ }
+};
- groups.classed = function(name, value) {
- var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
+var d3_selection_classedWhitespace = /\s+/g;
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- if (c = this.classList) return c.contains(name);
- var c = this.className;
- re.lastIndex = 0;
- return re.test(c.baseVal != null ? c.baseVal : c);
- });
- }
+function d3_selection_classed(name, value) {
+ var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
- /** @this {Element} */
- function classedAdd() {
- if (c = this.classList) return c.add(name);
- var c = this.className,
- cb = c.baseVal != null,
- cv = cb ? c.baseVal : c;
- re.lastIndex = 0;
- if (!re.test(cv)) {
- cv = d3_collapse(cv + " " + name);
- if (cb) c.baseVal = cv;
- else this.className = cv;
- }
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) {
+ var node = this.node();
+ if (c = node.classList) return c.contains(name);
+ var c = node.className;
+ re.lastIndex = 0;
+ return re.test(c.baseVal != null ? c.baseVal : c);
+ }
- /** @this {Element} */
- function classedRemove() {
- if (c = this.classList) return c.remove(name);
- var c = this.className,
- cb = c.baseVal != null,
- cv = cb ? c.baseVal : c;
- cv = d3_collapse(cv.replace(re, " "));
+ function classedAdd() {
+ if (c = this.classList) return c.add(name);
+ var c = this.className,
+ cb = c.baseVal != null,
+ cv = cb ? c.baseVal : c;
+ re.lastIndex = 0;
+ if (!re.test(cv)) {
+ cv = d3_collapse(cv + " " + name);
if (cb) c.baseVal = cv;
else this.className = cv;
}
+ }
- /** @this {Element} */
- function classedFunction() {
- (value.apply(this, arguments)
- ? classedAdd
- : classedRemove).call(this);
- }
+ function classedRemove() {
+ if (c = this.classList) return c.remove(name);
+ var c = this.className,
+ cb = c.baseVal != null,
+ cv = cb ? c.baseVal : c;
+ cv = d3_collapse(cv.replace(re, " "));
+ if (cb) c.baseVal = cv;
+ else this.className = cv;
+ }
- return groups.each(typeof value === "function"
- ? classedFunction : value
+ function classedFunction() {
+ (value.apply(this, arguments)
? classedAdd
- : classedRemove);
- };
-
- groups.style = function(name, value, priority) {
- if (arguments.length < 3) priority = "";
+ : classedRemove).call(this);
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- return window.getComputedStyle(this, null).getPropertyValue(name);
- });
- }
+ return this.each(typeof value === "function"
+ ? classedFunction : value
+ ? classedAdd
+ : classedRemove);
+}
+d3_selectionPrototype.style = function(name, value, priority) {
+ if (arguments.length < 3) priority = "";
- /** @this {Element} */
- function styleNull() {
- this.style.removeProperty(name);
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) return window
+ .getComputedStyle(this.node(), null)
+ .getPropertyValue(name);
- /** @this {Element} */
- function styleConstant() {
- this.style.setProperty(name, value, priority);
- }
+ function styleNull() {
+ this.style.removeProperty(name);
+ }
- /** @this {Element} */
- function styleFunction() {
- var x = value.apply(this, arguments);
- if (x == null) this.style.removeProperty(name);
- else this.style.setProperty(name, x, priority);
- }
+ function styleConstant() {
+ this.style.setProperty(name, value, priority);
+ }
- return groups.each(value == null
- ? styleNull : (typeof value === "function"
- ? styleFunction : styleConstant));
- };
+ function styleFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.style.removeProperty(name);
+ else this.style.setProperty(name, x, priority);
+ }
- groups.property = function(name, value) {
- name = d3.ns.qualify(name);
+ return this.each(value == null
+ ? styleNull : (typeof value === "function"
+ ? styleFunction : styleConstant));
+};
+d3_selectionPrototype.property = function(name, value) {
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- return this[name];
- });
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) return this.node()[name];
- /** @this {Element} */
- function propertyNull() {
- delete this[name];
- }
+ function propertyNull() {
+ delete this[name];
+ }
- /** @this {Element} */
- function propertyConstant() {
- this[name] = value;
- }
+ function propertyConstant() {
+ this[name] = value;
+ }
- /** @this {Element} */
- function propertyFunction() {
- var x = value.apply(this, arguments);
- if (x == null) delete this[name];
- else this[name] = x;
- }
+ function propertyFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) delete this[name];
+ else this[name] = x;
+ }
- return groups.each(value == null
- ? propertyNull : (typeof value === "function"
- ? propertyFunction : propertyConstant));
- };
+ return this.each(value == null
+ ? propertyNull : (typeof value === "function"
+ ? propertyFunction : propertyConstant));
+};
+d3_selectionPrototype.text = function(value) {
+ return arguments.length < 1
+ ? this.node().textContent : this.each(typeof value === "function"
+ ? function() { var v = value.apply(this, arguments); this.textContent = v == null ? "" : v; } : value == null
+ ? function() { this.textContent = ""; }
+ : function() { this.textContent = value; });
+};
+d3_selectionPrototype.html = function(value) {
+ return arguments.length < 1
+ ? this.node().innerHTML : this.each(typeof value === "function"
+ ? function() { var v = value.apply(this, arguments); this.innerHTML = v == null ? "" : v; } : value == null
+ ? function() { this.innerHTML = ""; }
+ : function() { this.innerHTML = value; });
+};
+// TODO append(node)?
+// TODO append(function)?
+d3_selectionPrototype.append = function(name) {
+ name = d3.ns.qualify(name);
- groups.text = function(value) {
+ function append() {
+ return this.appendChild(document.createElementNS(this.namespaceURI, name));
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 1) {
- return first(function() {
- return this.textContent;
- });
- }
+ function appendNS() {
+ return this.appendChild(document.createElementNS(name.space, name.local));
+ }
- /** @this {Element} */
- function textConstant() {
- this.textContent = value;
- }
+ return this.select(name.local ? appendNS : append);
+};
+// TODO insert(node, function)?
+// TODO insert(function, string)?
+// TODO insert(function, function)?
+d3_selectionPrototype.insert = function(name, before) {
+ name = d3.ns.qualify(name);
+
+ function insert() {
+ return this.insertBefore(
+ document.createElementNS(this.namespaceURI, name),
+ d3_select(before, this));
+ }
- /** @this {Element} */
- function textFunction() {
- this.textContent = value.apply(this, arguments);
- }
+ function insertNS() {
+ return this.insertBefore(
+ document.createElementNS(name.space, name.local),
+ d3_select(before, this));
+ }
- return groups.each(typeof value === "function"
- ? textFunction : textConstant);
- };
+ return this.select(name.local ? insertNS : insert);
+};
+// TODO remove(selector)?
+// TODO remove(node)?
+// TODO remove(function)?
+d3_selectionPrototype.remove = function() {
+ return this.each(function() {
+ var parent = this.parentNode;
+ if (parent) parent.removeChild(this);
+ });
+};
+// TODO data(null) for clearing data?
+d3_selectionPrototype.data = function(data, join) {
+ var enter = [],
+ update = [],
+ exit = [];
+
+ function bind(group, groupData) {
+ var i,
+ n = group.length,
+ m = groupData.length,
+ n0 = Math.min(n, m),
+ n1 = Math.max(n, m),
+ updateNodes = [],
+ enterNodes = [],
+ exitNodes = [],
+ node,
+ nodeData;
+
+ if (join) {
+ var nodeByKey = {},
+ keys = [],
+ key,
+ j = groupData.length;
+
+ for (i = -1; ++i < n;) {
+ key = join.call(node = group[i], node.__data__, i);
+ if (key in nodeByKey) {
+ exitNodes[j++] = node; // duplicate key
+ } else {
+ nodeByKey[key] = node;
+ }
+ keys.push(key);
+ }
- groups.html = function(value) {
+ for (i = -1; ++i < m;) {
+ node = nodeByKey[key = join.call(groupData, nodeData = groupData[i], i)];
+ if (node) {
+ node.__data__ = nodeData;
+ updateNodes[i] = node;
+ enterNodes[i] = exitNodes[i] = null;
+ } else {
+ enterNodes[i] = d3_selection_dataNode(nodeData);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ delete nodeByKey[key];
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 1) {
- return first(function() {
- return this.innerHTML;
- });
- }
-
- /** @this {Element} */
- function htmlConstant() {
- this.innerHTML = value;
+ for (i = -1; ++i < n;) {
+ if (keys[i] in nodeByKey) {
+ exitNodes[i] = group[i];
+ }
+ }
+ } else {
+ for (i = -1; ++i < n0;) {
+ node = group[i];
+ nodeData = groupData[i];
+ if (node) {
+ node.__data__ = nodeData;
+ updateNodes[i] = node;
+ enterNodes[i] = exitNodes[i] = null;
+ } else {
+ enterNodes[i] = d3_selection_dataNode(nodeData);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ }
+ for (; i < m; ++i) {
+ enterNodes[i] = d3_selection_dataNode(groupData[i]);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ for (; i < n1; ++i) {
+ exitNodes[i] = group[i];
+ enterNodes[i] = updateNodes[i] = null;
+ }
}
- /** @this {Element} */
- function htmlFunction() {
- this.innerHTML = value.apply(this, arguments);
- }
+ enterNodes.update
+ = updateNodes;
- return groups.each(typeof value === "function"
- ? htmlFunction : htmlConstant);
- };
+ enterNodes.parentNode
+ = updateNodes.parentNode
+ = exitNodes.parentNode
+ = group.parentNode;
- // TODO append(node)?
- // TODO append(function)?
- groups.append = function(name) {
- name = d3.ns.qualify(name);
+ enter.push(enterNodes);
+ update.push(updateNodes);
+ exit.push(exitNodes);
+ }
- function append(node) {
- return node.appendChild(document.createElement(name));
+ var i = -1,
+ n = this.length,
+ group;
+ if (typeof data === "function") {
+ while (++i < n) {
+ bind(group = this[i], data.call(group, group.parentNode.__data__, i));
}
-
- function appendNS(node) {
- return node.appendChild(document.createElementNS(name.space, name.local));
+ } else {
+ while (++i < n) {
+ bind(group = this[i], data);
}
+ }
- return select(name.local ? appendNS : append);
- };
-
- // TODO insert(node, function)?
- // TODO insert(function, string)?
- // TODO insert(function, function)?
- groups.insert = function(name, before) {
- name = d3.ns.qualify(name);
+ var selection = d3_selection(update);
+ selection.enter = function() { return d3_selection_enter(enter); };
+ selection.exit = function() { return d3_selection(exit); };
+ return selection;
+};
- function insert(node) {
- return node.insertBefore(
- document.createElement(name),
- d3_select(before, node));
+function d3_selection_dataNode(data) {
+ return {__data__: data};
+}
+d3_selectionPrototype.filter = function(filter) {
+ var subgroups = [],
+ subgroup,
+ group,
+ node;
+
+ if (typeof filter !== "function") filter = d3_selection_filter(filter);
+
+ for (var j = 0, m = this.length; j < m; j++) {
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = (group = this[j]).parentNode;
+ for (var i = 0, n = group.length; i < n; i++) {
+ if ((node = group[i]) && filter.call(node, node.__data__, i)) {
+ subgroup.push(node);
+ }
}
+ }
- function insertNS(node) {
- return node.insertBefore(
- document.createElementNS(name.space, name.local),
- d3_select(before, node));
- }
+ return d3_selection(subgroups);
+};
- return select(name.local ? insertNS : insert);
+function d3_selection_filter(selector) {
+ return function() {
+ return d3_selectMatches(this, selector);
};
+}
+d3_selectionPrototype.map = function(map) {
+ return this.each(function() {
+ this.__data__ = map.apply(this, arguments);
+ });
+};
+d3_selectionPrototype.order = function() {
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = group.length - 1, next = group[i], node; --i >= 0;) {
+ if (node = group[i]) {
+ if (next) next.parentNode.insertBefore(node, next);
+ next = node;
+ }
+ }
+ }
+ return this;
+};
+d3_selectionPrototype.sort = function(comparator) {
+ comparator = d3_selection_sortComparator.apply(this, arguments);
+ for (var j = -1, m = this.length; ++j < m;) this[j].sort(comparator);
+ return this.order();
+};
- // TODO remove(selector)?
- // TODO remove(node)?
- // TODO remove(function)?
- groups.remove = function() {
- return groups.each(function() {
- var parent = this.parentNode;
- if (parent) parent.removeChild(this);
- });
+function d3_selection_sortComparator(comparator) {
+ if (!arguments.length) comparator = d3.ascending;
+ return function(a, b) {
+ return comparator(a && a.__data__, b && b.__data__);
};
-
- groups.sort = function(comparator) {
- comparator = d3_selection_comparator.apply(this, arguments);
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- group.sort(comparator);
- for (var i = 1, n = group.length, prev = group[0]; i < n; i++) {
- var node = group[i];
- if (node) {
- if (prev) prev.parentNode.insertBefore(node, prev.nextSibling);
- prev = node;
- }
+}
+// type can be namespaced, e.g., "click.foo"
+// listener can be null for removal
+d3_selectionPrototype.on = function(type, listener, capture) {
+ if (arguments.length < 3) capture = false;
+
+ // parse the type specifier
+ var name = "__on" + type, i = type.indexOf(".");
+ if (i > 0) type = type.substring(0, i);
+
+ // if called with only one argument, return the current listener
+ if (arguments.length < 2) return (i = this.node()[name]) && i._;
+
+ // remove the old event listener, and add the new event listener
+ return this.each(function(d, i) {
+ var node = this;
+
+ if (node[name]) node.removeEventListener(type, node[name], capture);
+ if (listener) node.addEventListener(type, node[name] = l, capture);
+
+ // wrapped event listener that preserves i
+ function l(e) {
+ var o = d3.event; // Events can be reentrant (e.g., focus).
+ d3.event = e;
+ try {
+ listener.call(node, node.__data__, i);
+ } finally {
+ d3.event = o;
}
}
- return groups;
- };
-
- // type can be namespaced, e.g., "click.foo"
- // listener can be null for removal
- groups.on = function(type, listener, capture) {
- if (arguments.length < 3) capture = false;
-
- // parse the type specifier
- var i = type.indexOf("."),
- typo = i === -1 ? type : type.substring(0, i),
- name = "__on" + type;
- // remove the old event listener, and add the new event listener
- return groups.each(function(d, i) {
- if (this[name]) this.removeEventListener(typo, this[name], capture);
- if (listener) this.addEventListener(typo, this[name] = l, capture);
-
- // wrapped event listener that preserves i
- var node = this;
- function l(e) {
- var o = d3.event; // Events can be reentrant (e.g., focus).
- d3.event = e;
- try {
- listener.call(this, node.__data__, i);
- } finally {
- d3.event = o;
- }
- }
- });
- };
+ // stash the unwrapped listener for retrieval
+ l._ = listener;
+ });
+};
+d3_selectionPrototype.each = function(callback) {
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ var node = group[i];
+ if (node) callback.call(node, node.__data__, i, j);
+ }
+ }
+ return this;
+};
+//
+// Note: assigning to the arguments array simultaneously changes the value of
+// the corresponding argument!
+//
+// TODO The `this` argument probably shouldn't be the first argument to the
+// callback, anyway, since it's redundant. However, that will require a major
+// version bump due to backwards compatibility, so I'm not changing it right
+// away.
+//
+d3_selectionPrototype.call = function(callback) {
+ callback.apply(this, (arguments[0] = this, arguments));
+ return this;
+};
+d3_selectionPrototype.empty = function() {
+ return !this.node();
+};
+d3_selectionPrototype.node = function(callback) {
+ for (var j = 0, m = this.length; j < m; j++) {
+ for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+ var node = group[i];
+ if (node) return node;
+ }
+ }
+ return null;
+};
+d3_selectionPrototype.transition = function() {
+ var subgroups = [],
+ subgroup,
+ node;
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ subgroup.push((node = group[i]) ? {node: node, delay: 0, duration: 250} : null);
+ }
+ }
- // TODO slice?
+ return d3_transition(subgroups, d3_transitionInheritId || ++d3_transitionId, Date.now());
+};
+var d3_selectionRoot = d3_selection([[document]]);
- groups.transition = function() {
- return d3_transition(groups);
- };
+d3_selectionRoot[0].parentNode = d3_selectRoot;
- groups.call = d3_call;
+// TODO fast singleton implementation!
+// TODO select(function)
+d3.select = function(selector) {
+ return typeof selector === "string"
+ ? d3_selectionRoot.select(selector)
+ : d3_selection([[selector]]); // assume node
+};
- return groups;
+// TODO selectAll(function)
+d3.selectAll = function(selector) {
+ return typeof selector === "string"
+ ? d3_selectionRoot.selectAll(selector)
+ : d3_selection([d3_array(selector)]); // assume node[]
+};
+function d3_selection_enter(selection) {
+ d3_arraySubclass(selection, d3_selection_enterPrototype);
+ return selection;
}
-function d3_selectionEnter(groups) {
-
- function select(select) {
- var subgroups = [],
- subgroup,
- subnode,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroup.push(subnode = select(group.parentNode));
- subnode.__data__ = node.__data__;
- } else {
- subgroup.push(null);
- }
+var d3_selection_enterPrototype = [];
+
+d3_selection_enterPrototype.append = d3_selectionPrototype.append;
+d3_selection_enterPrototype.insert = d3_selectionPrototype.insert;
+d3_selection_enterPrototype.empty = d3_selectionPrototype.empty;
+d3_selection_enterPrototype.node = d3_selectionPrototype.node;
+d3_selection_enterPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ upgroup,
+ group,
+ node;
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ upgroup = (group = this[j]).update;
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = group.parentNode;
+ for (var i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroup.push(upgroup[i] = subnode = selector.call(group.parentNode, node.__data__, i));
+ subnode.__data__ = node.__data__;
+ } else {
+ subgroup.push(null);
}
}
- return d3_selection(subgroups);
}
- // TODO append(node)?
- // TODO append(function)?
- groups.append = function(name) {
- name = d3.ns.qualify(name);
-
- function append(node) {
- return node.appendChild(document.createElement(name));
- }
-
- function appendNS(node) {
- return node.appendChild(document.createElementNS(name.space, name.local));
- }
-
- return select(name.local ? appendNS : append);
- };
+ return d3_selection(subgroups);
+};
+function d3_transition(groups, id, time) {
+ d3_arraySubclass(groups, d3_transitionPrototype);
- // TODO insert(node, function)?
- // TODO insert(function, string)?
- // TODO insert(function, function)?
- groups.insert = function(name, before) {
- name = d3.ns.qualify(name);
+ var tweens = {},
+ event = d3.dispatch("start", "end"),
+ ease = d3_transitionEase;
- function insert(node) {
- return node.insertBefore(
- document.createElement(name),
- d3_select(before, node));
- }
+ groups.id = id;
- function insertNS(node) {
- return node.insertBefore(
- document.createElementNS(name.space, name.local),
- d3_select(before, node));
- }
+ groups.time = time;
- return select(name.local ? insertNS : insert);
+ groups.tween = function(name, tween) {
+ if (arguments.length < 2) return tweens[name];
+ if (tween == null) delete tweens[name];
+ else tweens[name] = tween;
+ return groups;
};
- return groups;
-}
+ groups.ease = function(value) {
+ if (!arguments.length) return ease;
+ ease = typeof value === "function" ? value : d3.ease.apply(d3, arguments);
+ return groups;
+ };
-function d3_selection_comparator(comparator) {
- if (!arguments.length) comparator = d3.ascending;
- return function(a, b) {
- return comparator(a && a.__data__, b && b.__data__);
+ groups.each = function(type, listener) {
+ if (arguments.length < 2) return d3_transition_each.call(groups, type);
+ event.on(type, listener);
+ return groups;
};
-}
-function d3_selection_enterNode(data) {
- return {__data__: data};
-}
-d3.transition = d3_root.transition;
+ d3.timer(function(elapsed) {
+ groups.each(function(d, i, j) {
+ var tweened = [],
+ node = this,
+ delay = groups[j][i].delay,
+ duration = groups[j][i].duration,
+ lock = node.__transition__ || (node.__transition__ = {active: 0, count: 0});
-var d3_transitionId = 0,
- d3_transitionInheritId = 0;
+ ++lock.count;
-function d3_transition(groups) {
- var transition = {},
- transitionId = d3_transitionInheritId || ++d3_transitionId,
- tweens = {},
- interpolators = [],
- remove = false,
- event = d3.dispatch("start", "end"),
- stage = [],
- delay = [],
- duration = [],
- durationMax,
- ease = d3.ease("cubic-in-out");
-
- //
- // Be careful with concurrent transitions!
- //
- // Say transition A causes an exit. Before A finishes, a transition B is
- // created, and believes it only needs to do an update, because the elements
- // haven't been removed yet (which happens at the very end of the exit
- // transition).
- //
- // Even worse, what if either transition A or B has a staggered delay? Then,
- // some elements may be removed, while others remain. Transition B does not
- // know to enter the elements because they were still present at the time
- // the transition B was created (but not yet started).
- //
- // To prevent such confusion, we only trigger end events for transitions if
- // the transition ending is the only one scheduled for the given element.
- // Similarly, we only allow one transition to be active for any given
- // element, so that concurrent transitions do not overwrite each other's
- // properties.
- //
- // TODO Support transition namespaces, so that transitions can proceed
- // concurrently on the same element if needed. Hopefully, this is rare!
- //
-
- groups.each(function() {
- (this.__transition__ || (this.__transition__ = {})).owner = transitionId;
- });
+ delay <= elapsed ? start(elapsed) : d3.timer(start, delay, time);
- function step(elapsed) {
- var clear = true,
- k = -1;
- groups.each(function() {
- if (stage[++k] === 2) return; // ended
- var t = (elapsed - delay[k]) / duration[k],
- tx = this.__transition__,
- te, // ease(t)
- tk, // tween key
- ik = interpolators[k];
-
- // Check if the (un-eased) time is outside the range [0,1].
- if (t < 1) {
- clear = false;
- if (t < 0) return;
- } else {
- t = 1;
- }
+ function start(elapsed) {
+ if (lock.active > id) return stop();
+ lock.active = id;
- // Determine the stage of this transition.
- // 0 - Not yet started.
- // 1 - In progress.
- // 2 - Ended.
- if (stage[k]) {
- if (!tx || tx.active !== transitionId) {
- stage[k] = 2;
- return;
- }
- } else if (!tx || tx.active > transitionId) {
- stage[k] = 2;
- return;
- } else {
- stage[k] = 1;
- event.start.dispatch.apply(this, arguments);
- ik = interpolators[k] = {};
- tx.active = transitionId;
- for (tk in tweens) {
- if (te = tweens[tk].apply(this, arguments)) {
- ik[tk] = te;
+ for (var tween in tweens) {
+ if (tween = tweens[tween].call(node, d, i)) {
+ tweened.push(tween);
}
}
+
+ event.start.call(node, d, i);
+ if (!tick(elapsed)) d3.timer(tick, 0, time);
+ return 1;
}
- // Apply the interpolators!
- te = ease(t);
- for (tk in ik) ik[tk].call(this, te);
-
- // Handle ending transitions.
- if (t === 1) {
- stage[k] = 2;
- if (tx.active === transitionId) {
- var owner = tx.owner;
- if (owner === transitionId) {
- delete this.__transition__;
- if (remove && this.parentNode) this.parentNode.removeChild(this);
- }
- d3_transitionInheritId = transitionId;
- event.end.dispatch.apply(this, arguments);
+ function tick(elapsed) {
+ if (lock.active !== id) return stop();
+
+ var t = (elapsed - delay) / duration,
+ e = ease(t),
+ n = tweened.length;
+
+ while (n > 0) {
+ tweened[--n].call(node, e);
+ }
+
+ if (t >= 1) {
+ stop();
+ d3_transitionInheritId = id;
+ event.end.call(node, d, i);
d3_transitionInheritId = 0;
- tx.owner = owner;
+ return 1;
}
}
- });
- return clear;
- }
- transition.delay = function(value) {
- var delayMin = Infinity,
- k = -1;
- if (typeof value === "function") {
- groups.each(function(d, i) {
- var x = delay[++k] = +value.apply(this, arguments);
- if (x < delayMin) delayMin = x;
- });
- } else {
- delayMin = +value;
- groups.each(function(d, i) {
- delay[++k] = delayMin;
- });
- }
- d3_timer(step, delayMin);
- return transition;
- };
-
- transition.duration = function(value) {
- var k = -1;
- if (typeof value === "function") {
- durationMax = 0;
- groups.each(function(d, i) {
- var x = duration[++k] = +value.apply(this, arguments);
- if (x > durationMax) durationMax = x;
- });
- } else {
- durationMax = +value;
- groups.each(function(d, i) {
- duration[++k] = durationMax;
- });
- }
- return transition;
- };
+ function stop() {
+ if (!--lock.count) delete node.__transition__;
+ return 1;
+ }
+ });
+ return 1;
+ }, 0, time);
- transition.ease = function(value) {
- ease = typeof value === "function" ? value : d3.ease.apply(d3, arguments);
- return transition;
- };
+ return groups;
+}
- transition.attrTween = function(name, tween) {
+var d3_transitionRemove = {};
- /** @this {Element} */
- function attrTween(d, i) {
- var f = tween.call(this, d, i, this.getAttribute(name));
- return f && function(t) {
- this.setAttribute(name, f(t));
- };
- }
+function d3_transitionNull(d, i, a) {
+ return a != "" && d3_transitionRemove;
+}
- /** @this {Element} */
- function attrTweenNS(d, i) {
- var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
- return f && function(t) {
- this.setAttributeNS(name.space, name.local, f(t));
- };
- }
+function d3_transitionTween(name, b) {
+ var interpolate = d3_interpolateByName(name);
- tweens["attr." + name] = name.local ? attrTweenNS : attrTween;
- return transition;
- };
+ function transitionFunction(d, i, a) {
+ var v = b.call(this, d, i);
+ return v == null
+ ? a != "" && d3_transitionRemove
+ : a != v && interpolate(a, v);
+ }
- transition.attr = function(name, value) {
- return transition.attrTween(name, d3_transitionTween(value));
- };
+ function transitionString(d, i, a) {
+ return a != b && interpolate(a, b);
+ }
- transition.styleTween = function(name, tween, priority) {
- if (arguments.length < 3) priority = null;
+ return typeof b === "function" ? transitionFunction
+ : b == null ? d3_transitionNull
+ : (b += "", transitionString);
+}
- /** @this {Element} */
- function styleTween(d, i) {
- var f = tween.call(this, d, i, window.getComputedStyle(this, null).getPropertyValue(name));
- return f && function(t) {
- this.style.setProperty(name, f(t), priority);
- };
- }
+var d3_transitionPrototype = [],
+ d3_transitionId = 0,
+ d3_transitionInheritId = 0,
+ d3_transitionEase = d3.ease("cubic-in-out");
- tweens["style." + name] = styleTween;
- return transition;
- };
+d3_transitionPrototype.call = d3_selectionPrototype.call;
- transition.style = function(name, value, priority) {
- if (arguments.length < 3) priority = null;
- return transition.styleTween(name, d3_transitionTween(value), priority);
- };
+d3.transition = function() {
+ return d3_selectionRoot.transition();
+};
- transition.text = function(value) {
- tweens.text = function(d, i) {
- this.textContent = typeof value === "function"
- ? value.call(this, d, i)
- : value;
- };
- return transition;
- };
+d3.transition.prototype = d3_transitionPrototype;
+d3_transitionPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selector(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if ((node = group[i]) && (subnode = selector.call(node.node, node.node.__data__, i))) {
+ if ("__data__" in node.node) subnode.__data__ = node.node.__data__;
+ subgroup.push({node: subnode, delay: node.delay, duration: node.duration});
+ } else {
+ subgroup.push(null);
+ }
+ }
+ }
- transition.select = function(query) {
- var k, t = d3_transition(groups.select(query)).ease(ease);
- k = -1; t.delay(function(d, i) { return delay[++k]; });
- k = -1; t.duration(function(d, i) { return duration[++k]; });
- return t;
- };
+ return d3_transition(subgroups, this.id, this.time).ease(this.ease());
+};
+d3_transitionPrototype.selectAll = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnodes,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selectorAll(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subnodes = selector.call(node.node, node.node.__data__, i);
+ subgroups.push(subgroup = []);
+ for (var k = -1, o = subnodes.length; ++k < o;) {
+ subgroup.push({node: subnodes[k], delay: node.delay, duration: node.duration});
+ }
+ }
+ }
+ }
- transition.selectAll = function(query) {
- var k, t = d3_transition(groups.selectAll(query)).ease(ease);
- k = -1; t.delay(function(d, i) { return delay[i ? k : ++k]; })
- k = -1; t.duration(function(d, i) { return duration[i ? k : ++k]; });
- return t;
- };
+ return d3_transition(subgroups, this.id, this.time).ease(this.ease());
+};
+d3_transitionPrototype.attr = function(name, value) {
+ return this.attrTween(name, d3_transitionTween(name, value));
+};
- transition.remove = function() {
- remove = true;
- return transition;
- };
+d3_transitionPrototype.attrTween = function(nameNS, tween) {
+ var name = d3.ns.qualify(nameNS);
- transition.each = function(type, listener) {
- event[type].add(listener);
- return transition;
- };
+ function attrTween(d, i) {
+ var f = tween.call(this, d, i, this.getAttribute(name));
+ return f === d3_transitionRemove
+ ? (this.removeAttribute(name), null)
+ : f && function(t) { this.setAttribute(name, f(t)); };
+ }
- transition.call = d3_call;
+ function attrTweenNS(d, i) {
+ var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
+ return f === d3_transitionRemove
+ ? (this.removeAttributeNS(name.space, name.local), null)
+ : f && function(t) { this.setAttributeNS(name.space, name.local, f(t)); };
+ }
- return transition.delay(0).duration(250);
-}
+ return this.tween("attr." + nameNS, name.local ? attrTweenNS : attrTween);
+};
+d3_transitionPrototype.style = function(name, value, priority) {
+ if (arguments.length < 3) priority = "";
+ return this.styleTween(name, d3_transitionTween(name, value), priority);
+};
-function d3_transitionTween(b) {
- return typeof b === "function"
- ? function(d, i, a) { var v = b.call(this, d, i) + ""; return a != v && d3.interpolate(a, v); }
- : (b = b + "", function(d, i, a) { return a != b && d3.interpolate(a, b); });
+d3_transitionPrototype.styleTween = function(name, tween, priority) {
+ if (arguments.length < 3) priority = "";
+ return this.tween("style." + name, function(d, i) {
+ var f = tween.call(this, d, i, window.getComputedStyle(this, null).getPropertyValue(name));
+ return f === d3_transitionRemove
+ ? (this.style.removeProperty(name), null)
+ : f && function(t) { this.style.setProperty(name, f(t), priority); };
+ });
+};
+d3_transitionPrototype.text = function(value) {
+ return this.tween("text", function(d, i) {
+ this.textContent = typeof value === "function"
+ ? value.call(this, d, i)
+ : value;
+ });
+};
+d3_transitionPrototype.remove = function() {
+ return this.each("end", function() {
+ var p;
+ if (!this.__transition__ && (p = this.parentNode)) p.removeChild(this);
+ });
+};
+d3_transitionPrototype.delay = function(value) {
+ var groups = this;
+ return groups.each(typeof value === "function"
+ ? function(d, i, j) { groups[j][i].delay = +value.apply(this, arguments); }
+ : (value = +value, function(d, i, j) { groups[j][i].delay = value; }));
+};
+d3_transitionPrototype.duration = function(value) {
+ var groups = this;
+ return groups.each(typeof value === "function"
+ ? function(d, i, j) { groups[j][i].duration = +value.apply(this, arguments); }
+ : (value = +value, function(d, i, j) { groups[j][i].duration = value; }));
+};
+function d3_transition_each(callback) {
+ for (var j = 0, m = this.length; j < m; j++) {
+ for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+ var node = group[i];
+ if (node) callback.call(node = node.node, node.__data__, i, j);
+ }
+ }
+ return this;
}
+d3_transitionPrototype.transition = function() {
+ return this.select(d3_this);
+};
var d3_timer_queue = null,
d3_timer_interval, // is an interval (or frame) active?
d3_timer_timeout; // is a timeout active?
// The timer will continue to fire until callback returns true.
-d3.timer = function(callback) {
- d3_timer(callback, 0);
-};
-
-function d3_timer(callback, delay) {
- var now = Date.now(),
- found = false,
+d3.timer = function(callback, delay, then) {
+ var found = false,
t0,
t1 = d3_timer_queue;
- if (!isFinite(delay)) return;
+ if (arguments.length < 3) {
+ if (arguments.length < 2) delay = 0;
+ else if (!isFinite(delay)) return;
+ then = Date.now();
+ }
// See if the callback's already in the queue.
while (t1) {
if (t1.callback === callback) {
- t1.then = now;
+ t1.then = then;
t1.delay = delay;
found = true;
break;
@@ -2105,7 +2205,7 @@ function d3_timer(callback, delay) {
// Otherwise, add the callback to the queue.
if (!found) d3_timer_queue = {
callback: callback,
- then: now,
+ then: then,
delay: delay,
next: d3_timer_queue
};
@@ -2125,7 +2225,7 @@ function d3_timer_step() {
while (t1) {
elapsed = now - t1.then;
- if (elapsed > t1.delay) t1.flush = t1.callback(elapsed);
+ if (elapsed >= t1.delay) t1.flush = t1.callback(elapsed);
t1 = t1.next;
}
@@ -2178,6 +2278,66 @@ var d3_timer_frame = window.requestAnimationFrame
|| window.oRequestAnimationFrame
|| window.msRequestAnimationFrame
|| function(callback) { setTimeout(callback, 17); };
+d3.transform = function(string) {
+ var g = document.createElementNS(d3.ns.prefix.svg, "g"),
+ identity = {a: 1, b: 0, c: 0, d: 1, e: 0, f: 0};
+ return (d3.transform = function(string) {
+ g.setAttribute("transform", string);
+ var t = g.transform.baseVal.consolidate();
+ return new d3_transform(t ? t.matrix : identity);
+ })(string);
+};
+
+// Compute x-scale and normalize the first row.
+// Compute shear and make second row orthogonal to first.
+// Compute y-scale and normalize the second row.
+// Finally, compute the rotation.
+function d3_transform(m) {
+ var r0 = [m.a, m.b],
+ r1 = [m.c, m.d],
+ kx = d3_transformNormalize(r0),
+ kz = d3_transformDot(r0, r1),
+ ky = d3_transformNormalize(d3_transformCombine(r1, r0, -kz)) || 0;
+ if (r0[0] * r1[1] < r1[0] * r0[1]) {
+ r0[0] *= -1;
+ r0[1] *= -1;
+ kx *= -1;
+ kz *= -1;
+ }
+ this.rotate = (kx ? Math.atan2(r0[1], r0[0]) : Math.atan2(-r1[0], r1[1])) * d3_transformDegrees;
+ this.translate = [m.e, m.f];
+ this.scale = [kx, ky];
+ this.skew = ky ? Math.atan2(kz, ky) * d3_transformDegrees : 0;
+};
+
+d3_transform.prototype.toString = function() {
+ return "translate(" + this.translate
+ + ")rotate(" + this.rotate
+ + ")skewX(" + this.skew
+ + ")scale(" + this.scale
+ + ")";
+};
+
+function d3_transformDot(a, b) {
+ return a[0] * b[0] + a[1] * b[1];
+}
+
+function d3_transformNormalize(a) {
+ var k = Math.sqrt(d3_transformDot(a, a));
+ if (k) {
+ a[0] /= k;
+ a[1] /= k;
+ }
+ return k;
+}
+
+function d3_transformCombine(a, b, k) {
+ a[0] += k * b[0];
+ a[1] += k * b[1];
+ return a;
+}
+
+var d3_transformDegrees = 180 / Math.PI;
function d3_noop() {}
d3.scale = {};
@@ -2185,6 +2345,10 @@ function d3_scaleExtent(domain) {
var start = domain[0], stop = domain[domain.length - 1];
return start < stop ? [start, stop] : [stop, start];
}
+
+function d3_scaleRange(scale) {
+ return scale.rangeExtent ? scale.rangeExtent() : d3_scaleExtent(scale.range());
+}
function d3_scale_nice(domain, nice) {
var i0 = 0,
i1 = domain.length - 1,
@@ -2197,9 +2361,12 @@ function d3_scale_nice(domain, nice) {
dx = x0; x0 = x1; x1 = dx;
}
- nice = nice(x1 - x0);
- domain[i0] = nice.floor(x0);
- domain[i1] = nice.ceil(x1);
+ if (dx = x1 - x0) {
+ nice = nice(dx);
+ domain[i0] = nice.floor(x0);
+ domain[i1] = nice.ceil(x1);
+ }
+
return domain;
}
@@ -2207,11 +2374,11 @@ function d3_scale_niceDefault() {
return Math;
}
d3.scale.linear = function() {
- var domain = [0, 1],
- range = [0, 1],
- interpolate = d3.interpolate,
- clamp = false,
- output,
+ return d3_scale_linear([0, 1], [0, 1], d3.interpolate, false);
+};
+
+function d3_scale_linear(domain, range, interpolate, clamp) {
+ var output,
input;
function rescale() {
@@ -2272,15 +2439,15 @@ d3.scale.linear = function() {
return rescale();
};
+ scale.copy = function() {
+ return d3_scale_linear(domain, range, interpolate, clamp);
+ };
+
return rescale();
};
function d3_scale_linearRebind(scale, linear) {
- scale.range = d3.rebind(scale, linear.range);
- scale.rangeRound = d3.rebind(scale, linear.rangeRound);
- scale.interpolate = d3.rebind(scale, linear.interpolate);
- scale.clamp = d3.rebind(scale, linear.clamp);
- return scale;
+ return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
}
function d3_scale_linearNice(dx) {
@@ -2341,9 +2508,11 @@ function d3_scale_polylinear(domain, range, uninterpolate, interpolate) {
};
}
d3.scale.log = function() {
- var linear = d3.scale.linear(),
- log = d3_scale_log,
- pow = log.pow;
+ return d3_scale_log(d3.scale.linear(), d3_scale_logp);
+};
+
+function d3_scale_log(linear, log) {
+ var pow = log.pow;
function scale(x) {
return linear(log(x));
@@ -2355,7 +2524,7 @@ d3.scale.log = function() {
scale.domain = function(x) {
if (!arguments.length) return linear.domain().map(pow);
- log = x[0] < 0 ? d3_scale_logn : d3_scale_log;
+ log = x[0] < 0 ? d3_scale_logn : d3_scale_logp;
pow = log.pow;
linear.domain(x.map(log));
return scale;
@@ -2388,14 +2557,27 @@ d3.scale.log = function() {
return ticks;
};
- scale.tickFormat = function() {
- return d3_scale_logTickFormat;
+ scale.tickFormat = function(n, format) {
+ if (arguments.length < 2) format = d3_scale_logFormat;
+ if (arguments.length < 1) return format;
+ var k = n / scale.ticks().length,
+ f = log === d3_scale_logn ? (e = -1e-12, Math.floor) : (e = 1e-12, Math.ceil),
+ e;
+ return function(d) {
+ return d / pow(f(log(d) + e)) < k ? format(d) : "";
+ };
+ };
+
+ scale.copy = function() {
+ return d3_scale_log(linear.copy(), log);
};
return d3_scale_linearRebind(scale, linear);
};
-function d3_scale_log(x) {
+var d3_scale_logFormat = d3.format(".0e");
+
+function d3_scale_logp(x) {
return Math.log(x) / Math.LN10;
}
@@ -2403,22 +2585,20 @@ function d3_scale_logn(x) {
return -Math.log(-x) / Math.LN10;
}
-d3_scale_log.pow = function(x) {
+d3_scale_logp.pow = function(x) {
return Math.pow(10, x);
};
d3_scale_logn.pow = function(x) {
return -Math.pow(10, -x);
};
-
-function d3_scale_logTickFormat(d) {
- return d.toPrecision(1);
-}
d3.scale.pow = function() {
- var linear = d3.scale.linear(),
- exponent = 1,
- powp = Number,
- powb = powp;
+ return d3_scale_pow(d3.scale.linear(), 1);
+};
+
+function d3_scale_pow(linear, exponent) {
+ var powp = d3_scale_powPow(exponent),
+ powb = d3_scale_powPow(1 / exponent);
function scale(x) {
return linear(powp(x));
@@ -2430,8 +2610,6 @@ d3.scale.pow = function() {
scale.domain = function(x) {
if (!arguments.length) return linear.domain().map(powb);
- powp = d3_scale_powPow(exponent);
- powb = d3_scale_powPow(1 / exponent);
linear.domain(x.map(powp));
return scale;
};
@@ -2451,10 +2629,15 @@ d3.scale.pow = function() {
scale.exponent = function(x) {
if (!arguments.length) return exponent;
var domain = scale.domain();
- exponent = x;
+ powp = d3_scale_powPow(exponent = x);
+ powb = d3_scale_powPow(1 / exponent);
return scale.domain(domain);
};
+ scale.copy = function() {
+ return d3_scale_pow(linear.copy(), exponent);
+ };
+
return d3_scale_linearRebind(scale, linear);
};
@@ -2467,73 +2650,69 @@ d3.scale.sqrt = function() {
return d3.scale.pow().exponent(.5);
};
d3.scale.ordinal = function() {
- var domain = [],
- index = {},
- range = [],
- rangeBand = 0,
- rerange = d3_noop;
+ return d3_scale_ordinal([], {t: "range", x: []});
+};
+
+function d3_scale_ordinal(domain, ranger) {
+ var index,
+ range,
+ rangeBand;
function scale(x) {
- var i = x in index ? index[x] : (index[x] = domain.push(x) - 1);
- return range[i % range.length];
+ return range[((index[x] || (index[x] = domain.push(x))) - 1) % range.length];
+ }
+
+ function steps(start, step) {
+ return d3.range(domain.length).map(function(i) { return start + step * i; });
}
scale.domain = function(x) {
if (!arguments.length) return domain;
- domain = x;
+ domain = [];
index = {};
- var i = -1, j = -1, n = domain.length; while (++i < n) {
- x = domain[i];
- if (!(x in index)) index[x] = ++j;
- }
- rerange();
- return scale;
+ var i = -1, n = x.length, xi;
+ while (++i < n) if (!index[xi = x[i]]) index[xi] = domain.push(xi);
+ return scale[ranger.t](ranger.x, ranger.p);
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- rerange = d3_noop;
+ rangeBand = 0;
+ ranger = {t: "range", x: x};
return scale;
};
scale.rangePoints = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- step = (stop - start) / (domain.length - 1 + padding);
- range = domain.length == 1
- ? [(start + stop) / 2]
- : d3.range(start + step * padding / 2, stop + step / 2, step);
- rangeBand = 0;
- })();
+ var start = x[0],
+ stop = x[1],
+ step = (stop - start) / (domain.length - 1 + padding);
+ range = steps(domain.length < 2 ? (start + stop) / 2 : start + step * padding / 2, step);
+ rangeBand = 0;
+ ranger = {t: "rangePoints", x: x, p: padding};
return scale;
};
scale.rangeBands = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- step = (stop - start) / (domain.length + padding);
- range = d3.range(start + step * padding, stop, step);
- rangeBand = step * (1 - padding);
- })();
+ var start = x[0],
+ stop = x[1],
+ step = (stop - start) / (domain.length + padding);
+ range = steps(start + step * padding, step);
+ rangeBand = step * (1 - padding);
+ ranger = {t: "rangeBands", x: x, p: padding};
return scale;
};
scale.rangeRoundBands = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- diff = stop - start,
- step = Math.floor(diff / (domain.length + padding)),
- err = diff - (domain.length - padding) * step;
- range = d3.range(start + Math.round(err / 2), stop, step);
- rangeBand = Math.round(step * (1 - padding));
- })();
+ var start = x[0],
+ stop = x[1],
+ step = Math.floor((stop - start) / (domain.length + padding));
+ range = steps(start + Math.round((stop - start - (domain.length - padding) * step) / 2), step);
+ rangeBand = Math.round(step * (1 - padding));
+ ranger = {t: "rangeRoundBands", x: x, p: padding};
return scale;
};
@@ -2541,7 +2720,15 @@ d3.scale.ordinal = function() {
return rangeBand;
};
- return scale;
+ scale.rangeExtent = function() {
+ return ranger.t === "range" ? d3_scaleExtent(ranger.x) : ranger.x;
+ };
+
+ scale.copy = function() {
+ return d3_scale_ordinal(domain, ranger);
+ };
+
+ return scale.domain(domain);
};
/*
* This product includes color specifications and designs developed by Cynthia
@@ -2598,16 +2785,19 @@ var d3_category20c = [
"#636363", "#969696", "#bdbdbd", "#d9d9d9"
];
d3.scale.quantile = function() {
- var domain = [],
- range = [],
- thresholds = [];
+ return d3_scale_quantile([], []);
+};
+
+function d3_scale_quantile(domain, range) {
+ var thresholds;
function rescale() {
var k = 0,
n = domain.length,
q = range.length;
- thresholds.length = Math.max(0, q - 1);
+ thresholds = [];
while (++k < q) thresholds[k - 1] = d3.quantile(domain, k / q);
+ return scale;
}
function scale(x) {
@@ -2618,51 +2808,60 @@ d3.scale.quantile = function() {
scale.domain = function(x) {
if (!arguments.length) return domain;
domain = x.filter(function(d) { return !isNaN(d); }).sort(d3.ascending);
- rescale();
- return scale;
+ return rescale();
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- rescale();
- return scale;
+ return rescale();
};
scale.quantiles = function() {
return thresholds;
};
- return scale;
+ scale.copy = function() {
+ return d3_scale_quantile(domain, range); // copy on write!
+ };
+
+ return rescale();
};
d3.scale.quantize = function() {
- var x0 = 0,
- x1 = 1,
- kx = 2,
- i = 1,
- range = [0, 1];
+ return d3_scale_quantize(0, 1, [0, 1]);
+};
+
+function d3_scale_quantize(x0, x1, range) {
+ var kx, i;
function scale(x) {
return range[Math.max(0, Math.min(i, Math.floor(kx * (x - x0))))];
}
- scale.domain = function(x) {
- if (!arguments.length) return [x0, x1];
- x0 = x[0];
- x1 = x[1];
+ function rescale() {
kx = range.length / (x1 - x0);
+ i = range.length - 1;
return scale;
+ }
+
+ scale.domain = function(x) {
+ if (!arguments.length) return [x0, x1];
+ x0 = +x[0];
+ x1 = +x[x.length - 1];
+ return rescale();
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- kx = range.length / (x1 - x0);
- i = range.length - 1;
- return scale;
+ return rescale();
+ };
+
+ scale.copy = function() {
+ return d3_scale_quantize(x0, x1, range); // copy on write
};
- return scale;
+ return rescale();
};
d3.svg = {};
d3.svg.arc = function() {
@@ -2676,7 +2875,7 @@ d3.svg.arc = function() {
r1 = outerRadius.apply(this, arguments),
a0 = startAngle.apply(this, arguments) + d3_svg_arcOffset,
a1 = endAngle.apply(this, arguments) + d3_svg_arcOffset,
- da = a1 - a0,
+ da = (a1 < a0 && (da = a0, a0 = a1, a1 = da), a1 - a0),
df = da < Math.PI ? "0" : "1",
c0 = Math.cos(a0),
s0 = Math.sin(a0),
@@ -2688,8 +2887,8 @@ d3.svg.arc = function() {
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
+ "M0," + r0
- + "A" + r0 + "," + r0 + " 0 1,1 0," + (-r0)
- + "A" + r0 + "," + r0 + " 0 1,1 0," + r0
+ + "A" + r0 + "," + r0 + " 0 1,0 0," + (-r0)
+ + "A" + r0 + "," + r0 + " 0 1,0 0," + r0
+ "Z"
: "M0," + r1
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
@@ -2855,33 +3054,30 @@ var d3_svg_lineInterpolators = {
// Linear interpolation; generates "L" commands.
function d3_svg_lineLinear(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("L", (p = points[i])[0], ",", p[1]);
return path.join("");
}
// Step interpolation; generates "H" and "V" commands.
function d3_svg_lineStepBefore(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("V", (p = points[i])[1], "H", p[0]);
return path.join("");
}
// Step interpolation; generates "H" and "V" commands.
function d3_svg_lineStepAfter(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("H", (p = points[i])[0], "V", p[1]);
return path.join("");
}
@@ -2979,15 +3175,14 @@ function d3_svg_lineCardinalTangents(points, tension) {
// B-spline interpolation; generates "C" commands.
function d3_svg_lineBasis(points) {
if (points.length < 3) return d3_svg_lineLinear(points);
- var path = [],
- i = 1,
+ var i = 1,
n = points.length,
pi = points[0],
x0 = pi[0],
y0 = pi[1],
px = [x0, x0, x0, (pi = points[1])[0]],
- py = [y0, y0, y0, pi[1]];
- path.push(x0, ",", y0);
+ py = [y0, y0, y0, pi[1]],
+ path = [x0, ",", y0];
d3_svg_lineBasisBezier(path, px, py);
while (++i < n) {
pi = points[i];
@@ -3206,16 +3401,17 @@ function d3_svg_area(projection) {
x1 = d3_svg_lineX,
y0 = 0,
y1 = d3_svg_lineY,
- interpolate = "linear",
- interpolator = d3_svg_lineInterpolators[interpolate],
+ interpolate,
+ i0,
+ i1,
tension = .7;
function area(d) {
if (d.length < 1) return null;
var points0 = d3_svg_linePoints(this, d, x0, y0),
points1 = d3_svg_linePoints(this, d, x0 === x1 ? d3_svg_areaX(points0) : x1, y0 === y1 ? d3_svg_areaY(points0) : y1);
- return "M" + interpolator(projection(points1), tension)
- + "L" + interpolator(projection(points0.reverse()), tension)
+ return "M" + i0(projection(points1), tension)
+ + "L" + i1(projection(points0.reverse()), tension)
+ "Z";
}
@@ -3257,7 +3453,8 @@ function d3_svg_area(projection) {
area.interpolate = function(x) {
if (!arguments.length) return interpolate;
- interpolator = d3_svg_lineInterpolators[interpolate = x];
+ i0 = d3_svg_lineInterpolators[interpolate = x];
+ i1 = i0.reverse || i0;
return area;
};
@@ -3267,9 +3464,12 @@ function d3_svg_area(projection) {
return area;
};
- return area;
+ return area.interpolate("linear");
}
+d3_svg_lineStepBefore.reverse = d3_svg_lineStepAfter;
+d3_svg_lineStepAfter.reverse = d3_svg_lineStepBefore;
+
d3.svg.area = function() {
return d3_svg_area(Object);
};
@@ -3308,10 +3508,10 @@ d3.svg.chord = function() {
var s = subgroup(this, source, d, i),
t = subgroup(this, target, d, i);
return "M" + s.p0
- + arc(s.r, s.p1) + (equals(s, t)
+ + arc(s.r, s.p1, s.a1 - s.a0) + (equals(s, t)
? curve(s.r, s.p1, s.r, s.p0)
: curve(s.r, s.p1, t.r, t.p0)
- + arc(t.r, t.p1)
+ + arc(t.r, t.p1, t.a1 - t.a0)
+ curve(t.r, t.p1, s.r, s.p0))
+ "Z";
}
@@ -3334,8 +3534,8 @@ d3.svg.chord = function() {
return a.a0 == b.a0 && a.a1 == b.a1;
}
- function arc(r, p) {
- return "A" + r + "," + r + " 0 0,1 " + p;
+ function arc(r, p, a) {
+ return "A" + r + "," + r + " 0 " + +(a > Math.PI) + ",1 " + p;
}
function curve(r0, p0, r1, p1) {
@@ -3465,7 +3665,7 @@ function d3_svg_mousePoint(container, e) {
var point = (container.ownerSVGElement || container).createSVGPoint();
if ((d3_mouse_bug44083 < 0) && (window.scrollX || window.scrollY)) {
var svg = d3.select(document.body)
- .append("svg:svg")
+ .append("svg")
.style("position", "absolute")
.style("top", 0)
.style("left", 0);
@@ -3483,8 +3683,9 @@ function d3_svg_mousePoint(container, e) {
point = point.matrixTransform(container.getScreenCTM().inverse());
return [point.x, point.y];
};
-d3.svg.touches = function(container) {
- var touches = d3.event.touches;
+d3.svg.touches = function(container, touches) {
+ if (arguments.length < 2) touches = d3.event.touches;
+
return touches ? d3_array(touches).map(function(touch) {
var point = d3_svg_mousePoint(container, touch);
point.identifier = touch.identifier;
@@ -3589,4 +3790,906 @@ d3.svg.symbolTypes = d3.keys(d3_svg_symbols);
var d3_svg_symbolSqrt3 = Math.sqrt(3),
d3_svg_symbolTan30 = Math.tan(30 * Math.PI / 180);
+d3.svg.axis = function() {
+ var scale = d3.scale.linear(),
+ orient = "bottom",
+ tickMajorSize = 6,
+ tickMinorSize = 6,
+ tickEndSize = 6,
+ tickPadding = 3,
+ tickArguments_ = [10],
+ tickFormat_,
+ tickSubdivide = 0;
+
+ function axis(selection) {
+ selection.each(function(d, i, j) {
+ var g = d3.select(this);
+
+ // If selection is a transition, create subtransitions.
+ var transition = selection.delay ? function(o) {
+ var id = d3_transitionInheritId;
+ try {
+ d3_transitionInheritId = selection.id;
+ return o.transition()
+ .delay(selection[j][i].delay)
+ .duration(selection[j][i].duration)
+ .ease(selection.ease());
+ } finally {
+ d3_transitionInheritId = id;
+ }
+ } : Object;
+
+ // Ticks, or domain values for ordinal scales.
+ var ticks = scale.ticks ? scale.ticks.apply(scale, tickArguments_) : scale.domain(),
+ tickFormat = tickFormat_ == null ? (scale.tickFormat ? scale.tickFormat.apply(scale, tickArguments_) : String) : tickFormat_;
+
+ // Minor ticks.
+ var subticks = d3_svg_axisSubdivide(scale, ticks, tickSubdivide),
+ subtick = g.selectAll(".minor").data(subticks, String),
+ subtickEnter = subtick.enter().insert("line", "g").attr("class", "tick minor").style("opacity", 1e-6),
+ subtickExit = transition(subtick.exit()).style("opacity", 1e-6).remove(),
+ subtickUpdate = transition(subtick).style("opacity", 1);
+
+ // Major ticks.
+ var tick = g.selectAll("g").data(ticks, String),
+ tickEnter = tick.enter().insert("g", "path").style("opacity", 1e-6),
+ tickExit = transition(tick.exit()).style("opacity", 1e-6).remove(),
+ tickUpdate = transition(tick).style("opacity", 1),
+ tickTransform;
+
+ // Domain.
+ var range = d3_scaleRange(scale),
+ path = g.selectAll(".domain").data([0]),
+ pathEnter = path.enter().append("path").attr("class", "domain"),
+ pathUpdate = transition(path);
+
+ // Stash a snapshot of the new scale, and retrieve the old snapshot.
+ var scale1 = scale.copy(),
+ scale0 = this.__chart__ || scale1;
+ this.__chart__ = scale1;
+
+ tickEnter.append("line").attr("class", "tick");
+ tickEnter.append("text");
+ tickUpdate.select("text").text(tickFormat);
+
+ switch (orient) {
+ case "bottom": {
+ tickTransform = d3_svg_axisX;
+ subtickUpdate.attr("x2", 0).attr("y2", tickMinorSize);
+ tickUpdate.select("line").attr("x2", 0).attr("y2", tickMajorSize);
+ tickUpdate.select("text").attr("x", 0).attr("y", Math.max(tickMajorSize, 0) + tickPadding).attr("dy", ".71em").attr("text-anchor", "middle");
+ pathUpdate.attr("d", "M" + range[0] + "," + tickEndSize + "V0H" + range[1] + "V" + tickEndSize);
+ break;
+ }
+ case "top": {
+ tickTransform = d3_svg_axisX;
+ subtickUpdate.attr("x2", 0).attr("y2", -tickMinorSize);
+ tickUpdate.select("line").attr("x2", 0).attr("y2", -tickMajorSize);
+ tickUpdate.select("text").attr("x", 0).attr("y", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("dy", "0em").attr("text-anchor", "middle");
+ pathUpdate.attr("d", "M" + range[0] + "," + -tickEndSize + "V0H" + range[1] + "V" + -tickEndSize);
+ break;
+ }
+ case "left": {
+ tickTransform = d3_svg_axisY;
+ subtickUpdate.attr("x2", -tickMinorSize).attr("y2", 0);
+ tickUpdate.select("line").attr("x2", -tickMajorSize).attr("y2", 0);
+ tickUpdate.select("text").attr("x", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "end");
+ pathUpdate.attr("d", "M" + -tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + -tickEndSize);
+ break;
+ }
+ case "right": {
+ tickTransform = d3_svg_axisY;
+ subtickUpdate.attr("x2", tickMinorSize).attr("y2", 0);
+ tickUpdate.select("line").attr("x2", tickMajorSize).attr("y2", 0);
+ tickUpdate.select("text").attr("x", Math.max(tickMajorSize, 0) + tickPadding).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "start");
+ pathUpdate.attr("d", "M" + tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + tickEndSize);
+ break;
+ }
+ }
+
+ // For quantitative scales:
+ // - enter new ticks from the old scale
+ // - exit old ticks to the new scale
+ if (scale.ticks) {
+ tickEnter.call(tickTransform, scale0);
+ tickUpdate.call(tickTransform, scale1);
+ tickExit.call(tickTransform, scale1);
+ subtickEnter.call(tickTransform, scale0);
+ subtickUpdate.call(tickTransform, scale1);
+ subtickExit.call(tickTransform, scale1);
+ }
+
+ // For ordinal scales:
+ // - any entering ticks are undefined in the old scale
+ // - any exiting ticks are undefined in the new scale
+ // Therefore, we only need to transition updating ticks.
+ else {
+ var dx = scale1.rangeBand() / 2, x = function(d) { return scale1(d) + dx; };
+ tickEnter.call(tickTransform, x);
+ tickUpdate.call(tickTransform, x);
+ }
+ });
+ }
+
+ axis.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = x;
+ return axis;
+ };
+
+ axis.orient = function(x) {
+ if (!arguments.length) return orient;
+ orient = x;
+ return axis;
+ };
+
+ axis.ticks = function() {
+ if (!arguments.length) return tickArguments_;
+ tickArguments_ = arguments;
+ return axis;
+ };
+
+ axis.tickFormat = function(x) {
+ if (!arguments.length) return tickFormat_;
+ tickFormat_ = x;
+ return axis;
+ };
+
+ axis.tickSize = function(x, y, z) {
+ if (!arguments.length) return tickMajorSize;
+ var n = arguments.length - 1;
+ tickMajorSize = +x;
+ tickMinorSize = n > 1 ? +y : tickMajorSize;
+ tickEndSize = n > 0 ? +arguments[n] : tickMajorSize;
+ return axis;
+ };
+
+ axis.tickPadding = function(x) {
+ if (!arguments.length) return tickPadding;
+ tickPadding = +x;
+ return axis;
+ };
+
+ axis.tickSubdivide = function(x) {
+ if (!arguments.length) return tickSubdivide;
+ tickSubdivide = +x;
+ return axis;
+ };
+
+ return axis;
+};
+
+function d3_svg_axisX(selection, x) {
+ selection.attr("transform", function(d) { return "translate(" + x(d) + ",0)"; });
+}
+
+function d3_svg_axisY(selection, y) {
+ selection.attr("transform", function(d) { return "translate(0," + y(d) + ")"; });
+}
+
+function d3_svg_axisSubdivide(scale, ticks, m) {
+ subticks = [];
+ if (m && ticks.length > 1) {
+ var extent = d3_scaleExtent(scale.domain()),
+ subticks,
+ i = -1,
+ n = ticks.length,
+ d = (ticks[1] - ticks[0]) / ++m,
+ j,
+ v;
+ while (++i < n) {
+ for (j = m; --j > 0;) {
+ if ((v = +ticks[i] - j * d) >= extent[0]) {
+ subticks.push(v);
+ }
+ }
+ }
+ for (--i, j = 0; ++j < m && (v = +ticks[i] + j * d) < extent[1];) {
+ subticks.push(v);
+ }
+ }
+ return subticks;
+}
+d3.svg.brush = function() {
+ var event = d3.dispatch("brushstart", "brush", "brushend"),
+ x, // x-scale, optional
+ y, // y-scale, optional
+ extent = [[0, 0], [0, 0]]; // [x0, y0], [x1, y1]
+
+ function brush(g) {
+ var resizes = x && y ? ["n", "e", "s", "w", "nw", "ne", "se", "sw"]
+ : x ? ["e", "w"]
+ : y ? ["n", "s"]
+ : [];
+
+ g.each(function() {
+ var g = d3.select(this).on("mousedown.brush", down),
+ bg = g.selectAll(".background").data([,]),
+ fg = g.selectAll(".extent").data([,]),
+ tz = g.selectAll(".resize").data(resizes, String),
+ e;
+
+ // An invisible, mouseable area for starting a new brush.
+ bg.enter().append("rect")
+ .attr("class", "background")
+ .style("visibility", "hidden")
+ .style("pointer-events", "all")
+ .style("cursor", "crosshair");
+
+ // The visible brush extent; style this as you like!
+ fg.enter().append("rect")
+ .attr("class", "extent")
+ .style("cursor", "move");
+
+ // More invisible rects for resizing the extent.
+ tz.enter().append("rect")
+ .attr("class", function(d) { return "resize " + d; })
+ .attr("width", 6)
+ .attr("height", 6)
+ .style("visibility", "hidden")
+ .style("pointer-events", brush.empty() ? "none" : "all")
+ .style("cursor", function(d) { return d3_svg_brushCursor[d]; });
+
+ // Remove any superfluous resizers.
+ tz.exit().remove();
+
+ // Initialize the background to fill the defined range.
+ // If the range isn't defined, you can post-process.
+ if (x) {
+ e = d3_scaleRange(x);
+ bg.attr("x", e[0]).attr("width", e[1] - e[0]);
+ d3_svg_brushRedrawX(g, extent);
+ }
+ if (y) {
+ e = d3_scaleRange(y);
+ bg.attr("y", e[0]).attr("height", e[1] - e[0]);
+ d3_svg_brushRedrawY(g, extent);
+ }
+ });
+ }
+
+ function down() {
+ var target = d3.select(d3.event.target);
+
+ // Store some global state for the duration of the brush gesture.
+ d3_svg_brush = brush;
+ d3_svg_brushTarget = this;
+ d3_svg_brushExtent = extent;
+ d3_svg_brushOffset = d3.svg.mouse(d3_svg_brushTarget);
+
+ // If the extent was clicked on, drag rather than brush;
+ // store the offset between the mouse and extent origin instead.
+ if (d3_svg_brushDrag = target.classed("extent")) {
+ d3_svg_brushOffset[0] = extent[0][0] - d3_svg_brushOffset[0];
+ d3_svg_brushOffset[1] = extent[0][1] - d3_svg_brushOffset[1];
+ }
+
+ // If a resizer was clicked on, record which side is to be resized.
+ // Also, set the offset to the opposite side.
+ else if (target.classed("resize")) {
+ d3_svg_brushResize = d3.event.target.__data__;
+ d3_svg_brushOffset[0] = extent[+/w$/.test(d3_svg_brushResize)][0];
+ d3_svg_brushOffset[1] = extent[+/^n/.test(d3_svg_brushResize)][1];
+ }
+
+ // If the ALT key is down when starting a brush, the center is at the mouse.
+ else if (d3.event.altKey) {
+ d3_svg_brushCenter = d3_svg_brushOffset.slice();
+ }
+
+ // Restrict which dimensions are resized.
+ d3_svg_brushX = !/^(n|s)$/.test(d3_svg_brushResize) && x;
+ d3_svg_brushY = !/^(e|w)$/.test(d3_svg_brushResize) && y;
+
+ // Notify listeners.
+ d3_svg_brushDispatch = dispatcher(this, arguments);
+ d3_svg_brushDispatch("brushstart");
+ d3_svg_brushMove();
+ d3_eventCancel();
+ }
+
+ function dispatcher(that, argumentz) {
+ return function(type) {
+ var e = d3.event;
+ try {
+ d3.event = {type: type, target: brush};
+ event[type].apply(that, argumentz);
+ } finally {
+ d3.event = e;
+ }
+ };
+ }
+
+ brush.x = function(z) {
+ if (!arguments.length) return x;
+ x = z;
+ return brush;
+ };
+
+ brush.y = function(z) {
+ if (!arguments.length) return y;
+ y = z;
+ return brush;
+ };
+
+ brush.extent = function(z) {
+ var x0, x1, y0, y1, t;
+
+ // Invert the pixel extent to data-space.
+ if (!arguments.length) {
+ if (x) {
+ x0 = extent[0][0], x1 = extent[1][0];
+ if (x.invert) x0 = x.invert(x0), x1 = x.invert(x1);
+ if (x1 < x0) t = x0, x0 = x1, x1 = t;
+ }
+ if (y) {
+ y0 = extent[0][1], y1 = extent[1][1];
+ if (y.invert) y0 = y.invert(y0), y1 = y.invert(y1);
+ if (y1 < y0) t = y0, y0 = y1, y1 = t;
+ }
+ return x && y ? [[x0, y0], [x1, y1]] : x ? [x0, x1] : y && [y0, y1];
+ }
+
+ // Scale the data-space extent to pixels.
+ if (x) {
+ x0 = z[0], x1 = z[1];
+ if (y) x0 = x0[0], x1 = x1[0];
+ if (x.invert) x0 = x(x0), x1 = x(x1);
+ if (x1 < x0) t = x0, x0 = x1, x1 = t;
+ extent[0][0] = x0, extent[1][0] = x1;
+ }
+ if (y) {
+ y0 = z[0], y1 = z[1];
+ if (x) y0 = y0[1], y1 = y1[1];
+ if (y.invert) y0 = y(y0), y1 = y(y1);
+ if (y1 < y0) t = y0, y0 = y1, y1 = t;
+ extent[0][1] = y0, extent[1][1] = y1;
+ }
+
+ return brush;
+ };
+
+ brush.clear = function() {
+ extent[0][0] =
+ extent[0][1] =
+ extent[1][0] =
+ extent[1][1] = 0;
+ return brush;
+ };
+
+ brush.empty = function() {
+ return (x && extent[0][0] === extent[1][0])
+ || (y && extent[0][1] === extent[1][1]);
+ };
+
+ d3.select(window)
+ .on("mousemove.brush", d3_svg_brushMove)
+ .on("mouseup.brush", d3_svg_brushUp)
+ .on("keydown.brush", d3_svg_brushKeydown)
+ .on("keyup.brush", d3_svg_brushKeyup);
+
+ return d3.rebind(brush, event, "on");
+};
+
+var d3_svg_brush,
+ d3_svg_brushDispatch,
+ d3_svg_brushTarget,
+ d3_svg_brushX,
+ d3_svg_brushY,
+ d3_svg_brushExtent,
+ d3_svg_brushDrag,
+ d3_svg_brushResize,
+ d3_svg_brushCenter,
+ d3_svg_brushOffset;
+
+function d3_svg_brushRedrawX(g, extent) {
+ g.select(".extent").attr("x", extent[0][0]);
+ g.selectAll(".n,.s,.w,.nw,.sw").attr("x", extent[0][0] - 2);
+ g.selectAll(".e,.ne,.se").attr("x", extent[1][0] - 3);
+ g.selectAll(".extent,.n,.s").attr("width", extent[1][0] - extent[0][0]);
+}
+
+function d3_svg_brushRedrawY(g, extent) {
+ g.select(".extent").attr("y", extent[0][1]);
+ g.selectAll(".n,.e,.w,.nw,.ne").attr("y", extent[0][1] - 3);
+ g.selectAll(".s,.se,.sw").attr("y", extent[1][1] - 4);
+ g.selectAll(".extent,.e,.w").attr("height", extent[1][1] - extent[0][1]);
+}
+
+function d3_svg_brushKeydown() {
+ if (d3.event.keyCode == 32 && d3_svg_brushTarget && !d3_svg_brushDrag) {
+ d3_svg_brushCenter = null;
+ d3_svg_brushOffset[0] -= d3_svg_brushExtent[1][0];
+ d3_svg_brushOffset[1] -= d3_svg_brushExtent[1][1];
+ d3_svg_brushDrag = 2;
+ d3_eventCancel();
+ }
+}
+
+function d3_svg_brushKeyup() {
+ if (d3.event.keyCode == 32 && d3_svg_brushDrag == 2) {
+ d3_svg_brushOffset[0] += d3_svg_brushExtent[1][0];
+ d3_svg_brushOffset[1] += d3_svg_brushExtent[1][1];
+ d3_svg_brushDrag = 0;
+ d3_eventCancel();
+ }
+}
+
+function d3_svg_brushMove() {
+ if (d3_svg_brushOffset) {
+ var mouse = d3.svg.mouse(d3_svg_brushTarget),
+ g = d3.select(d3_svg_brushTarget);
+
+ if (!d3_svg_brushDrag) {
+
+ // If needed, determine the center from the current extent.
+ if (d3.event.altKey) {
+ if (!d3_svg_brushCenter) {
+ d3_svg_brushCenter = [
+ (d3_svg_brushExtent[0][0] + d3_svg_brushExtent[1][0]) / 2,
+ (d3_svg_brushExtent[0][1] + d3_svg_brushExtent[1][1]) / 2
+ ];
+ }
+
+ // Update the offset, for when the ALT key is released.
+ d3_svg_brushOffset[0] = d3_svg_brushExtent[+(mouse[0] < d3_svg_brushCenter[0])][0];
+ d3_svg_brushOffset[1] = d3_svg_brushExtent[+(mouse[1] < d3_svg_brushCenter[1])][1];
+ }
+
+ // When the ALT key is released, we clear the center.
+ else d3_svg_brushCenter = null;
+ }
+
+ // Update the brush extent for each dimension.
+ if (d3_svg_brushX) {
+ d3_svg_brushMove1(mouse, d3_svg_brushX, 0);
+ d3_svg_brushRedrawX(g, d3_svg_brushExtent);
+ }
+ if (d3_svg_brushY) {
+ d3_svg_brushMove1(mouse, d3_svg_brushY, 1);
+ d3_svg_brushRedrawY(g, d3_svg_brushExtent);
+ }
+
+ // Notify listeners.
+ d3_svg_brushDispatch("brush");
+ }
+}
+
+function d3_svg_brushMove1(mouse, scale, i) {
+ var range = d3_scaleRange(scale),
+ r0 = range[0],
+ r1 = range[1],
+ offset = d3_svg_brushOffset[i],
+ size = d3_svg_brushExtent[1][i] - d3_svg_brushExtent[0][i],
+ min,
+ max;
+
+ // When dragging, reduce the range by the extent size and offset.
+ if (d3_svg_brushDrag) {
+ r0 -= offset;
+ r1 -= size + offset;
+ }
+
+ // Clamp the mouse so that the extent fits within the range extent.
+ min = Math.max(r0, Math.min(r1, mouse[i]));
+
+ // Compute the new extent bounds.
+ if (d3_svg_brushDrag) {
+ max = (min += offset) + size;
+ } else {
+
+ // If the ALT key is pressed, then preserve the center of the extent.
+ if (d3_svg_brushCenter) offset = Math.max(r0, Math.min(r1, 2 * d3_svg_brushCenter[i] - min));
+
+ // Compute the min and max of the offset and mouse.
+ if (offset < min) {
+ max = min;
+ min = offset;
+ } else {
+ max = offset;
+ }
+ }
+
+ // Update the stored bounds.
+ d3_svg_brushExtent[0][i] = min;
+ d3_svg_brushExtent[1][i] = max;
+}
+
+function d3_svg_brushUp() {
+ if (d3_svg_brushOffset) {
+ d3_svg_brushMove();
+ d3.select(d3_svg_brushTarget).selectAll(".resize").style("pointer-events", d3_svg_brush.empty() ? "none" : "all");
+ d3_svg_brushDispatch("brushend");
+ d3_svg_brush =
+ d3_svg_brushDispatch =
+ d3_svg_brushTarget =
+ d3_svg_brushX =
+ d3_svg_brushY =
+ d3_svg_brushExtent =
+ d3_svg_brushDrag =
+ d3_svg_brushResize =
+ d3_svg_brushCenter =
+ d3_svg_brushOffset = null;
+ d3_eventCancel();
+ }
+}
+
+var d3_svg_brushCursor = {
+ n: "ns-resize",
+ e: "ew-resize",
+ s: "ns-resize",
+ w: "ew-resize",
+ nw: "nwse-resize",
+ ne: "nesw-resize",
+ se: "nwse-resize",
+ sw: "nesw-resize"
+};
+d3.behavior = {};
+// TODO Track touch points by identifier.
+
+d3.behavior.drag = function() {
+ var event = d3.dispatch("drag", "dragstart", "dragend"),
+ origin = null;
+
+ function drag() {
+ this
+ .on("mousedown.drag", mousedown)
+ .on("touchstart.drag", mousedown);
+
+ d3.select(window)
+ .on("mousemove.drag", d3_behavior_dragMove)
+ .on("touchmove.drag", d3_behavior_dragMove)
+ .on("mouseup.drag", d3_behavior_dragUp, true)
+ .on("touchend.drag", d3_behavior_dragUp, true)
+ .on("click.drag", d3_behavior_dragClick, true);
+ }
+
+ // snapshot the local context for subsequent dispatch
+ function start() {
+ d3_behavior_dragEvent = event;
+ d3_behavior_dragEventTarget = d3.event.target;
+ d3_behavior_dragTarget = this;
+ d3_behavior_dragArguments = arguments;
+ d3_behavior_dragOrigin = d3_behavior_dragPoint();
+ if (origin) {
+ d3_behavior_dragOffset = origin.apply(d3_behavior_dragTarget, d3_behavior_dragArguments);
+ d3_behavior_dragOffset = [d3_behavior_dragOffset.x - d3_behavior_dragOrigin[0], d3_behavior_dragOffset.y - d3_behavior_dragOrigin[1]];
+ } else {
+ d3_behavior_dragOffset = [0, 0];
+ }
+ d3_behavior_dragMoved = 0;
+ }
+
+ function mousedown() {
+ start.apply(this, arguments);
+ d3_behavior_dragDispatch("dragstart");
+ }
+
+ drag.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ return drag;
+ };
+
+ return d3.rebind(drag, event, "on");
+};
+
+var d3_behavior_dragEvent,
+ d3_behavior_dragEventTarget,
+ d3_behavior_dragTarget,
+ d3_behavior_dragArguments,
+ d3_behavior_dragOffset,
+ d3_behavior_dragOrigin,
+ d3_behavior_dragMoved;
+
+function d3_behavior_dragDispatch(type) {
+ var p = d3_behavior_dragPoint(),
+ o = d3.event,
+ e = d3.event = {type: type};
+
+ if (p) {
+ e.x = p[0] + d3_behavior_dragOffset[0];
+ e.y = p[1] + d3_behavior_dragOffset[1];
+ e.dx = p[0] - d3_behavior_dragOrigin[0];
+ e.dy = p[1] - d3_behavior_dragOrigin[1];
+ d3_behavior_dragMoved |= e.dx | e.dy;
+ d3_behavior_dragOrigin = p;
+ }
+
+ try {
+ d3_behavior_dragEvent[type].apply(d3_behavior_dragTarget, d3_behavior_dragArguments);
+ } finally {
+ d3.event = o;
+ }
+
+ o.stopPropagation();
+ o.preventDefault();
+}
+
+function d3_behavior_dragPoint() {
+ var p = d3_behavior_dragTarget.parentNode,
+ t = d3.event.changedTouches;
+ return p && (t
+ ? d3.svg.touches(p, t)[0]
+ : d3.svg.mouse(p));
+}
+
+function d3_behavior_dragMove() {
+ if (!d3_behavior_dragTarget) return;
+ var parent = d3_behavior_dragTarget.parentNode;
+
+ // O NOES! The drag element was removed from the DOM.
+ if (!parent) return d3_behavior_dragUp();
+
+ d3_behavior_dragDispatch("drag");
+ d3_eventCancel();
+}
+
+function d3_behavior_dragUp() {
+ if (!d3_behavior_dragTarget) return;
+ d3_behavior_dragDispatch("dragend");
+
+ // If the node was moved, prevent the mouseup from propagating.
+ // Also prevent the subsequent click from propagating (e.g., for anchors).
+ if (d3_behavior_dragMoved) {
+ d3_eventCancel();
+ d3_behavior_dragMoved = d3.event.target === d3_behavior_dragEventTarget;
+ }
+
+ d3_behavior_dragEvent =
+ d3_behavior_dragEventTarget =
+ d3_behavior_dragTarget =
+ d3_behavior_dragArguments =
+ d3_behavior_dragOffset =
+ d3_behavior_dragOrigin = null;
+}
+
+function d3_behavior_dragClick() {
+ if (d3_behavior_dragMoved) {
+ d3_eventCancel();
+ d3_behavior_dragMoved = 0;
+ }
+}
+// TODO unbind zoom behavior?
+d3.behavior.zoom = function() {
+ var xyz = [0, 0, 0],
+ event = d3.dispatch("zoom"),
+ extent = d3_behavior_zoomInfiniteExtent;
+
+ function zoom() {
+ this
+ .on("mousedown.zoom", mousedown)
+ .on("mousewheel.zoom", mousewheel)
+ .on("DOMMouseScroll.zoom", mousewheel)
+ .on("dblclick.zoom", dblclick)
+ .on("touchstart.zoom", touchstart);
+
+ d3.select(window)
+ .on("mousemove.zoom", d3_behavior_zoomMousemove)
+ .on("mouseup.zoom", d3_behavior_zoomMouseup)
+ .on("touchmove.zoom", d3_behavior_zoomTouchmove)
+ .on("touchend.zoom", d3_behavior_zoomTouchup)
+ .on("click.zoom", d3_behavior_zoomClick, true);
+ }
+
+ // snapshot the local context for subsequent dispatch
+ function start() {
+ d3_behavior_zoomXyz = xyz;
+ d3_behavior_zoomExtent = extent;
+ d3_behavior_zoomDispatch = event.zoom;
+ d3_behavior_zoomEventTarget = d3.event.target;
+ d3_behavior_zoomTarget = this;
+ d3_behavior_zoomArguments = arguments;
+ }
+
+ function mousedown() {
+ start.apply(this, arguments);
+ d3_behavior_zoomPanning = d3_behavior_zoomLocation(d3.svg.mouse(d3_behavior_zoomTarget));
+ d3_behavior_zoomMoved = 0;
+ d3.event.preventDefault();
+ window.focus();
+ }
+
+ // store starting mouse location
+ function mousewheel() {
+ start.apply(this, arguments);
+ if (!d3_behavior_zoomZooming) d3_behavior_zoomZooming = d3_behavior_zoomLocation(d3.svg.mouse(d3_behavior_zoomTarget));
+ d3_behavior_zoomTo(d3_behavior_zoomDelta() + xyz[2], d3.svg.mouse(d3_behavior_zoomTarget), d3_behavior_zoomZooming);
+ }
+
+ function dblclick() {
+ start.apply(this, arguments);
+ var mouse = d3.svg.mouse(d3_behavior_zoomTarget);
+ d3_behavior_zoomTo(d3.event.shiftKey ? Math.ceil(xyz[2] - 1) : Math.floor(xyz[2] + 1), mouse, d3_behavior_zoomLocation(mouse));
+ }
+
+ // doubletap detection
+ function touchstart() {
+ start.apply(this, arguments);
+ var touches = d3_behavior_zoomTouchup(),
+ touch,
+ now = Date.now();
+ if ((touches.length === 1) && (now - d3_behavior_zoomLast < 300)) {
+ d3_behavior_zoomTo(1 + Math.floor(xyz[2]), touch = touches[0], d3_behavior_zoomLocations[touch.identifier]);
+ }
+ d3_behavior_zoomLast = now;
+ }
+
+ zoom.extent = function(x) {
+ if (!arguments.length) return extent;
+ extent = x == null ? d3_behavior_zoomInfiniteExtent : x;
+ return zoom;
+ };
+
+ return d3.rebind(zoom, event, "on");
+};
+
+var d3_behavior_zoomDiv,
+ d3_behavior_zoomPanning,
+ d3_behavior_zoomZooming,
+ d3_behavior_zoomLocations = {}, // identifier -> location
+ d3_behavior_zoomLast = 0,
+ d3_behavior_zoomXyz,
+ d3_behavior_zoomExtent,
+ d3_behavior_zoomDispatch,
+ d3_behavior_zoomEventTarget,
+ d3_behavior_zoomTarget,
+ d3_behavior_zoomArguments,
+ d3_behavior_zoomMoved;
+
+function d3_behavior_zoomLocation(point) {
+ return [
+ point[0] - d3_behavior_zoomXyz[0],
+ point[1] - d3_behavior_zoomXyz[1],
+ d3_behavior_zoomXyz[2]
+ ];
+}
+
+// detect the pixels that would be scrolled by this wheel event
+function d3_behavior_zoomDelta() {
+
+ // mousewheel events are totally broken!
+ // https://bugs.webkit.org/show_bug.cgi?id=40441
+ // not only that, but Chrome and Safari differ in re. to acceleration!
+ if (!d3_behavior_zoomDiv) {
+ d3_behavior_zoomDiv = d3.select("body").append("div")
+ .style("visibility", "hidden")
+ .style("top", 0)
+ .style("height", 0)
+ .style("width", 0)
+ .style("overflow-y", "scroll")
+ .append("div")
+ .style("height", "2000px")
+ .node().parentNode;
+ }
+
+ var e = d3.event, delta;
+ try {
+ d3_behavior_zoomDiv.scrollTop = 1000;
+ d3_behavior_zoomDiv.dispatchEvent(e);
+ delta = 1000 - d3_behavior_zoomDiv.scrollTop;
+ } catch (error) {
+ delta = e.wheelDelta || (-e.detail * 5);
+ }
+
+ return delta * .005;
+}
+
+// Note: Since we don't rotate, it's possible for the touches to become
+// slightly detached from their original positions. Thus, we recompute the
+// touch points on touchend as well as touchstart!
+function d3_behavior_zoomTouchup() {
+ var touches = d3.svg.touches(d3_behavior_zoomTarget),
+ i = -1,
+ n = touches.length,
+ touch;
+ while (++i < n) d3_behavior_zoomLocations[(touch = touches[i]).identifier] = d3_behavior_zoomLocation(touch);
+ return touches;
+}
+
+function d3_behavior_zoomTouchmove() {
+ var touches = d3.svg.touches(d3_behavior_zoomTarget);
+ switch (touches.length) {
+
+ // single-touch pan
+ case 1: {
+ var touch = touches[0];
+ d3_behavior_zoomTo(d3_behavior_zoomXyz[2], touch, d3_behavior_zoomLocations[touch.identifier]);
+ break;
+ }
+
+ // double-touch pan + zoom
+ case 2: {
+ var p0 = touches[0],
+ p1 = touches[1],
+ p2 = [(p0[0] + p1[0]) / 2, (p0[1] + p1[1]) / 2],
+ l0 = d3_behavior_zoomLocations[p0.identifier],
+ l1 = d3_behavior_zoomLocations[p1.identifier],
+ l2 = [(l0[0] + l1[0]) / 2, (l0[1] + l1[1]) / 2, l0[2]];
+ d3_behavior_zoomTo(Math.log(d3.event.scale) / Math.LN2 + l0[2], p2, l2);
+ break;
+ }
+ }
+}
+
+function d3_behavior_zoomMousemove() {
+ d3_behavior_zoomZooming = null;
+ if (d3_behavior_zoomPanning) {
+ d3_behavior_zoomMoved = 1;
+ d3_behavior_zoomTo(d3_behavior_zoomXyz[2], d3.svg.mouse(d3_behavior_zoomTarget), d3_behavior_zoomPanning);
+ }
+}
+
+function d3_behavior_zoomMouseup() {
+ if (d3_behavior_zoomPanning) {
+ if (d3_behavior_zoomMoved) {
+ d3_eventCancel();
+ d3_behavior_zoomMoved = d3_behavior_zoomEventTarget === d3.event.target;
+ }
+
+ d3_behavior_zoomXyz =
+ d3_behavior_zoomExtent =
+ d3_behavior_zoomDispatch =
+ d3_behavior_zoomEventTarget =
+ d3_behavior_zoomTarget =
+ d3_behavior_zoomArguments =
+ d3_behavior_zoomPanning = null;
+ }
+}
+
+function d3_behavior_zoomClick() {
+ if (d3_behavior_zoomMoved) {
+ d3_eventCancel();
+ d3_behavior_zoomMoved = 0;
+ }
+}
+
+function d3_behavior_zoomTo(z, x0, x1) {
+ z = d3_behavior_zoomExtentClamp(z, 2);
+ var j = Math.pow(2, d3_behavior_zoomXyz[2]),
+ k = Math.pow(2, z),
+ K = Math.pow(2, (d3_behavior_zoomXyz[2] = z) - x1[2]),
+ x_ = d3_behavior_zoomXyz[0],
+ y_ = d3_behavior_zoomXyz[1],
+ x = d3_behavior_zoomXyz[0] = d3_behavior_zoomExtentClamp((x0[0] - x1[0] * K), 0, k),
+ y = d3_behavior_zoomXyz[1] = d3_behavior_zoomExtentClamp((x0[1] - x1[1] * K), 1, k),
+ o = d3.event; // Events can be reentrant (e.g., focus).
+
+ d3.event = {
+ scale: k,
+ translate: [x, y],
+ transform: function(sx, sy) {
+ if (sx) transform(sx, x_, x);
+ if (sy) transform(sy, y_, y);
+ }
+ };
+
+ function transform(scale, a, b) {
+ scale.domain(scale.range().map(function(v) { return scale.invert(((v - b) * j) / k + a); }));
+ }
+
+ try {
+ d3_behavior_zoomDispatch.apply(d3_behavior_zoomTarget, d3_behavior_zoomArguments);
+ } finally {
+ d3.event = o;
+ }
+
+ o.preventDefault();
+}
+
+var d3_behavior_zoomInfiniteExtent = [
+ [-Infinity, Infinity],
+ [-Infinity, Infinity],
+ [-Infinity, Infinity]
+];
+
+function d3_behavior_zoomExtentClamp(x, i, k) {
+ var range = d3_behavior_zoomExtent[i],
+ r0 = range[0],
+ r1 = range[1];
+ return arguments.length === 3
+ ? Math.max(r1 * (r1 === Infinity ? -Infinity : 1 / k - 1),
+ Math.min(r0 === -Infinity ? Infinity : r0, x / k)) * k
+ : Math.max(r0, Math.min(r1, x));
+}
})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
index 76ddee0..24bcc42 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
@@ -113,16 +113,19 @@ d3.layout.chord = function() {
k = (2 * Math.PI - padding * n) / k;
// Compute the start and end angle for each group and subgroup.
+ // Note: Opera has a bug reordering object literal properties!
x = 0, i = -1; while (++i < n) {
x0 = x, j = -1; while (++j < n) {
var di = groupIndex[i],
- dj = subgroupIndex[i][j],
- v = matrix[di][dj];
+ dj = subgroupIndex[di][j],
+ v = matrix[di][dj],
+ a0 = x,
+ a1 = x += v * k;
subgroups[di + "-" + dj] = {
index: di,
subindex: dj,
- startAngle: x,
- endAngle: x += v * k,
+ startAngle: a0,
+ endAngle: a1,
value: v
};
}
@@ -143,7 +146,7 @@ d3.layout.chord = function() {
if (source.value || target.value) {
chords.push(source.value < target.value
? {source: target, target: source}
- : {source: source, target: target})
+ : {source: source, target: target});
}
}
}
@@ -153,7 +156,9 @@ d3.layout.chord = function() {
function resort() {
chords.sort(function(a, b) {
- return sortChords(a.target.value, b.target.value);
+ return sortChords(
+ (a.source.value + a.target.value) / 2,
+ (b.source.value + b.target.value) / 2);
});
}
@@ -209,6 +214,7 @@ d3.layout.force = function() {
var force = {},
event = d3.dispatch("tick"),
size = [1, 1],
+ drag,
alpha,
friction = .9,
linkDistance = d3_layout_forceLinkDistance,
@@ -220,9 +226,10 @@ d3.layout.force = function() {
nodes = [],
links = [],
distances,
- strengths;
+ strengths,
+ charges;
- function repulse(node, kc) {
+ function repulse(node) {
return function(quad, x1, y1, x2, y2) {
if (quad.point !== node) {
var dx = quad.cx - node.x,
@@ -231,30 +238,32 @@ d3.layout.force = function() {
/* Barnes-Hut criterion. */
if ((x2 - x1) * dn < theta) {
- var k = kc * quad.count * dn * dn;
- node.x += dx * k;
- node.y += dy * k;
+ var k = quad.charge * dn * dn;
+ node.px -= dx * k;
+ node.py -= dy * k;
return true;
}
if (quad.point && isFinite(dn)) {
- var k = kc * dn * dn;
- node.x += dx * k;
- node.y += dy * k;
+ var k = quad.pointCharge * dn * dn;
+ node.px -= dx * k;
+ node.py -= dy * k;
}
}
+ return !quad.charge;
};
}
function tick() {
var n = nodes.length,
m = links.length,
- q = d3.geom.quadtree(nodes),
+ q,
i, // current index
o, // current object
s, // current source
t, // current target
l, // current distance
+ k, // current force
x, // x-distance
y; // y-distance
@@ -269,30 +278,32 @@ d3.layout.force = function() {
l = alpha * strengths[i] * ((l = Math.sqrt(l)) - distances[i]) / l;
x *= l;
y *= l;
- t.x -= x;
- t.y -= y;
- s.x += x;
- s.y += y;
+ t.x -= x * (k = s.weight / (t.weight + s.weight));
+ t.y -= y * k;
+ s.x += x * (k = 1 - k);
+ s.y += y * k;
}
}
// apply gravity forces
- var kg = alpha * gravity;
- x = size[0] / 2;
- y = size[1] / 2;
- i = -1; while (++i < n) {
- o = nodes[i];
- o.x += (x - o.x) * kg;
- o.y += (y - o.y) * kg;
+ if (k = alpha * gravity) {
+ x = size[0] / 2;
+ y = size[1] / 2;
+ i = -1; if (k) while (++i < n) {
+ o = nodes[i];
+ o.x += (x - o.x) * k;
+ o.y += (y - o.y) * k;
+ }
}
- // compute quadtree center of mass
- d3_layout_forceAccumulate(q);
-
- // apply charge forces
- var kc = alpha * charge;
- i = -1; while (++i < n) {
- q.visit(repulse(nodes[i], kc));
+ // compute quadtree center of mass and apply charge forces
+ if (charge) {
+ d3_layout_forceAccumulate(q = d3.geom.quadtree(nodes), alpha, charges);
+ i = -1; while (++i < n) {
+ if (!(o = nodes[i]).fixed) {
+ q.visit(repulse(o));
+ }
+ }
}
// position verlet integration
@@ -307,17 +318,12 @@ d3.layout.force = function() {
}
}
- event.tick.dispatch({type: "tick", alpha: alpha});
+ event.tick({type: "tick", alpha: alpha});
// simulated annealing, basically
return (alpha *= .99) < .005;
}
- force.on = function(type, listener) {
- event[type].add(listener);
- return force;
- };
-
force.nodes = function(x) {
if (!arguments.length) return nodes;
nodes = x;
@@ -359,7 +365,7 @@ d3.layout.force = function() {
force.charge = function(x) {
if (!arguments.length) return charge;
- charge = x;
+ charge = typeof x === "function" ? x : +x;
return force;
};
@@ -387,6 +393,7 @@ d3.layout.force = function() {
for (i = 0; i < n; ++i) {
(o = nodes[i]).index = i;
+ o.weight = 0;
}
distances = [];
@@ -397,6 +404,8 @@ d3.layout.force = function() {
if (typeof o.target == "number") o.target = nodes[o.target];
distances[i] = linkDistance.call(this, o, i);
strengths[i] = linkStrength.call(this, o, i);
+ ++o.source.weight;
+ ++o.target.weight;
}
for (i = 0; i < n; ++i) {
@@ -407,6 +416,17 @@ d3.layout.force = function() {
if (isNaN(o.py)) o.py = o.y;
}
+ charges = [];
+ if (typeof charge === "function") {
+ for (i = 0; i < n; ++i) {
+ charges[i] = +charge.call(this, nodes[i], i);
+ }
+ } else {
+ for (i = 0; i < n; ++i) {
+ charges[i] = charge;
+ }
+ }
+
// initialize node position based on first neighbor
function position(dimension, size) {
var neighbors = neighbor(i),
@@ -449,116 +469,52 @@ d3.layout.force = function() {
// use `node.call(force.drag)` to make nodes draggable
force.drag = function() {
-
- this
- .on("mouseover.force", d3_layout_forceDragOver)
- .on("mouseout.force", d3_layout_forceDragOut)
- .on("mousedown.force", dragdown)
- .on("touchstart.force", dragdown);
-
- d3.select(window)
- .on("mousemove.force", d3_layout_forceDragMove)
- .on("touchmove.force", d3_layout_forceDragMove)
- .on("mouseup.force", d3_layout_forceDragUp, true)
- .on("touchend.force", d3_layout_forceDragUp, true)
- .on("click.force", d3_layout_forceDragClick, true);
-
- return force;
+ if (!drag) drag = d3.behavior.drag()
+ .origin(Object)
+ .on("dragstart", dragstart)
+ .on("drag", d3_layout_forceDrag)
+ .on("dragend", d3_layout_forceDragEnd);
+
+ this.on("mouseover.force", d3_layout_forceDragOver)
+ .on("mouseout.force", d3_layout_forceDragOut)
+ .call(drag);
};
- function dragdown(d, i) {
- var m = d3_layout_forcePoint(this.parentNode);
- (d3_layout_forceDragNode = d).fixed = true;
- d3_layout_forceDragMoved = false;
- d3_layout_forceDragElement = this;
+ function dragstart(d) {
+ d3_layout_forceDragOver(d3_layout_forceDragNode = d);
d3_layout_forceDragForce = force;
- d3_layout_forceDragOffset = [m[0] - d.x, m[1] - d.y];
- d3_layout_forceCancel();
}
- return force;
+ return d3.rebind(force, event, "on");
};
var d3_layout_forceDragForce,
- d3_layout_forceDragNode,
- d3_layout_forceDragMoved,
- d3_layout_forceDragOffset,
- d3_layout_forceStopClick,
- d3_layout_forceDragElement;
+ d3_layout_forceDragNode;
function d3_layout_forceDragOver(d) {
- d.fixed = true;
+ d.fixed |= 2;
}
function d3_layout_forceDragOut(d) {
- if (d !== d3_layout_forceDragNode) {
- d.fixed = false;
- }
+ if (d !== d3_layout_forceDragNode) d.fixed &= 1;
}
-function d3_layout_forcePoint(container) {
- return d3.event.touches
- ? d3.svg.touches(container)[0]
- : d3.svg.mouse(container);
+function d3_layout_forceDragEnd() {
+ d3_layout_forceDrag();
+ d3_layout_forceDragNode.fixed &= 1;
+ d3_layout_forceDragForce = d3_layout_forceDragNode = null;
}
-function d3_layout_forceDragMove() {
- if (!d3_layout_forceDragNode) return;
- var parent = d3_layout_forceDragElement.parentNode;
-
- // O NOES! The drag element was removed from the DOM.
- if (!parent) {
- d3_layout_forceDragNode.fixed = false;
- d3_layout_forceDragOffset = d3_layout_forceDragNode = d3_layout_forceDragElement = null;
- return;
- }
-
- var m = d3_layout_forcePoint(parent);
- d3_layout_forceDragMoved = true;
- d3_layout_forceDragNode.px = m[0] - d3_layout_forceDragOffset[0];
- d3_layout_forceDragNode.py = m[1] - d3_layout_forceDragOffset[1];
- d3_layout_forceCancel();
+function d3_layout_forceDrag() {
+ d3_layout_forceDragNode.px = d3.event.x;
+ d3_layout_forceDragNode.py = d3.event.y;
d3_layout_forceDragForce.resume(); // restart annealing
}
-function d3_layout_forceDragUp() {
- if (!d3_layout_forceDragNode) return;
-
- // If the node was moved, prevent the mouseup from propagating.
- // Also prevent the subsequent click from propagating (e.g., for anchors).
- if (d3_layout_forceDragMoved) {
- d3_layout_forceStopClick = true;
- d3_layout_forceCancel();
- }
-
- // Don't trigger this for touchend.
- if (d3.event.type === "mouseup") {
- d3_layout_forceDragMove();
- }
-
- d3_layout_forceDragNode.fixed = false;
- d3_layout_forceDragForce =
- d3_layout_forceDragOffset =
- d3_layout_forceDragNode =
- d3_layout_forceDragElement = null;
-}
-
-function d3_layout_forceDragClick() {
- if (d3_layout_forceStopClick) {
- d3_layout_forceCancel();
- d3_layout_forceStopClick = false;
- }
-}
-
-function d3_layout_forceCancel() {
- d3.event.stopPropagation();
- d3.event.preventDefault();
-}
-
-function d3_layout_forceAccumulate(quad) {
+function d3_layout_forceAccumulate(quad, alpha, charges) {
var cx = 0,
cy = 0;
- quad.count = 0;
+ quad.charge = 0;
if (!quad.leaf) {
var nodes = quad.nodes,
n = nodes.length,
@@ -567,10 +523,10 @@ function d3_layout_forceAccumulate(quad) {
while (++i < n) {
c = nodes[i];
if (c == null) continue;
- d3_layout_forceAccumulate(c);
- quad.count += c.count;
- cx += c.count * c.cx;
- cy += c.count * c.cy;
+ d3_layout_forceAccumulate(c, alpha, charges);
+ quad.charge += c.charge;
+ cx += c.charge * c.cx;
+ cy += c.charge * c.cy;
}
}
if (quad.point) {
@@ -579,12 +535,13 @@ function d3_layout_forceAccumulate(quad) {
quad.point.x += Math.random() - .5;
quad.point.y += Math.random() - .5;
}
- quad.count++;
- cx += quad.point.x;
- cy += quad.point.y;
+ var k = alpha * charges[quad.point.index];
+ quad.charge += quad.pointCharge = k;
+ cx += k * quad.point.x;
+ cy += k * quad.point.y;
}
- quad.cx = cx / quad.count;
- quad.cy = cy / quad.count;
+ quad.cx = cx / quad.charge;
+ quad.cy = cy / quad.charge;
}
function d3_layout_forceLinkDistance(link) {
@@ -604,12 +561,12 @@ d3.layout.partition = function() {
node.y = node.depth * dy;
node.dx = dx;
node.dy = dy;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length,
+ n,
c,
d;
- dx /= node.value;
+ dx = node.value ? dx / node.value : 0;
while (++i < n) {
position(c = children[i], x, d = c.value * dx, dy);
x += d;
@@ -620,9 +577,9 @@ d3.layout.partition = function() {
function depth(node) {
var children = node.children,
d = 0;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length;
+ n;
while (++i < n) d = Math.max(d, depth(children[i]));
}
return 1 + d;
@@ -644,48 +601,44 @@ d3.layout.partition = function() {
};
d3.layout.pie = function() {
var value = Number,
- sort = null,
+ sort = d3_layout_pieSortByValue,
startAngle = 0,
endAngle = 2 * Math.PI;
function pie(data, i) {
+ // Compute the numeric values for each data element.
+ var values = data.map(function(d, i) { return +value.call(pie, d, i); });
+
// Compute the start angle.
var a = +(typeof startAngle === "function"
? startAngle.apply(this, arguments)
: startAngle);
- // Compute the angular range (end - start).
- var k = (typeof endAngle === "function"
+ // Compute the angular scale factor: from value to radians.
+ var k = ((typeof endAngle === "function"
? endAngle.apply(this, arguments)
- : endAngle) - startAngle;
+ : endAngle) - startAngle)
+ / d3.sum(values);
// Optionally sort the data.
var index = d3.range(data.length);
- if (sort != null) index.sort(function(i, j) {
- return sort(data[i], data[j]);
- });
-
- // Compute the numeric values for each data element.
- var values = data.map(value);
-
- // Convert k into a scale factor from value to angle, using the sum.
- k /= values.reduce(function(p, d) { return p + d; }, 0);
+ if (sort != null) index.sort(sort === d3_layout_pieSortByValue
+ ? function(i, j) { return values[j] - values[i]; }
+ : function(i, j) { return sort(data[i], data[j]); });
// Compute the arcs!
- var arcs = index.map(function(i) {
- return {
+ // They are stored in the original data's order.
+ var arcs = [];
+ index.forEach(function(i) {
+ arcs[i] = {
data: data[i],
value: d = values[i],
startAngle: a,
endAngle: a += d * k
};
});
-
- // Return the arcs in the original data's order.
- return data.map(function(d, i) {
- return arcs[index[i]];
- });
+ return arcs;
}
/**
@@ -737,6 +690,8 @@ d3.layout.pie = function() {
return pie;
};
+
+var d3_layout_pieSortByValue = {};
// data is two-dimensional array of x,y; we populate y0
d3.layout.stack = function() {
var values = Object,
@@ -1088,9 +1043,9 @@ d3.layout.hierarchy = function() {
node = d3_layout_hierarchyInline ? data : {data: data};
node.depth = depth;
nodes.push(node);
- if (childs) {
+ if (childs && (n = childs.length)) {
var i = -1,
- n = childs.length,
+ n,
c = node.children = [],
v = 0,
j = depth + 1;
@@ -1103,7 +1058,7 @@ d3.layout.hierarchy = function() {
if (sort) c.sort(sort);
if (value) node.value = v;
} else if (value) {
- node.value = value.call(hierarchy, data, depth);
+ node.value = +value.call(hierarchy, data, depth) || 0;
}
return node;
}
@@ -1112,13 +1067,13 @@ d3.layout.hierarchy = function() {
function revalue(node, depth) {
var children = node.children,
v = 0;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length,
+ n,
j = depth + 1;
while (++i < n) v += revalue(children[i], j);
} else if (value) {
- v = value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth);
+ v = +value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth) || 0;
}
if (value) node.value = v;
return v;
@@ -1159,10 +1114,10 @@ d3.layout.hierarchy = function() {
// A method assignment helper for hierarchy subclasses.
function d3_layout_hierarchyRebind(object, hierarchy) {
- object.sort = d3.rebind(object, hierarchy.sort);
- object.children = d3.rebind(object, hierarchy.children);
+ d3.rebind(object, hierarchy, "sort", "children", "value");
+
+ // Add an alias for links, for convenience.
object.links = d3_layout_hierarchyLinks;
- object.value = d3.rebind(object, hierarchy.value);
// If the new API is used, enabling inlining.
object.nodes = function(d) {
@@ -1362,7 +1317,7 @@ function d3_layout_packUnlink(node) {
function d3_layout_packTree(node) {
var children = node.children;
- if (children) {
+ if (children && children.length) {
children.forEach(d3_layout_packTree);
node.r = d3_layout_packCircle(children);
} else {
@@ -1382,19 +1337,22 @@ function d3_layout_packTransform(node, x, y, k) {
}
function d3_layout_packPlace(a, b, c) {
- var da = b.r + c.r,
- db = a.r + c.r,
+ var db = a.r + c.r,
dx = b.x - a.x,
- dy = b.y - a.y,
- dc = Math.sqrt(dx * dx + dy * dy),
- cos = (db * db + dc * dc - da * da) / (2 * db * dc),
- theta = Math.acos(cos),
- x = cos * db,
- h = Math.sin(theta) * db;
- dx /= dc;
- dy /= dc;
- c.x = a.x + x * dx + h * dy;
- c.y = a.y + x * dy - h * dx;
+ dy = b.y - a.y;
+ if (db && (dx || dy)) {
+ var da = b.r + c.r,
+ dc = Math.sqrt(dx * dx + dy * dy),
+ cos = Math.max(-1, Math.min(1, (db * db + dc * dc - da * da) / (2 * db * dc))),
+ theta = Math.acos(cos),
+ x = cos * (db /= dc),
+ y = Math.sin(theta) * db;
+ c.x = a.x + x * dx + y * dy;
+ c.y = a.y + x * dy - y * dx;
+ } else {
+ c.x = a.x + db;
+ c.y = a.y;
+ }
}
// Implements a hierarchical layout using the cluster (or dendogram) algorithm.
d3.layout.cluster = function() {
@@ -1412,9 +1370,10 @@ d3.layout.cluster = function() {
// First walk, computing the initial x & y values.
d3_layout_treeVisitAfter(root, function(node) {
- if (node.children) {
- node.x = d3_layout_clusterX(node.children);
- node.y = d3_layout_clusterY(node.children);
+ var children = node.children;
+ if (children && children.length) {
+ node.x = d3_layout_clusterX(children);
+ node.y = d3_layout_clusterY(children);
} else {
node.x = previousNode ? x += separation(node, previousNode) : 0;
node.y = 0;
@@ -1431,7 +1390,7 @@ d3.layout.cluster = function() {
// Second walk, normalizing x & y to the desired size.
d3_layout_treeVisitAfter(root, function(node) {
node.x = (node.x - x0) / (x1 - x0) * size[0];
- node.y = (1 - node.y / root.y) * size[1];
+ node.y = (1 - (root.y ? node.y / root.y : 1)) * size[1];
});
return nodes;
@@ -1466,12 +1425,12 @@ function d3_layout_clusterX(children) {
function d3_layout_clusterLeft(node) {
var children = node.children;
- return children ? d3_layout_clusterLeft(children[0]) : node;
+ return children && children.length ? d3_layout_clusterLeft(children[0]) : node;
}
function d3_layout_clusterRight(node) {
- var children = node.children;
- return children ? d3_layout_clusterRight(children[children.length - 1]) : node;
+ var children = node.children, n;
+ return children && (n = children.length) ? d3_layout_clusterRight(children[n - 1]) : node;
}
// Node-link tree diagram using the Reingold-Tilford "tidy" algorithm
d3.layout.tree = function() {
@@ -1486,8 +1445,8 @@ d3.layout.tree = function() {
function firstWalk(node, previousSibling) {
var children = node.children,
layout = node._tree;
- if (children && children.length) {
- var n = children.length,
+ if (children && (n = children.length)) {
+ var n,
firstChild = children[0],
previousChild,
ancestor = firstChild,
@@ -1517,9 +1476,9 @@ d3.layout.tree = function() {
function secondWalk(node, x) {
node.x = node._tree.prelim + x;
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length;
+ n;
x += node._tree.mod;
while (++i < n) {
secondWalk(children[i], x);
@@ -1624,18 +1583,21 @@ function d3_layout_treeSeparation(a, b) {
// }
function d3_layout_treeLeft(node) {
- return node.children ? node.children[0] : node._tree.thread;
+ var children = node.children;
+ return children && children.length ? children[0] : node._tree.thread;
}
function d3_layout_treeRight(node) {
- return node.children ? node.children[node.children.length - 1] : node._tree.thread;
+ var children = node.children,
+ n;
+ return children && (n = children.length) ? children[n - 1] : node._tree.thread;
}
function d3_layout_treeSearch(node, compare) {
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var child,
- n = children.length,
+ n,
i = -1;
while (++i < n) {
if (compare(child = d3_layout_treeSearch(children[i], compare), node) > 0) {
@@ -1661,11 +1623,11 @@ function d3_layout_treeDeepest(a, b) {
function d3_layout_treeVisitAfter(node, callback) {
function visit(node, previousSibling) {
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var child,
previousChild = null,
i = -1,
- n = children.length;
+ n;
while (++i < n) {
child = children[i];
visit(child, previousChild);
@@ -1733,57 +1695,61 @@ d3.layout.treemap = function() {
// Recursively arranges the specified node's children into squarified rows.
function squarify(node) {
- if (!node.children) return;
- var rect = pad(node),
- row = [],
- children = node.children.slice(), // copy-on-write
- child,
- best = Infinity, // the best row score so far
- score, // the current row score
- u = Math.min(rect.dx, rect.dy), // initial orientation
- n;
- scale(children, rect.dx * rect.dy / node.value);
- row.area = 0;
- while ((n = children.length) > 0) {
- row.push(child = children[n - 1]);
- row.area += child.area;
- if ((score = worst(row, u)) <= best) { // continue with this orientation
- children.pop();
- best = score;
- } else { // abort, and try a different orientation
- row.area -= row.pop().area;
- position(row, u, rect, false);
- u = Math.min(rect.dx, rect.dy);
+ var children = node.children;
+ if (children && children.length) {
+ var rect = pad(node),
+ row = [],
+ remaining = children.slice(), // copy-on-write
+ child,
+ best = Infinity, // the best row score so far
+ score, // the current row score
+ u = Math.min(rect.dx, rect.dy), // initial orientation
+ n;
+ scale(remaining, rect.dx * rect.dy / node.value);
+ row.area = 0;
+ while ((n = remaining.length) > 0) {
+ row.push(child = remaining[n - 1]);
+ row.area += child.area;
+ if ((score = worst(row, u)) <= best) { // continue with this orientation
+ remaining.pop();
+ best = score;
+ } else { // abort, and try a different orientation
+ row.area -= row.pop().area;
+ position(row, u, rect, false);
+ u = Math.min(rect.dx, rect.dy);
+ row.length = row.area = 0;
+ best = Infinity;
+ }
+ }
+ if (row.length) {
+ position(row, u, rect, true);
row.length = row.area = 0;
- best = Infinity;
}
+ children.forEach(squarify);
}
- if (row.length) {
- position(row, u, rect, true);
- row.length = row.area = 0;
- }
- node.children.forEach(squarify);
}
// Recursively resizes the specified node's children into existing rows.
// Preserves the existing layout!
function stickify(node) {
- if (!node.children) return;
- var rect = pad(node),
- children = node.children.slice(), // copy-on-write
- child,
- row = [];
- scale(children, rect.dx * rect.dy / node.value);
- row.area = 0;
- while (child = children.pop()) {
- row.push(child);
- row.area += child.area;
- if (child.z != null) {
- position(row, child.z ? rect.dx : rect.dy, rect, !children.length);
- row.length = row.area = 0;
+ var children = node.children;
+ if (children && children.length) {
+ var rect = pad(node),
+ remaining = children.slice(), // copy-on-write
+ child,
+ row = [];
+ scale(remaining, rect.dx * rect.dy / node.value);
+ row.area = 0;
+ while (child = remaining.pop()) {
+ row.push(child);
+ row.area += child.area;
+ if (child.z != null) {
+ position(row, child.z ? rect.dx : rect.dy, rect, !remaining.length);
+ row.length = row.area = 0;
+ }
}
+ children.forEach(stickify);
}
- node.children.forEach(stickify);
}
// Computes the score for the specified row, as the worst aspect ratio.
@@ -1815,7 +1781,7 @@ d3.layout.treemap = function() {
v = u ? round(row.area / u) : 0,
o;
if (u == rect.dx) { // horizontal subdivision
- if (flush || v > rect.dy) v = rect.dy; // over+underflow
+ if (flush || v > rect.dy) v = v ? rect.dy : 0; // over+underflow
while (++i < n) {
o = row[i];
o.x = x;
@@ -1828,7 +1794,7 @@ d3.layout.treemap = function() {
rect.y += v;
rect.dy -= v;
} else { // vertical subdivision
- if (flush || v > rect.dx) v = rect.dx; // over+underflow
+ if (flush || v > rect.dx) v = v ? rect.dx : 0; // over+underflow
while (++i < n) {
o = row[i];
o.x = x;
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
index 3a3409f..4c1cda4 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
@@ -78,6 +78,7 @@ var d3_time_formats = {
H: function(d) { return d3_time_zfill2(d.getHours()); },
I: function(d) { return d3_time_zfill2(d.getHours() % 12 || 12); },
j: d3_time_dayOfYear,
+ L: function(d) { return d3_time_zfill3(d.getMilliseconds()); },
m: function(d) { return d3_time_zfill2(d.getMonth() + 1); },
M: function(d) { return d3_time_zfill2(d.getMinutes()); },
p: function(d) { return d.getHours() >= 12 ? "PM" : "AM"; },
@@ -104,6 +105,7 @@ var d3_time_parsers = {
H: d3_time_parseHour24,
I: d3_time_parseHour12,
// j: function(d, s, i) { /*TODO day of year [001,366] */ return i; },
+ L: d3_time_parseMilliseconds,
m: d3_time_parseMonthNumber,
M: d3_time_parseMinutes,
p: d3_time_parseAmPm,
@@ -277,6 +279,12 @@ function d3_time_parseSeconds(date, string, i) {
return n ? (date.setSeconds(+n[0]), i += n[0].length) : -1;
}
+function d3_time_parseMilliseconds(date, string, i) {
+ d3_time_numberRe.lastIndex = 0;
+ var n = d3_time_numberRe.exec(string.substring(i, i + 3));
+ return n ? (date.setMilliseconds(+n[0]), i += n[0].length) : -1;
+}
+
// Note: we don't look at the next directive.
var d3_time_numberRe = /\s*\d+/;
@@ -294,18 +302,22 @@ function d3_time_year(d) {
return new d3_time(d.getFullYear(), 0, 1);
}
+function d3_time_daysElapsed(d0, d1) {
+ return ~~((d1 - d0) / 864e5 - (d1.getTimezoneOffset() - d0.getTimezoneOffset()) / 1440);
+}
+
function d3_time_dayOfYear(d) {
- return d3_time_zfill3(1 + ~~((d - d3_time_year(d)) / 864e5));
+ return d3_time_zfill3(1 + d3_time_daysElapsed(d3_time_year(d), d));
}
function d3_time_weekNumberSunday(d) {
var d0 = d3_time_year(d);
- return d3_time_zfill2(~~(((d - d0) / 864e5 + d0.getDay()) / 7));
+ return d3_time_zfill2(~~((d3_time_daysElapsed(d0, d) + d0.getDay()) / 7));
}
function d3_time_weekNumberMonday(d) {
var d0 = d3_time_year(d);
- return d3_time_zfill2(~~(((d - d0) / 864e5 + (d0.getDay() + 6) % 7) / 7));
+ return d3_time_zfill2(~~((d3_time_daysElapsed(d0, d) + (d0.getDay() + 6) % 7) / 7));
}
// TODO table of time zone offset names?
@@ -320,9 +332,14 @@ d3.time.format.utc = function(template) {
var local = d3.time.format(template);
function format(date) {
- var utc = new d3_time_format_utc();
- utc._ = date;
- return local(utc);
+ try {
+ d3_time = d3_time_format_utc;
+ var utc = new d3_time();
+ utc._ = date;
+ return local(utc);
+ } finally {
+ d3_time = Date;
+ }
}
format.parse = function(string) {
@@ -364,7 +381,19 @@ d3_time_format_utc.prototype = {
setMonth: function(x) { this._.setUTCMonth(x); },
setSeconds: function(x) { this._.setUTCSeconds(x); }
};
-d3.time.format.iso = d3.time.format.utc("%Y-%m-%dT%H:%M:%SZ");
+var d3_time_formatIso = d3.time.format.utc("%Y-%m-%dT%H:%M:%S.%LZ");
+
+d3.time.format.iso = Date.prototype.toISOString ? d3_time_formatIsoNative : d3_time_formatIso;
+
+function d3_time_formatIsoNative(date) {
+ return date.toISOString();
+}
+
+d3_time_formatIsoNative.parse = function(string) {
+ return new Date(string);
+};
+
+d3_time_formatIsoNative.toString = d3_time_formatIso.toString;
function d3_time_range(floor, step, number) {
return function(t0, t1, dt) {
var time = floor(t0), times = [];
@@ -502,8 +531,7 @@ d3.time.years.utc = d3_time_range(d3.time.year.utc, function(date) {
return date.getUTCFullYear();
});
// TODO nice
-function d3_time_scale(methods, format) {
- var linear = d3.scale.linear();
+function d3_time_scale(linear, methods, format) {
function scale(x) {
return linear(x);
@@ -537,13 +565,12 @@ function d3_time_scale(methods, format) {
return format;
};
- // TOOD expose d3_scale_linear_rebind?
- scale.range = d3.rebind(scale, linear.range);
- scale.rangeRound = d3.rebind(scale, linear.rangeRound);
- scale.interpolate = d3.rebind(scale, linear.interpolate);
- scale.clamp = d3.rebind(scale, linear.clamp);
+ scale.copy = function() {
+ return d3_time_scale(linear.copy(), methods, format);
+ };
- return scale;
+ // TOOD expose d3_scale_linear_rebind?
+ return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
}
// TODO expose d3_scaleExtent?
@@ -619,7 +646,7 @@ var d3_time_scaleLocalFormats = [
var d3_time_scaleLocalFormat = d3_time_scaleFormat(d3_time_scaleLocalFormats);
d3.time.scale = function() {
- return d3_time_scale(d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
+ return d3_time_scale(d3.scale.linear(), d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
};
var d3_time_scaleUTCMethods = [
[d3.time.seconds.utc, 1],
@@ -655,6 +682,6 @@ var d3_time_scaleUTCFormats = [
var d3_time_scaleUTCFormat = d3_time_scaleFormat(d3_time_scaleUTCFormats);
d3.time.scale.utc = function() {
- return d3_time_scale(d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
+ return d3_time_scale(d3.scale.linear(), d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
};
})();
commit 3f2e1dd08dfcfb38ef22aba22d6609c1a44b20da
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Jan 6 16:18:07 2012 -0600
[BZ 765795] Removed the recursive call that was creating StackOverflowError and added the correct call to create a resource.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
index 2395503..37131c2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
@@ -521,9 +521,9 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
@XmlJavaTypeAdapter(value = ConfigurationAdapter.class)//
Configuration deploymentTimeConfiguration, byte[] packageBits, Integer timeout) {
- return createPackageBackedResource(subject, parentResourceId, newResourceTypeId, newResourceName,//
+ return createResource(subject, parentResourceId, newResourceTypeId, newResourceName,//
pluginConfiguration, packageName, packageVersionNumber, architectureId,//
- deploymentTimeConfiguration, packageBits, (Integer) null);
+ deploymentTimeConfiguration, new ByteArrayInputStream(packageBits), (Map<String, String>) null, timeout);
}
@Override
commit 38ca523ad95e2fdc3adec301fef5f88951c6dd2a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Jan 6 09:15:14 2012 -0500
[Bug 771201 - EPP 5.2 discovery fails with java.lang.StringIndexOutOfBoundsException]
EPP 5.2 has changed the format of its Implementation-Version string in the
manifest (5.1.1 was different). Add support for the new format. Also,
in general, fail more gracefully when encountering an unexpected version
string.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java
index fe13a7a..cae73f3 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java
@@ -40,6 +40,7 @@ public class JBossInstallationInfo {
private static final String LOCALHOST_ADDRESS = "127.0.0.1";
private static final String SOA_IMPL_VERSION_PREFIX = "SOA-";
private static final String EAP_IMPL_VERSION_PREFIX = "EAP-";
+ private static final String EPP_IMPL_VERSION_PREFIX = "JBoss-EPP";
private static final ComparableVersion VERSION_4_2 = new ComparableVersion("4.2");
private final JBossProductType productType;
@@ -53,11 +54,15 @@ public class JBossInstallationInfo {
File runJar = new File(binDir, "run.jar");
if (!runJar.exists()) {
throw new RuntimeException(runJar + " does not exist - " + installationDir
- + " does not appear to be a JBoss installation/home directory.");
+ + " does not appear to be a JBoss installation/home directory.");
}
Attributes jarManifestAttributes = loadManifestAttributesFromJar(runJar);
this.productType = JBossProductType.determineJBossProductType(jarManifestAttributes);
this.version = getVersion(jarManifestAttributes);
+ int majorVersionIndex = version.indexOf('.');
+ if (-1 == majorVersionIndex) {
+ throw new RuntimeException("Unexpected run.jar implementation version, can't parse: " + this.version);
+ }
this.defaultBindAddress = getDefaultServerName(this.version);
this.isEap = determineEap(jarManifestAttributes);
this.majorVersion = version.substring(0, version.indexOf('.'));
@@ -112,6 +117,10 @@ public class JBossInstallationInfo {
String implementationVersion = jarManifestAttributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
// e.g. AS 5.1: "Implementation-Version: 5.1.0.GA (build: SVNTag=JBoss_5_1_0_GA date=200905221634)"
// e.g. EAP 5.0: "Implementation-Version: 5.0.0.Beta (build: SVNTag=JBPAPP_5_0_0_Beta date=200906191731)"
+ if (implementationVersion.startsWith(EPP_IMPL_VERSION_PREFIX)) {
+ implementationVersion = implementationVersion.substring(EPP_IMPL_VERSION_PREFIX.length()).trim();
+ }
+
int spaceIndex = validateImplementationVersion(implementationVersion);
String version = implementationVersion.substring(0, spaceIndex);
if (version.startsWith(SOA_IMPL_VERSION_PREFIX)) {
@@ -120,6 +129,7 @@ public class JBossInstallationInfo {
if (version.startsWith(EAP_IMPL_VERSION_PREFIX)) {
version = version.substring(EAP_IMPL_VERSION_PREFIX.length());
}
+
return version;
}
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java
index 20e7e81..13e1304 100644
--- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java
+++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java
@@ -38,6 +38,7 @@ import org.apache.maven.artifact.versioning.ComparableVersion;
public class JBossInstallationInfo {
private static final String ANY_ADDRESS = "0.0.0.0";
private static final String LOCALHOST_ADDRESS = "127.0.0.1";
+ private static final String EPP_IMPL_VERSION_PREFIX = "JBoss-EPP";
private static final String SOA_IMPL_VERSION_PREFIX = "SOA-";
private static final ComparableVersion VERSION_4_2 = new ComparableVersion("4.2");
@@ -56,8 +57,12 @@ public class JBossInstallationInfo {
Attributes jarManifestAttributes = loadManifestAttributesFromJar(runJar);
this.productType = JBossProductType.determineJBossProductType(jarManifestAttributes);
this.version = getVersion(jarManifestAttributes);
+ int majorVersionIndex = version.indexOf('.');
+ if (-1 == majorVersionIndex) {
+ throw new RuntimeException("Unexpected run.jar implementation version, can't parse: " + this.version);
+ }
this.defaultBindAddress = getDefaultServerName(this.version);
- this.majorVersion = version.substring(0, version.indexOf('.'));
+ this.majorVersion = version.substring(0, majorVersionIndex);
}
public JBossProductType getProductType() {
@@ -103,15 +108,21 @@ public class JBossInstallationInfo {
throw new IllegalStateException("'" + Attributes.Name.IMPLEMENTATION_VERSION
+ "' MANIFEST.MF attribute not found.");
}
+ if (implementationVersion.startsWith(EPP_IMPL_VERSION_PREFIX)) {
+ implementationVersion = implementationVersion.substring(EPP_IMPL_VERSION_PREFIX.length()).trim();
+ }
+
int spaceIndex = implementationVersion.indexOf(' ');
if (spaceIndex == -1) {
throw new IllegalStateException("'" + Attributes.Name.IMPLEMENTATION_VERSION
+ "' MANIFEST.MF attribute has an invalid value: " + implementationVersion);
}
+
String version = implementationVersion.substring(0, spaceIndex);
if (version.startsWith(SOA_IMPL_VERSION_PREFIX)) {
version = version.substring(SOA_IMPL_VERSION_PREFIX.length());
}
+
return version;
}
commit 27f562a09d9334d5b0df1d81ae500ed304717481
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jan 5 16:42:29 2012 -0500
Fix Calculate AutoBaselines Admin option (although it should be used with
great care as nothing stops it from running concurrently with the data
purge job)
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
index dd81dfb..0261703 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
@@ -155,11 +155,6 @@
}
else if ("calculateAutoBaselines".equals(mode))
{
- // for now, baselines aren't calculated until we hit our day limit, we force it here
- java.util.Properties props = systemManager.getSystemConfiguration(subjectManager.getOverlord());
- props.put("CAM_BASELINE_LASTTIME", "0");
- systemManager.setSystemConfiguration(subjectManager.getOverlord(), props,true);
-
measurementBaselineManager.calculateAutoBaselines();
}
else if ("calculateOOBs".equals(mode))
commit 723653fea5586b683fc8df76cdbeb81ecc65ca5d
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jan 5 16:40:55 2012 -0500
trivial, fix reference link in comments
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
index 3add80f..606eefe 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
@@ -511,11 +511,8 @@ public class StartupServlet extends HttpServlet {
// Data Purge Job
try {
- // Let's leave this non-volatile - in case we fail to schedule any jobs above, then at least
- // our old schedule from a previous run will still be there - we want to be able to make sure we run
- // db maintenance when the server starts.
// TODO [mazz]: make the data purge job's cron string configurable via SystemManagerBean
- // For Quartz cron syntax, see: http://www.opensymphony.com/quartz/wikidocs/CronTriggers%20Tutorial.html
+ // For Quartz cron syntax, see: http://www.quartz-scheduler.org/documentation/quartz-2.1.x/tutorials/crontr…
String cronString = "0 0 * * * ?"; // every hour, on the hour
scheduler.scheduleSimpleCronJob(DataPurgeJob.class, true, false, cronString);
} catch (Exception e) {
commit afb9bfa4c6252f71fcf99343d92c892724592d79
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jan 5 15:24:34 2012 -0500
fix the user prefs test page so the buttons are re-enabled after clicking them
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java
index 3c1e768..42dfbbe 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java
@@ -97,6 +97,8 @@ public class TestUserPreferencesView extends Table {
new MessageWindow(extendLocatorId("csv"), "Export To CSV", "<pre>" + csv.toString() + "</pre>")
.show();
+
+ refreshTableInfo();
}
});
}
@@ -110,6 +112,7 @@ public class TestUserPreferencesView extends Table {
public void refresh() {
super.refresh();
getListGrid().setRecords(transform(this.prefs.getConfiguration()));
+ refreshTableInfo();
}
private ListGridRecord[] transform(Configuration configuration) {
commit 08a2a27a85319bf47e512780f678e532229381c8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Jan 5 12:37:07 2012 -0500
fix the log message - we want to see the resource Ids so we need to convert the array to a string
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
index e5df592..5b6b048 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java
@@ -23,6 +23,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -1008,7 +1009,7 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage
}
}
} catch (Throwable t) {
- log.warn("problem creating schedules for resourceIds [" + resourceIds + "]", t);
+ log.warn("problem creating schedules for resourceIds [" + Arrays.toString(resourceIds) + "]", t);
}
return;
commit cf293cb3baf9e3d3447c16db0c181735d12c12e9
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Jan 5 13:58:08 2012 +0100
[BZ 746113] - increasing the maximum wait time for the tomcat start/stop
scripts from 1s to 120s.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
index f1e78f4..e9002f8 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java
@@ -403,7 +403,7 @@ public class TomcatServerOperationsDelegate {
private void initProcessExecution(ProcessExecution processExecution) {
processExecution.setCaptureOutput(true);
- processExecution.setWaitForCompletion(1000L); // 1 second // TODO: Should we wait longer than one second?
+ processExecution.setWaitForCompletion(120000L); // 120 seconds - that should be safe? // TODO: make this configurable
processExecution.setKillOnTimeout(false);
}
commit aa4ec7d05bb38856a664ba6996255780db44f3d2
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Jan 4 21:56:48 2012 +0100
BZ 770967 - the port expression may now also have a ${} expression.
BZ 766284 - Detect managed AS7 in domain mode
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
index 78b1543..0e58078 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
@@ -158,7 +158,8 @@ public class AbstractBaseDiscovery {
if (portString!=null && !portString.isEmpty()) {
- hp.port = Integer.valueOf(portString);
+ String tmp = replaceDollarExpression(portString,commandLine);
+ hp.port = Integer.valueOf(tmp);
}
else
hp.port = 9990; // Fallback to default
@@ -197,15 +198,24 @@ public class AbstractBaseDiscovery {
* -D jboss.bind.address.management
* or
* -b management
- * to find the management port
+ * to find the management addresss
*/
String ret=null;
for (String line: commandLine) {
- if (line.contains("-bmanagement") || line.contains("jboss.bind.address.management")) {
- ret = line.substring(line.indexOf("=")+1);
- break;
+ if (expression.contains("address")) {
+ if (line.contains("-bmanagement") || line.contains("jboss.bind.address.management")) {
+ ret = line.substring(line.indexOf("=")+1);
+ break;
+ }
}
+ else if (expression.contains("port")) {
+ if (line.contains(expression)) {
+ ret = line.substring(line.indexOf("=")+1);
+ break;
+ }
+ }
+
}
if (ret==null)
ret = fallback;
@@ -269,12 +279,17 @@ public class AbstractBaseDiscovery {
if (hostXml==null)
throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
- // TODO make realm variable
String fileName = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@path");
String relDir = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@relative-to");
+ String dmode;
+ if (mode==AS7Mode.STANDALONE)
+ dmode="server";
+ else
+ dmode="domain";
+
String fullName ;
- if (relDir.equals("jboss.server.config.dir"))
+ if (relDir.equals("jboss." + dmode + ".config.dir"))
fullName = baseDir + File.separator + mode.getBaseDir() + File.separator + "configuration" + File.separator + fileName;
else
fullName = relDir + File.separator + fileName;
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
index 3e90588..53afe21 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
@@ -35,6 +35,7 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.pluginapi.event.log.LogFileEventResourceComponentHelper;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.ProcessScanResult;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.core.system.ProcessInfo;
import org.rhq.modules.plugins.jbossas7.json.Address;
@@ -49,7 +50,7 @@ import org.rhq.modules.plugins.jbossas7.json.ReadResource;
* @author Heiko W. Rupp
*/
@SuppressWarnings("unused")
-public class ManagedASDiscovery extends AbstractBaseDiscovery
+public class ManagedASDiscovery extends AbstractBaseDiscovery implements ResourceDiscoveryComponent
{
@@ -144,7 +145,7 @@ public class ManagedASDiscovery extends AbstractBaseDiscovery
Address theAddress = new Address("server-group", serverGroup);
Operation op = new ReadResource(theAddress);
ComplexResult res = (ComplexResult) dcConnection.execute(op, true);
- if (res.isSuccess()) {
+ if (res!=null && res.isSuccess()) {
if (res.getResult().containsKey("socket-binding-group")) {
String sbg = (String) res.getResult().get("socket-binding-group");
commit 51d8b4632a497bdbdfe2ae154aafbf2631411452
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Jan 4 15:32:40 2012 +0100
Allow to submit a 'now' value - otherwise the 7days case will always be served from the 1h table as the Handler's now is some ms earlier than the utilities now.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java
index 0dfe0bb..f43820f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java
@@ -447,12 +447,12 @@ public class MeasurementDataManagerUtility {
return tables;
}
- /**
+ /**
* The raw tables starting at the specified index. Can be useful for getting the tables in a necessary time order (like
* oldest data first.
- *
- * @param startIndex >= 0. If >= TABLE_COUNT normalized via modulo.
- * @return Array of raw table names starting with the table with the specified index.
+ *
+ * @param startIndex >= 0. If >= TABLE_COUNT normalized via modulo.
+ * @return Array of raw table names starting with the table with the specified index.
*/
public static String[] getAllRawTables(int startIndex) {
String[] tables = new String[TABLE_COUNT];
@@ -465,9 +465,13 @@ public class MeasurementDataManagerUtility {
}
public static String[] getTables(long beginTime, long endTime) {
+ return getTables(beginTime, endTime, System.currentTimeMillis());
+ }
+
+ public static String[] getTables(long beginTime, long endTime, long now) {
List<String> tables = new ArrayList<String>();
- long now = System.currentTimeMillis();
+
if ((now - RAW_PURGE) < beginTime) {
int startIndex = getTableIndex(beginTime);
int endIndex = getTableIndex(endTime);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index a772ab4..71a6a45 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -407,14 +407,15 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
+ long now = System.currentTimeMillis();
if (endTime==0)
- endTime = System.currentTimeMillis();
+ endTime = now;
if (startTime==0)
startTime = endTime - EIGHT_HOURS;
if (duration>0) // overrides start time
startTime = endTime - duration*1000L; // duration is in seconds
- if (startTime < System.currentTimeMillis()-7L*86400*1000)
+ if (startTime < now -7L*86400*1000)
throw new IllegalArgumentException("Start time is older than 7 days");
// Check if the schedule exists
@@ -425,6 +426,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
so.startTime = startTime;
so.endTime = endTime;
so.mediaType = mediaType;
+ so.now = now-1; // pass this so that the for the 7days case is still handled from raw tables.
return so;
@@ -484,12 +486,13 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
int scheduleId;
long startTime;
long endTime;
+ long now;
MediaType mediaType;
@Override
public void write(OutputStream outputStream) throws IOException, WebApplicationException {
- String[] tables = MeasurementDataManagerUtility.getTables(startTime,endTime);
+ String[] tables = MeasurementDataManagerUtility.getTables(startTime,endTime,now);
StringBuilder sb = new StringBuilder();
for (int i = 0 ; i < tables.length ; i ++) {
sb.append("SELECT time_stamp,value FROM ");
commit d757cd72c10213f8888699095f7e5a1932427970
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Jan 4 17:27:03 2012 -0500
[BZ 759481] fix the NPE that occurred when quick clicking between the template screens
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
index afb7b31..72563c2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java
@@ -25,6 +25,7 @@ import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.tree.Tree;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
@@ -118,8 +119,7 @@ public abstract class ResourceTypeTreeNodeBuilder {
boolean isPlatform = (parentType.getCategory() == ResourceCategory.PLATFORM && isEmpty(parentType
.getParentResourceTypes()));
if (!isPlatform || !gotPlatform) {
- treeNodes
- .add(getTreeNodeInstance(composite, String.valueOf(parentType.getId())));
+ treeNodes.add(getTreeNodeInstance(composite, String.valueOf(parentType.getId())));
}
if (isPlatform) {
gotPlatform = true;
@@ -132,7 +132,11 @@ public abstract class ResourceTypeTreeNodeBuilder {
platformsGrid.setData(platformsRecords.toArray(new ListGridRecord[platformsRecords.size()]));
platformServicesGrid.setData(platformServicesRecords
.toArray(new ListGridRecord[platformServicesRecords.size()]));
- serversGrid.getTree().linkNodes(treeNodes.toArray(new TreeNode[treeNodes.size()]));
+ Tree tree = serversGrid.getTree();
+ if (tree != null) {
+ TreeNode[] treeNodeArray = treeNodes.toArray(new TreeNode[treeNodes.size()]);
+ tree.linkNodes(treeNodeArray);
+ }
}
@Override
commit 04000903b57864003ee41a86e013ddcc39ec4789
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Jan 4 14:22:00 2012 -0500
[Bug 751778 - Upgrade from rhq4.1.0 to rhq4.2.0 fails with error : relation "rhq_drift_def_template" does not exist]
Fix query syntax for Oracle compatibility
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
index 95d9ef7..386bd2a 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java
@@ -74,7 +74,7 @@ public class DriftTemplateMapDatabaseUpgradeTask implements DatabaseUpgradeTask
+ " from RHQ_DRIFT_DEF_TEMPLATE dt" //
+ " join RHQ_RESOURCE_TYPE rt on dt.RESOURCE_TYPE_ID = rt.ID" //
+ " join RHQ_RESOURCE res on rt.ID = res.RESOURCE_TYPE_ID" //
- + " and dd.RESOURCE_ID = res.ID" //
+ + " where dd.RESOURCE_ID = res.ID" //
+ " )" //
+ " where dd.DRIFT_DEF_TEMPLATE_ID is null";
commit 0db0f28f90897d71b3c992d802e58dc091ff2b7e
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Jan 4 10:31:51 2012 -0500
add jboss-sasl jar (as-7 plugin dep) to eclipse build path
diff --git a/.classpath b/.classpath
index 24fb54d..9eaf31b 100644
--- a/.classpath
+++ b/.classpath
@@ -124,6 +124,7 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.2.1.GA/resteasy-jaxrs-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jettison-provider/2.2.1.GA/resteasy-jettison-provider-2.2.1.GA.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/2.2.1.GA/jaxrs-api-2.2.1.GA.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/sasl/jboss-sasl/1.0.0.Beta9/jboss-sasl-1.0.0.Beta9.jar"/>
<classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/itests/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/drift-mongodb/src/main/java"/>
commit 51fbaef6a41e324118e069b7b5b8915526c2dc34
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Jan 4 14:15:57 2012 +0100
Adding support for Ldap, Dir, Event and EventDir contexts in addition to
the normal JNDI contexts in our JNDI security wrappers. This should unbreak
the LDAP support in the RHQ server.
Fixed enterprise/server/itests tests.
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java
deleted file mode 100644
index df42afe..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingContextDecorator.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-/**
- * This is the "meat" of the RHQ's secured JNDI access. This {@link Context} decorator
- * applied security checks in each method (lookups, (un)bindings, etc).
- * <p>
- * The security check consists of checking if the current callstack has the {@link AllowRhqServerInternalsAccessPermission}.
- * <p>
- * This decorator applies the security check on any JNDI name without a scheme and
- * on any name that has a scheme listed in the {@link #checkedSchemes} list supplied
- * in the constructor.
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingContextDecorator implements Context {
-
- private static final AllowRhqServerInternalsAccessPermission PERM = new AllowRhqServerInternalsAccessPermission();
- private Context original;
- private List<String> checkedSchemes;
-
- public AccessCheckingContextDecorator(Context original, String... checkedSchemes) {
- this.original = original;
- this.checkedSchemes = Arrays.asList(checkedSchemes);
- }
-
- private static void check() {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) sm.checkPermission(PERM);
- }
-
- private void checkScheme(String scheme) {
- if (scheme == null || checkedSchemes.contains(scheme)) {
- check();
- }
- }
-
- private void check(String name) {
- checkScheme(getURLScheme(name));
- }
-
- private void check(Name name) {
- if (name.size() == 0) {
- check();
- } else {
- String first = name.get(0);
- checkScheme(getURLScheme(first));
- }
- }
-
- public Object lookup(Name name) throws NamingException {
- check(name);
- return original.lookup(name);
- }
-
- public Object lookup(String name) throws NamingException {
- check(name);
- return original.lookup(name);
- }
-
- public void bind(Name name, Object obj) throws NamingException {
- check(name);
- original.bind(name, obj);
- }
-
- public void bind(String name, Object obj) throws NamingException {
- check(name);
- original.bind(name, obj);
- }
-
- public void rebind(Name name, Object obj) throws NamingException {
- check(name);
- original.rebind(name, obj);
- }
-
- public void rebind(String name, Object obj) throws NamingException {
- check(name);
- original.rebind(name, obj);
- }
-
- public void unbind(Name name) throws NamingException {
- check(name);
- original.unbind(name);
- }
-
- public void unbind(String name) throws NamingException {
- check(name);
- original.unbind(name);
- }
-
- public void rename(Name oldName, Name newName) throws NamingException {
- check(oldName);
- check(newName);
- original.rename(oldName, newName);
- }
-
- public void rename(String oldName, String newName) throws NamingException {
- check(oldName);
- check(newName);
- original.rename(oldName, newName);
- }
-
- public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
- check(name);
- return original.list(name);
- }
-
- public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
- check(name);
- return original.list(name);
- }
-
- public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
- check(name);
- return original.listBindings(name);
- }
-
- public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
- check(name);
- return original.listBindings(name);
- }
-
- public void destroySubcontext(Name name) throws NamingException {
- check(name);
- original.destroySubcontext(name);
- }
-
- public void destroySubcontext(String name) throws NamingException {
- check(name);
- original.destroySubcontext(name);
- }
-
- public Context createSubcontext(Name name) throws NamingException {
- check(name);
- return original.createSubcontext(name);
- }
-
- public Context createSubcontext(String name) throws NamingException {
- check(name);
- return original.createSubcontext(name);
- }
-
- public Object lookupLink(Name name) throws NamingException {
- check(name);
- return original.lookupLink(name);
- }
-
- public Object lookupLink(String name) throws NamingException {
- check(name);
- return original.lookupLink(name);
- }
-
- public NameParser getNameParser(Name name) throws NamingException {
- check(name);
- return original.getNameParser(name);
- }
-
- public NameParser getNameParser(String name) throws NamingException {
- check(name);
- return original.getNameParser(name);
- }
-
- public Name composeName(Name name, Name prefix) throws NamingException {
- check(name);
- return original.composeName(name, prefix);
- }
-
- public String composeName(String name, String prefix) throws NamingException {
- check(name);
- return original.composeName(name, prefix);
- }
-
- public Object addToEnvironment(String propName, Object propVal) throws NamingException {
- check();
- return original.addToEnvironment(propName, propVal);
- }
-
- public Object removeFromEnvironment(String propName) throws NamingException {
- check();
- return original.removeFromEnvironment(propName);
- }
-
- public Hashtable<?, ?> getEnvironment() throws NamingException {
- check();
- return original.getEnvironment();
- }
-
- public void close() throws NamingException {
- check();
- original.close();
- }
-
- public String getNameInNamespace() throws NamingException {
- check();
- return original.getNameInNamespace();
- }
-
- //copied from InitialContext
- private static String getURLScheme(String str) {
- int colon_posn = str.indexOf(':');
- int slash_posn = str.indexOf('/');
-
- if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
- return str.substring(0, colon_posn);
- return null;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
index e529347..60e9bf6 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
@@ -27,6 +27,7 @@ import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
@@ -43,6 +44,18 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jnp.interfaces.NamingContextFactory;
+import org.rhq.jndi.context.AccessCheckingContextDecorator;
+import org.rhq.jndi.context.AccessCheckingDirContextDecorator;
+import org.rhq.jndi.context.AccessCheckingEventContextDecorator;
+import org.rhq.jndi.context.AccessCheckingEventDirContextDecorator;
+import org.rhq.jndi.context.AccessCheckingLdapContextDecorator;
+import org.rhq.jndi.context.ContextDecoratorPicker;
+import org.rhq.jndi.context.URLPreferringContextDecorator;
+import org.rhq.jndi.context.URLPreferringDirContextDecorator;
+import org.rhq.jndi.context.URLPreferringEventContextDecorator;
+import org.rhq.jndi.context.URLPreferringEventDirContextDecorator;
+import org.rhq.jndi.context.URLPreferringLdapContextDecorator;
+
/**
* This initial context factory builder is installed early on during the RHQ server startup
* and is later on used for obtaining the {@link Context}s for all JNDI lookups in the
@@ -67,7 +80,7 @@ import org.jnp.interfaces.NamingContextFactory;
*/
public class AccessCheckingInitialContextFactoryBuilder implements InitialContextFactoryBuilder {
private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
-
+
/**
* The list of JNDI name schemes that should be checked for security permissions
* (in addition to the names with no scheme).
@@ -79,14 +92,14 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
private static final Set<InetAddress> SERVER_BIND_IPS;
static {
SERVER_BIND_IPS = new HashSet<InetAddress>();
-
+
try {
String bindingAddressString = System.getProperty("jboss.bind.address");
InetAddress bindingAddress = InetAddress.getByName(bindingAddressString);
-
+
if (bindingAddress.isAnyLocalAddress()) {
Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
- while(ifaces.hasMoreElements()) {
+ while (ifaces.hasMoreElements()) {
NetworkInterface iface = ifaces.nextElement();
SERVER_BIND_IPS.addAll(Collections.list(iface.getInetAddresses()));
}
@@ -97,11 +110,12 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
LOG.error("Could not obtain the list of local IPs", e);
} catch (UnknownHostException e) {
LOG.error("Failed to get the binding address of the RHQ server.", e);
- }
+ }
}
-
- private static final int JNP_PORT = Integer.parseInt(System.getProperty("rhq.server.startup.namingservice.port", "2099"));
-
+
+ private static final int JNP_PORT = Integer.parseInt(System.getProperty("rhq.server.startup.namingservice.port",
+ "2099"));
+
/**
* This is the default initial context factory that is returned when no other is
* configured using the environment variables.
@@ -147,31 +161,72 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
});
}
- private static InitialContextFactory createSecureWrapper(InitialContextFactory factory, Hashtable<?, ?> environment) {
+ private static InitialContextFactory
+ createSecureWrapper(InitialContextFactory factory, Hashtable<?, ?> environment) {
String providerUrl = (String) environment.get(Context.PROVIDER_URL);
-
+
if (providerUrl == null) {
- return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
+ return getAccessCheckingFactory(factory);
} else {
try {
URI uri = new URI(providerUrl);
InetAddress providerHost = InetAddress.getByName(uri.getHost());
-
+
//check if we are accessing the RHQ server through some remoting
//interface.
- if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
- return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
+ if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
+ return getAccessCheckingFactory(factory);
} else {
- return new URLPreferringInitialContextFactoryDecorator(factory);
+ return getURLPreferringFactory(factory);
}
} catch (URISyntaxException e) {
- return new AccessCheckingInitialContextFactoryDecorator(factory, CHECKED_SCHEMES);
+ return getAccessCheckingFactory(factory);
} catch (UnknownHostException e) {
//let the factory deal with the unknown host...
//this most probably shouldn't be secured because localhost addresses
//should be resolvable.
- return new URLPreferringInitialContextFactoryDecorator(factory);
+ return getURLPreferringFactory(factory);
}
}
}
+
+ private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
+ return new DecoratingInitialContextFactory(original, Arrays.asList(
+ getURLPreferringDecoratorPicker(), getAccessCheckingDecoratorPicker()));
+ }
+
+ private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
+ return new DecoratingInitialContextFactory(original, Arrays.asList(
+ getURLPreferringDecoratorPicker()));
+ }
+
+ private static ContextDecoratorPicker getAccessCheckingDecoratorPicker() {
+ ContextDecoratorPicker ret = new ContextDecoratorPicker();
+
+ ret.setConstructorParameters(new Object[] { CHECKED_SCHEMES });
+ ret.setConstructorParameterTypes(new Class<?>[] { String[].class });
+
+ ret.getPossibleDecorators().add(AccessCheckingContextDecorator.class);
+ ret.getPossibleDecorators().add(AccessCheckingDirContextDecorator.class);
+ ret.getPossibleDecorators().add(AccessCheckingEventContextDecorator.class);
+ ret.getPossibleDecorators().add(AccessCheckingEventDirContextDecorator.class);
+ ret.getPossibleDecorators().add(AccessCheckingLdapContextDecorator.class);
+
+ return ret;
+ }
+
+ private static ContextDecoratorPicker getURLPreferringDecoratorPicker() {
+ ContextDecoratorPicker ret = new ContextDecoratorPicker();
+
+ ret.setConstructorParameters(null);
+ ret.setConstructorParameterTypes(null);
+
+ ret.getPossibleDecorators().add(URLPreferringContextDecorator.class);
+ ret.getPossibleDecorators().add(URLPreferringDirContextDecorator.class);
+ ret.getPossibleDecorators().add(URLPreferringEventContextDecorator.class);
+ ret.getPossibleDecorators().add(URLPreferringEventDirContextDecorator.class);
+ ret.getPossibleDecorators().add(URLPreferringLdapContextDecorator.class);
+
+ return ret;
+ }
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java
deleted file mode 100644
index b23935f..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryDecorator.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-
-/**
- * A decorator of an {@link InitialContextFactory} that adds the security checking
- * machinery to the returned initial contexts.
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingInitialContextFactoryDecorator extends URLPreferringInitialContextFactoryDecorator {
-
- private final String[] checkedSchemes;
-
- /**
- * @param factory the factory to wrap
- * @param checkedSchemes the list of JNDI name schemes to check for permissions
- * @see AccessCheckingContextDecorator
- */
- public AccessCheckingInitialContextFactoryDecorator(InitialContextFactory factory, String... checkedSchemes) {
- super(factory);
- this.checkedSchemes = checkedSchemes;
- }
-
- /**
- * @param environment the environment variables for the return {@link Context} to use
- *
- * @return the initial context returned by the decorated factory wrapped in
- * {@link URLPreferringContext} and {@link AccessCheckingContextDecorator} in that
- * order.
- */
- @Override
- public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
- return new AccessCheckingContextDecorator(super.getInitialContext(environment), checkedSchemes);
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
new file mode 100644
index 0000000..2414c98
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
@@ -0,0 +1,63 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi;
+
+import java.util.Hashtable;
+import java.util.List;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+import org.rhq.jndi.context.ContextDecoratorPicker;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class DecoratingInitialContextFactory implements InitialContextFactory {
+
+ private List<ContextDecoratorPicker> pickers;
+ private InitialContextFactory factory;
+
+ public DecoratingInitialContextFactory(InitialContextFactory factory, List<ContextDecoratorPicker> decoratorPickers) {
+ this.factory = factory;
+ this.pickers = decoratorPickers;
+ }
+
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+ Context ctx = factory.getInitialContext(environment);
+
+ try {
+ for(ContextDecoratorPicker picker : pickers) {
+ ctx = picker.wrapInAppropriateDecorator(ctx);
+ }
+ } catch (IllegalArgumentException e) {
+ NamingException ex = new NamingException();
+ ex.initCause(ex);
+
+ throw e;
+ }
+
+ return ctx;
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java
deleted file mode 100644
index c6456a2..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringContext.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.NamingManager;
-
-/**
- * This is a modification of the default {@link InitialContext} class that
- * ignores the initial context factory builder when constructing the default
- * context to use in lookups etc.
- * <p>
- * This is important because RHQ server has its own initial context factory
- * builder that creates factories that in turn create contexts. If the default
- * {@link InitialContext} implementation was used, we'd never be able to lookup
- * scheme-based names because the default implementation of the {@link InitialContext}
- * always uses the default context of the builder if one is installed no matter
- * the scheme in the name.
- * <p>
- * The {@link AccessCheckingInitialContextFactoryBuilder} wraps the context returned
- * by the factory in an instance of this class and thus is restoring the original
- * intended behavior of the {@link InitialContext}. It looks at the name being looked
- * up (bound or whatever) and prefers to use the URL context factories if the name
- * contains the scheme (as does the {@link InitialContext} if no builder is installed).
- * If the name doesn't contain a scheme, the provided default context factory is used to
- * look up the name.
- *
- * @author Lukas Krejci
- */
-public class URLPreferringContext extends InitialContext {
-
- public URLPreferringContext(InitialContextFactory defaultContextFactory) throws NamingException {
- super(true);
- this.defaultInitCtx = defaultContextFactory.getInitialContext(null);
- this.gotDefault = true;
- init(null);
- }
-
- public URLPreferringContext(Hashtable<?, ?> environment, InitialContextFactory defaultContextFactory) throws NamingException {
- super(true);
- this.defaultInitCtx = defaultContextFactory.getInitialContext(environment);
- this.gotDefault = true;
- init(environment);
- }
-
- @Override
- protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
- if (name.size() > 0) {
- String first = name.get(0);
- String scheme = getURLScheme(first);
- if (scheme != null) {
- Context ctx = NamingManager.getURLContext(scheme, myProps);
- if (ctx != null) {
- return ctx;
- }
- }
- }
- return getDefaultInitCtx();
- }
-
- @Override
- protected Context getURLOrDefaultInitCtx(String name) throws NamingException {
- String scheme = getURLScheme(name);
- if (scheme != null) {
- Context ctx = NamingManager.getURLContext(scheme, myProps);
- if (ctx != null) {
- return ctx;
- }
- }
- return getDefaultInitCtx();
- }
-
- //copied from InitialContext
- private static String getURLScheme(String str) {
- int colon_posn = str.indexOf(':');
- int slash_posn = str.indexOf('/');
-
- if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
- return str.substring(0, colon_posn);
- return null;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java
deleted file mode 100644
index 609e98c..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/URLPreferringInitialContextFactoryDecorator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-
-/**
- * A decorator of an {@link InitialContextFactory} that returns an {@link URLPreferringContext}
- * backed by the wrapped initial context factory.
- * <p>
- * This is to support contexts that don't need to be secured, yet we need to make sure to
- * re-enable lookup of scheme-based names.
- *
- * @author Lukas Krejci
- */
-public class URLPreferringInitialContextFactoryDecorator implements InitialContextFactory {
-
- private final InitialContextFactory factory;
-
- public URLPreferringInitialContextFactoryDecorator(InitialContextFactory factory) {
- this.factory = factory;
- }
-
- public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
- return new URLPreferringContext(environment, getFactory());
- }
-
- protected InitialContextFactory getFactory() {
- return factory;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
new file mode 100644
index 0000000..6bfec7e
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
@@ -0,0 +1,254 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
+
+/**
+ * This is the "meat" of the RHQ's secured JNDI access. This {@link Context} decorator
+ * applied security checks in each method (lookups, (un)bindings, etc).
+ * <p>
+ * The security check consists of checking if the current callstack has the {@link AllowRhqServerInternalsAccessPermission}.
+ * <p>
+ * This decorator applies the security check on any JNDI name without a scheme and
+ * on any name that has a scheme listed in the {@link #checkedSchemes} list supplied
+ * in the constructor.
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingContextDecorator implements Context, ContextDecorator, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final AllowRhqServerInternalsAccessPermission PERM = new AllowRhqServerInternalsAccessPermission();
+ private Context original;
+ private List<String> checkedSchemes;
+
+ public AccessCheckingContextDecorator(String... checkedSchemes) {
+ this.checkedSchemes = Arrays.asList(checkedSchemes);
+ }
+
+ public AccessCheckingContextDecorator(Context original, String... checkedSchemes) {
+ this.original = original;
+ this.checkedSchemes = Arrays.asList(checkedSchemes);
+ }
+
+ public void init(Context ctx) {
+ this.original = ctx;
+ }
+
+ protected Context getOriginal() {
+ return original;
+ }
+
+ protected static void check() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) sm.checkPermission(PERM);
+ }
+
+ private void checkScheme(String scheme) {
+ if (scheme == null || checkedSchemes.contains(scheme)) {
+ check();
+ }
+ }
+
+ protected void check(String name) {
+ checkScheme(getURLScheme(name));
+ }
+
+ protected void check(Name name) {
+ if (name.size() == 0) {
+ check();
+ } else {
+ String first = name.get(0);
+ checkScheme(getURLScheme(first));
+ }
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ check(name);
+ return original.lookup(name);
+ }
+
+ public Object lookup(String name) throws NamingException {
+ check(name);
+ return original.lookup(name);
+ }
+
+ public void bind(Name name, Object obj) throws NamingException {
+ check(name);
+ original.bind(name, obj);
+ }
+
+ public void bind(String name, Object obj) throws NamingException {
+ check(name);
+ original.bind(name, obj);
+ }
+
+ public void rebind(Name name, Object obj) throws NamingException {
+ check(name);
+ original.rebind(name, obj);
+ }
+
+ public void rebind(String name, Object obj) throws NamingException {
+ check(name);
+ original.rebind(name, obj);
+ }
+
+ public void unbind(Name name) throws NamingException {
+ check(name);
+ original.unbind(name);
+ }
+
+ public void unbind(String name) throws NamingException {
+ check(name);
+ original.unbind(name);
+ }
+
+ public void rename(Name oldName, Name newName) throws NamingException {
+ check(oldName);
+ check(newName);
+ original.rename(oldName, newName);
+ }
+
+ public void rename(String oldName, String newName) throws NamingException {
+ check(oldName);
+ check(newName);
+ original.rename(oldName, newName);
+ }
+
+ public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
+ check(name);
+ return original.list(name);
+ }
+
+ public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
+ check(name);
+ return original.list(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
+ check(name);
+ return original.listBindings(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
+ check(name);
+ return original.listBindings(name);
+ }
+
+ public void destroySubcontext(Name name) throws NamingException {
+ check(name);
+ original.destroySubcontext(name);
+ }
+
+ public void destroySubcontext(String name) throws NamingException {
+ check(name);
+ original.destroySubcontext(name);
+ }
+
+ public Context createSubcontext(Name name) throws NamingException {
+ check(name);
+ return original.createSubcontext(name);
+ }
+
+ public Context createSubcontext(String name) throws NamingException {
+ check(name);
+ return original.createSubcontext(name);
+ }
+
+ public Object lookupLink(Name name) throws NamingException {
+ check(name);
+ return original.lookupLink(name);
+ }
+
+ public Object lookupLink(String name) throws NamingException {
+ check(name);
+ return original.lookupLink(name);
+ }
+
+ public NameParser getNameParser(Name name) throws NamingException {
+ check(name);
+ return original.getNameParser(name);
+ }
+
+ public NameParser getNameParser(String name) throws NamingException {
+ check(name);
+ return original.getNameParser(name);
+ }
+
+ public Name composeName(Name name, Name prefix) throws NamingException {
+ check(name);
+ return original.composeName(name, prefix);
+ }
+
+ public String composeName(String name, String prefix) throws NamingException {
+ check(name);
+ return original.composeName(name, prefix);
+ }
+
+ public Object addToEnvironment(String propName, Object propVal) throws NamingException {
+ check();
+ return original.addToEnvironment(propName, propVal);
+ }
+
+ public Object removeFromEnvironment(String propName) throws NamingException {
+ check();
+ return original.removeFromEnvironment(propName);
+ }
+
+ public Hashtable<?, ?> getEnvironment() throws NamingException {
+ check();
+ return original.getEnvironment();
+ }
+
+ public void close() throws NamingException {
+ check();
+ original.close();
+ }
+
+ public String getNameInNamespace() throws NamingException {
+ check();
+ return original.getNameInNamespace();
+ }
+
+ //copied from InitialContext
+ private static String getURLScheme(String str) {
+ int colon_posn = str.indexOf(':');
+ int slash_posn = str.indexOf('/');
+
+ if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
+ return str.substring(0, colon_posn);
+ return null;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
new file mode 100644
index 0000000..1614180
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
@@ -0,0 +1,187 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
+/**
+ * A decorator of {@link DirContext}.
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingDirContextDecorator extends AccessCheckingContextDecorator implements DirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingDirContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingDirContextDecorator(DirContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected DirContext getOriginal() {
+ return (DirContext) super.getOriginal();
+ }
+
+ public Attributes getAttributes(Name name) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name);
+ }
+
+ public Attributes getAttributes(String name) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name);
+ }
+
+ public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name, attrIds);
+ }
+
+ public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
+ check(name);
+ return getOriginal().getAttributes(name, attrIds);
+ }
+
+ public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mods);
+ }
+
+ public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
+ check(name);
+ getOriginal().modifyAttributes(name, mods);
+ }
+
+ public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().bind(name, obj, attrs);
+ }
+
+ public void bind(String name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().bind(name, obj, attrs);
+ }
+
+ public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().rebind(name, obj, attrs);
+ }
+
+ public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
+ check(name);
+ getOriginal().rebind(name, obj, attrs);
+ }
+
+ public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
+ check(name);
+ return getOriginal().createSubcontext(name, attrs);
+ }
+
+ public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
+ check(name);
+ return getOriginal().createSubcontext(name, attrs);
+ }
+
+ public DirContext getSchema(Name name) throws NamingException {
+ check(name);
+ return getOriginal().getSchema(name);
+ }
+
+ public DirContext getSchema(String name) throws NamingException {
+ check(name);
+ return getOriginal().getSchema(name);
+ }
+
+ public DirContext getSchemaClassDefinition(Name name) throws NamingException {
+ check(name);
+ return getOriginal().getSchemaClassDefinition(name);
+ }
+
+ public DirContext getSchemaClassDefinition(String name) throws NamingException {
+ check(name);
+ return getOriginal().getSchema(name);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
+ String[] attributesToReturn) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
+ check(name);
+ return getOriginal().search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
+ check(name);
+ return getOriginal().search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
+ throws NamingException {
+ check(name);
+ return getOriginal().search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
+ check(name);
+ return getOriginal().search(name, filterExpr, filterArgs, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
+ SearchControls cons) throws NamingException {
+ check(name);
+ return getOriginal().search(name, filterExpr, filterArgs, cons);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
new file mode 100644
index 0000000..67a9527
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
@@ -0,0 +1,69 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingEventContextDecorator extends AccessCheckingContextDecorator implements EventContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingEventContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingEventContextDecorator(EventContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected EventContext getOriginal() {
+ return (EventContext) super.getOriginal();
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ check();
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ check();
+ return getOriginal().targetMustExist();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
new file mode 100644
index 0000000..ed7a848
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
@@ -0,0 +1,96 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.directory.SearchControls;
+import javax.naming.event.EventDirContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingEventDirContextDecorator extends AccessCheckingDirContextDecorator implements
+ EventDirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingEventDirContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingEventDirContextDecorator(EventDirContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected EventDirContext getOriginal() {
+ return (EventDirContext) super.getOriginal();
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ check();
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ check();
+ return getOriginal().targetMustExist();
+ }
+
+ public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void
+ addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
+ NamingListener l) throws NamingException {
+ check(target);
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
new file mode 100644
index 0000000..e361db8
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
@@ -0,0 +1,85 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.NamingException;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.ExtendedRequest;
+import javax.naming.ldap.ExtendedResponse;
+import javax.naming.ldap.LdapContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingLdapContextDecorator extends AccessCheckingDirContextDecorator implements LdapContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public AccessCheckingLdapContextDecorator(String... checkedSchemes) {
+ super(checkedSchemes);
+ }
+
+ public AccessCheckingLdapContextDecorator(LdapContext original, String... checkedSchemes) {
+ super(original, checkedSchemes);
+ }
+
+ @Override
+ protected LdapContext getOriginal() {
+ return (LdapContext) super.getOriginal();
+ }
+
+ public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
+ check();
+ return getOriginal().extendedOperation(request);
+ }
+
+ public LdapContext newInstance(Control[] requestControls) throws NamingException {
+ check();
+ return getOriginal().newInstance(requestControls);
+ }
+
+ public void reconnect(Control[] connCtls) throws NamingException {
+ check();
+ getOriginal().reconnect(connCtls);
+ }
+
+ public Control[] getConnectControls() throws NamingException {
+ check();
+ return getOriginal().getConnectControls();
+ }
+
+ public void setRequestControls(Control[] requestControls) throws NamingException {
+ check();
+ getOriginal().setRequestControls(requestControls);
+ }
+
+ public Control[] getRequestControls() throws NamingException {
+ check();
+ return getOriginal().getRequestControls();
+ }
+
+ public Control[] getResponseControls() throws NamingException {
+ check();
+ return getOriginal().getResponseControls();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
new file mode 100644
index 0000000..5755ebd
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
@@ -0,0 +1,33 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public interface ContextDecorator extends Context {
+
+ void init(Context context) throws NamingException;
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
new file mode 100644
index 0000000..a088aa2
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
@@ -0,0 +1,162 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+/**
+ * @author Lukas Krejci
+ */
+public class ContextDecoratorPicker {
+
+ private Set<Class<? extends ContextDecorator>> possibleDecorators = new HashSet<Class<? extends ContextDecorator>>();
+ private Class<?>[] constructorParameterTypes;
+ private Object[] constructorParameters;
+
+ public ContextDecoratorPicker() {
+ }
+
+ public ContextDecoratorPicker(Collection<? extends Class<? extends ContextDecorator>> c) {
+ possibleDecorators.addAll(c);
+ }
+
+ public Set<Class<? extends ContextDecorator>> getPossibleDecorators() {
+ return possibleDecorators;
+ }
+
+ public Class<?>[] getConstructorParameterTypes() {
+ return constructorParameterTypes;
+ }
+
+ public void setConstructorParameterTypes(Class<?>[] constructorParameterTypes) {
+ this.constructorParameterTypes = constructorParameterTypes;
+ }
+
+ public Object[] getConstructorParameters() {
+ return constructorParameters;
+ }
+
+ public void setConstructorParameters(Object[] constructorParameters) {
+ this.constructorParameters = constructorParameters;
+ }
+
+ public Context wrapInAppropriateDecorator(Context context) throws NamingException {
+ Class<? extends ContextDecorator> cls = getMatchByInterfaces(context, possibleDecorators);
+
+ if (cls == null) {
+ throw new IllegalArgumentException("Could not find a matching context decorator for " + context.getClass() + " in " + this);
+ }
+
+ Constructor<? extends ContextDecorator> ctor = null;
+ try {
+ ctor = cls.getConstructor(constructorParameterTypes);
+ ContextDecorator ctx = ctor.newInstance(constructorParameters);
+
+ ctx.init(context);
+
+ return ctx;
+ } catch (SecurityException e) {
+ throw new IllegalStateException("Could not instantiate a class through reflection.", e);
+ } catch (NoSuchMethodException e) {
+ throw new IllegalArgumentException(
+ "Could not construct a context decorator - unable to find a constructor with parameters "
+ + (constructorParameterTypes == null ? "[no parameters]" : Arrays.asList(constructorParameterTypes)) + " on class " + cls.getName(), e);
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
+ } catch (InstantiationException e) {
+ throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
+ } catch (IllegalAccessException e) {
+ throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
+ } catch (InvocationTargetException e) {
+ throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
+ }
+ }
+
+ private static <T> Class<? extends T> getMatchByInterfaces(Object obj, Set<Class<? extends T>> classes) {
+ Set<Class<?>> ifaces = getAllImplementedInterfaces(obj.getClass());
+
+ Class<? extends T> match = null;
+ int maxMatchCnt = Integer.MIN_VALUE;
+
+ for(Class<? extends T> cls : classes) {
+ int cnt = getBestMatchByIfaces(cls, ifaces);
+ if (cnt > maxMatchCnt) {
+ maxMatchCnt = cnt;
+ match = cls;
+ }
+ }
+
+ return match;
+ }
+
+ private static int getBestMatchByIfaces(Class<?> cls, Set<Class<?>> ifaces) {
+ int ret = 0;
+
+ //count how many interfaces from the supplied array the class implements
+ for(Class<?> iface : ifaces) {
+ if (iface.isAssignableFrom(cls)) {
+ ++ret;
+ } else {
+ --ret;
+ }
+ }
+
+ //that's not all - to get the best possible match, we need to take into account
+ //the fact that the class might implement more than just the interfaces provided
+ Set<Class<?>> clsIfaces = getAllImplementedInterfaces(cls);
+
+ for(Class<?> clsIface : clsIfaces) {
+ if (!(ifaces.contains(clsIface))) {
+ --ret;
+ }
+ }
+
+ return ret;
+ }
+
+ private static Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
+ HashSet<Class<?>> ret = new HashSet<Class<?>>();
+ getAllImplementedInterfaces(cls, ret);
+
+ return ret;
+ }
+
+ private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
+ Class<?>[] ifaces = cls.getInterfaces();
+
+ for(Class<?> iface : Arrays.asList(ifaces)) {
+ output.add(iface);
+ getAllImplementedInterfaces(iface, output);
+ }
+
+ if (cls.getSuperclass() != null) {
+ getAllImplementedInterfaces(cls.getSuperclass(), output);
+ }
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
new file mode 100644
index 0000000..20077de
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
@@ -0,0 +1,212 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2011 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.io.Serializable;
+import java.util.Hashtable;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+
+import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
+
+/**
+ * This is a wrapper class around another {@link Context} implementation that
+ * prefers to use an URL context for some operation if the JNDI name contains
+ * a scheme rather than the original. This is the behavior of {@link InitialContext}
+ * which we need to restore in the contexts created by the {@link AccessCheckingInitialContextFactoryBuilder}
+ * (which an {@link InitialContext} uses exclusively if the builder is set).
+ * <p>
+ * This is important because RHQ server has its own initial context factory
+ * builder that creates factories that in turn create contexts. If the default
+ * {@link InitialContext} implementation was used, we'd never be able to lookup
+ * scheme-based names because the default implementation of the {@link InitialContext}
+ * always uses the default context of the builder if one is installed no matter
+ * the scheme in the name.
+ * <p>
+ * The {@link AccessCheckingInitialContextFactoryBuilder} wraps the context returned
+ * by the factory in an instance of this class and thus is restoring the original
+ * intended behavior of the {@link InitialContext}. It looks at the name being looked
+ * up (bound or whatever) and prefers to use the URL context factories if the name
+ * contains the scheme (as does the {@link InitialContext} if no builder is installed).
+ * If the name doesn't contain a scheme, the provided default context factory is used to
+ * look up the name.
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecorator implements Context, ContextDecorator, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Context original;
+
+ public URLPreferringContextDecorator() {
+
+ }
+
+ public URLPreferringContextDecorator(Context ctx) {
+ original = ctx;
+ }
+
+ public void init(Context context) {
+ original = context;
+ }
+
+ protected Context getOriginal() throws NamingException {
+ return original;
+ }
+
+ protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
+ @SuppressWarnings("unchecked")
+ Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
+ return urlContext == null ? getOriginal() : urlContext;
+ }
+
+ protected Context getURLOrDefaultInitCtx(String name) throws NamingException {
+ @SuppressWarnings("unchecked")
+ Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
+ return urlContext == null ? getOriginal() : urlContext;
+ }
+
+ public Object lookup(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookup(name);
+ }
+
+ public Object lookup(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookup(name);
+ }
+
+ public void bind(Name name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj);
+ }
+
+ public void bind(String name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj);
+ }
+
+ public void rebind(Name name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj);
+ }
+
+ public void rebind(String name, Object obj) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj);
+ }
+
+ public void unbind(Name name) throws NamingException {
+ getURLOrDefaultInitCtx(name).unbind(name);
+ }
+
+ public void unbind(String name) throws NamingException {
+ getURLOrDefaultInitCtx(name).unbind(name);
+ }
+
+ public void rename(Name oldName, Name newName) throws NamingException {
+ getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
+ }
+
+ public void rename(String oldName, String newName) throws NamingException {
+ getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
+ }
+
+ public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).list(name);
+ }
+
+ public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).list(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).listBindings(name);
+ }
+
+ public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).listBindings(name);
+ }
+
+ public void destroySubcontext(Name name) throws NamingException {
+ getURLOrDefaultInitCtx(name).destroySubcontext(name);
+ }
+
+ public void destroySubcontext(String name) throws NamingException {
+ getURLOrDefaultInitCtx(name).destroySubcontext(name);
+ }
+
+ public Context createSubcontext(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name);
+ }
+
+ public Context createSubcontext(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name);
+ }
+
+ public Object lookupLink(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookupLink(name);
+ }
+
+ public Object lookupLink(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).lookupLink(name);
+ }
+
+ public NameParser getNameParser(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getNameParser(name);
+ }
+
+ public NameParser getNameParser(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getNameParser(name);
+ }
+
+ public Name composeName(Name name, Name prefix) throws NamingException {
+ return getOriginal().composeName(name, prefix);
+ }
+
+ public String composeName(String name, String prefix) throws NamingException {
+ return getOriginal().composeName(name, prefix);
+ }
+
+ public Object addToEnvironment(String propName, Object propVal) throws NamingException {
+ return getOriginal().addToEnvironment(propName, propVal);
+ }
+
+ public Object removeFromEnvironment(String propName) throws NamingException {
+ return getOriginal().removeFromEnvironment(propName);
+ }
+
+ public Hashtable<?, ?> getEnvironment() throws NamingException {
+ return getOriginal().getEnvironment();
+ }
+
+ public void close() throws NamingException {
+ if (getOriginal() != null) {
+ getOriginal().close();
+ original = null;
+ }
+ }
+
+ public String getNameInNamespace() throws NamingException {
+ return getOriginal().getNameInNamespace();
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
new file mode 100644
index 0000000..6e7debc
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
@@ -0,0 +1,76 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.spi.NamingManager;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecoratorHelper {
+
+ private URLPreferringContextDecoratorHelper() {
+
+ }
+
+ public static Context getURLContext(String name, Hashtable<Object, Object> env) throws NamingException {
+ String scheme = getURLScheme(name);
+ if (scheme != null) {
+ Context ctx = NamingManager.getURLContext(scheme, env);
+ if (ctx != null) {
+ return ctx;
+ }
+ }
+
+ return null;
+ }
+
+ public static Context getURLContext(Name name, Hashtable<Object, Object> env) throws NamingException {
+ if (name.size() > 0) {
+ String first = name.get(0);
+ String scheme = getURLScheme(first);
+ if (scheme != null) {
+ Context ctx = NamingManager.getURLContext(scheme, env);
+ if (ctx != null) {
+ return ctx;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ //copied from InitialContext
+ private static String getURLScheme(String str) {
+ int colon_posn = str.indexOf(':');
+ int slash_posn = str.indexOf('/');
+
+ if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
+ return str.substring(0, colon_posn);
+ return null;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
new file mode 100644
index 0000000..6a49942
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
@@ -0,0 +1,185 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
+/**
+ * Akin to {@link URLPreferringContextDecorator} this class implements the similar logic
+ * for {@link DirContext}s.
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringDirContextDecorator extends URLPreferringContextDecorator implements DirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringDirContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringDirContextDecorator(DirContext ctx) {
+ super(ctx);
+ }
+
+ protected DirContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof DirContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException(
+ "Not an instance of DirContext");
+ }
+ }
+
+ return (DirContext) ctx;
+ }
+
+ @Override
+ protected DirContext getURLOrDefaultInitCtx(Name name) throws NamingException {
+ Context ctx = super.getURLOrDefaultInitCtx(name);
+ return checkAndCast(ctx);
+ }
+
+ @Override
+ protected DirContext getURLOrDefaultInitCtx(String name) throws NamingException {
+ Context ctx = super.getURLOrDefaultInitCtx(name);
+ return checkAndCast(ctx);
+ }
+
+ public Attributes getAttributes(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name);
+ }
+
+ public Attributes getAttributes(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name);
+ }
+
+ public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
+ }
+
+ public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
+ }
+
+ public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
+ }
+
+ public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
+ }
+
+ public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
+ getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
+ }
+
+ public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
+ }
+
+ public void bind(String name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
+ }
+
+ public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
+ }
+
+ public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
+ getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
+ }
+
+ public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
+ }
+
+ public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
+ return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
+ }
+
+ public DirContext getSchema(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchema(name);
+ }
+
+ public DirContext getSchema(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchema(name);
+ }
+
+ public DirContext getSchemaClassDefinition(Name name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
+ }
+
+ public DirContext getSchemaClassDefinition(String name) throws NamingException {
+ return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
+ String[] attributesToReturn) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
+ }
+
+ public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
+ throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filter, cons);
+ }
+
+ public NamingEnumeration<SearchResult>
+ search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
+ }
+
+ public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
+ SearchControls cons) throws NamingException {
+ return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
new file mode 100644
index 0000000..e3298a0
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
@@ -0,0 +1,81 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringEventContextDecorator extends URLPreferringContextDecorator implements EventContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringEventContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringEventContextDecorator(EventContext ctx) {
+ super(ctx);
+ }
+
+ protected EventContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof EventContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException(
+ "Not an instance of EventContext");
+ }
+ }
+
+ return (EventContext) ctx;
+ }
+
+ @Override
+ protected EventContext getOriginal() throws NamingException {
+ return checkAndCast(super.getOriginal());
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return getOriginal().targetMustExist();
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
new file mode 100644
index 0000000..4925297
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
@@ -0,0 +1,104 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.directory.SearchControls;
+import javax.naming.event.EventDirContext;
+import javax.naming.event.NamingListener;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringEventDirContextDecorator extends URLPreferringDirContextDecorator implements EventDirContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringEventDirContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringEventDirContextDecorator(EventDirContext ctx) {
+ super(ctx);
+ }
+
+ @Override
+ protected EventDirContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof EventDirContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException(
+ "Not an instance of EventDirContext");
+ }
+ }
+
+ return (EventDirContext) ctx;
+ }
+
+ @Override
+ protected EventDirContext getOriginal() throws NamingException {
+ return checkAndCast(super.getOriginal());
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ getOriginal().removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return getOriginal().targetMustExist();
+ }
+
+ public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ getOriginal().addNamingListener(target, filter, ctls, l);
+ }
+
+ public void
+ addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
+ throws NamingException {
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+ public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
+ NamingListener l) throws NamingException {
+ getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
new file mode 100644
index 0000000..c74df39
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
@@ -0,0 +1,94 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
+import javax.naming.NotContextException;
+import javax.naming.ldap.Control;
+import javax.naming.ldap.ExtendedRequest;
+import javax.naming.ldap.ExtendedResponse;
+import javax.naming.ldap.LdapContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringLdapContextDecorator extends URLPreferringDirContextDecorator implements LdapContext {
+
+ private static final long serialVersionUID = 1L;
+
+ public URLPreferringLdapContextDecorator() {
+ super(null);
+ }
+
+ public URLPreferringLdapContextDecorator(LdapContext original) {
+ super(original);
+ }
+
+ @Override
+ protected LdapContext checkAndCast(Context ctx) throws NamingException {
+ if (!(ctx instanceof LdapContext)) {
+ if (ctx == null) {
+ throw new NoInitialContextException();
+ } else {
+ throw new NotContextException("Not an instance of LdapContext");
+ }
+ }
+
+ return (LdapContext) ctx;
+ }
+
+ @Override
+ protected LdapContext getOriginal() throws NamingException {
+ return checkAndCast(super.getOriginal());
+ }
+
+ public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
+ return getOriginal().extendedOperation(request);
+ }
+
+ public LdapContext newInstance(Control[] requestControls) throws NamingException {
+ return new URLPreferringLdapContextDecorator(getOriginal().newInstance(requestControls));
+ }
+
+ public void reconnect(Control[] connCtls) throws NamingException {
+ getOriginal().reconnect(connCtls);
+ }
+
+ public Control[] getConnectControls() throws NamingException {
+ return getOriginal().getConnectControls();
+ }
+
+ public void setRequestControls(Control[] requestControls) throws NamingException {
+ getOriginal().setRequestControls(requestControls);
+ }
+
+ public Control[] getRequestControls() throws NamingException {
+ return getOriginal().getRequestControls();
+ }
+
+ public Control[] getResponseControls() throws NamingException {
+ return getOriginal().getResponseControls();
+ }
+
+}
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 8753e6f..6898621 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -56,6 +56,12 @@
<dependency>
<groupId>org.rhq</groupId>
+ <artifactId>rhq-container-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
commit d1d18876b9f22a681e7243ef54aa649d066e8656
Author: Larry O'Leary <loleary(a)redhat.com>
Date: Tue Jan 3 16:37:31 2012 -0600
[Bug 769470] TomcatWarDiscoveryComponent excludes valid WAR deployments due to eager host name regular expression
Changed regular expression used to extract host name from context name to stop at first slash instead of last slash.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java
index f6fa791..7605749 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java
@@ -1,5 +1,5 @@
/** Jopr Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2012 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -58,7 +58,7 @@ public class TomcatWarDiscoveryComponent extends MBeanResourceDiscoveryComponent
private static final List<String> EMS_ATTRIBUTE_DOC_BASE = Arrays.asList(new String[] { "docBase" });
private static final List<String> EMS_ATTRIBUTE_PATH = Arrays.asList(new String[] { "path" });
/** The name MBean attribute for each application is of the form "Tomcat WAR (//vHost/contextRoot)". */
- private static final Pattern PATTERN_NAME = Pattern.compile("//(.*)(/.*)");
+ private static final Pattern PATTERN_NAME = Pattern.compile("^//([^/]+)(.*)$");
private static final String RT_LOG_FILE_NAME_SUFFIX = "_rt.log";
private final Log log = LogFactory.getLog(this.getClass());
commit caff389ecc3e3f6c53e9880f840c1995241a92a4
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 3 15:19:18 2012 +0100
Some cleanup, return location for PUT metric, allow to expose raw metrics as xml too.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index 77e36a4..a772ab4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -123,30 +123,8 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
List<List<MeasurementDataNumericHighLowComposite>> listList = dataManager.findDataForResource(caller,
schedule.getResource().getId(), new int[]{definitionId}, startTime, endTime, dataPoints);
-/*
- long minTime=Long.MAX_VALUE;
- long maxTime=0;
-*/
-
if (!listList.isEmpty()) {
List<MeasurementDataNumericHighLowComposite> list = listList.get(0);
-/*
- for (MeasurementDataNumericHighLowComposite c : list) {
- long timestamp = c.getTimestamp();
- if (!Double.isNaN(c.getValue()) || !hideEmpty) {
- MetricAggregate.DataPoint dp = new MetricAggregate.DataPoint(timestamp,c.getValue(),c.getHighValue(),c.getLowValue());
- res.addDataPoint(dp);
- }
- if (timestamp <minTime)
- minTime= timestamp;
- if (timestamp >maxTime)
- maxTime= timestamp;
- }
- res.setNumDataPoints(list.size());
- }
- res.setMaxTimeStamp(maxTime);
- res.setMinTimeStamp(minTime);
-*/
fill(res, list,scheduleId,hideEmpty);
}
@@ -156,7 +134,6 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
cc.setPrivate(false);
cc.setNoCache(false);
-
Response.ResponseBuilder builder;
MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
@@ -224,6 +201,8 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@QueryParam("hideEmpty") boolean hideEmpty, @Context Request request,
@Context HttpHeaders headers) {
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
+
if (startTime==0) {
endTime = System.currentTimeMillis();
startTime = endTime - EIGHT_HOURS;
@@ -259,7 +238,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
GenericEntity<List<MetricAggregate>> metAgg = new GenericEntity<List<MetricAggregate>>(resList) {};
- return Response.ok(metAgg).build();
+ return Response.ok(metAgg,mediaType).build();
}
@@ -275,8 +254,10 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
*/
public Response getSchedule(int scheduleId, Request request, HttpHeaders headers, UriInfo uriInfo) {
- MeasurementSchedule schedule=null;
- Response.ResponseBuilder builder=null;
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
+
+ MeasurementSchedule schedule;
+ Response.ResponseBuilder builder;
// Create a cache control
CacheControl cc = new CacheControl();
@@ -351,9 +332,6 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
Link updateLink = new Link("edit",uri.toString());
metricSchedule.addLink(updateLink);
- // What media type does the user request?
- MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
-
if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
builder = Response.ok(renderTemplate("metricSchedule", metricSchedule), mediaType);
}
@@ -427,6 +405,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
Request request,
HttpHeaders headers) {
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
if (endTime==0)
endTime = System.currentTimeMillis();
@@ -441,10 +420,11 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
// Check if the schedule exists
obtainSchedule(scheduleId);
- RawNumericJsonStreamingOutput so = new RawNumericJsonStreamingOutput();
+ RawNumericStreamingOutput so = new RawNumericStreamingOutput();
so.scheduleId = scheduleId;
so.startTime = startTime;
so.endTime = endTime;
+ so.mediaType = mediaType;
return so;
@@ -456,8 +436,9 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
@Path("data/{scheduleId}/raw/{timeStamp}")
public Response putMetricValue(@PathParam("scheduleId") int scheduleId, @PathParam("timeStamp") long timestamp,
- NumericDataPoint point, @Context HttpHeaders headers) {
+ NumericDataPoint point, @Context HttpHeaders headers, UriInfo uriInfo) {
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
MeasurementSchedule schedule = obtainSchedule(scheduleId);
Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(1);
@@ -465,7 +446,13 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
dataManager.addNumericData(data);
- return Response.ok().build(); // TODO correct code?
+ UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
+ uriBuilder.path("/metric/data/{scheduleId}/raw");
+ uriBuilder.queryParam("startTime",timestamp);
+ uriBuilder.queryParam("endTime",timestamp);
+ URI uri = uriBuilder.build(scheduleId);
+
+ return Response.created(uri).type(mediaType).build();
}
@@ -475,6 +462,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public Response postMetricValues(Collection<NumericDataPoint> points, @Context HttpHeaders headers) {
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(points.size());
for (NumericDataPoint point : points) {
data.add(new MeasurementDataNumeric(point.getTimeStamp(), point.getScheduleId(),point.getValue()));
@@ -482,7 +470,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
dataManager.addNumericData(data);
- return Response.ok().build();
+ return Response.noContent().type(mediaType).build();
}
@@ -491,11 +479,12 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
* without creating tons of objects in the middle to have them marshalled
* by JAX-RS
*/
- private class RawNumericJsonStreamingOutput implements StreamingOutput {
+ private class RawNumericStreamingOutput implements StreamingOutput {
int scheduleId;
long startTime;
long endTime;
+ MediaType mediaType;
@Override
public void write(OutputStream outputStream) throws IOException, WebApplicationException {
@@ -528,22 +517,38 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
rs = ps.executeQuery();
PrintWriter pw = new PrintWriter(outputStream);
- pw.println("[");
- while (rs.next()) {
- pw.print("{");
- pw.print("\"scheduleId\":");
- pw.print(scheduleId);
- pw.print(", ");
- pw.print("\"timeStamp\":");
- pw.print(rs.getLong(1));
- pw.print(", ");
- pw.print("\"value\":");
- pw.print(rs.getLong(2));
- pw.print("}");
- if (!rs.isLast())
- pw.print(",\n");
+
+ if (mediaType.equals(MediaType.APPLICATION_JSON_TYPE)) {
+ pw.println("[");
+ while (rs.next()) {
+ pw.print("{");
+ pw.print("\"scheduleId\":");
+ pw.print(scheduleId);
+ pw.print(", ");
+ pw.print("\"timeStamp\":");
+ pw.print(rs.getLong(1));
+ pw.print(", ");
+ pw.print("\"value\":");
+ pw.print(rs.getDouble(2));
+ pw.print("}");
+ if (!rs.isLast())
+ pw.print(",\n");
+ }
+ pw.println("]");
+ }
+ else if (mediaType.equals(MediaType.APPLICATION_XML_TYPE)) {
+ pw.println("<collection>");
+ while(rs.next()) {
+ pw.print(" <numericDataPoint scheduleId=\"");
+ pw.print(scheduleId);
+ pw.print("\" timeStamp=\"");
+ pw.print(rs.getLong(1));
+ pw.print("\" value=\"");
+ pw.print(rs.getDouble(2));
+ pw.println("\"/>");
+ }
+ pw.println("</collection>");
}
- pw.println("]");
pw.flush();
pw.close();
} catch (SQLException e) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
index 2c75a55..6f76bce 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
@@ -119,7 +119,7 @@ public interface MetricHandlerLocal {
*/
@GET
@Path("data/{scheduleId}/raw")
- @Produces({MediaType.APPLICATION_JSON})
+ @Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
StreamingOutput getMetricDataRaw(@PathParam("scheduleId") int scheduleId,
@QueryParam("startTime") long startTime,
@QueryParam("endTime") long endTime,
@@ -133,15 +133,17 @@ public interface MetricHandlerLocal {
* @param timestamp Timestamp of the entry
* @param point Datapoint of class NumericDataPoint
* @param headers Injected HTTP headers
+ * @param uriInfo Injected info about the uri
* @return
*/
@PUT
@Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
@Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
@Path("data/{scheduleId}/raw/{timeStamp}")
- Response putMetricValue(@PathParam("scheduleId")int scheduleId,
- @PathParam("timeStamp")long timestamp, NumericDataPoint point,
- @Context HttpHeaders headers);
+ Response putMetricValue(@PathParam("scheduleId") int scheduleId,
+ @PathParam("timeStamp") long timestamp, NumericDataPoint point,
+ @Context HttpHeaders headers,
+ @Context UriInfo uriInfo);
/**
* Submit a series of (numerical) metric values to the server
commit 6945397a12e96fcaa7c92161e5f474abd98f7cad
Merge: 89027fe eb92c16
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Jan 3 15:26:38 2012 +0100
Merge branch 'lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs'
commit 89027fe4e28299fbe408617ff830701c63ec00e5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 3 14:01:32 2012 +0100
BZ 771216 - return messages accompanying error codes with the return type the client has requested.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
index 58ccf30..fe23ad2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
@@ -18,12 +18,16 @@
*/
package org.rhq.enterprise.server.rest;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import org.rhq.enterprise.server.authz.PermissionException;
import org.rhq.enterprise.server.resource.ResourceNotFoundException;
+import org.rhq.enterprise.server.rest.domain.RHQErrorWrapper;
/**
* Map a NotFoundException to a HTTP response with respective error message
@@ -32,10 +36,14 @@ import org.rhq.enterprise.server.resource.ResourceNotFoundException;
@Provider
public class CustomExceptionMapper implements ExceptionMapper<Exception> {
+ @Context
+ HttpHeaders httpHeaders;
@Override
public Response toResponse(Exception e) {
+
+
Throwable cause = e.getCause();
Response.ResponseBuilder builder;
if (cause !=null) {
@@ -52,7 +60,8 @@ public class CustomExceptionMapper implements ExceptionMapper<Exception> {
status = Response.Status.SERVICE_UNAVAILABLE;
builder = Response.status(status);
- builder.entity(cause.getMessage());
+ String message = cause.getMessage();
+ wrapMessage(builder, message);
}
else {
if (e instanceof PermissionException) {
@@ -60,9 +69,30 @@ public class CustomExceptionMapper implements ExceptionMapper<Exception> {
} else {
builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
}
- if (e.getMessage()!=null)
- builder.entity(e.getMessage());
+ if (e.getMessage()!=null) {
+ wrapMessage(builder,e.getMessage());
+ }
}
return builder.build();
}
+
+ /**
+ * Wrap the passed message according to the mediaType from the HttpHeader
+ * @param builder
+ * @param message
+ */
+ private void wrapMessage(Response.ResponseBuilder builder, String message) {
+
+ MediaType mediaType = httpHeaders.getAcceptableMediaTypes().get(0);
+
+ if (mediaType.equals(MediaType.TEXT_PLAIN_TYPE)) {
+ builder.entity(message);
+ } else if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
+ builder.entity("<html><body><h1>Error</h1><h2>" + message + "</h2></body></html>");
+ } else {
+ RHQErrorWrapper error = new RHQErrorWrapper(message);
+ builder.entity(error);
+ }
+ builder.type(mediaType);
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/RHQErrorWrapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/RHQErrorWrapper.java
new file mode 100644
index 0000000..f62b1bc
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/RHQErrorWrapper.java
@@ -0,0 +1,28 @@
+package org.rhq.enterprise.server.rest.domain;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Wrapper for Exceptions
+ * @author Heiko W. Rupp
+ */
+@XmlRootElement
+public class RHQErrorWrapper {
+
+ private String message;
+
+ public RHQErrorWrapper(String message) {
+ this.message = message;
+ }
+
+ public RHQErrorWrapper() {
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
commit 3fea0b257d0598b7beeaa2bc3982b2d07def1887
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 2 22:05:49 2012 +0100
Mention RHQ samples project.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 76aa220..9e96d76 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -5,7 +5,9 @@
Join us in making it great by providing feedback and contributions of code and examples
that use the api.
-See also <a href="http://rhq-project.org/display/RHQ/Design-REST">the RHQ wiki</a> and
+See also <a href="http://rhq-project.org/display/RHQ/Design-REST">the RHQ wiki</a> on REST.
+Check out the <a href="https://github.com/rhq-project/samples/tree/master/rest-api">RHQ samples project</a>
+for samples in various programming languages and
<a href="https://github.com/pilhuhn/RHQpocket">RHQpocket</a> as an example of a
mobile client (Android) of the API.
<ul>
commit 09dee7d811bfed40ff6b4606242c4aa89f8225c6
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 2 13:08:00 2012 +0100
sort retrieved values by timestamp, as some clients don't cope well with out of order data.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index ba9785c..77e36a4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -510,6 +510,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
sb.append(" UNION ALL ");
}
+ sb.append(" ORDER BY time_stamp ASC");
commit 14fc3e1c71e67517449dcbe6543327cee9ffddcb
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sat Dec 31 15:21:30 2011 +0100
Rollback jackson to 1.7.4, as 1.9.3 has a bug (JACKSON-744)
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index f39c296..8220355 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -16,7 +16,7 @@
<properties>
<json.version>${project.json.version}</json.version>
- <jackson.version>1.9.3</jackson.version>
+ <jackson.version>1.7.4</jackson.version>
<jboss.sasl.version>1.0.0.Beta9</jboss.sasl.version>
</properties>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
index 11f823d..e895dd4 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
@@ -21,6 +21,7 @@ package org.rhq.modules.plugins.jbossas7;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -430,7 +431,8 @@ public class ConfigurationLoadingTest extends AbstractConfigurationHandlingTest
ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(definition,connection,null);
Configuration config = delegate.loadResourceConfiguration();
assert config!=null;
- assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5: " + config.getProperties().toString();
+ Collection<Property> properties = config.getProperties();
+ assert properties.size()==6 : "Got " + properties.size() + " props instead of 6: " + properties.toString();
PropertySimple simple = config.getSimple("check-interval");
assert simple !=null;
Integer integerValue = simple.getIntegerValue();
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
index 67f2243..2dcd49f 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
@@ -59,6 +59,7 @@ public class OperationJsonTest {
assert op!=null;
assert op.getOperation()!=null : "op.operation was null!";
assert op.getOperation().equals(operation.getOperation()) : "Operation is " + op.getOperation();
+ assert op.getName()!=null : "op.getName is null";
assert op.getName().equals("socket-binding") : "attribute name is " + op.getName() + " and not 'socket-binding'";
assert op.getValue().equals("jndi") : "attribute value is " + op.getValue();
assert op.getAddress().size()==2 : "Address did not contain 2 parts, but " + op.getAddress().size();
commit 685a93c8b98e796173e5830159b33aa8350676a0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Dec 30 17:02:00 2011 +0100
Support submission of (numerical) metrics into the server and retrieval of raw numeric values.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java
index d0d26ab..d22689f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java
@@ -82,6 +82,10 @@ public abstract class MeasurementData implements Serializable {
this.setName(request.getName());
}
+ protected MeasurementData(long timestamp, int scheduleId) {
+ this(new MeasurementDataPK(timestamp,scheduleId));
+ }
+
public int getScheduleId() {
return id.scheduleId;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java
index 4e82c43..d0bf41f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java
@@ -59,6 +59,11 @@ public class MeasurementDataNumeric extends MeasurementData implements Serializa
this.rawNumericType = request.getRawNumericType();
}
+ public MeasurementDataNumeric(long collectionTime, int scheduleId,Double value) {
+ super(collectionTime,scheduleId);
+ this.value = value;
+ }
+
@Deprecated
// Have to make this protected so that people only use the constructor taking a request (so the name can be set for live values)
public MeasurementDataNumeric(MeasurementDataPK md, Double value) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
index 7ffb8e1..7bb7c8f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.server.measurement;
import java.sql.Connection;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
@@ -176,9 +177,9 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
long start = System.currentTimeMillis();
// TODO GH: Deal with offset (this is only for situations where the clock doesn't match on the agent)
- /*
+ /*
* even if these methods check for null/empty collections, they cross the EJB boundary and so unnecessarily
- * start transactions. by checking the null/emptiness of a collection here, by only create transactions
+ * start transactions. by checking the null/emptiness of a collection here, by only create transactions
* when real work will be done;
*/
if (report.getNumericData() != null && !report.getNumericData().isEmpty()) {
@@ -799,6 +800,37 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
return values;
}
+ @Override
+ public List<MeasurementDataNumeric> findRawData(Subject subject, int scheduleId, long startTime, long endTime) {
+
+ List<MeasurementDataNumeric> result = new ArrayList<MeasurementDataNumeric>();
+ String table = MeasurementDataManagerUtility.getCurrentRawTable();
+ Connection connection = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ connection = rhqDs.getConnection();
+ ps = connection.prepareStatement( // TODO supply real impl that spans multiple tables
+ "SELECT time_stamp,value FROM " + table + " WHERE schedule_id= ? AND time_stamp BETWEEN ? AND ?");
+ ps.setLong(1,scheduleId);
+ ps.setLong(2,startTime);
+ ps.setLong(3,endTime);
+ rs = ps.executeQuery();
+
+ while (rs.next()) {
+ MeasurementDataNumeric point = new MeasurementDataNumeric(rs.getLong(1),scheduleId,rs.getDouble(2));
+ result.add(point);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace(); // TODO: Customise this generated block
+ } finally {
+ JDBCUtil.safeClose(connection, ps, rs);
+ }
+
+
+ return result;
+ }
+
private List<MeasurementDataRequest> createRequests(List<MeasurementDefinition> definitions) {
List<MeasurementDataRequest> requests = new ArrayList<MeasurementDataRequest>();
for (MeasurementDefinition definition : definitions) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java
index e80f16a..4ea8302 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java
@@ -189,4 +189,6 @@ public interface MeasurementDataManagerLocal {
List<List<MeasurementDataNumericHighLowComposite>> findDataForResource(Subject subject, int resourceId,
int[] definitionIds, long beginTime, long endTime, int numPoints);
+
+ List<MeasurementDataNumeric> findRawData(Subject subject, int scheduleId, long startTime, long endTime);
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index 99dd6fe..ba9785c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -18,18 +18,34 @@
*/
package org.rhq.enterprise.server.rest;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
import java.net.URI;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.interceptor.Interceptors;
+import javax.sql.DataSource;
+import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.CacheControl;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.EntityTag;
@@ -38,6 +54,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
@@ -45,9 +62,13 @@ import org.jboss.cache.Fqn;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.measurement.DataType;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
+import org.rhq.core.util.jdbc.JDBCUtil;
+import org.rhq.enterprise.server.RHQConstants;
+import org.rhq.enterprise.server.measurement.util.MeasurementDataManagerUtility;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.rest.domain.Link;
import org.rhq.enterprise.server.rest.domain.MetricAggregate;
@@ -55,6 +76,7 @@ import org.rhq.enterprise.server.measurement.MeasurementAggregate;
import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal;
import org.rhq.enterprise.server.rest.domain.MetricSchedule;
+import org.rhq.enterprise.server.rest.domain.NumericDataPoint;
/**
* Deal with metrics
@@ -62,6 +84,7 @@ import org.rhq.enterprise.server.rest.domain.MetricSchedule;
*/
@Interceptors(SetCallerInterceptor.class)
@Stateless
+(a)javax.annotation.Resource(name = "RHQ_DS", mappedName = RHQConstants.DATASOURCE_JNDI_NAME)
public class MetricHandlerBean extends AbstractRestBean implements MetricHandlerLocal {
@EJB
@@ -71,6 +94,10 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
@EJB
ResourceManagerLocal resMgr;
+ @javax.annotation.Resource(name = "RHQ_DS")
+ private DataSource rhqDs;
+
+
private static final long EIGHT_HOURS = 8 * 3600L * 1000L;
@Override
@@ -87,20 +114,7 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
startTime = endTime - EIGHT_HOURS;
}
-
- MeasurementSchedule schedule;
- schedule = getFromCache(scheduleId,MeasurementSchedule.class);
- if (schedule==null) {
- schedule = scheduleManager.getScheduleById(caller,scheduleId);
- if (schedule==null) {
- throw new StuffNotFoundException("Schedule with id " + scheduleId);
- }
- else
- putToCache(scheduleId,MeasurementSchedule.class,schedule);
- }
-
- if (schedule.getDefinition().getDataType()!= DataType.MEASUREMENT)
- throw new IllegalArgumentException("Schedule [" + scheduleId + "] is not a (numerical) metric");
+ MeasurementSchedule schedule = obtainSchedule(scheduleId);
MeasurementAggregate aggr = dataManager.getAggregate(caller, scheduleId, startTime, endTime);
MetricAggregate res = new MetricAggregate(scheduleId, aggr.getMin(),aggr.getAvg(),aggr.getMax());
@@ -156,6 +170,28 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
return builder.build();
}
+ /**
+ * Get the schedule for the passed schedule id
+ * @param scheduleId id to look up
+ * @return schedule
+ * @throws StuffNotFoundException if there is no schedule with the passed id
+ */
+ private MeasurementSchedule obtainSchedule(int scheduleId) {
+ MeasurementSchedule schedule;
+ schedule = getFromCache(scheduleId,MeasurementSchedule.class);
+ if (schedule==null) {
+ schedule = scheduleManager.getScheduleById(caller,scheduleId);
+ if (schedule==null) {
+ throw new StuffNotFoundException("Schedule with id " + scheduleId);
+ }
+ else
+ putToCache(scheduleId,MeasurementSchedule.class,schedule);
+ }
+
+ if (schedule.getDefinition().getDataType()!= DataType.MEASUREMENT)
+ throw new IllegalArgumentException("Schedule [" + scheduleId + "] is not a (numerical) metric");
+ return schedule;
+ }
private MetricAggregate fill(MetricAggregate res, List<MeasurementDataNumericHighLowComposite> list, int scheduleId,
boolean hideEmpty) {
long minTime=Long.MAX_VALUE;
@@ -180,7 +216,6 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
return res;
}
- @Override
@GET
@Path("data")
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_HTML})
@@ -382,4 +417,139 @@ public class MetricHandlerBean extends AbstractRestBean implements MetricHandle
return Response.ok(ret,httpHeaders.getAcceptableMediaTypes().get(0)).build();
}
+
+ @GET
+ @Path("data/{scheduleId}/raw")
+ public StreamingOutput getMetricDataRaw(@PathParam("scheduleId") int scheduleId,
+ @QueryParam("startTime") long startTime,
+ @QueryParam("endTime") long endTime,
+ long duration,
+ Request request,
+ HttpHeaders headers) {
+
+
+ if (endTime==0)
+ endTime = System.currentTimeMillis();
+ if (startTime==0)
+ startTime = endTime - EIGHT_HOURS;
+ if (duration>0) // overrides start time
+ startTime = endTime - duration*1000L; // duration is in seconds
+
+ if (startTime < System.currentTimeMillis()-7L*86400*1000)
+ throw new IllegalArgumentException("Start time is older than 7 days");
+
+ // Check if the schedule exists
+ obtainSchedule(scheduleId);
+
+ RawNumericJsonStreamingOutput so = new RawNumericJsonStreamingOutput();
+ so.scheduleId = scheduleId;
+ so.startTime = startTime;
+ so.endTime = endTime;
+
+
+ return so;
+ }
+
+ @Override
+ @PUT
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ @Path("data/{scheduleId}/raw/{timeStamp}")
+ public Response putMetricValue(@PathParam("scheduleId") int scheduleId, @PathParam("timeStamp") long timestamp,
+ NumericDataPoint point, @Context HttpHeaders headers) {
+
+ MeasurementSchedule schedule = obtainSchedule(scheduleId);
+
+ Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(1);
+ data.add(new MeasurementDataNumeric(point.getTimeStamp(),scheduleId,point.getValue()));
+
+ dataManager.addNumericData(data);
+
+ return Response.ok().build(); // TODO correct code?
+ }
+
+
+ @Override
+ @POST
+ @Path("data/raw")
+ @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public Response postMetricValues(Collection<NumericDataPoint> points, @Context HttpHeaders headers) {
+
+ Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>(points.size());
+ for (NumericDataPoint point : points) {
+ data.add(new MeasurementDataNumeric(point.getTimeStamp(), point.getScheduleId(),point.getValue()));
+ }
+
+ dataManager.addNumericData(data);
+
+ return Response.ok().build();
+
+ }
+
+ /**
+ * Write the numeric data points to the output stream in JSON encoding
+ * without creating tons of objects in the middle to have them marshalled
+ * by JAX-RS
+ */
+ private class RawNumericJsonStreamingOutput implements StreamingOutput {
+
+ int scheduleId;
+ long startTime;
+ long endTime;
+
+ @Override
+ public void write(OutputStream outputStream) throws IOException, WebApplicationException {
+
+ String[] tables = MeasurementDataManagerUtility.getTables(startTime,endTime);
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0 ; i < tables.length ; i ++) {
+ sb.append("SELECT time_stamp,value FROM ");
+ sb.append(tables[i]);
+ sb.append(" WHERE schedule_id = ? AND time_stamp BETWEEN ? AND ?");
+ if (i < tables.length-1)
+ sb.append(" UNION ALL ");
+ }
+
+
+
+
+ Connection connection = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ connection = rhqDs.getConnection();
+ ps = connection.prepareStatement( sb.toString() );
+ for (int i = 0; i < tables.length ; i++) {
+ ps.setInt(i * 3 + 1, scheduleId);
+ ps.setLong(i*3+2,startTime);
+ ps.setLong(i*3+3,endTime);
+ }
+ rs = ps.executeQuery();
+
+ PrintWriter pw = new PrintWriter(outputStream);
+ pw.println("[");
+ while (rs.next()) {
+ pw.print("{");
+ pw.print("\"scheduleId\":");
+ pw.print(scheduleId);
+ pw.print(", ");
+ pw.print("\"timeStamp\":");
+ pw.print(rs.getLong(1));
+ pw.print(", ");
+ pw.print("\"value\":");
+ pw.print(rs.getLong(2));
+ pw.print("}");
+ if (!rs.isLast())
+ pw.print(",\n");
+ }
+ pw.println("]");
+ pw.flush();
+ pw.close();
+ } catch (SQLException e) {
+ log.error(e);
+ } finally {
+ JDBCUtil.safeClose(connection, ps, rs);
+ }
+ }
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
index 6631ef4..2c75a55 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java
@@ -18,12 +18,14 @@
*/
package org.rhq.enterprise.server.rest;
+import java.util.Collection;
import java.util.List;
import javax.ejb.Local;
import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
+import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -34,10 +36,12 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
import javax.ws.rs.core.UriInfo;
import org.rhq.enterprise.server.rest.domain.MetricAggregate;
import org.rhq.enterprise.server.rest.domain.MetricSchedule;
+import org.rhq.enterprise.server.rest.domain.NumericDataPoint;
/**
* Deal with metrics
@@ -76,16 +80,77 @@ public interface MetricHandlerLocal {
@Path("data/resource/{resourceId}")
List<MetricAggregate> getAggregatesForResource(@PathParam("resourceId") int resourceId);
+ /**
+ * Get information about the schedule
+ * @param scheduleId id of the schedule
+ * @param request Injected request
+ * @param headers Injected http headers
+ * @param uriInfo Injected Uri
+ * @return the schedule
+ */
@GET
@Path("/schedule/{id}")
@Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML,MediaType.TEXT_HTML})
Response getSchedule(@PathParam("id") int scheduleId, @Context Request request, @Context HttpHeaders headers,
@Context UriInfo uriInfo);
+ /**
+ * Update a schedule. Currently change of collection interval and enabled/disabled state are supported.
+ * @param scheduleId Id of the schedule to update
+ * @param in Modified schedule object
+ * @param headers Injected http headers
+ * @return Result of updating
+ */
@PUT
@Path("/schedule/{id}")
@Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
@Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
Response updateSchedule(@PathParam("id") int scheduleId, MetricSchedule in,@Context HttpHeaders headers);
+ /**
+ * Expose the raw metrics for the given schedule
+ * @param scheduleId Schedule id
+ * @param startTime Start time, if 0 and duration=, start time = 8h before endTime
+ * @param endTime End time. If 0, now is used
+ * @param duration Duration in seconds. If duration=0, startTime is used
+ * @param request Injected Request headers
+ * @param headers Injected HttpHeaders
+ * @return a JSON encoded stream of numerical values
+ */
+ @GET
+ @Path("data/{scheduleId}/raw")
+ @Produces({MediaType.APPLICATION_JSON})
+ StreamingOutput getMetricDataRaw(@PathParam("scheduleId") int scheduleId,
+ @QueryParam("startTime") long startTime,
+ @QueryParam("endTime") long endTime,
+ @QueryParam("duration") long duration,
+ @Context Request request,
+ @Context HttpHeaders headers);
+
+ /**
+ * Submit a single (numerical) metric value to the server.
+ * @param scheduleId Id of the schedule to submit to
+ * @param timestamp Timestamp of the entry
+ * @param point Datapoint of class NumericDataPoint
+ * @param headers Injected HTTP headers
+ * @return
+ */
+ @PUT
+ @Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ @Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ @Path("data/{scheduleId}/raw/{timeStamp}")
+ Response putMetricValue(@PathParam("scheduleId")int scheduleId,
+ @PathParam("timeStamp")long timestamp, NumericDataPoint point,
+ @Context HttpHeaders headers);
+
+ /**
+ * Submit a series of (numerical) metric values to the server
+ * @param points Collection of NumericDataPoint entries
+ * @param headers Injected HTTP headers
+ * @return
+ */
+ @POST
+ @Path("data/raw")
+ @Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
+ Response postMetricValues(Collection<NumericDataPoint> points, @Context HttpHeaders headers);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/NumericDataPoint.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/NumericDataPoint.java
new file mode 100644
index 0000000..e1ef904
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/NumericDataPoint.java
@@ -0,0 +1,65 @@
+package org.rhq.enterprise.server.rest.domain;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * One numerical data point of a schedule.
+ * This point does not contain the schedule id, as it is expected
+ * to be used to return lists of data points for a schedule.
+ *
+ * Xml names for the item and the attributes are shortened to
+ * conserve space when transferring to clients
+ *
+ * @author Heiko W. Rupp
+ */
+@XmlRootElement
+public class NumericDataPoint {
+
+ long timeStamp;
+ Double value;
+ private int scheduleId;
+
+ @SuppressWarnings("unused")
+ public NumericDataPoint() {
+ // Needed for JAXB
+ }
+
+ public NumericDataPoint(long timeStamp, Double value) {
+ this.timeStamp = timeStamp;
+ this.value = value;
+ }
+
+ public NumericDataPoint(long timeStamp, int scheduleId, Double value) {
+ this.timeStamp = timeStamp;
+ this.scheduleId = scheduleId;
+ this.value = value;
+ }
+
+ @XmlAttribute
+ public long getTimeStamp() {
+ return timeStamp;
+ }
+
+ @XmlAttribute
+ public Double getValue() {
+ return value;
+ }
+
+ @XmlAttribute
+ public int getScheduleId() {
+ return scheduleId;
+ }
+
+ public void setScheduleId(int scheduleId) {
+ this.scheduleId = scheduleId;
+ }
+
+ public void setTimeStamp(long timeStamp) {
+ this.timeStamp = timeStamp;
+ }
+
+ public void setValue(Double value) {
+ this.value = value;
+ }
+}
commit 14b81e5036bbbc47bb09fac2dc86b7166b1846fd
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sun Dec 25 11:42:47 2011 +0100
Initialize additionalProperties; give more debug output when assert fails.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java
index 0517ee1..23df1a5 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java
@@ -47,10 +47,12 @@ public class Operation {
this.operation = operation;
this.address = new Address(addressKey,addressValue);
this._address = address.path;
+ additionalProperties = new HashMap<String, Object>();
}
public Operation(String operation, Address address) {
this.operation = operation;
+ additionalProperties = new HashMap<String, Object>();
if (address!=null && address.path!=null) {
this.address = address;
this._address = address.path;
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
index ef58967..11f823d 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
@@ -430,7 +430,7 @@ public class ConfigurationLoadingTest extends AbstractConfigurationHandlingTest
ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(definition,connection,null);
Configuration config = delegate.loadResourceConfiguration();
assert config!=null;
- assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5";
+ assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5: " + config.getProperties().toString();
PropertySimple simple = config.getSimple("check-interval");
assert simple !=null;
Integer integerValue = simple.getIntegerValue();
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
index 354ab8d..67f2243 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java
@@ -59,7 +59,7 @@ public class OperationJsonTest {
assert op!=null;
assert op.getOperation()!=null : "op.operation was null!";
assert op.getOperation().equals(operation.getOperation()) : "Operation is " + op.getOperation();
- assert op.getName().equals("socket-binding") : "attribute name is " + op.getName();
+ assert op.getName().equals("socket-binding") : "attribute name is " + op.getName() + " and not 'socket-binding'";
assert op.getValue().equals("jndi") : "attribute value is " + op.getValue();
assert op.getAddress().size()==2 : "Address did not contain 2 parts, but " + op.getAddress().size();
commit 894c2ec182b75d50ab0238a3a211966e517f939b
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Dec 22 17:57:02 2011 -0500
[BZ 767734] conditionally disabling remaining tags references from Bundles.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index 5ac460c..bbc4175 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -124,7 +124,11 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
+ deployment.getDestination().getName(), LinkManager.getBundleDestinationLink(version.getBundle().getId(),
deployment.getDestination().getId())));
addMember(new HeaderLabel(Canvas.getImgURL("subsystems/bundle/BundleDeployment_24.png"), deployment.getName()));
- addMember(createTagEditor());
+
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
addMember(createSummaryForm());
addMemberDeploymentsTable();
@@ -219,8 +223,8 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
// deployment represents content on the remote machines, showing purge only for live
// deployments makes sense).
if (deployment.isLive()) {
- IButton revertButton = new LocatableIButton(actionLayout.extendLocatorId("Revert"), MSG
- .view_bundle_revert());
+ IButton revertButton = new LocatableIButton(actionLayout.extendLocatorId("Revert"),
+ MSG.view_bundle_revert());
revertButton.setIcon("subsystems/bundle/BundleAction_Revert_16.png");
revertButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
public void onClick(com.smartgwt.client.widgets.events.ClickEvent event) {
@@ -252,8 +256,9 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
new Message(MSG.view_bundle_dest_purgeSuccessful(destinationName),
Message.Severity.Info));
// Bundle destination is purged, go back to bundle deployment view - it is not live anymore
- CoreGUI.goToView(LinkManager.getBundleDeploymentLink(bundle.getId(), deployment
- .getId()), true);
+ CoreGUI.goToView(
+ LinkManager.getBundleDeploymentLink(bundle.getId(), deployment.getId()),
+ true);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
index 1e47427..d0966f2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
@@ -101,7 +101,12 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
addMember(backButton);
addMember(header);
- addMember(createTagEditor());
+
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
+
addMember(createSummaryForm());
addMember(createDeploymentsTable());
addMember(detail);
@@ -223,8 +228,8 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
new Message(MSG.view_bundle_dest_purgeSuccessful(destination.getName()),
Message.Severity.Info));
// Bundle destination is purged, go back to bundle destination view
- CoreGUI.goToView(LinkManager.getBundleDestinationLink(bundle.getId(), destination
- .getId()), true);
+ CoreGUI.goToView(
+ LinkManager.getBundleDestinationLink(bundle.getId(), destination.getId()), true);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
index e8eabfa..7a39e5a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
@@ -108,7 +108,11 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
addMember(backButton);
addMember(headerLabel);
- addMember(createTagEditor());
+
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
addMember(createSummaryForm());
addMember(tabs);
@@ -184,8 +188,8 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
StaticTextItem versionCountItem = new StaticTextItem("versionCount", MSG.view_bundle_list_versionsCount());
versionCountItem.setValue(bundle.getBundleVersions() != null ? bundle.getBundleVersions().size() : 0);
- StaticTextItem destinationsCountItem = new StaticTextItem("destinationsCount", MSG
- .view_bundle_list_destinationsCount());
+ StaticTextItem destinationsCountItem = new StaticTextItem("destinationsCount",
+ MSG.view_bundle_list_destinationsCount());
destinationsCountItem.setValue(bundle.getDestinations() != null ? bundle.getDestinations().size() : 0);
StaticTextItem descriptionItem = new StaticTextItem("description", MSG.common_title_description());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
index 19116bb..5737a9c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
@@ -93,7 +93,10 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
addMember(new HeaderLabel(Canvas.getImgURL("subsystems/bundle/BundleVersion_24.png"), version.getName() + ": "
+ version.getVersion()));
- addMember(createTagEditor());
+ //conditionally add tags. Defaults to true, not available in JON builds.
+ if (CoreGUI.isTagsEnabledForUI()) {
+ addMember(createTagEditor());
+ }
addMember(createSummaryForm());
@@ -268,16 +271,17 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
criteria.fetchConfigurationDefinition(true);
criteria.fetchTags(true);
- bundleManager.findBundleVersionsByCriteriaWithDestinationFilter(criteria, new AsyncCallback<PageList<BundleVersion>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_bundle_version_loadFailure(), caught);
- }
+ bundleManager.findBundleVersionsByCriteriaWithDestinationFilter(criteria,
+ new AsyncCallback<PageList<BundleVersion>>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_bundle_version_loadFailure(), caught);
+ }
- public void onSuccess(PageList<BundleVersion> result) {
- BundleVersion version = result.get(0);
- ViewId nextPath = viewPath.next().getCurrent();
- viewBundleVersion(version, nextPath);
- }
- });
+ public void onSuccess(PageList<BundleVersion> result) {
+ BundleVersion version = result.get(0);
+ ViewId nextPath = viewPath.next().getCurrent();
+ viewBundleVersion(version, nextPath);
+ }
+ });
}
}
commit ca7c3763fd627f0c26a8f6cfd48f3e929f64e2be
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Dec 22 15:58:36 2011 -0500
[BZ 759640] this also appears related to BZ 765670 - have the installer ping the startup servlet to know if the server is fully installed and ready
diff --git a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
index 673b018..7c04d9d 100644
--- a/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
+++ b/modules/enterprise/gui/installer-war/src/main/webapp/header.jsp
@@ -20,7 +20,7 @@
<c:if test="<%= new ServerInformation().isFullyDeployed() && request.getRequestURI().indexOf("installer/start") == -1 %>">
<script type="text/javascript" language="JavaScript">
- var startPage = '/Dashboard.do';
+ var startPage = '/startupstatus';
var xmlRequest = false;
function doLoad()
@@ -49,7 +49,7 @@
}
xmlRequest.onreadystatechange = processStateChange;
- xmlRequest.open('GET', startPage, true);
+ xmlRequest.open('HEAD', startPage, true);
xmlRequest.send(null);
}
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
index bc3942a..3add80f 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.startup;
+import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.sql.Connection;
@@ -31,6 +32,8 @@ import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
import org.apache.commons.logging.Log;
@@ -44,7 +47,6 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.common.ProductInfo;
-import org.rhq.core.domain.common.ServerDetails;
import org.rhq.core.domain.configuration.PropertyDynamicType;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.gui.configuration.helper.PropertyRenderingUtility;
@@ -65,7 +67,17 @@ import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainer;
import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement;
import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
import org.rhq.enterprise.server.scheduler.SchedulerLocal;
-import org.rhq.enterprise.server.scheduler.jobs.*;
+import org.rhq.enterprise.server.scheduler.jobs.AsyncResourceDeleteJob;
+import org.rhq.enterprise.server.scheduler.jobs.CheckForSuspectedAgentsJob;
+import org.rhq.enterprise.server.scheduler.jobs.CheckForTimedOutConfigUpdatesJob;
+import org.rhq.enterprise.server.scheduler.jobs.CheckForTimedOutContentRequestsJob;
+import org.rhq.enterprise.server.scheduler.jobs.CheckForTimedOutOperationsJob;
+import org.rhq.enterprise.server.scheduler.jobs.CloudManagerJob;
+import org.rhq.enterprise.server.scheduler.jobs.DataPurgeJob;
+import org.rhq.enterprise.server.scheduler.jobs.DynaGroupAutoRecalculationJob;
+import org.rhq.enterprise.server.scheduler.jobs.PurgePluginsJob;
+import org.rhq.enterprise.server.scheduler.jobs.PurgeResourceTypesJob;
+import org.rhq.enterprise.server.scheduler.jobs.SavedSearchResultCountRecalculationJob;
import org.rhq.enterprise.server.util.LookupUtil;
import org.rhq.enterprise.server.util.concurrent.AlertSerializer;
import org.rhq.enterprise.server.util.concurrent.AvailabilityReportSerializer;
@@ -73,6 +85,8 @@ import org.rhq.enterprise.server.util.concurrent.AvailabilityReportSerializer;
/**
* This servlet is ensured to be initialized after the rest of the RHQ Server has been deployed and started.
* Specifically, we know that at {@link #init()} time, all EJBs have been deployed and available.
+ *
+ * This also accepts requests and responds with information regarding the state of the startup.
*/
public class StartupServlet extends HttpServlet {
@@ -80,6 +94,20 @@ public class StartupServlet extends HttpServlet {
private Log log = LogFactory.getLog(this.getClass());
+ private boolean initialized = false;
+
+ /**
+ * This merely returns an HTTP status code to indicate the status of the startup.
+ * Under normal conditions, this will always return a 200 status code.
+ */
+ @Override
+ protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ resp.setHeader("Cache-Control", "no-cache, no-store");
+ resp.setHeader("Expires", "-1");
+ resp.setHeader("Pragma", "no-cache");
+ resp.setStatus(initialized ? HttpServletResponse.SC_OK : HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ }
+
/**
* Performs the final RHQ Server initialization work that needs to talk place. EJBs are available in this method.
*
@@ -87,6 +115,8 @@ public class StartupServlet extends HttpServlet {
*/
@Override
public void init() throws ServletException {
+ initialized = false;
+
log.info("All business tier deployments are complete - finishing the startup...");
// As a security measure, make sure the installer has been undeployed
@@ -138,6 +168,7 @@ public class StartupServlet extends HttpServlet {
logServerStartedMessage();
+ initialized = true;
return;
}
@@ -339,8 +370,12 @@ public class StartupServlet extends HttpServlet {
try {
ServerCommunicationsServiceUtil.getService().startCommunicationServices();
- ServerCommunicationsServiceUtil.getService().getServiceContainer().addCommandListener(
- new ExternalizableStrategyCommandListener(org.rhq.core.server.ExternalizableStrategy.Subsystem.AGENT));
+ ServerCommunicationsServiceUtil
+ .getService()
+ .getServiceContainer()
+ .addCommandListener(
+ new ExternalizableStrategyCommandListener(
+ org.rhq.core.server.ExternalizableStrategy.Subsystem.AGENT));
} catch (Exception e) {
throw new ServletException("Cannot start the server-side communications services.", e);
}
@@ -574,19 +609,19 @@ public class StartupServlet extends HttpServlet {
Server server = LookupUtil.getServerManager().getServer();
if (agentAddress == null || agentAddress.trim().equals("")) {
- overrides.setProperty(ServiceContainerConfigurationConstants.CONNECTOR_BIND_ADDRESS, server
- .getAddress());
+ overrides.setProperty(ServiceContainerConfigurationConstants.CONNECTOR_BIND_ADDRESS,
+ server.getAddress());
}
if (serverAddress == null || serverAddress.trim().equals("")) {
overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_ADDRESS, server.getAddress());
}
if (serverPort == null || serverPort.trim().equals("")) {
if (SecurityUtil.isTransportSecure(serverTransport)) {
- overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_PORT, Integer.toString(server
- .getSecurePort()));
+ overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_PORT,
+ Integer.toString(server.getSecurePort()));
} else {
- overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_PORT, Integer.toString(server
- .getPort()));
+ overrides.setProperty(AgentConfigurationConstants_SERVER_BIND_PORT,
+ Integer.toString(server.getPort()));
}
}
@@ -684,7 +719,8 @@ public class StartupServlet extends HttpServlet {
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
ProductInfo productInfo = LookupUtil.getSystemManager().getProductInfo(overlord);
log.info("--------------------------------------------------"); // 50 dashes
- log.info(productInfo.getFullName() + " " + productInfo.getVersion() + " (build " + productInfo.getBuildNumber() + ") Server started.");
+ log.info(productInfo.getFullName() + " " + productInfo.getVersion() + " (build " + productInfo.getBuildNumber()
+ + ") Server started.");
log.info("--------------------------------------------------"); // 50 dashes
}
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
index 1beef97..7528dd9 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
@@ -457,13 +457,18 @@
<url-pattern>/client/download</url-pattern>
</servlet-mapping>
+ <!-- provides startup progress information (mainly for the installer) -->
+ <servlet-mapping>
+ <servlet-name>initializer</servlet-name>
+ <url-pattern>/startupstatus</url-pattern>
+ </servlet-mapping>
+
+ <!-- TODO what is this for? -->
<servlet-mapping>
<servlet-name>sessionAccess</servlet-name>
<url-pattern>/sessionAccess</url-pattern>
</servlet-mapping>
-
-
<!-- The download servlet; this URI /downloads will effectively look like its pointing to rhq-downloads -->
<servlet-mapping>
<servlet-name>DownloadServlet</servlet-name>
commit 41c87d1c7ed3f0719cee76067afb3e84c7644481
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Dec 21 21:29:45 2011 +0100
Fix compile errors.
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java b/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java
index fbf81b5..6714c40 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java
+++ b/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java
@@ -57,9 +57,11 @@ import org.rhq.modules.plugins.jbossas7.json.PROPERTY_VALUE;
public abstract class AbstractIntegrationTest {
protected static final String DC_HOST = "localhost";
protected static final int DC_HTTP_PORT = 9990;
+ protected static final String DC_USER = "rhqadmin";
+ protected static final String DC_PASS = "rhqadmin";
String uploadToAs(String deploymentName) throws IOException {
- ASUploadConnection conn = new ASUploadConnection(DC_HOST, DC_HTTP_PORT);
+ ASUploadConnection conn = new ASUploadConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
OutputStream os = conn.getOutputStream(deploymentName);
@@ -92,7 +94,7 @@ public abstract class AbstractIntegrationTest {
}
ASConnection getASConnection() {
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
return connection;
}
diff --git a/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java b/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java
index 9b35471..cc55f1c 100644
--- a/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java
+++ b/modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java
@@ -90,7 +90,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest {
System.out.println("sha: " + bytes_value);
System.out.println();
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
Address deploymentsAddress = new Address("deployment", TEST_WAR);
Operation op = new Operation("add",deploymentsAddress);
@@ -168,7 +168,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest {
System.out.println("sha: " + bytes_value);
System.out.println();
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
/*
Address deploymentsAddress = new Address();
@@ -275,7 +275,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest {
cop.addStep(step2a);
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
JsonNode ret = connection.executeRaw(cop);
System.out.println(ret);
System.out.flush();
@@ -326,7 +326,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest {
cop.addStep(step1);
- ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT);
+ ASConnection connection = new ASConnection(DC_HOST, DC_HTTP_PORT,DC_USER,DC_PASS);
JsonNode ret = connection.executeRaw(cop);
System.out.println(ret);
System.out.flush();
commit 47086c02a2ed841262811c5a9ac1b92e22e7368d
Author: Mohamed Hamza Ben Mansour <>
Date: Wed Dec 21 18:19:37 2011 +0100
BZ 744262 - add resource lineage to SNMP traps.
diff --git a/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt b/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt
index 61fdb09..20bb110 100644
--- a/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt
+++ b/modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt
@@ -11,14 +11,14 @@ IMPORTS
FROM SNMPv2-TC;
rhqMIB MODULE-IDENTITY
- LAST-UPDATED "201010180000Z"
+ LAST-UPDATED "201112200000Z"
ORGANIZATION "RHQ-Project"
CONTACT-INFO "http://www.rhq-project.org/"
DESCRIPTION
"The MIB module for RHQ alerts.
This file is part of the RHQ management platform
- Copyright (C) 2005-2010 Red Hat, Inc.
+ Copyright (C) 2005-2011 Red Hat, Inc.
All rights reserved.
"
@@ -26,6 +26,8 @@ rhqMIB MODULE-IDENTITY
DESCRIPTION "Initial version"
REVISION "201010180000Z"
DESCRIPTION "Better trap support"
+ REVISION "201112200000Z"
+ DESCRIPTION "Also emit resource lineage"
::= { snmpModules 1 }
jboss OBJECT IDENTIFIER ::= {enterprises 18016 }
@@ -85,6 +87,14 @@ alertUrl OBJECT-TYPE
"The url of the individual alert"
::= { alert 6 }
+alertHierarchy OBJECT-TYPE
+ SYNTAX DisplayString (SIZE (0..1024))
+ MAX-ACCESS read-only
+ STATUS current
+ DESCRIPTION
+ "The hierarchy of the resource that triggered the alert"
+ ::= { alert 6 }
+
-- conformance information
snmpMIBConformance
@@ -110,7 +120,8 @@ alertGroup OBJECT-GROUP
alertPlatformName,
alertCondition,
alertSeverity,
- alertUrl }
+ alertUrl,
+ alertHierarchy }
STATUS current
DESCRIPTION "A collection of objects providing information about an alert"
::= { snmpMIBGroups 1 }
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java
index 664be6d..3e753f0 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java
@@ -22,6 +22,8 @@ import java.util.List;
import java.util.Random;
import javax.persistence.EntityManager;
+import javax.transaction.NotSupportedException;
+import javax.transaction.SystemException;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -110,6 +112,95 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase {
assert errors.size() == 0;
}
+
+ public void testResourceLineage() throws Exception {
+ // given a resource id for the leaf resource in a resource hierachy
+ int leafResourceId = givenASampleResourceHierarchy();
+
+ // when
+ List<Resource> resourceLineage = resourceManager.getResourceLineage(leafResourceId);
+
+ // then
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Resource resource : resourceLineage) {
+ stringBuilder.append(resource.getName());
+ if (resourceLineage.indexOf(resource) != resourceLineage.size() - 1) {
+ stringBuilder.append("::");
+ }
+ }
+ System.err.println(stringBuilder.toString());
+
+ }
+
+ private int givenASampleResourceHierarchy() throws NotSupportedException,
+ SystemException {
+ getTransactionManager().begin();
+ EntityManager em = getEntityManager();
+ int leafResoureId = 0;
+ try {
+ ResourceType platformType = createResourceType(em, "platform"
+ + System.currentTimeMillis(), "test", null,
+ ResourceCategory.PLATFORM);
+ ResourceType appserverType = createResourceType(em, "jboss AS 5"
+ + System.currentTimeMillis(), "jbossas5", platformType,
+ ResourceCategory.SERVER);
+ ResourceType jvmType = createResourceType(em,
+ "JVM" + System.currentTimeMillis(), "jbossas5",
+ appserverType, ResourceCategory.SERVICE);
+ ResourceType memType = createResourceType(em, "Memory Subsystem"
+ + System.currentTimeMillis(), "jbossas5", jvmType,
+ ResourceCategory.SERVICE);
+ Agent agent = new Agent("hamza007", "hamzahost", 1, "", "hamzatoken");
+ em.persist(agent);
+ em.flush();
+
+ Resource platform = createResource(em, platformType, agent,
+ "platformKey" + System.currentTimeMillis(),
+ "host.dev.corp", null);
+ Resource appserver = createResource(em, appserverType, agent,
+ "JEAP" + System.currentTimeMillis(), "JBOSS EAP 5.1.1",
+ platform);
+ Resource jvm = createResource(em, memType, agent, "jvm"
+ + System.currentTimeMillis(), "JBoss AS JVM", appserver);
+ Resource memSubystem = createResource(em, appserverType, agent,
+ "mem" + System.currentTimeMillis(), "Memory Subsystem", jvm);
+ leafResoureId = memSubystem.getId();
+ getTransactionManager().commit();
+ } catch (Exception e) {
+ try {
+ System.out.println("CANNOT Prepare TEST: Cause: " + e);
+ getTransactionManager().rollback();
+ } catch (Exception ignore) {
+ }
+ } finally {
+ em.close();
+ }
+ return leafResoureId;
+ }
+
+ private Resource createResource(EntityManager em, ResourceType platformType,
+ Agent agent, String resourceKey, String resourceName,
+ Resource parent) {
+ Resource resource = new Resource(resourceKey, resourceName, platformType);
+ resource.setUuid("" + new Random().nextInt());
+ resource.setAgent(agent);
+ resource.setParentResource(parent);
+ em.persist(resource);
+ return resource;
+ }
+
+
+ private ResourceType createResourceType(EntityManager em, String name,
+ String pluginName, ResourceType parentResourceType,
+ ResourceCategory resourceCategory) {
+ ResourceType platformType = new ResourceType(name, pluginName,
+ resourceCategory, parentResourceType);
+ ResourceType resourceType = platformType;
+ em.persist(resourceType);
+ return resourceType;
+ }
+
+
private Resource createNewResourceWithNewType() throws Exception {
getTransactionManager().begin();
EntityManager em = getEntityManager();
@@ -173,4 +264,4 @@ public class ResourceManagerBeanTest extends UpdatePluginMetadataTestBase {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java
index 627e23d..1ea5e0b 100644
--- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java
+++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java
@@ -60,16 +60,30 @@ public class SnmpSender extends AlertSender {
String platformName = lineage.get(0).getName();
String conditions = alertManager.prettyPrintAlertConditions(alert, false);
String alertUrl = alertManager.prettyPrintAlertURL(alert);
+
+
+ String hierarchy = getResourceHierarchyAsString(lineage);
Date bootTime = new Date(); // TODO: want to use LookupUtil.getCoreServer().getBootTime() but ServiceMBean is not visible
String result = snmpTrapSender.sendSnmpTrap(alert, alertParameters, platformName, conditions, bootTime,
- alertUrl);
+ alertUrl, hierarchy);
return SenderResult.getSimpleSuccess(result);
} catch (Throwable t) {
return SenderResult.getSimpleFailure("failed - cause: " + t);
}
}
+ private String getResourceHierarchyAsString(List<Resource> lineage) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (Resource resource : lineage) {
+ stringBuilder.append(resource.getName());
+ if (lineage.indexOf(resource) != lineage.size() - 1) {
+ stringBuilder.append("::");
+ }
+ }
+ return stringBuilder.toString();
+ }
+
@Override
public String previewConfiguration() {
SnmpInfo info = SnmpInfo.load(alertParameters);
diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java
index ba4bf84..53bfd85 100644
--- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java
+++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java
@@ -464,7 +464,7 @@ public class SnmpTrapSender implements PDUFactory {
* @return 'Error code' of the operation
*/
public String sendSnmpTrap(Alert alert, Configuration alertParameters, String platformName, String conditions,
- Date bootTime, String alertUrl) {
+ Date bootTime, String alertUrl, String hierarchy) {
if (!this.snmpEnabled) {
return "SNMP is not enabled.";
}
@@ -486,6 +486,8 @@ public class SnmpTrapSender implements PDUFactory {
getVariableBindings(baseOid + ".5" + "={s}" + alert.getAlertDefinition().getPriority().toString().toLowerCase());
// url of the alert detail
getVariableBindings(baseOid + ".6" + "={s}" + alertUrl);
+ // hierarchy of the resource on alert
+ getVariableBindings(baseOid + ".7" + "={s}" + hierarchy);
setSysUpTimeFromBootTime(bootTime); // needs to be called before checkTrapVariables();
checkTrapVariables(this.vbs);
commit 470dc5a6f40012d3632fef4f07c3b3c6f5951016
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Dec 21 12:10:54 2011 +0100
Add tests for child:key=value groups in config. Also update Jackson.
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 8220355..f39c296 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -16,7 +16,7 @@
<properties>
<json.version>${project.json.version}</json.version>
- <jackson.version>1.7.4</jackson.version>
+ <jackson.version>1.9.3</jackson.version>
<jboss.sasl.version>1.0.0.Beta9</jboss.sasl.version>
</properties>
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index ee6b902..7e88906 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -765,7 +765,7 @@
<c:simple-property name="mapped-file" required="false" type="boolean" defaultValue="true"
description="Map to the JSP source."/>
<c:simple-property name="check-interval" required="false" type="integer" defaultValue="60"
- description="Check interval for JSP updates using a background thread."/> <!-- TODO revisit default when https://issues.jboss.org/browse/AS7-3098 is fixed -->
+ description="Check interval in seconds for JSP updates using a background thread."/> <!-- TODO revisit default when https://issues.jboss.org/browse/AS7-3098 is fixed -->
<c:simple-property name="modification-test-interval" required="false" type="integer" defaultValue="4"
description="Minimum amount of time between two tests for updates, in seconds."/>
<c:simple-property name="recompile-on-fail" required="false" type="boolean" defaultValue="false"
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
index 0266071..e1627e3 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
@@ -28,6 +28,8 @@ import javax.xml.bind.util.ValidationEventCollector;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.node.ObjectNode;
import org.rhq.core.clientapi.agent.metadata.ConfigurationMetadataParser;
import org.rhq.core.clientapi.agent.metadata.InvalidPluginDescriptorException;
@@ -35,6 +37,7 @@ import org.rhq.core.clientapi.descriptor.DescriptorPackages;
import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor;
import org.rhq.core.clientapi.descriptor.plugin.ServerDescriptor;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.Operation;
/**
@@ -107,6 +110,30 @@ public class AbstractConfigurationHandlingTest {
public JsonNode executeRaw(Operation operation) {
if (content==null)
throw new IllegalStateException("Content not yet set");
+
+ Address address = operation.getAddress();
+ if (address!=null && !address.isEmpty()) {
+ // we need to clone the content and then for the result find the right sub-content to put into result and
+ // return this one.
+
+ // find the sub-content we want
+ String[] parts = address.getPath().split("=");
+ String key = parts[0];
+ String val = parts[1];
+ JsonNode result = content.get("result");
+ JsonNode keyNode = result.get(key);
+ JsonNode valNode = keyNode.get(val);
+
+ // clone the original content
+ ObjectMapper tmpMapper = new ObjectMapper();
+ JsonNode tmp = tmpMapper.createObjectNode();
+ ((ObjectNode)tmp).putAll(((ObjectNode)content));
+
+ // replace the result with the sub-content
+ ((ObjectNode)tmp).put("result",valNode);
+
+ return tmp;
+ }
return content;
}
}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
index 0a46516..ef58967 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java
@@ -416,6 +416,51 @@ public class ConfigurationLoadingTest extends AbstractConfigurationHandlingTest
}
+ public void test9() throws Exception {
+ String resultString = loadJsonFromFile("web.json");
+ ConfigurationDefinition definition = loadDescriptor("test9");
+
+ ObjectMapper mapper = new ObjectMapper();
+ ComplexResult result = mapper.readValue(resultString,ComplexResult.class);
+ JsonNode json = mapper.valueToTree(result);
+
+ FakeConnection connection = new FakeConnection();
+ connection.setContent(json);
+
+ ConfigurationLoadDelegate delegate = new ConfigurationLoadDelegate(definition,connection,null);
+ Configuration config = delegate.loadResourceConfiguration();
+ assert config!=null;
+ assert config.getProperties().size()==5 : "Got " + config.getProperties().size() + " props instead of 5";
+ PropertySimple simple = config.getSimple("check-interval");
+ assert simple !=null;
+ Integer integerValue = simple.getIntegerValue();
+ assert integerValue !=null : "check-interval was null";
+ assert integerValue ==17 : "check-interval was not 17 but " + integerValue;
+ PropertySimple disabled = config.getSimple("disabled");
+ assert disabled !=null : "disabled was null";
+ Boolean booleanValue = disabled.getBooleanValue();
+ assert booleanValue !=null;
+ assert booleanValue;
+ PropertySimple listings = config.getSimple("listings");
+ assert listings !=null;
+ Boolean booleanValue1 = listings.getBooleanValue();
+ assert booleanValue1 !=null;
+ assert !booleanValue1;
+ PropertySimple simple1 = config.getSimple("max-depth");
+ assert simple1 !=null;
+ Integer integerValue1 = simple1.getIntegerValue();
+ assert integerValue1 !=null;
+ assert integerValue1 ==3;
+ PropertySimple simple2 = config.getSimple("default-virtual-server");
+ assert simple2 !=null;
+ String stringValue = simple2.getStringValue();
+ assert stringValue !=null;
+ assert stringValue.equals("default-host");
+
+
+
+ }
+
private String loadJsonFromFile(String fileName) throws Exception {
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(fileName);
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
index a512133..09439f3 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
@@ -31,6 +31,7 @@ import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.modules.plugins.jbossas7.json.Address;
import org.rhq.modules.plugins.jbossas7.json.CompositeOperation;
import org.rhq.modules.plugins.jbossas7.json.Operation;
@@ -62,7 +63,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(new PropertySimple("needed","test"));
conf.put(new PropertySimple("optional",null));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1;
Operation step1 = cop.step(0);
@@ -89,7 +90,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -120,7 +121,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -148,7 +149,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -176,7 +177,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -207,7 +208,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -240,7 +241,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 3 : "#Steps should be 3 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -289,7 +290,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
assert cop.numberOfSteps() == 5 : "#Steps should be 5 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -317,4 +318,48 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
assert step4.getAddress().get(0).equals("socket-binding=https");
assert step5.getAddress().get(0).equals("socket-binding=https");
}
+
+ public void test9() throws Exception {
+
+ ConfigurationDefinition definition = loadDescriptor("test9");
+
+ FakeConnection connection = new FakeConnection();
+
+ ConfigurationWriteDelegate delegate = new ConfigurationWriteDelegate(definition,connection,null);
+
+ Configuration conf = new Configuration();
+
+ conf.put(new PropertySimple("default-virtual-server","hulla")); // this is read-only and must not show up in result
+ conf.put(new PropertySimple("test-prop","Heiko"));
+ conf.put(new PropertySimple("check-interval",23));
+ conf.put(new PropertySimple("disabled",true));
+ conf.put(new PropertySimple("listings",false));
+ conf.put(new PropertySimple("max-depth",17));
+
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, new Address());
+
+ assert cop.numberOfSteps() == 5 : "#Steps should be 5 but were " + cop.numberOfSteps();
+
+ Operation step1 = cop.step(0);
+ Operation step2 = cop.step(1);
+ Operation step3 = cop.step(2);
+ Operation step4 = cop.step(3);
+ Operation step5 = cop.step(4);
+
+ assert step1.getAddress().isEmpty();
+ assert step2.getAddress().size()==1;
+ assert step3.getAddress().size()==1;
+ assert step4.getAddress().size()==1;
+ assert step5.getAddress().size()==1;
+ assert step2.getAddress().get(0).equals("configuration=jsp-configuration");
+ assert step3.getAddress().get(0).equals("configuration=jsp-configuration");
+ assert step4.getAddress().get(0).equals("configuration=static-resources");
+ assert step5.getAddress().get(0).equals("configuration=static-resources");
+
+ assert step1.getAdditionalProperties().get("name").equals("test-prop");
+ assert step1.getAdditionalProperties().get("value").equals("Heiko");
+ assert step2.getAdditionalProperties().get("name").equals("check-interval");
+ assert step2.getAdditionalProperties().get("value").equals("23");
+
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
index 69201e2..53f351a 100644
--- a/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml
@@ -89,6 +89,21 @@
</server>
+ <server class="foo" discovery="foo" name="test9">
+ <resource-configuration>
+ <c:simple-property name="default-virtual-server" type="string" readOnly="true"/>
+ <c:simple-property name="test-prop" type="string" required="true" defaultValue="Hello"/>
+ <c:group name="child:configuration=jsp-configuration">
+ <c:simple-property name="check-interval" type="integer" units="seconds" readOnly="false" default="1"/>
+ <c:simple-property name="disabled" type="boolean" default="false"/>
+ </c:group>
+ <c:group name="child:configuration=static-resources">
+ <c:simple-property name="listings" default="true" type="boolean"/>
+ <c:simple-property name="max-depth" default="9" type="integer" />
+ </c:group>
+ </resource-configuration>
+ </server>
+
<server class="foo" discovery="foo" name="simple1">
<resource-configuration>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/web.json b/modules/plugins/jboss-as-7/src/test/resources/web.json
new file mode 100644
index 0000000..96f0565
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/web.json
@@ -0,0 +1,62 @@
+{
+ "outcome" : "success",
+ "result" :
+
+
+ {"default-virtual-server" : "default-host",
+ "native" : true,
+ "configuration" : {
+ "container" : {},
+ "static-resources" : {
+ "disabled" : false,
+ "listings" : false,
+ "max-depth" : 3,
+ "read-only" : true,
+ "sendfile" : 49152,
+ "webdav" : false},
+ "jsp-configuration" : {
+ "check-interval" : 17,
+ "development" : false,
+ "disabled" : true,
+ "display-source-fragment" : true,
+ "dump-smap" : false,
+ "error-on-use-bean-invalid-class-attribute" : false,
+ "generate-strings-as-char-arrays" : false,
+ "java-encoding" : "UTF-8",
+ "keep-generated" : true,
+ "mapped-file" : true,
+ "modification-test-interval" : "7",
+ "recompile-on-fail" : false,
+ "smap" : false,
+ "source-vm" : "1.5",
+ "tag-pooling" : true,
+ "target-vm" : "1.5",
+ "trim-spaces" : true,
+ "x-powered-by" : true}
+ },
+ "connector" : {
+ "http" : {
+ "enable-lookups" : true,
+ "enabled" : true,
+ "max-post-size" : 2097152,
+ "max-save-post-size" : 4096,
+ "protocol" : "HTTP/1.1",
+ "redirect-port" : 8443,
+ "scheme" : "http",
+ "secure" : false,
+ "socket-binding" : "http",
+ "ssl" : null,
+ "virtual-server" : null}
+ },
+
+ "virtual-server" : {
+ "default-host" : {
+ "access-log" : null,
+ "alias" : ["localhost","example.com"],
+ "default-web-module" : "ROOT.war",
+ "enable-welcome-root" : true,
+ "rewrite" : null,
+ "sso" : null}
+ }
+ }
+}
commit 74fe0df63135344a74cf0f58edf6f22a5c6c9124
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 20 17:28:21 2011 -0500
[BZ 766574] for some reason, the remote interface was removed from the discovery SLSB. put it back.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index fcb2f9e..2ea6234 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -99,7 +99,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author Greg Hinkle
*/
@Stateless
-public class DiscoveryBossBean implements DiscoveryBossLocal {
+public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemote {
private final Log log = LogFactory.getLog(DiscoveryBossBean.class.getName());
commit a638398ba148f419eba537b5851dac8955dad482
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Dec 20 14:40:53 2011 -0500
[BZ 766574] fix NPE if there is no availability yet
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
index 6ead45c..94a4d05 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java
@@ -44,6 +44,7 @@ import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertyList;
import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.ResourceAvailability;
import org.rhq.core.domain.resource.ResourceType;
@@ -715,7 +716,8 @@ public class TabularWriter {
} else if (object instanceof ResourceType) {
return ((ResourceType) object).getName();
} else if (object instanceof ResourceAvailability) {
- return ((ResourceAvailability) object).getAvailabilityType().getName();
+ AvailabilityType availType = ((ResourceAvailability) object).getAvailabilityType();
+ return (availType == null) ? "?" : availType.getName();
} else if (object != null && object.getClass().isArray()) {
return Arrays.toString((Object[]) object);
} else {
commit 19097edb5d591dae5ae6fdf7565b682cd5b1506c
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Nov 18 15:23:26 2011 +0100
Several improvements to the AS7 plugin:
* BZ 754858 - in as7.1 the management port is now determined via socket binding reference. Also allow discover older versions.
The xml parsing code has been rewritten to use XPath expressions.
* BZ 754849 supply authentication to the remote. The JVM calls back to the AS7 Authenticator when needed.
* Prevent a NPE in the case we get no results.
* Add an operation to install a management user.
* BZ 709678 - update jboss web to latest code and enable updating of properties.
* Allow to merge in new/changed properties instead of requiring to supply the whole configuration in the standalone container.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java
index 10b1b1b..07e2965 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java
@@ -21,7 +21,6 @@ package org.rhq.core.pc;
import java.io.*;
import java.util.ArrayList;
import java.util.EnumSet;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -31,6 +30,7 @@ import java.util.Stack;
import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.clientapi.agent.configuration.ConfigurationUpdateRequest;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.Property;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinition;
@@ -75,8 +75,6 @@ public class StandaloneContainer {
InventoryManager inventoryManager;
/** Global operation counter */
Integer opId = 0;
- /** Map of resource plugin configurations */
- Map<Integer, Configuration> resConfigMap = new HashMap<Integer, Configuration>();
/** variable set by find() and which can be used in set() */
int dollarR = 0;
/** Do we read from stdin ? */
@@ -340,32 +338,58 @@ public class StandaloneContainer {
}
- private void setResourcePluginConfig(String[] tokens,boolean pluginConfig) {
+ private void setResourcePluginConfig(String[] tokens,boolean isPluginConfig) throws PluginContainerException {
if (resourceId == 0) {
System.err.println("No resource set");
return;
}
+ Configuration newConfig = null;
Configuration config = null;
- if (tokens.length > 1)
- config = createConfigurationFromString(tokens[1]);
- else {
+ boolean merge=false;
+ int pos = 1;
+ if (tokens.length < 2) {
+ System.err.println("Need at least 1 token");
+ return;
+ }
+ if (tokens[1].equals("-m")) {
+ merge = true;
+ pos++;
+ }
+ if (tokens.length < pos+1) {
System.err.println("Need at least 1 token");
return;
}
- ConfigurationUpdateRequest request = new ConfigurationUpdateRequest(1,config,resourceId);
+ newConfig = createConfigurationFromString(tokens[pos]);
ConfigurationManager cm = pc.getConfigurationManager();
- if (pluginConfig) {
- pc.getInventoryManager().getResourceContainer(resourceId).getResource().setPluginConfiguration(config);
- } else
- cm.updateResourceConfiguration(request);
-
-
+ if (isPluginConfig) {
+ Resource targetResource = pc.getInventoryManager().getResourceContainer(resourceId).getResource();
+ config = targetResource.getPluginConfiguration();
+ if (merge) {
+ // copy over existing properties that are not in newConfig
+ for (Property p : config.getProperties()) {
+ if (newConfig.get(p.getName())==null)
+ newConfig.put(p);
+ }
+ }
+ targetResource.setPluginConfiguration(newConfig);
+ } else {
+ config = pc.getConfigurationManager().loadResourceConfiguration(resourceId);
+ if (merge) {
+ // copy over existing properties that are not in newConfig
+ for (Property p : config.getProperties()) {
+ if (newConfig.get(p.getName())==null)
+ newConfig.put(p);
+ }
+ }
+ ConfigurationUpdateRequest request = new ConfigurationUpdateRequest(1,newConfig,resourceId);
+ cm.updateResourceConfiguration(request);
+ }
}
@@ -715,7 +739,7 @@ public class StandaloneContainer {
}
private void showConfig(Configuration config) {
- System.out.println(config.getProperties());
+ System.out.println(config.getProperties()); // TODO convert to input format or key=value or json
}
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java
index c992000..0f1d01d 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java
@@ -47,8 +47,8 @@ public enum Command {
WAIT("w", "milliseconds", 1, "Waits the given amount of time"),
P_CONFIG("pc", "", 0, "Shows the plugin configuration of the current resource."),
R_CONFIG("rc", "", 0, "Shows the resource configuration of the current resource."),
- SR_CONFIG("rcs", "", 0, "[parameters] set resource config "),
- SP_CONFIG("pcs", "", 0, "[parameters] set plugin config ")
+ SR_CONFIG("rcs", "", 1, "[-m] [parameters] set resource config. '-m' merges with current config; default is overwrite."),
+ SP_CONFIG("pcs", "", 1, "[-m] [parameters] set plugin config.'-m' merges with current config; default is overwrite.")
;
private String abbrev;
diff --git a/modules/plugins/jboss-as-7/d2d.sh b/modules/plugins/jboss-as-7/d2d.sh
index 16c1e57..d36d8e9 100755
--- a/modules/plugins/jboss-as-7/d2d.sh
+++ b/modules/plugins/jboss-as-7/d2d.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-java -cp target/rhq-jboss-as-7-plugin-4.1.0-SNAPSHOT.jar:/im/rhq/modules/enterprise/agent/target/rhq-agent/lib/commons-logging-1.1.0.jboss.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar org.rhq.modules.plugins.jbossas7.Domain2Descriptor $*
+java -cp target/rhq-jboss-as-7-plugin-4.3.0-SNAPSHOT.jar:/im/rhq/modules/enterprise/agent/target/rhq-agent/lib/commons-logging-1.1.0.jboss.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.7.4/jackson-core-asl-1.7.4.jar:/Users/hrupp/.m2/repository/org/codehaus/jackson/jackson-mapper-asl/1.7.4/jackson-mapper-asl-1.7.4.jar org.rhq.modules.plugins.jbossas7.Domain2Descriptor $*
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index e069be3..8220355 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -17,6 +17,7 @@
<properties>
<json.version>${project.json.version}</json.version>
<jackson.version>1.7.4</jackson.version>
+ <jboss.sasl.version>1.0.0.Beta9</jboss.sasl.version>
</properties>
<build>
@@ -49,6 +50,11 @@
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.sasl</groupId>
+ <artifactId>jboss-sasl</artifactId>
+ <version>${jboss.sasl.version}</version>
+ </artifactItem>
</artifactItems>
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
@@ -76,7 +82,7 @@
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -204,6 +210,13 @@
<scope>provided</scope>
</dependency>
+ <!-- for the password hashing - we may want to copy the relevant stuff over ourselves -->
+ <dependency>
+ <groupId>org.jboss.sasl</groupId>
+ <artifactId>jboss-sasl</artifactId>
+ <version>${jboss.sasl.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java
new file mode 100644
index 0000000..703e177
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java
@@ -0,0 +1,26 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+
+/**
+ * Authenticator to authenticate against as7
+ * @author Heiko W. Rupp
+ */
+public class AS7Authenticator extends Authenticator {
+
+ private String user;
+ private String pass;
+
+ public AS7Authenticator(String user, String pass) {
+ this.user = user;
+ this.pass = pass;
+ if (this.pass==null)
+ this.pass=""; // prevent NPE later
+ }
+
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(user,pass.toCharArray());
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index 40561a0..cf0b5b9 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -23,15 +23,14 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.net.Authenticator;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
@@ -51,15 +50,17 @@ public class ASConnection {
String urlString;
private ObjectMapper mapper;
public static boolean verbose = false; // This is a variable on purpose, so devs can switch it on in the debugger or in the agent
- private HttpURLConnection conn;
+ Authenticator passwordAuthenticator ;
/**
* Construct an ASConnection object. The real "physical" connection is done in
* #executeRaw.
* @param host Host of the DomainController or standalone server
* @param port Port of the JSON api.
+ * @param user user needed for authentication
+ * @param password password needed for authentication
*/
- public ASConnection(String host, int port) {
+ public ASConnection(String host, int port, String user, String password) {
try {
url = new URL("http", host, port, MANAGEMENT);
@@ -69,6 +70,9 @@ public class ASConnection {
throw new IllegalArgumentException(e.getMessage());
}
+ passwordAuthenticator = new AS7Authenticator(user,password);
+ Authenticator.setDefault(passwordAuthenticator);
+
// read system property "as7plugin.verbose"
verbose = Boolean.getBoolean("as7plugin.verbose");
@@ -92,14 +96,15 @@ public class ASConnection {
InputStream inputStream = null;
BufferedReader br = null;
InputStream es = null;
+ HttpURLConnection conn=null;
long t1 = System.currentTimeMillis();
try {
-
conn = (HttpURLConnection) url.openConnection();
conn.setDoOutput(true);
conn.setRequestMethod("POST");
- conn.addRequestProperty("Content-Type","application/json");
+ conn.addRequestProperty("Content-Type", "application/json");
conn.addRequestProperty("Accept","application/json");
+
OutputStream out = conn.getOutputStream();
String result = mapper.writeValueAsString(operation);
@@ -236,6 +241,7 @@ public class ASConnection {
if (node==null) {
log.warn("Operation [" + op + "] returned null");
+ return null;
}
try {
Result res;
@@ -250,22 +256,5 @@ public class ASConnection {
}
}
- public void writeValue(OutputStream out, Object value) throws IOException, JsonGenerationException,
- JsonMappingException {
- // JsonGenerator jgen = _jsonFactory.createJsonGenerator(out, JsonEncoding.UTF8);
- // JsonGenerator jgen = mapper.createJsonGenerator(out, JsonEncoding.UTF8);
- // JsonGenerator jgen = new Js
- // boolean closed = false;
- // try {
- // writeValue(jgen, value);
- // closed = true;
- // jgen.close();
- // } finally {
- // if (!closed) {
- // jgen.close();
- // }
- // }
-
- }
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
index d17a311..a5b8bdd 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.net.Authenticator;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -55,15 +56,18 @@ public class ASUploadConnection {
private static final Log log = LogFactory.getLog(ASUploadConnection.class);
+ Authenticator passwordAuthenticator ;
BufferedOutputStream os = null;
InputStream is = null;
private HttpURLConnection connection;
private String host;
private int port;
- public ASUploadConnection(String dcHost, int port) {
+ public ASUploadConnection(String dcHost, int port, String user, String password) {
this.host = dcHost;
this.port = port;
+ passwordAuthenticator = new AS7Authenticator(user,password);
+ Authenticator.setDefault(passwordAuthenticator);
}
public OutputStream getOutputStream(String fileName) {
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
index 8736495..78b1543 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
@@ -24,15 +24,16 @@ import java.io.InputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.system.ProcessInfo;
/**
@@ -40,14 +41,24 @@ import org.rhq.core.system.ProcessInfo;
* in the area of processes and host.xml
* @author Heiko W. Rupp
*/
-public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> implements ResourceDiscoveryComponent<T> {
+public class AbstractBaseDiscovery {
static final String DORG_JBOSS_BOOT_LOG_FILE = "-Dorg.jboss.boot.log.file=";
private static final String DJBOSS_SERVER_HOME_DIR = "-Djboss.home.dir";
static final int DEFAULT_MGMT_PORT = 9990;
private static final String JBOSS_AS_PREFIX = "jboss-as-";
+ static final String CALL_READ_STANDALONE_OR_HOST_XML_FIRST = "hostXml is null. You need to call 'readStandaloneOrHostXml' first.";
protected Document hostXml;
protected final Log log = LogFactory.getLog(this.getClass());
private static final String JBOSS_EAP_PREFIX = "jboss-eap-";
+ private XPathFactory factory;
+
+
+
+ protected AbstractBaseDiscovery() {
+ synchronized (this) {
+ factory = XPathFactory.newInstance();
+ }
+ }
/**
* Read the host.xml or standalone.xml file depending on isDomainMode. If isDomainMode is true,
@@ -58,6 +69,10 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
*/
protected void readStandaloneOrHostXml(ProcessInfo processInfo, boolean isDomainMode) {
String hostXmlFile = getHostXmlFileLocation(processInfo,isDomainMode);
+ readStandaloneOrHostXmlFromFile(hostXmlFile);
+ }
+
+ protected void readStandaloneOrHostXmlFromFile(String hostXmlFile) {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
try {
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -107,99 +122,50 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
*/
protected HostPort getManagementPortFromHostXml(String[] commandLine) {
if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
- Element host = hostXml.getDocumentElement();
- NodeList interfaceParent = host.getElementsByTagName("management-interfaces");
- if (interfaceParent ==null || interfaceParent.getLength()==0) {
- log.warn("No <management-interfaces> found in host.xml");
- return new HostPort();
- }
- NodeList mgmtInterfaces = interfaceParent.item(0).getChildNodes();
- if (mgmtInterfaces==null || mgmtInterfaces.getLength()==0) {
- log.warn("No <*-interface> found in host.xml");
- return new HostPort();
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+ String portString;
+ String interfaceExpession;
+
+ String socketBindingName = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/socket-binding/@http");
+ if (socketBindingName==null || socketBindingName.isEmpty()) {
+ // old AS7.0, early 7.1 style
+ portString = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@port");
+ String interfaceName = obtainXmlPropertyViaXPath(
+ "//management/management-interfaces/http-interface/@interface");
+ interfaceExpession = obtainXmlPropertyViaXPath(
+ "/server/interfaces/interface[@name='" + interfaceName + "']/inet-address/@value");
}
- for (int i = 0 ; i < mgmtInterfaces.getLength(); i++) {
- if (!(mgmtInterfaces.item(i) instanceof Element))
- continue;
-
- Element mgmtInterface = (Element) mgmtInterfaces.item(i);
- if (mgmtInterface.getNodeName().equals("http-interface")) {
- String tmp = mgmtInterface.getAttribute("port"); // TODO if we don't find it, check for socket-binding
- int port;
- if (!tmp.isEmpty())
- port = Integer.valueOf(tmp);
- else
- port = DEFAULT_MGMT_PORT;
- HostPort hp = new HostPort();
- hp.isLocal=true; // TODO adjust when host != localhost
- hp.port = port;
-
- String nIf = mgmtInterface.getAttribute("interface");
- if (!nIf.isEmpty())
- hp.host = getInterface(nIf, commandLine);
- else
- hp.host = "localhost";
- return hp;
- }
- }
- return new HostPort();
- }
+ else {
+ // later AS7.1 and EAP6
+ portString = obtainXmlPropertyViaXPath(
+ "/server/socket-binding-group/socket-binding[@name='" + socketBindingName + "']/@port");
+ String interfaceName = obtainXmlPropertyViaXPath(
+ "/server/socket-binding-group/socket-binding[@name='" + socketBindingName + "']/@interface");
- /**
- * Try to obtain the management interface IP from the host/standalone.xml files
- *
- * @param nIf Interface to look for
- * @param commandLine Command line arguments of the process
- * @return IP address to use
- */
- private String getInterface(String nIf, String[] commandLine) {
- if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
+ // TODO the next may also be expressed differently
+ interfaceExpession = obtainXmlPropertyViaXPath(
+ "/server/interfaces/interface[@name='" + interfaceName + "']/inet-address/@value");
- Element host = hostXml.getDocumentElement();
- NodeList interfaceParent = host.getElementsByTagName("interfaces");
- if (interfaceParent ==null || interfaceParent.getLength()==0) {
- log.warn("No <interfaces> found in host.xml");
- return null;
- }
- NodeList mgmtInterfaces = interfaceParent.item(0).getChildNodes();
- if (mgmtInterfaces==null || mgmtInterfaces.getLength()==0) {
- log.warn("No <*-interface> found in host.xml");
- return null;
}
- for (int i = 0 ; i < mgmtInterfaces.getLength(); i++) {
- if (!(mgmtInterfaces.item(i) instanceof Element))
- continue;
- Element mgmtInterface = (Element) mgmtInterfaces.item(i);
- if (mgmtInterface.getNodeName().equals("interface")) {
- String name = mgmtInterface.getAttribute("name");
- if (!name.equals(nIf))
- continue;
-
- NodeList nl = mgmtInterface.getChildNodes();
- if (nl!=null) {
- for (int j = 0 ; j < nl.getLength(); j++) {
- if (!(nl.item(j) instanceof Element))
- continue;
-
- String nodeName = nl.item(j).getNodeName();
- if (nodeName.equals("any-ipv4-address"))
- return "0.0.0.0";
-
- String value = ((Element) nl.item(j)).getAttribute("value");
- value = replaceExpression(value, commandLine);
- return value;
-
- // TODO check for <any> and so on
- }
- }
- }
+ HostPort hp = new HostPort();
+
+ if (!interfaceExpession.isEmpty())
+ hp.host = replaceDollarExpression(interfaceExpession, commandLine);
+ else
+ hp.host = "localhost"; // Fallback
+
+ if (portString!=null && !portString.isEmpty()) {
+ hp.port = Integer.valueOf(portString);
}
- return null; // TODO: Customise this generated block
+ else
+ hp.port = 9990; // Fallback to default
+ return hp;
}
+
/**
* Check if the passed value has an expression in the form of ${var} or ${var:default},
* try to resolve it. Resolution is done by looking at the command line to see if
@@ -209,7 +175,7 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
* @param commandLine The command line from the process
* @return resolved value
*/
- private String replaceExpression(String value, String[] commandLine) {
+ private String replaceDollarExpression(String value, String[] commandLine) {
if (!value.contains("${"))
return value;
@@ -250,12 +216,12 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
/**
* Try to determine the host name - that is the name of a standalone server or a
- * host in domain mode by looking at the standalone/host.xml files
+ * host in domain mode by looking at the standalone.xml/host.xml files
* @return server name
*/
protected String findHostName() {
if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
String hostName = hostXml.getDocumentElement().getAttribute("name");
return hostName;
@@ -267,29 +233,53 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
*/
protected HostPort getDomainControllerFromHostXml() {
if (hostXml==null)
- throw new IllegalArgumentException("hostXml is null. You need to call 'readStandaloneOrHostXml' first.");
-
- Element host = hostXml.getDocumentElement();
- NodeList dcParent = host.getElementsByTagName("domain-controller");
- if (dcParent==null || dcParent.getLength()==0)
- return new HostPort(false);
- NodeList interfs = dcParent.item(0).getChildNodes();
- for (int i = 0; i < interfs.getLength(); i++) {
- if (!(interfs.item(i)instanceof Element))
- continue;
-
- Element interf = (Element) interfs.item(i);
- if (interf.getNodeName().equals("local"))
- return new HostPort();
-
- // not local, so get the remote
- HostPort hp = new HostPort(false);
- hp.host = interf.getAttribute("host");
- hp.port = Integer.parseInt(interf.getAttribute("port"));
- return hp;
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+
+ // first check remote, as we can't distinguish between a missing local element or
+ // and empty one which is the default
+ String remoteHost = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@host");
+ String portString = obtainXmlPropertyViaXPath("/host/domain-controller/remote/@port");
+
+ HostPort hp;
+ if (!remoteHost.isEmpty() && !portString.isEmpty()) {
+ hp = new HostPort(false);
+ hp.host = remoteHost;
+ hp.port = Integer.parseInt(portString);
}
+ else {
+ hp = new HostPort(true);
+ hp.port = 9999;
+ }
+
+ return hp;
+
+ }
+
+ String getManagementSecurtiyRealmFromHostXml() {
+ if (hostXml==null)
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+ String realm = obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm");
+
+ return realm;
+ }
+
+ String getSecurityPropertyFileFromHostXml(String baseDir, AS7Mode mode, String realm) {
+ if (hostXml==null)
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+ // TODO make realm variable
+ String fileName = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@path");
+ String relDir = obtainXmlPropertyViaXPath("//security-realms/security-realm[@name='" + realm + "']/authentication/properties/@relative-to");
+
+ String fullName ;
+ if (relDir.equals("jboss.server.config.dir"))
+ fullName = baseDir + File.separator + mode.getBaseDir() + File.separator + "configuration" + File.separator + fileName;
+ else
+ fullName = relDir + File.separator + fileName;
- return new HostPort(false);
+ return fullName;
}
/**
@@ -332,6 +322,34 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl
}
/**
+ * Run the passed xpathExpression on the prepopulated hostXml document and
+ * return the target element or attribute as a String.
+ * @param xpathExpression XPath Expression to evaluate
+ * @return String value of the Element or Attribute the XPath was pointing to.
+ * Null in case the xpathExpression could not be evaluated.
+ * @throws IllegalArgumentException if hostXml is null
+ *
+ */
+ protected String obtainXmlPropertyViaXPath(String xpathExpression) {
+ if (hostXml==null)
+ throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
+
+
+ XPath xpath = factory.newXPath();
+ try {
+ XPathExpression expr = xpath.compile(xpathExpression);
+
+ Object result = expr.evaluate(hostXml, XPathConstants.STRING);
+
+ return result.toString();
+ } catch (XPathExpressionException e) {
+ log.error("Evaluation XPath expression failed: " + e.getMessage());
+ return null;
+ }
+ }
+
+
+ /**
* Helper class that holds information about the host,port tuple
*/
protected static class HostPort {
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index 7395233..3f03e52 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -89,6 +89,8 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
String host;
int port;
private boolean verbose = ASConnection.verbose;
+ String managementUser;
+ String managementPassword;
/**
* Return availability of this resource
@@ -99,7 +101,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
ReadResource op = new ReadResource(address);
Result res = connection.execute(op);
- return res.isSuccess()? AvailabilityType.UP: AvailabilityType.DOWN;
+ return (res!=null && res.isSuccess()) ? AvailabilityType.UP: AvailabilityType.DOWN;
}
@@ -115,7 +117,9 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
host = pluginConfiguration.getSimpleValue("hostname", LOCALHOST);
String portString = pluginConfiguration.getSimpleValue("port", DEFAULT_HTTP_MANAGEMENT_PORT);
port = Integer.parseInt(portString);
- connection = new ASConnection(host,port);
+ managementUser = pluginConfiguration.getSimpleValue("user","-unset-");
+ managementPassword = pluginConfiguration.getSimpleValue("password","-unset-");
+ connection = new ASConnection(host,port, managementUser, managementPassword);
}
else {
connection = ((BaseComponent)context.getParentResourceComponent()).getASConnection();
@@ -310,7 +314,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements ResourceCo
ContentServices contentServices = cctx.getContentServices();
String resourceTypeName = report.getResourceType().getName();
- ASUploadConnection uploadConnection = new ASUploadConnection(host,port);
+ ASUploadConnection uploadConnection = new ASUploadConnection(host,port, managementUser, managementPassword);
OutputStream out = uploadConnection.getOutputStream(details.getFileName());
contentServices.downloadPackageBitsForChildResource(cctx, resourceTypeName, details.getKey(), out);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
index 54e7e78..3f049dc 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -75,7 +75,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
String serverNameFull;
String serverName;
String psName = psr.getProcessScan().getName();
- String description = discoveryContext.getResourceType().getDescription();
+ String description;
String homeDir = getHomeDirFromCommandLine(commandLine);
String version = determineServerVersionFromHomeDir(homeDir);
boolean isEAP = false;
@@ -115,7 +115,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
String host = findHost(psr.getProcessInfo(), true);
config.put(new PropertySimple("domainHost", host));
- fillUserPassFromFile(config, "domain", homeDir);
+ fillUserPassFromFile(config, AS7Mode.DOMAIN, homeDir);
// provide running config
String domainConfig = getServerConfigFromCommandLine(commandLine, AS7Mode.DOMAIN);
@@ -157,7 +157,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
config.put(new PropertySimple("config",serverConfig));
config.put(new PropertySimple("startScript",AS7Mode.STANDALONE.getStartScript()));
- fillUserPassFromFile(config, "standalone", serverNameFull);
+ fillUserPassFromFile(config, AS7Mode.STANDALONE, serverNameFull);
//preload server.log file for event log monitoring
logFile = bootLogFile.substring(0, bootLogFile.lastIndexOf("/")) + File.separator + "server.log";
@@ -173,6 +173,8 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
HostPort managmentPort = getManagementPortFromHostXml(commandLine);
config.put(new PropertySimple("hostname", managmentPort.host));
config.put(new PropertySimple("port", managmentPort.port));
+ config.put(new PropertySimple("realm",getManagementSecurtiyRealmFromHostXml()));
+
// String javaClazz = psr.getProcessInfo().getName();
/*
@@ -207,11 +209,14 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
}
- private void fillUserPassFromFile(Configuration config, String mode, String baseDir) {
+ private void fillUserPassFromFile(Configuration config, AS7Mode mode, String baseDir) {
+
+// String configDir = baseDir + File.separator + mode + File.separator + "configuration";
+ String realm = getManagementSecurtiyRealmFromHostXml();
+ String fileName = getSecurityPropertyFileFromHostXml(baseDir,mode, realm);
- String configDir = baseDir + File.separator + mode + File.separator + "configuration";
- File file = new File(configDir, "mgmt-users.properties");
+ File file = new File(fileName);
if (!file.exists() || !file.canRead()) {
if (log.isDebugEnabled())
log.debug("No console user properties file found at [" + file.getAbsolutePath()
@@ -234,7 +239,7 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
String user = line.substring(0, line.indexOf("="));
String pass = line.substring(line.indexOf("=") + 1);
config.put(new PropertySimple("user", user));
- config.put(new PropertySimple("password", pass));
+// config.put(new PropertySimple("password", pass)); // this is now hashed, so no point in supplying it
}
} catch (IOException e) {
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
index 581c4e1..3a3fa03 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
@@ -19,13 +19,20 @@
package org.rhq.modules.plugins.jbossas7;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.net.ConnectException;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.sasl.util.UsernamePasswordHashUtil;
+
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.pluginapi.operation.OperationResult;
import org.rhq.core.pluginapi.util.ProcessExecutionUtility;
@@ -137,6 +144,11 @@ public class BaseServerComponent extends BaseComponent {
*/
protected OperationResult postProcessResult(String name, Result res) {
OperationResult operationResult = new OperationResult();
+ if (res==null) {
+ operationResult.setErrorMessage("No result received from server");
+ return operationResult;
+ }
+
if (name.equals("shutdown") || name.equals("reload")) {
/*
* Shutdown needs a special treatment, because after sending the operation, if shutdown suceeds,
@@ -168,4 +180,55 @@ public class BaseServerComponent extends BaseComponent {
return operationResult;
}
+ protected OperationResult installManagementUser(Configuration parameters, Configuration pluginConfig, AS7Mode mode) {
+ String user = parameters.getSimpleValue("user","");
+ String password = parameters.getSimpleValue("password","");
+
+ OperationResult result = new OperationResult();
+ if (user.isEmpty() || password.isEmpty()) {
+ result.setErrorMessage("User and Password must not be empty");
+ return result;
+ }
+
+ String baseDir = pluginConfig.getSimpleValue("baseDir","");
+ if (baseDir.isEmpty()) {
+ result.setErrorMessage("No baseDir found, can not continue");
+ return result;
+ }
+ String standaloneXmlFile = pluginConfig.getSimpleValue("config",mode.getDefaultXmlFile());
+
+ String standaloneXml = baseDir + File.separator + mode.getBaseDir() + File.separator + "configuration" + File.separator + standaloneXmlFile;
+
+ AbstractBaseDiscovery abd = new AbstractBaseDiscovery();
+ abd.readStandaloneOrHostXmlFromFile(standaloneXml);
+
+ String realm = pluginConfig.getSimpleValue("realm","ManagementRealm");
+ String propertiesFilePath = abd.getSecurityPropertyFileFromHostXml(baseDir,mode, realm);
+
+
+ Properties p = new Properties();
+ try {
+ UsernamePasswordHashUtil util = new UsernamePasswordHashUtil();
+ String value = util.generateHashedHexURP(user, realm, password.toCharArray());
+
+
+ FileInputStream fis = new FileInputStream(propertiesFilePath);
+ p.load(fis);
+ fis.close();
+ p.setProperty(user,value);
+ FileOutputStream fos = new FileOutputStream(propertiesFilePath);
+ p.store(fos,null);
+ fos.flush();
+ fos.close();
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ result.setErrorMessage(e.getMessage());
+ } catch (NoSuchAlgorithmException nsae) {
+ log.error(nsae.getMessage());
+ result.setErrorMessage(nsae.getMessage());
+ }
+ result.setSimpleResult("User/Password set or updated");
+
+ return result;
+ }
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
index c844d78..cbed07e 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java
@@ -120,6 +120,15 @@ public class ConfigurationLoadDelegate implements ConfigurationFacet {
operation = new ReadChildrenResources(address,type);
operation.addAdditionalProperty("recursive", "true");
}
+ else if (groupName.startsWith("child:")) {
+ String subPath = groupName.substring("child:".length());
+ if (!subPath.contains("="))
+ throw new IllegalArgumentException("subPath of 'child:' expression has no =");
+
+ Address address1 = new Address(address);
+ address1.addSegment(subPath);
+ operation = new ReadResource(address1);
+ }
else {
throw new IllegalArgumentException("Unknown operation in group name [" + groupName + "]");
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
index e966ba3..4f07bfc 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java
@@ -50,7 +50,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
final Log log = LogFactory.getLog(this.getClass());
- private Address address;
+ private Address _address;
private ASConnection connection;
private ConfigurationDefinition configurationDefinition;
private String namePropLocator;
@@ -65,7 +65,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
public ConfigurationWriteDelegate(ConfigurationDefinition configDef, ASConnection connection, Address address) {
this.configurationDefinition = configDef;
this.connection = connection;
- this.address = address;
+ this._address = address;
}
/**
@@ -89,7 +89,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
Configuration conf = report.getConfiguration();
- CompositeOperation cop = updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = updateGenerateOperationFromProperties(conf, _address);
Result result = connection.execute(cop);
if (!result.isSuccess()) {
@@ -103,13 +103,13 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
- protected CompositeOperation updateGenerateOperationFromProperties(Configuration conf) {
+ protected CompositeOperation updateGenerateOperationFromProperties(Configuration conf, Address address) {
CompositeOperation cop = new CompositeOperation();
for (PropertyDefinition propDef : configurationDefinition.getNonGroupedProperties()) {
- updateProperty(conf, cop, propDef);
+ updateProperty(conf, cop, propDef, address);
}
for (PropertyGroupDefinition pgd: configurationDefinition.getGroupDefinitions()) {
String groupName = pgd.getName();
@@ -126,8 +126,21 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
List<PropertyDefinition> definitions = configurationDefinition.getPropertiesInGroup(groupName);
for (PropertyDefinition def : definitions) {
- updateProperty(conf,cop,def);
+ updateProperty(conf,cop,def, address);
}
+ } if (groupName.startsWith("child:")) {
+ String subPath = groupName.substring("child:".length());
+ if (!subPath.contains("="))
+ throw new IllegalArgumentException("subPath of 'child:' expression has no =");
+
+ Address address1 = new Address(address);
+ address1.addSegment(subPath);
+
+ List<PropertyDefinition> definitions = configurationDefinition.getPropertiesInGroup(groupName);
+ for (PropertyDefinition def : definitions) {
+ updateProperty(conf,cop,def, address1);
+ }
+
} // TODO handle attribute: case
}
@@ -135,7 +148,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
return cop;
}
- private void updateProperty(Configuration conf, CompositeOperation cop, PropertyDefinition propDef) {
+ private void updateProperty(Configuration conf, CompositeOperation cop, PropertyDefinition propDef,
+ Address baseAddress) {
// Skip over read-only properties, the AS can not use them anyway
if (propDef.isReadOnly())
@@ -147,7 +161,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
PropertyList pl = (PropertyList) conf.get("*"); // TODO loop over the list content
for (Property prop2 : pl.getList()) {
- updateHandlePropertyMapSpecial(cop, (PropertyMap) prop2, (PropertyDefinitionMap) propDef);
+ updateHandlePropertyMapSpecial(cop, (PropertyMap) prop2, (PropertyDefinitionMap) propDef, baseAddress);
}
}
else {
@@ -155,25 +169,27 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
Property prop = conf.get(propDef.getName());
if (prop instanceof PropertySimple) {
- updateHandlePropertySimple(cop, (PropertySimple)prop, (PropertyDefinitionSimple) propDef);
+ updateHandlePropertySimple(cop, (PropertySimple)prop, (PropertyDefinitionSimple) propDef, baseAddress);
}
else if (prop instanceof PropertyList) {
- updateHandlePropertyList(cop, (PropertyList) prop, (PropertyDefinitionList) propDef);
+ updateHandlePropertyList(cop, (PropertyList) prop, (PropertyDefinitionList) propDef, baseAddress);
}
else {
- updateHandlePropertyMap(cop,(PropertyMap)prop,(PropertyDefinitionMap)propDef);
+ updateHandlePropertyMap(cop,(PropertyMap)prop,(PropertyDefinitionMap)propDef, baseAddress);
}
}
}
- private void updateHandlePropertyMap(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef) {
- Map<String,Object> results = updateHandleMap(prop,propDef);
+ private void updateHandlePropertyMap(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef,
+ Address address) {
+ Map<String,Object> results = updateHandleMap(prop,propDef, address);
Operation writeAttribute = new WriteAttribute(address,prop.getName(),results);
cop.addStep(writeAttribute);
}
- private void updateHandlePropertyMapSpecial(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef) {
- Map<String,Object> results = updateHandleMap(prop,propDef);
+ private void updateHandlePropertyMapSpecial(CompositeOperation cop, PropertyMap prop, PropertyDefinitionMap propDef,
+ Address address) {
+ Map<String,Object> results = updateHandleMap(prop,propDef, address);
if (prop.get(namePropLocator)==null) {
throw new IllegalArgumentException("There is no element in the map with the name " + namePropLocator);
}
@@ -186,7 +202,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
}
- private void updateHandlePropertyList(CompositeOperation cop, PropertyList prop, PropertyDefinitionList propDef) {
+ private void updateHandlePropertyList(CompositeOperation cop, PropertyList prop, PropertyDefinitionList propDef,
+ Address address) {
PropertyDefinition memberDef = propDef.getMemberDefinition();
// We need to collect the list members, create an array and attach this to the cop
@@ -201,7 +218,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
if (memberDef instanceof PropertyDefinitionMap) {
- Map<String,Object> mapResult = updateHandleMap((PropertyMap) inner,(PropertyDefinitionMap)memberDef);
+ Map<String,Object> mapResult = updateHandleMap((PropertyMap) inner,(PropertyDefinitionMap)memberDef,
+ address);
values.add(mapResult);
}
}
@@ -210,7 +228,8 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
}
- private void updateHandlePropertySimple(CompositeOperation cop, PropertySimple propertySimple, PropertyDefinitionSimple propDef) {
+ private void updateHandlePropertySimple(CompositeOperation cop, PropertySimple propertySimple,
+ PropertyDefinitionSimple propDef, Address address) {
// If the property value is null and the property is optional, skip too
if (propertySimple.getStringValue()==null && !propDef.isRequired())
@@ -221,7 +240,7 @@ public class ConfigurationWriteDelegate implements ConfigurationFacet {
cop.addStep(writeAttribute);
}
- private Map<String, Object> updateHandleMap(PropertyMap map, PropertyDefinitionMap mapDef) {
+ private Map<String, Object> updateHandleMap(PropertyMap map, PropertyDefinitionMap mapDef, Address address) {
Map<String,PropertyDefinition> memberDefinitions = mapDef.getPropertyDefinitions();
Map<String,Object> results = new HashMap<String,Object>();
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
index df5362c..bc7d601 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java
@@ -54,28 +54,47 @@ public class Domain2Descriptor {
private void run(String[] args) {
D2DMode mode = null;
+ String user = null;
+ String pass = null;
+
int pos = 0;
- if (args[0].startsWith("-")) {
- if (args[0].equals("-m"))
- mode = D2DMode.METRICS;
- else if (args[0].equals("-p"))
- mode = D2DMode.PROPERTIES;
- else if (args[0].equals("-o"))
- mode = D2DMode.OPERATION;
- else {
- usage();
- return;
+ boolean optionFound=false;
+
+ String arg;
+ do {
+ arg = args[pos];
+ if (arg.startsWith("-")) {
+ if (args[0].equals("-m"))
+ mode = D2DMode.METRICS;
+ else if (arg.equals("-p"))
+ mode = D2DMode.PROPERTIES;
+ else if (arg.equals("-o"))
+ mode = D2DMode.OPERATION;
+ else if (arg.startsWith("-U")) {
+ String tmp = arg.substring(2);
+ if (!tmp.contains(":"))
+ usage();
+ user = tmp.substring(0,tmp.indexOf(":"));
+ pass = tmp.substring(tmp.indexOf(":")+1);
+ }
+ else {
+ usage();
+ return;
+ }
+ pos++;
+ optionFound=true;
}
- pos++;
- }
+ else
+ optionFound=false;
+ }while(optionFound);
- String path = args[pos];
+ String path = arg;
path = path.replaceAll("/",","); // Allow path from jboss-admin.sh's pwd command
String childType = null;
if (args.length>pos+1)
childType = args[pos+1];
- ASConnection conn = new ASConnection("localhost",9990);
+ ASConnection conn = new ASConnection("localhost",9990, user, pass);
Address address = new Address(path);
Operation op = new Operation("read-resource-description",address);
@@ -87,6 +106,10 @@ public class Domain2Descriptor {
op.addAdditionalProperty("include-runtime",true);
ComplexResult res = conn.executeComplex(op);
+ if (res==null) {
+ System.err.println("Got no result");
+ return;
+ }
if (!res.isSuccess()) {
System.err.println("Failure: " + res.getFailureDescription());
return;
@@ -313,6 +336,8 @@ public class Domain2Descriptor {
typeString = "long"; break;
case BIG_DECIMAL:
typeString = "long"; break; // TODO better float or double?
+ case DOUBLE:
+ typeString = "long"; break; // TODO float or double?
case LIST:
typeString = "-list-";
break; // Handled below
@@ -412,6 +437,7 @@ public class Domain2Descriptor {
System.out.println(" -p create properties (default)");
System.out.println(" -m create metrics");
System.out.println(" -o create operations");
+ System.out.println(" -U<user>:<pass> - supply credentials to talk to AS7" );
}
public enum Type {
@@ -421,7 +447,8 @@ public class Domain2Descriptor {
LONG,
BIG_DECIMAL,
OBJECT,
- LIST
+ LIST,
+ DOUBLE
;
}
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
index 6168dad..f4fa473 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java
@@ -61,6 +61,10 @@ public class HostControllerComponent extends BaseServerComponent implements Oper
return postProcessResult(name,res);
}
+ else if (name.equals("installRhqUser")) {
+ return installManagementUser(parameters, pluginConfiguration, AS7Mode.HOST);
+ }
+
// Defer other stuff to the base component for now
return super.invokeOperation(name, parameters);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
index 8df1c47..3e90588 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java
@@ -48,6 +48,7 @@ import org.rhq.modules.plugins.jbossas7.json.ReadResource;
*
* @author Heiko W. Rupp
*/
+@SuppressWarnings("unused")
public class ManagedASDiscovery extends AbstractBaseDiscovery
{
@@ -138,7 +139,7 @@ public class ManagedASDiscovery extends AbstractBaseDiscovery
}
private ServerInfo getBindingsFromDC(HostPort domainController, String serverGroup) {
- ASConnection dcConnection = new ASConnection(domainController.host, domainController.port);
+ ASConnection dcConnection = new ASConnection(domainController.host, domainController.port, "-TODO-", "-TODO-"); // TODO where do we get these from?
List<PROPERTY_VALUE> address = new ArrayList<PROPERTY_VALUE>();
Address theAddress = new Address("server-group", serverGroup);
Operation op = new ReadResource(theAddress);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
index c703635..c5a17a8 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
@@ -74,7 +74,7 @@ public class ServerGroupComponent extends ManagedASComponent implements ContentF
for (ResourcePackageDetails details : packages) {
- ASUploadConnection uploadConnection = new ASUploadConnection(host,port);
+ ASUploadConnection uploadConnection = new ASUploadConnection(host,port, super.managementUser, super.managementPassword);
String fileName = details.getFileName();
OutputStream out = uploadConnection.getOutputStream(fileName);
contentServices.downloadPackageBits(cctx, details.getKey(), out, false);
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
index 11a0e4d..f3c3184 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java
@@ -40,6 +40,8 @@ public class StandaloneASComponent extends BaseServerComponent implements Operat
} else if (name.equals("restart")) {
return restartServer(parameters, AS7Mode.STANDALONE);
+ } else if (name.equals("installRhqUser")) {
+ return installManagementUser(parameters, pluginConfiguration, AS7Mode.STANDALONE);
}
// reload, shutdown go to the remote server
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
index c0a9196..51fc3a2 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java
@@ -83,11 +83,7 @@ public class Address {
if (tmp.contains("=")) {
// strip / from the start of the key if it happens to be there
- if (tmp.startsWith("/"))
- tmp = tmp.substring(1);
-
- String[] pair = tmp.split("=");
- PROPERTY_VALUE valuePair = new PROPERTY_VALUE(pair[0], pair[1]);
+ PROPERTY_VALUE valuePair = pathFromSegment(tmp);
this.path.add(valuePair);
}
}
@@ -95,6 +91,19 @@ public class Address {
}
/**
+ * Generates a path from a segment in the form of key=value.
+ * @param segment A segment in the form key=value
+ * @return A path
+ */
+ private PROPERTY_VALUE pathFromSegment(String segment) {
+ if (segment.startsWith("/"))
+ segment = segment.substring(1);
+
+ String[] pair = segment.split("=");
+ return new PROPERTY_VALUE(pair[0], pair[1]);
+ }
+
+ /**
* Add a key value pair to the path
* @param key Key part of this path element
* @param value Value part of this path element
@@ -103,6 +112,14 @@ public class Address {
path.add(new PROPERTY_VALUE(key,value));
}
+ public void addSegment(String segment) {
+ if (!segment.contains("="))
+ throw new IllegalArgumentException("Segment [" + segment + "] contains no '='");
+
+ PROPERTY_VALUE pv = pathFromSegment(segment);
+ path.add(pv);
+ }
+
@Override
public String toString() {
StringBuilder builder = new StringBuilder( "Address{" +
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index 8048100..ee6b902 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -50,31 +50,11 @@
xmlns:c="urn:xmlns:rhq-configuration"
>
- <depends plugin="JMX" useClasses="true"/>
-
<!-- TODO I think we should introduce an abstract AS7 plugin that contains some base functionality and then
~~ additional 'Personalities' for the kinds of servers (PM, SM, Standalone AS, Managed AS)
-->
- <!-- TODO do we want to show the process controller at all? We have no benefit from it
- <server name="ProcessController"
- discovery="BaseProcessDiscovery"
- class="BaseComponent"
- description="Reaper process for other AS7 services"
- >
-
- <plugin-configuration>
- <c:simple-property name="hostname" default="localhost" required="true"/>
- <c:simple-property name="port" default="9990" type="integer" required="true"/>
-
- </plugin-configuration>
-
- <process-scan name="ProcessController" query="process|basename|match=^java.*,arg|org.jboss.as.process-controller|match=.*"/>
-
-
- </server>
- -->
<server name="JBossAS7 Host Controller"
discovery="BaseProcessDiscovery"
class="HostControllerComponent"
@@ -84,8 +64,8 @@
<plugin-configuration>
<c:simple-property name="hostname" default="localhost" required="true" description="Host name of the domain API"/>
<c:simple-property name="port" default="9990" type="integer" required="true" description="Port of the domain API"/>
- <c:simple-property name="user" type="string" description="Management user for a secured Host controller" required="false"/>
- <c:simple-property name="password" type="password" description="Password for the management user" required="false"/>
+ <c:simple-property name="user" type="string" default="rhqadmin" description="Management user for a secured Host controller" required="false"/>
+ <c:simple-property name="password" type="password" default="rhqadmin" description="Password for the management user" required="false"/>
<c:simple-property name="domainConfig" type="string" default="domain.xml" description="Running configuration (domain part)" displayName="Domain Configuration"/>
<c:simple-property name="hostConfig" type="string" default="host.xml" description="Running configuration (host part)" displayName="Host Configuration"/>
<c:simple-property name="baseDir" type="file" description="Base directory of the server installation" displayName="Base directory" readOnly="true" required="false"/>
@@ -179,6 +159,15 @@
<c:simple-property name="operationResult" description="Outcome of the stop operation"/>
</results>
</operation>
+ <operation name="installRhqUser" description="Installs a user in the server for management" displayName="Install RHQ user">
+ <parameters>
+ <c:simple-property name="user" displayName="Username" description="Name of the management user" default="rhqadmin"/>
+ <c:simple-property name="password" displayName="Password" description="Password of this management user" default="rhqadmin" type="password"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
<metric property="_internal:mgmtRequests" category="performance" dataType="measurement" defaultInterval="120000"
@@ -192,6 +181,11 @@
displayType="summary" measurementType="dynamic" description="Max time for a request since last metric get" units="milliseconds"
displayName="Maximum request time"/>
+ <metric property="server-state" dataType="trait" displayName="Server state" description="Detailed server state"
+ displayType="summary"/>
+ <metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
+ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
+
<event name="logEntry" description="an entry in a log file"/>
<resource-configuration>
@@ -206,11 +200,10 @@
</c:group>
-->
- <c:group name="children:extension" displayName="Installed extensions">
-
+ <c:group name="children:extension" displayName="Installed extensions" hiddenByDefault="true">
<c:list-property name="*" displayName="Installed extensions" readOnly="true" required="false">
<c:map-property name="*" displayName="Name" readOnly="true">
- <c:simple-property name="module" displayName="Module name"/>
+ <c:simple-property name="module" displayName="Module name" readOnly="true"/>
</c:map-property>
</c:list-property>
</c:group>
@@ -332,8 +325,8 @@
<plugin-configuration>
<c:simple-property name="hostname" default="localhost" required="true"/>
<c:simple-property name="port" default="9990" type="integer" required="true"/>
- <c:simple-property name="user" type="string" description="Management user for a secured AS" required="false"/>
- <c:simple-property name="password" type="password" description="Password for the management user" required="false"/>
+ <c:simple-property name="user" default="rhqadmin" type="string" description="Management user for a secured AS" required="false"/>
+ <c:simple-property name="password" default="rhqadmin" type="password" description="Password for the management user" required="false"/>
<c:simple-property name="config" type="string" default="standalone.xml" description="Running configuration" displayName="Configuration"/>
<c:simple-property name="baseDir" type="file" description="Base directory of the server installation" displayName="Base directory" readOnly="true" required="false"/>
<c:simple-property name="startScript" type="file" default="bin/standalone.sh" description="Script used to start the server. If the path is not absolute, it is relative to the base directory"/>
@@ -404,6 +397,15 @@
<c:simple-property name="operationResult"/>
</results>
</operation>
+ <operation name="installRhqUser" description="Installs a user in the server for management" displayName="Install RHQ user">
+ <parameters>
+ <c:simple-property name="user" displayName="Username" description="Name of the management user" default="rhqadmin"/>
+ <c:simple-property name="password" displayName="Password" description="Password of this management user" default="rhqadmin" type="password"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
<metric property="_internal:mgmtRequests" category="performance" dataType="measurement" defaultInterval="120000"
@@ -416,6 +418,11 @@
displayType="summary" measurementType="dynamic" description="Max time for a request since last metric get" units="milliseconds"
displayName="Maximum request time"/>
+ <metric property="server-state" dataType="trait" displayName="Server state" description="Detailed server state"
+ displayType="summary"/>
+ <metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
+ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
+
<event name="logEntry" description="an entry in a log file"/>
<resource-configuration>
@@ -431,11 +438,10 @@
</c:group>
-->
- <c:group name="children:extension" displayName="Installed extensions">
-
+ <c:group name="children:extension" displayName="Installed extensions" hiddenByDefault="true">
<c:list-property name="*" displayName="Installed extensions" readOnly="true" required="false">
<c:map-property name="*" displayName="Name" readOnly="true">
- <c:simple-property name="module" displayName="Module name"/>
+ <c:simple-property name="module" displayName="Module name" readOnly="true"/>
</c:map-property>
</c:list-property>
</c:group>
@@ -515,31 +521,98 @@
</results>
</operation>
- <metric property="status" dataType="trait" displayName="Server state" description="Detailed server state"
+ <metric property="server-state" dataType="trait" displayName="Server state" description="Detailed server state"
displayType="summary"/>
+ <metric property="release-codename" dataType="trait" displayName="Code name of the release" displayType="summary"/>
+ <metric property="release-version" dataType="trait" displayName="Version of the server" displayType="summary"/>
<event name="logEntry" description="an entry in a log file"/>
</server>
- <server name="JBoss AS JVM"
- description="JVM of the JBossAS"
- sourcePlugin="JMX"
- sourceType="JMX Server"
- discovery="org.rhq.plugins.jmx.EmbeddedJMXServerDiscoveryComponent"
- class="org.rhq.plugins.jmx.JMXServerComponent"
- singleton="true">
+ <server name="JVM"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="Information about the underlying JVM"
+ singleton="true">
<runs-inside>
<parent-resource-type name="JBossAS7 Managed Server" plugin="jboss-as-7"/>
<parent-resource-type name="JBossAS7 Standalone Server" plugin="jboss-as-7"/>
</runs-inside>
- </server>
- <server name="Messaging"
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="core-service=platform-mbean"/>
+ </plugin-configuration>
+
+ <service name="Operating System"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ >
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="type=operating-system"/>
+ </plugin-configuration>
+
+ <metric property="available-processors"
+ description="The number of processors available to the Java virtual machine."/>
+ <metric property="system-load-average"
+ description="The system load average for the last minute. The load average may not be available on some platforms; if the load average is not available, a negative value is returned."/>
+ </service>
+
+ <service name="Runtime"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ singleton="true"
+ >
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="type=runtime"/>
+ </plugin-configuration>
+
+ <metric property="uptime" description="The uptime of the Java virtual machine in milliseconds."/>
+ </service>
+
+ <service name="Threading"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ >
+
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="type=threading"/>
+ </plugin-configuration>
+
+ <metric property="thread-count" description="The current number of live threads including both daemon and non-daemon threads."/>
+ <metric property="peak-thread-count" description="The peak live thread count since the Java virtual machine started or peak was reset."/>
+ <metric property="total-started-thread-count" description="The total number of threads created and also started since the Java virtual machine started."/>
+ <metric property="daemon-thread-count" description="The current number of live daemon threads."/>
+ <metric property="current-thread-cpu-time" description="The total CPU time for the current thread in nanoseconds, or -1 if 'thread-cpu-time-enabled' is 'false'. A Java virtual machine implementation may not support CPU time measurement. If 'thread-cpu-time-supported', is 'false' undefined."/>
+ <metric property="current-thread-user-time" description="The CPU time that the current thread has executed in user mode in nanoseconds, or -1 if 'thread-cpu-time-enabled' is 'false'. A Java virtual machine implementation may not support CPU time measurement. If 'thread-cpu-time-supported', is 'false' the result will be undefined "/>
+
+ <resource-configuration>
+ <c:simple-property name="thread-contention-monitoring-enabled" required="false" type="boolean" readOnly="false" description="Whether thread contention monitoring is enabled."/>
+ <c:simple-property name="thread-cpu-time-enabled" required="false" type="boolean" readOnly="false" description="Whether thread CPU time measurement is enabled."/>
+ <c:list-property name="all-thread-ids" description="All live thread IDs. If a security manager is installed and the caller does not have ManagementPermission('monitor'), the result will be und
+ ." >
+ <c:simple-property name="all-thread-ids" />
+ </c:list-property>
+ <c:simple-property name="thread-contention-monitoring-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports thread contention monitoring."/>
+ <c:simple-property name="thread-cpu-time-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine implementation supports CPU time measurement for any thread."/>
+ <c:simple-property name="current-thread-cpu-time-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports CPU time measurement for the current thread."/>
+ <c:simple-property name="object-monitor-usage-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports monitoring of object monitor usage."/>
+ <c:simple-property name="synchronizer-usage-supported" required="false" type="boolean" readOnly="true" description="Whether the Java virtual machine supports monitoring of ownable synchronizer usage."/>
+ </resource-configuration>
+ </service>
+
+
+
+ </server>
+
+ <server name="Messaging-Provider"
discovery="SubsystemDiscovery"
class="BaseComponent"
- description="The HornetQ based messaging subsystem"
+ description="The messaging subsystems"
singleton="true"
>
<runs-inside>
@@ -551,82 +624,94 @@
<c:simple-property name="path" readOnly="true" default="subsystem=messaging"/>
</plugin-configuration>
- <operation name="destination:add" displayName="Add destination" description="Add a Queue or Topic">
- <parameters>
- <c:simple-property name="name" description="Name of the Destination" required="true"/>
- <c:list-property name="entries" description="The JNDI names the destination should be bound to." required="true">
- <c:simple-property name="entry" description="A single JNDI name. Note, this is relative to java:jboss/jms/"/>
- </c:list-property>
- <c:simple-property name="type" description="Type of Destination to create" default="Queue">
- <c:property-options>
- <c:option value="jms-queue" name="Queue"/>
- <c:option value="jms-topic" name="Topic"/>
- </c:property-options>
- </c:simple-property>
- <c:simple-property name="durable" description="Defines whether the queue is durable (for Queues only)." type="boolean" default="false"/>
- </parameters>
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
- <operation name="destination:remove" displayName="Remove Destination" description="Remove a destination">
- <parameters>
- <c:simple-property name="name" description="Name of the Destination" required="true"/>
- </parameters>
- <results>
- <c:simple-property name="operationResult"/>
- </results>
- </operation>
-
- <resource-configuration>
- <c:simple-property name="journal-min-files" />
- <c:simple-property name="journal-type" />
- </resource-configuration>
+ <server name="HornetQ"
+ discovery="SubsystemDiscovery"
+ class="BaseComponent"
+ description="The HornetQ based messaging subsystem"
+ >
- <service name="JMS Queue"
- discovery="SubsystemDiscovery"
- class="JmsComponent"
- createDeletePolicy="delete-only"
- >
<plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="jms-queue"/>
+ <c:simple-property name="path" readOnly="true" default="hornetq-server"/>
</plugin-configuration>
+
+ <operation name="destination:add" displayName="Add destination" description="Add a Queue or Topic">
+ <parameters>
+ <c:simple-property name="name" description="Name of the Destination" required="true"/>
+ <c:list-property name="entries" description="The JNDI names the destination should be bound to." required="true">
+ <c:simple-property name="entry" description="A single JNDI name. Note, this is relative to java:jboss/jms/"/>
+ </c:list-property>
+ <c:simple-property name="type" description="Type of Destination to create" default="Queue">
+ <c:property-options>
+ <c:option value="jms-queue" name="Queue"/>
+ <c:option value="jms-topic" name="Topic"/>
+ </c:property-options>
+ </c:simple-property>
+ <c:simple-property name="durable" description="Defines whether the queue is durable (for Queues only)." type="boolean" default="false"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+ <operation name="destination:remove" displayName="Remove Destination" description="Remove a destination">
+ <parameters>
+ <c:simple-property name="name" description="Name of the Destination" required="true"/>
+ </parameters>
+ <results>
+ <c:simple-property name="operationResult"/>
+ </results>
+ </operation>
+
<resource-configuration>
- <c:simple-property name="durable" required="false" type="boolean" readOnly="true" default="false"
- description="Whether the queue is durable or not."/>
- <c:list-property name="entries" required="false" readOnly="true"
- description="The jndi names the queue will be bound to.">
- <c:simple-property name="entries" type="string"/>
- </c:list-property>
- <c:simple-property name="selector" required="false" type="string" readOnly="true" description="The queue selector."/>
- </resource-configuration>
- </service>
- <service name="JMS Topic"
- discovery="SubsystemDiscovery"
- class="JmsComponent"
- createDeletePolicy="delete-only"
- >
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="jms-topic"/>
- </plugin-configuration>
- <resource-configuration>
- <c:list-property name="entries" required="false" readOnly="true"
- description="The jndi names the queue will be bound to.">
- <c:simple-property name="entries" type="string"/>
- </c:list-property>
+ <c:simple-property name="journal-min-files" />
+ <c:simple-property name="journal-type" />
</resource-configuration>
- </service>
- <service name="Connection-Factory"
- discovery="SubsystemDiscovery"
- class="JmsComponent"
- createDeletePolicy="both"
- >
- <plugin-configuration>
- <c:simple-property name="path" readOnly="true" default="connection-factory"/>
- </plugin-configuration>
- </service>
+ <service name="JMS Queue"
+ discovery="SubsystemDiscovery"
+ class="JmsComponent"
+ createDeletePolicy="delete-only"
+ >
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="jms-queue"/>
+ </plugin-configuration>
+
+ <resource-configuration>
+ <c:simple-property name="durable" required="false" type="boolean" readOnly="true" default="false"
+ description="Whether the queue is durable or not."/>
+ <c:list-property name="entries" required="false" readOnly="true"
+ description="The jndi names the queue will be bound to.">
+ <c:simple-property name="entries" type="string"/>
+ </c:list-property>
+ <c:simple-property name="selector" required="false" type="string" readOnly="true" description="The queue selector."/>
+ </resource-configuration>
+ </service>
+ <service name="JMS Topic"
+ discovery="SubsystemDiscovery"
+ class="JmsComponent"
+ createDeletePolicy="delete-only"
+ >
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="jms-topic"/>
+ </plugin-configuration>
+ <resource-configuration>
+ <c:list-property name="entries" required="false" readOnly="true"
+ description="The jndi names the queue will be bound to.">
+ <c:simple-property name="entries" type="string"/>
+ </c:list-property>
+ </resource-configuration>
+ </service>
+ <service name="Connection-Factory"
+ discovery="SubsystemDiscovery"
+ class="JmsComponent"
+ createDeletePolicy="both"
+ >
+ <plugin-configuration>
+ <c:simple-property name="path" readOnly="true" default="connection-factory"/>
+ </plugin-configuration>
+ </service>
+
+ </server>
</server>
<server name="JBossWeb"
@@ -649,61 +734,64 @@
description="The web container's default virtual server."/>
<c:simple-property name="native" required="false" type="boolean" readOnly="true" defaultValue="true"
description="Add the native initialization listener to the web container."/>
- <c:map-property name="configuration" description="The common web container configuration." >
- <c:map-property name="static-resources" description="Configuration for static resources" >
- <c:simple-property name="listings" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="instance-id" readOnly="true" required="false" type="string" description="The identifier for this server instance."/>
+ <c:group name="child:configuration=static-resources" displayName="Static Resources" >
+ <c:simple-property name="listings" required="false" type="boolean" defaultValue="false"
description="Enable folder listings."/>
- <c:simple-property name="sendfile" required="false" type="integer" readOnly="true" defaultValue="49152"
+ <c:simple-property name="sendfile" required="false" type="integer" defaultValue="49152"
description="Enable sendfile if possible, for files bigger than the specified byte size."/>
- <c:simple-property name="read-only" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="file-encoding" required="false" description="Force a file encoding." type="string"/>
+ <c:simple-property name="read-only" required="false" type="boolean" defaultValue="true"
description="Allow write HTTP methods (PUT, DELETE)."/>
- <c:simple-property name="webdav" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="webdav" required="false" type="boolean" defaultValue="false"
description="Enable WebDAV functionality."/>
<c:simple-property name="secret" required="false" type="string" readOnly="true" description="Secret for WebDAV locking operations."/>
- <c:simple-property name="max-depth" required="false" type="integer" readOnly="true" defaultValue="3"
+ <c:simple-property name="max-depth" required="false" type="integer" defaultValue="3"
description="Maximum recursion for PROPFIND."/>
- <c:simple-property name="disabled" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="disabled" required="false" type="boolean" defaultValue="false"
+ description="Enable the default Servlet mapping."/>
+ </c:group>
+ <c:group name="child:configuration=jsp-configuration" displayName="JSP Configuration">
+ <c:simple-property name="development" required="false" type="boolean" default="false"
+ description="Enable the development mode, which gives more information when an error occurs. And also enables automatic JSP recompiles."/>
+ <c:simple-property name="disabled" required="false" type="boolean" defaultValue="false"
description="Enable the JSP container."/>
- </c:map-property>
- <c:map-property name="jsp-configuration" description="JSP container configuration">
- <c:simple-property name="development" required="false" type="boolean" readOnly="true" defaultValue="false"
- description="Enable the development mode, which gives more information when an error occurs."/>
- <c:simple-property name="file-encoding" required="false" type="string" readOnly="true" description="Force a file encoding."/>
- <c:simple-property name="keep-generated" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="keep-generated" required="false" type="boolean" defaultValue="true"
description="Keep the generated Servlets."/>
<c:simple-property name="trim-spaces" required="false" type="boolean" readOnly="true" defaultValue="true"
- description="Trim some spaces from the generated Servlet."/>
- <c:simple-property name="tag-pooling" required="false" type="boolean" readOnly="true" defaultValue="true"
+ description="Trim some spaces from the generated Servlet."/> <!-- TODO make r/w when https://issues.jboss.org/browse/AS7-3097 is solved -->
+ <c:simple-property name="tag-pooling" required="false" type="boolean" defaultValue="true"
description="Enable tag pooling."/>
- <c:simple-property name="mapped-file" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="mapped-file" required="false" type="boolean" defaultValue="true"
description="Map to the JSP source."/>
- <c:simple-property name="check-interval" required="false" type="integer" readOnly="true" defaultValue="0"
- description="Check interval for JSP updates using a background thread."/>
- <c:simple-property name="modification-test-interval" required="false" type="integer" readOnly="true" defaultValue="4"
+ <c:simple-property name="check-interval" required="false" type="integer" defaultValue="60"
+ description="Check interval for JSP updates using a background thread."/> <!-- TODO revisit default when https://issues.jboss.org/browse/AS7-3098 is fixed -->
+ <c:simple-property name="modification-test-interval" required="false" type="integer" defaultValue="4"
description="Minimum amount of time between two tests for updates, in seconds."/>
- <c:simple-property name="recompile-on-fail" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="recompile-on-fail" required="false" type="boolean" defaultValue="false"
description="Retry failed JSP compilations on each request."/>
- <c:simple-property name="smap" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="smap" required="false" type="boolean" defaultValue="false"
description="Enable SMAP."/>
- <c:simple-property name="dump-smap" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="dump-smap" required="false" type="boolean" defaultValue="false"
description="Write SMAP data to a file."/>
- <c:simple-property name="generate-strings-as-char-arrays" required="false" type="boolean" readOnly="true"
+ <c:simple-property name="generate-strings-as-char-arrays" required="false" type="boolean"
defaultValue="false"
description="Generate String constants as char arrays."/>
- <c:simple-property name="error-on-use-bean-invalid-class-attribute" required="false" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="error-on-use-bean-invalid-class-attribute" required="false" type="boolean" defaultValue="false"
description="Enable errors when using a bad class in useBean."/>
- <c:simple-property name="scratch-dir" required="false" type="string" readOnly="true" description="Specify a different work directory."/>
- <c:simple-property name="source-vm" required="false" type="string" readOnly="true" defaultValue="1.5"
+ <c:simple-property name="scratch-dir" required="false" type="string" description="Specify a different work directory."/>
+ <c:simple-property name="source-vm" required="false" type="string" defaultValue="1.5"
description="Source VM level for compilation."/>
- <c:simple-property name="target-vm" required="false" type="string" readOnly="true" defaultValue="1.5"
+ <c:simple-property name="target-vm" required="false" type="string" defaultValue="1.5"
description="Target VM level for compilation."/>
- <c:simple-property name="java-encoding" required="false" type="string" readOnly="true" defaultValue="UTF-8"
+ <c:simple-property name="java-encoding" required="false" type="string" defaultValue="UTF-8"
description="Specify the encoding used for Java sources."/>
- <c:simple-property name="x-powered-by" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="x-powered-by" required="false" type="boolean" defaultValue="true"
description="Enable advertising the JSP engine in x-powered-by."/>
- <c:simple-property name="display-source-fragment" required="false" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="display-source-fragment" required="false" type="boolean" defaultValue="true"
description="When a runtime error occurs, attempts to display corresponding JSP source fragment."/>
- </c:map-property>
+ </c:group>
+ <!-- <c:group name="child:configuration=container" displayName="Container">
<c:list-property name="mime-mapping" description="A mime-mapping definition." >
<c:map-property name="mime-mapping" >
<c:simple-property name="name" description="A MIME mapping name"/>
@@ -713,8 +801,8 @@
<c:list-property name="welcome-file" description="A welcome file declaration." >
<c:simple-property name="welcome-file" />
</c:list-property>
- </c:map-property>
- </resource-configuration>
+ </c:group>
+--> </resource-configuration>
<service name="Connector"
discovery="SubsystemDiscovery"
@@ -726,41 +814,41 @@
</plugin-configuration>
- <metric property="bytesSent" measurementType="trendsup"/>
- <metric property="bytesReceived" measurementType="trendsup"/>
- <metric property="processingTime" measurementType="trendsup" units="milliseconds"/>
- <metric property="errorCount" measurementType="trendsup" displayType="summary"/>
- <metric property="maxTime" units="milliseconds"/>
- <metric property="requestCount" measurementType="trendsup" displayType="summary"/>
+ <metric property="bytesSent" measurementType="trendsup" description="Number of byte sent by the connector."/>
+ <metric property="bytesReceived" measurementType="trendsup" description="Number of byte received by the connector (POST data)."/>
+ <metric property="processingTime" measurementType="trendsup" units="milliseconds" description="Processing time used by the connector. Im milli-seconds."/>
+ <metric property="errorCount" measurementType="trendsup" displayType="summary" description="Number of error that occurs when processing requests by the connector."/>
+ <metric property="maxTime" units="milliseconds" description="Max time spent to process a requests."/>
+ <metric property="requestCount" measurementType="trendsup" displayType="summary" description="Number of the request processed by the connector."/>
<resource-configuration>
- <c:simple-property name="protocol" required="true" type="string" readOnly="true" description="The web connector protocol."/>
- <c:simple-property name="socket-binding" required="true" type="string" readOnly="true"
+ <c:simple-property name="protocol" required="true" type="string" description="The web connector protocol."/>
+ <c:simple-property name="socket-binding" required="true" type="string"
description="The web connector socket-binding reference, this connector should be bound to.">
<c:option-source target="configuration" expression="socket-binding=name:type=SocketBindingGroup"/> <!-- TODO different for Domain vs standalone -->
</c:simple-property>
- <c:simple-property name="scheme" type="string" readOnly="true" default="http" description="The web connector scheme." required="true"/>
- <c:simple-property name="executor" type="string" readOnly="true" required="false"
+ <c:simple-property name="scheme" type="string" default="http" description="The web connector scheme." required="true"/>
+ <c:simple-property name="executor" type="string" required="false"
description="The name of the executor that should be used for the processing threads of this connector. Defaults to using an internal pool."/>
- <c:simple-property name="enabled" type="boolean" readOnly="true" defaultValue="true"
+ <c:simple-property name="enabled" type="boolean" default="true"
description="Defines whether the connector should be started on startup."/>
- <c:simple-property name="enable-lookups" type="boolean" readOnly="true" defaultValue="false"
+ <c:simple-property name="enable-lookups" type="boolean" defaultValue="false"
description="Enable DNS lookups for Servlet API."/>
- <c:simple-property name="proxy-name" type="string" readOnly="true" required="false"
+ <c:simple-property name="proxy-name" type="string" required="false"
description="The host name that will be used when sending a redirect. The default value is null."/>
- <c:simple-property name="proxy-port" type="integer" readOnly="true" required="false"
+ <c:simple-property name="proxy-port" type="integer" required="false"
description="The port that will be used when sending a redirect."/>
- <c:simple-property name="max-post-size" type="integer" readOnly="true" defaultValue="2097152"
+ <c:simple-property name="max-post-size" type="integer" defaultValue="2097152"
description="Maximum size in bytes of a POST request that can be parsed by the container."/>
- <c:simple-property name="max-save-post-size" type="integer" readOnly="true" defaultValue="4096"
+ <c:simple-property name="max-save-post-size" type="integer" defaultValue="4096"
description="Maximum size in bytes of a POST request that will be saved during certain authentication schemes."/>
<c:simple-property name="secure" type="boolean" readOnly="true" defaultValue="false"
description="Indicates if content sent or recieved by the connector is secured from the user perspective."/>
<c:simple-property name="redirect-port" type="integer" readOnly="true" defaultValue="8443"
description="The port for redirection to a secure connector."/>
- <c:simple-property name="max-connections" type="integer" readOnly="true" required="false"
+ <c:simple-property name="max-connections" type="integer" required="false"
description="Amount of concurrent connections that can be processed by the connector with optimum performance. The default value depends on the connector used."/>
- <c:list-property name="virtual-server" description="The list of virtual servers that can be accessed through this connector. The default is to allow all virtual servers." readOnly="true" required="false">
+ <c:list-property name="virtual-server" description="The list of virtual servers that can be accessed through this connector. The default is to allow all virtual servers." required="false">
<c:simple-property name="virtual-server" />
</c:list-property>
<c:map-property name="ssl" description="The SSL configuration of the connector." readOnly="true" required="false">
@@ -795,10 +883,10 @@
</plugin-configuration>
<resource-configuration>
- <c:list-property name="alias" >
+ <c:list-property name="alias" description="The virtual server aliases" displayName="Virtual server aliases" >
<c:simple-property name="alias" />
</c:list-property>
- <c:simple-property name="default-web-module" type="string" readOnly="true" defaultValue="ROOT.war"
+ <c:simple-property name="default-web-module" type="string" defaultValue="ROOT.war"
description="The web module deployment name that will be mapped as the root webapp."/>
<c:map-property name="access-log" description="The access log configuration for this virtual server." >
<c:simple-property name="pattern" type="string" readOnly="true" defaultValue="common" required="false" description="The access log pattern."/>
@@ -825,7 +913,7 @@
</c:list-property>
</c:map-property>
</c:list-property>
- <c:simple-property name="enable-welcome-root" type="boolean" />
+ <c:simple-property name="enable-welcome-root" type="boolean" description="Whether or not the bundled welcome directory is used as the root web context."/>
</resource-configuration>
</service>
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
index 16c94f9..0266071 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java
@@ -28,7 +28,6 @@ import javax.xml.bind.util.ValidationEventCollector;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jackson.JsonNode;
-import org.testng.annotations.BeforeSuite;
import org.rhq.core.clientapi.agent.metadata.ConfigurationMetadataParser;
import org.rhq.core.clientapi.agent.metadata.InvalidPluginDescriptorException;
@@ -97,7 +96,7 @@ public class AbstractConfigurationHandlingTest {
JsonNode content;
public FakeConnection() {
- super("localhost", 1234);
+ super("localhost", 1234, "fake", "fake");
}
public void setContent(JsonNode content) {
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
index d021ab2..a512133 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java
@@ -62,7 +62,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(new PropertySimple("needed","test"));
conf.put(new PropertySimple("optional",null));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1;
Operation step1 = cop.step(0);
@@ -89,7 +89,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -120,7 +120,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -148,7 +148,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -176,7 +176,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyMap);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -207,7 +207,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 1 : "#Steps should be 1 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -240,7 +240,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 3 : "#Steps should be 3 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
@@ -289,7 +289,7 @@ public class ConfigurationUpdatingTest extends AbstractConfigurationHandlingTest
conf.put(propertyList);
conf.put(new PropertySimple("port-offset",0));
- CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf);
+ CompositeOperation cop = delegate.updateGenerateOperationFromProperties(conf, null);
assert cop.numberOfSteps() == 5 : "#Steps should be 5 but were " + cop.numberOfSteps();
Operation step1 = cop.step(0);
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java
new file mode 100644
index 0000000..2365d19
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java
@@ -0,0 +1,133 @@
+package org.rhq.modules.plugins.jbossas7;
+
+import java.net.URL;
+
+import org.testng.annotations.Test;
+
+/**
+ * Test the ability to read information from the AS7 xml files (standalone.xml and so on)
+ * @author Heiko W. Rupp
+ */
+@Test
+public class XmlFileReadingTest {
+
+ public void hostPort70() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone70.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getManagementPortFromHostXml(new String[]{});
+ System.out.println(hp);
+ assert hp.host.equals("127.0.0.70") : "Host is " + hp.host;
+ assert hp.port==19990 : "Port is " + hp.port;
+ }
+
+ public void hostPort71() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone71.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getManagementPortFromHostXml(new String[]{});
+ System.out.println(hp);
+ // hp : HostPort{host='localhost', port=9990, isLocal=true}
+ assert hp.host.equals("127.0.0.71") : "Host is " + hp.host;
+ assert hp.port==29990 : "Port is " + hp.port;
+ }
+
+ public void domainController1() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("host1.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getDomainControllerFromHostXml();
+ assert hp.isLocal : "DC is not local as expected: " + hp;
+
+ }
+
+ public void domainController2() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("host2.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ AbstractBaseDiscovery.HostPort hp = bd.getDomainControllerFromHostXml();
+ assert "192.168.100.1".equals(hp.host) : "DC is at " + hp.host;
+ assert hp.port == 9559 : "DC port is at " + hp.port;
+ }
+
+
+
+ public void testXpath70() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone70.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+/*
+ String realm = bd.obtainXmlPropertyViaXPath("/management/management-interfaces/http-interface/@security-realm");
+ assert "ManagementRealm".equals(realm) : "Realm was " + realm;
+*/
+
+ String pathExpr = "//management/management-interfaces/http-interface/@port";
+ String port = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "19990".equals(port) : "Port was [" + port + "]";
+
+ pathExpr = "//management/management-interfaces/http-interface/@interface";
+ String interfName = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "management".equals(interfName) : "Interface was " + interfName;
+
+ pathExpr = "/server/interfaces/interface[@name='" + interfName + "']/inet-address/@value";
+ String interfElem = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "${jboss.bind.address.management:127.0.0.70}".equals(interfElem) : "InterfElem was " + interfElem;
+
+ }
+
+
+ public void testXpath71() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone71.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ String realm = bd.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm");
+ assert "ManagementRealm".equals(realm) : "Realm was " + realm;
+ String sbindingRef = bd.obtainXmlPropertyViaXPath(
+ ("//management/management-interfaces/http-interface/socket-binding/@http"));
+ assert "management-http".equals(sbindingRef): "Socketbinding was " + sbindingRef;
+
+ String pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@port";
+ String port = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "29990".equals(port) : "Port was [" + port + "]";
+
+ pathExpr = "/server/socket-binding-group/socket-binding[@name='" + sbindingRef + "']/@interface";
+ String interfName = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "management".equals(interfName) : "Interface was " + interfName;
+
+ pathExpr = "/server/interfaces/interface[@name='" + interfName + "']/inet-address/@value";
+ String interfElem = bd.obtainXmlPropertyViaXPath(pathExpr);
+ assert "${jboss.bind.address.management:127.0.0.71}".equals(interfElem) : "InterfElem was " + interfElem;
+
+ }
+
+ public void testGetRealm() throws Exception {
+
+ BaseProcessDiscovery bd = new BaseProcessDiscovery();
+ URL url = getClass().getClassLoader().getResource("standalone71.xml");
+ bd.readStandaloneOrHostXmlFromFile(url.getFile());
+
+ String realm = bd.obtainXmlPropertyViaXPath("//management/management-interfaces/http-interface/@security-realm");
+ assert "ManagementRealm".equals(realm) : "Realm was " + realm;
+
+ String xpathExpression = "//management//security-realm[@name ='%s']/authentication/properties/@path";
+
+ String propsFileName = bd.obtainXmlPropertyViaXPath(String.format(xpathExpression,realm));
+ assert "mgmt-users.properties".equals(propsFileName) : "File name was " + propsFileName;
+
+ String propsFilePathRel = bd.obtainXmlPropertyViaXPath("//management//security-realm[@name ='" + realm + "']/authentication/properties/@relative-to");
+ assert "jboss.server.config.dir".equals(propsFilePathRel) : "Path was " + propsFileName;
+
+ }
+}
diff --git a/modules/plugins/jboss-as-7/src/test/resources/host1.xml b/modules/plugins/jboss-as-7/src/test/resources/host1.xml
new file mode 100644
index 0000000..2e35b78
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/host1.xml
@@ -0,0 +1,92 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<host xmlns="urn:jboss:domain:1.1"
+ name="master">
+
+ <management>
+ <security-realms>
+ <security-realm name="ManagementRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9999"/>
+ </native-interface>
+ <http-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9990"/>
+ </http-interface>
+ </management-interfaces>
+ </management>
+
+ <domain-controller>
+ <local/>
+ <!-- Alternative remote domain controller configuration with a host and port -->
+ <!-- <remote host="192.168.100.1" port="9999"/> -->
+ </domain-controller>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
+ <jvms>
+ <jvm name="default">
+ <heap size="64m" max-size="128m"/>
+ </jvm>
+ </jvms>
+
+ <servers>
+ <server name="server-one" group="main-server-group">
+ <!-- server-one inherits the default socket-group declared in the server-group -->
+ <jvm name="default">
+ <!-- Remote JPDA debugging for a specific server
+ <jvm-options>
+ <option value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
+ </jvm-options>
+ -->
+ </jvm>
+ </server>
+
+ <server name="server-two" group="main-server-group" auto-start="true">
+ <!-- server-two avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="standard-sockets" port-offset="150"/>
+ <jvm name="default">
+ <heap size="64m" max-size="256m"/>
+ </jvm>
+ </server>
+
+ <server name="server-three" group="other-server-group" auto-start="false">
+ <!-- server-three avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="ha-sockets" port-offset="250"/>
+ </server>
+ </servers>
+</host>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/host2.xml b/modules/plugins/jboss-as-7/src/test/resources/host2.xml
new file mode 100644
index 0000000..38ada1a
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/host2.xml
@@ -0,0 +1,91 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<host xmlns="urn:jboss:domain:1.1"
+ name="master">
+
+ <management>
+ <security-realms>
+ <security-realm name="ManagementRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.domain.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9999"/>
+ </native-interface>
+ <http-interface security-realm="ManagementRealm">
+ <socket interface="management" port="9990"/>
+ </http-interface>
+ </management-interfaces>
+ </management>
+
+ <domain-controller>
+ <!-- Alternative remote domain controller configuration with a host and port -->
+ <remote host="192.168.100.1" port="9559"/>
+ </domain-controller>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
+ <jvms>
+ <jvm name="default">
+ <heap size="64m" max-size="128m"/>
+ </jvm>
+ </jvms>
+
+ <servers>
+ <server name="server-one" group="main-server-group">
+ <!-- server-one inherits the default socket-group declared in the server-group -->
+ <jvm name="default">
+ <!-- Remote JPDA debugging for a specific server
+ <jvm-options>
+ <option value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
+ </jvm-options>
+ -->
+ </jvm>
+ </server>
+
+ <server name="server-two" group="main-server-group" auto-start="true">
+ <!-- server-two avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="standard-sockets" port-offset="150"/>
+ <jvm name="default">
+ <heap size="64m" max-size="256m"/>
+ </jvm>
+ </server>
+
+ <server name="server-three" group="other-server-group" auto-start="false">
+ <!-- server-three avoids port conflicts by incrementing the ports in
+ the default socket-group declared in the server-group -->
+ <socket-binding-group ref="ha-sockets" port-offset="250"/>
+ </server>
+ </servers>
+</host>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/standalone70.xml b/modules/plugins/jboss-as-7/src/test/resources/standalone70.xml
new file mode 100644
index 0000000..e07b9ef
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/standalone70.xml
@@ -0,0 +1,433 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<server xmlns="urn:jboss:domain:1.1">
+
+ <extensions>
+ <extension module="org.jboss.as.clustering.infinispan"/>
+ <extension module="org.jboss.as.connector"/>
+ <extension module="org.jboss.as.deployment-scanner"/>
+ <extension module="org.jboss.as.ee"/>
+ <extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.jacorb"/>
+ <extension module="org.jboss.as.jaxrs"/>
+ <extension module="org.jboss.as.jmx"/>
+ <extension module="org.jboss.as.jpa"/>
+ <extension module="org.jboss.as.logging"/>
+ <extension module="org.jboss.as.mail"/>
+ <extension module="org.jboss.as.messaging"/>
+ <extension module="org.jboss.as.naming"/>
+ <extension module="org.jboss.as.osgi"/>
+ <extension module="org.jboss.as.remoting"/>
+ <extension module="org.jboss.as.sar"/>
+ <extension module="org.jboss.as.security"/>
+ <extension module="org.jboss.as.threads"/>
+ <extension module="org.jboss.as.transactions"/>
+ <extension module="org.jboss.as.web"/>
+ <extension module="org.jboss.as.webservices"/>
+ <extension module="org.jboss.as.weld"/>
+ </extensions>
+
+ <management>
+ <security-realms>
+ <security-realm name="PropertiesMgmtSecurityRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface interface="management" port="9999"/>
+ <http-interface interface="management" port="19990"/>
+ </management-interfaces>
+ </management>
+
+ <profile>
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+
+ <periodic-rotating-file-handler name="FILE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="server.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ </periodic-rotating-file-handler>
+
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="org.apache.tomcat.util.modeler">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup -->
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+ <datasources>
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true"
+ pool-name="H2DS">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <pool></pool>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+ <drivers>
+ <driver name="h2" module="com.h2database.h2">
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ </driver>
+ </drivers>
+ </datasources>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
+ <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0" />
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2" >
+
+ <remote connector-ref="remoting-connector" thread-pool-name="default" />
+ <async thread-pool-name="default" />
+
+ <timer-service thread-pool-name="default" >
+ <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+ </timer-service>
+
+ <!-- EJB3 pools -->
+ <pools>
+ <bean-instance-pools>
+ <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+
+ <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+ </bean-instance-pools>
+ </pools>
+
+ <!-- Default MDB configurations -->
+ <mdb>
+ <resource-adapter-ref resource-adapter-name="hornetq-ra"/>
+ <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+ </mdb>
+
+ <!-- Session bean configurations -->
+ <session-bean>
+ <stateless>
+ <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+ </stateless>
+ </session-bean>
+
+ <default-stateful-access-timeout>5000</default-stateful-access-timeout>
+ <default-singleton-access-timeout>5000</default-singleton-access-timeout>
+
+ <thread-pools>
+ <thread-pool name="default" max-threads="10" keepalive-time="100" />
+ </thread-pools>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate">
+ <cache-container name="hibernate" default-cache="local-query">
+ <local-cache name="entity">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="local-query">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="timestamps">
+ <eviction strategy="NONE"/>
+ </local-cache>
+ </cache-container>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.0">
+ <orb name="JBoss" print-version="off" giop-minor-version="2">
+ <connection max-managed-buf-size="24" outbuf-cache-timeout="-1"/>
+ <naming root-context="JBoss/Naming/root" export-corbaloc="on"/>
+ </orb>
+ <poa monitoring="off" queue-wait="off">
+ <request-processors pool-size="2" max-threads="8"/>
+ </poa>
+ <interop sun="on" chunk-custom-rmi-valuetypes="on" strict-check-on-tc-creation="off"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.0">
+ <archive-validation enabled="false"/>
+ <bean-validation enabled="false"/>
+ <default-workmanager>
+ <short-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </short-running-threads>
+ <long-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </long-running-threads>
+ </default-workmanager>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true">
+ <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" />
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:mail:1.0">
+ <mail-session jndi-name="java:jboss/mail/Default">
+ <smtp-server address="localhost" port="25"/>
+ </mail-session>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:messaging:1.1">
+ <hornetq-server>
+ <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot -->
+ <journal-file-size>102400</journal-file-size>
+ <journal-min-files>2</journal-min-files>
+ <journal-type>NIO</journal-type>
+ <!-- disable messaging persistence -->
+ <persistence-enabled>false</persistence-enabled>
+
+ <connectors>
+ <netty-connector name="netty" socket-binding="messaging"/>
+ <netty-connector name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ </netty-connector>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ </connectors>
+
+ <acceptors>
+ <netty-acceptor name="netty" socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ <param key="direct-deliver" value="false"/>
+ </netty-acceptor>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>10485760</max-size-bytes>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-full-policy>BLOCK</address-full-policy>
+ </address-setting>
+ </address-settings>
+
+ <!--JMS Stuff-->
+ <jms-connection-factories>
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/ConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <connection-factory name="RemoteConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="RemoteConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <pooled-connection-factory name="hornetq-ra">
+ <transaction mode="xa"/>
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/JmsXA"/>
+ </entries>
+ </pooled-connection-factory>
+ </jms-connection-factories>
+
+ <jms-destinations>
+ <jms-queue name="testQueue">
+ <entry name="queue/test"/>
+ </jms-queue>
+ <jms-topic name="testTopic">
+ <entry name="topic/test"/>
+ </jms-topic>
+ </jms-destinations>
+ </hornetq-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
+ <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
+ <property name="manager.root" value="jboss-osgi"/>
+ </configuration>
+ <properties>
+ <!-- Specifies the beginning start level of the framework -->
+ <property name="org.osgi.framework.startlevel.beginning">1</property>
+ </properties>
+ <capabilities>
+ <!-- modules registered with the OSGi layer on startup -->
+ <capability name="javax.api"/>
+ <capability name="javax.servlet.api"/>
+ <capability name="javax.transaction.api"/>
+ <!-- bundles installed on startup -->
+ <capability name="org.apache.aries.util"/>
+ <capability name="org.jboss.osgi.webconsole"/>
+ <capability name="org.osgi.compendium"/>
+ <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log" startlevel="1"/>
+ <capability name="org.jboss.osgi.logging" startlevel="1"/>
+ <capability name="org.apache.felix.configadmin" startlevel="1"/>
+ <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
+ <!-- bundles started in startlevel 2 -->
+ <capability name="org.apache.aries.jmx" startlevel="2"/>
+ <capability name="org.apache.felix.eventadmin" startlevel="2"/>
+ <capability name="org.apache.felix.metatype" startlevel="2"/>
+ <capability name="org.apache.felix.scr" startlevel="2"/>
+ <capability name="org.apache.felix.webconsole" startlevel="2"/>
+ <capability name="org.jboss.netty" startlevel="2"/>
+ <capability name="org.jboss.osgi.jmx" startlevel="2"/>
+ <capability name="org.jboss.osgi.http" startlevel="2"/>
+ <capability name="org.projectodd.stilts" startlevel="2"/>
+ <!-- bundles started in startlevel 3 -->
+ <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
+ <capability name="org.jboss.osgi.webapp" startlevel="3"/>
+ <capability name="org.jboss.osgi.xerces" startlevel="3"/>
+ </capabilities>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:remoting:1.0">
+ <connector name="remoting-connector" socket-binding="remoting"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" />
+ <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.0">
+ <security-domains>
+ <security-domain name="other" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required"/>
+ </authentication>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:transactions:1.0">
+ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+ <core-environment>
+ <process-id>
+ <uuid/>
+ </process-id>
+ </core-environment>
+ <coordinator-environment default-timeout="300"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host">
+ <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/>
+ <virtual-server name="default-host" enable-welcome-root="true">
+ <alias name="localhost"/>
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.0">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>localhost</wsdl-host>
+ <!--
+ <wsdl-port>8080</wsdl-port>
+ <wsdl-secure-port>8443</wsdl-secure-port>
+ -->
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Standard-Endpoint-Config</ws:config-name>
+ </endpoint-config>
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Recording-Endpoint-Config</ws:config-name>
+ <ws:pre-handler-chains>
+ <handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
+ <protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM
+ </protocol-bindings>
+ <handler>
+ <handler-name>RecordingHandler</handler-name>
+ <handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</handler-class>
+ </handler>
+ </handler-chain>
+ </ws:pre-handler-chains>
+ </endpoint-config>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ </profile>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.70}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.70}"/>
+ </interface>
+ </interfaces>
+
+ <socket-binding-group name="standard-sockets" default-interface="public">
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
+ <socket-binding name="jacorb" port="3528"/>
+ <socket-binding name="jacorb-ssl" port="3529"/>
+ <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
+ <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
+ <socket-binding name="jndi" port="1099"/>
+ <socket-binding name="messaging" port="5445"/>
+ <socket-binding name="messaging-throughput" port="5455"/>
+ <socket-binding name="osgi-http" interface="management" port="8090"/>
+ <socket-binding name="remoting" port="4447"/>
+ <socket-binding name="txn-recovery-environment" port="4712"/>
+ <socket-binding name="txn-status-manager" port="4713"/>
+ </socket-binding-group>
+
+</server>
diff --git a/modules/plugins/jboss-as-7/src/test/resources/standalone71.xml b/modules/plugins/jboss-as-7/src/test/resources/standalone71.xml
new file mode 100644
index 0000000..0de6d00
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/resources/standalone71.xml
@@ -0,0 +1,453 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<server xmlns="urn:jboss:domain:1.1">
+
+ <extensions>
+ <extension module="org.jboss.as.clustering.infinispan"/>
+ <extension module="org.jboss.as.cmp"/>
+ <extension module="org.jboss.as.connector"/>
+ <extension module="org.jboss.as.deployment-scanner"/>
+ <extension module="org.jboss.as.ee"/>
+ <extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.jacorb"/>
+ <extension module="org.jboss.as.jaxr"/>
+ <extension module="org.jboss.as.jaxrs"/>
+ <extension module="org.jboss.as.jdr"/>
+ <extension module="org.jboss.as.jmx"/>
+ <extension module="org.jboss.as.jpa"/>
+ <extension module="org.jboss.as.logging"/>
+ <extension module="org.jboss.as.mail"/>
+ <extension module="org.jboss.as.messaging"/>
+ <extension module="org.jboss.as.naming"/>
+ <extension module="org.jboss.as.osgi"/>
+ <extension module="org.jboss.as.pojo"/>
+ <extension module="org.jboss.as.remoting"/>
+ <extension module="org.jboss.as.sar"/>
+ <extension module="org.jboss.as.security"/>
+ <extension module="org.jboss.as.threads"/>
+ <extension module="org.jboss.as.transactions"/>
+ <extension module="org.jboss.as.web"/>
+ <extension module="org.jboss.as.webservices"/>
+ <extension module="org.jboss.as.weld"/>
+ </extensions>
+
+ <management>
+ <security-realms>
+ <security-realm name="ManagementRealm">
+ <authentication>
+ <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+ </authentication>
+ </security-realm>
+ </security-realms>
+ <management-interfaces>
+ <native-interface security-realm="ManagementRealm">
+ <socket-binding native="management-native"/>
+ </native-interface>
+ <http-interface security-realm="ManagementRealm">
+ <socket-binding http="management-http"/>
+ </http-interface>
+ </management-interfaces>
+ </management>
+
+ <profile>
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ </console-handler>
+
+ <periodic-rotating-file-handler name="FILE">
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir" path="server.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ <append value="true"/>
+ </periodic-rotating-file-handler>
+
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="org.apache.tomcat.util.modeler">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not found" messages during startup -->
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:cmp:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:datasources:1.0">
+ <datasources>
+ <datasource jndi-name="java:jboss/datasources/ExampleDS" enabled="true" use-java-context="true"
+ pool-name="H2DS">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <pool></pool>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+ <drivers>
+ <driver name="h2" module="com.h2database.h2">
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ </driver>
+ </drivers>
+ </datasources>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:deployment-scanner:1.0">
+ <deployment-scanner scan-interval="5000" relative-to="jboss.server.base.dir" path="deployments"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0" />
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2" >
+
+ <remote connector-ref="remoting-connector" thread-pool-name="default" />
+ <async thread-pool-name="default" />
+
+ <timer-service thread-pool-name="default" >
+ <data-store path="timer-service-data" relative-to="jboss.server.data.dir"/>
+ </timer-service>
+
+ <!-- EJB3 pools -->
+ <pools>
+ <bean-instance-pools>
+ <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+
+ <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5"
+ instance-acquisition-timeout-unit="MINUTES"/>
+ </bean-instance-pools>
+ </pools>
+
+ <!-- Default MDB configurations -->
+ <mdb>
+ <resource-adapter-ref resource-adapter-name="hornetq-ra"/>
+ <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
+ </mdb>
+
+ <!-- Session bean configurations -->
+ <session-bean>
+ <stateless>
+ <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+ </stateless>
+ <stateful default-access-timeout="5000"/>
+ <singleton default-access-timeout="5000"/>
+ </session-bean>
+
+ <thread-pools>
+ <thread-pool name="default" max-threads="10" keepalive-time="100" />
+ </thread-pools>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:infinispan:1.0" default-cache-container="hibernate">
+ <cache-container name="hibernate" default-cache="local-query">
+ <local-cache name="entity">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="local-query">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <expiration max-idle="100000"/>
+ </local-cache>
+ <local-cache name="timestamps">
+ <eviction strategy="NONE"/>
+ </local-cache>
+ </cache-container>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.1"/>
+ <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
+ <datasource jndi-name="java:jboss/datasources/ExampleDS"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.0">
+ <archive-validation enabled="false"/>
+ <bean-validation enabled="false"/>
+ <default-workmanager>
+ <short-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </short-running-threads>
+ <long-running-threads blocking="true">
+ <core-threads count="10" per-cpu="20"/>
+ <queue-length count="10" per-cpu="20"/>
+ <max-threads count="10" per-cpu="20"/>
+ <keepalive-time time="10" unit="seconds"/>
+ </long-running-threads>
+ </default-workmanager>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1" show-model="true">
+ <jmx-connector registry-binding="jmx-connector-registry" server-binding="jmx-connector-server" />
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:mail:1.0">
+ <mail-session jndi-name="java:jboss/mail/Default">
+ <smtp-server address="localhost" port="25"/>
+ </mail-session>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:messaging:1.1">
+ <hornetq-server>
+ <!-- Default journal file size is 10Mb, reduced here to 100k for faster first boot -->
+ <journal-file-size>102400</journal-file-size>
+ <journal-min-files>2</journal-min-files>
+ <!-- disable messaging persistence -->
+ <persistence-enabled>false</persistence-enabled>
+
+ <connectors>
+ <netty-connector name="netty" socket-binding="messaging-client"/>
+ <netty-connector name="netty-throughput" socket-binding="messaging-throughput-client">
+ <param key="batch-delay" value="50"/>
+ </netty-connector>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ </connectors>
+
+ <acceptors>
+ <netty-acceptor name="netty" socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput" socket-binding="messaging-throughput">
+ <param key="batch-delay" value="50"/>
+ <param key="direct-deliver" value="false"/>
+ </netty-acceptor>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ </acceptors>
+
+ <security-settings>
+ <security-setting match="#">
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <address-settings>
+ <!--default for catch all-->
+ <address-setting match="#">
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+ <max-size-bytes>10485760</max-size-bytes>
+ <message-counter-history-day-limit>10</message-counter-history-day-limit>
+ <address-full-policy>BLOCK</address-full-policy>
+ </address-setting>
+ </address-settings>
+
+ <!--JMS Stuff-->
+ <jms-connection-factories>
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/ConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <connection-factory name="RemoteConnectionFactory">
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
+ <entries>
+ <entry name="RemoteConnectionFactory"/>
+ </entries>
+ </connection-factory>
+ <pooled-connection-factory name="hornetq-ra">
+ <transaction mode="xa"/>
+ <connectors>
+ <connector-ref connector-name="in-vm"/>
+ </connectors>
+ <entries>
+ <entry name="java:/JmsXA"/>
+ </entries>
+ </pooled-connection-factory>
+ </jms-connection-factories>
+
+ <jms-destinations>
+ <jms-queue name="testQueue">
+ <entry name="queue/test"/>
+ </jms-queue>
+ <jms-topic name="testTopic">
+ <entry name="topic/test"/>
+ </jms-topic>
+ </jms-destinations>
+ </hornetq-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.1" activation="lazy">
+ <configuration pid="org.apache.felix.webconsole.internal.servlet.OsgiManager">
+ <property name="manager.root" value="jboss-osgi"/>
+ </configuration>
+ <properties>
+ <!-- Specifies the beginning start level of the framework -->
+ <property name="org.osgi.framework.startlevel.beginning">1</property>
+ </properties>
+ <capabilities>
+ <!-- modules registered with the OSGi layer on startup -->
+ <capability name="javax.api"/>
+ <capability name="javax.servlet.api"/>
+ <capability name="javax.transaction.api"/>
+ <!-- bundles installed on startup -->
+ <capability name="org.apache.aries.util"/>
+ <capability name="org.jboss.osgi.webconsole"/>
+ <capability name="org.osgi.compendium"/>
+ <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log" startlevel="1"/>
+ <capability name="org.jboss.osgi.logging" startlevel="1"/>
+ <capability name="org.apache.felix.configadmin" startlevel="1"/>
+ <capability name="org.jboss.as.osgi.configadmin" startlevel="1"/>
+ <!-- bundles started in startlevel 2 -->
+ <capability name="org.apache.aries.jmx" startlevel="2"/>
+ <capability name="org.apache.felix.eventadmin" startlevel="2"/>
+ <capability name="org.apache.felix.metatype" startlevel="2"/>
+ <capability name="org.apache.felix.scr" startlevel="2"/>
+ <capability name="org.apache.felix.webconsole" startlevel="2"/>
+ <capability name="org.jboss.netty" startlevel="2"/>
+ <capability name="org.jboss.osgi.jmx" startlevel="2"/>
+ <capability name="org.jboss.osgi.http" startlevel="2"/>
+ <capability name="org.projectodd.stilts" startlevel="2"/>
+ <!-- bundles started in startlevel 3 -->
+ <capability name="org.jboss.osgi.blueprint" startlevel="3"/>
+ <capability name="org.jboss.osgi.webapp" startlevel="3"/>
+ <capability name="org.jboss.osgi.xerces" startlevel="3"/>
+ </capabilities>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:pojo:1.0" />
+ <subsystem xmlns="urn:jboss:domain:remoting:1.0">
+ <connector name="remoting-connector" socket-binding="remoting"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:resource-adapters:1.0" />
+ <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.0">
+ <security-domains>
+ <security-domain name="other" cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles" flag="required"/>
+ </authentication>
+ </security-domain>
+ <security-domain name="jboss-web-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ <security-domain name="jboss-ejb-policy" cache-type="default">
+ <authorization>
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:transactions:1.1">
+ <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+ <core-environment>
+ <process-id>
+ <uuid/>
+ </process-id>
+ </core-environment>
+ <coordinator-environment default-timeout="300"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:web:1.0" default-virtual-server="default-host">
+ <connector name="http" scheme="http" protocol="HTTP/1.1" socket-binding="http"/>
+ <virtual-server name="default-host" enable-welcome-root="true">
+ <alias name="localhost"/>
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.0">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+ <!--
+ <wsdl-port>8080</wsdl-port>
+ <wsdl-secure-port>8443</wsdl-secure-port>
+ -->
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Standard-Endpoint-Config</ws:config-name>
+ </endpoint-config>
+ <endpoint-config xmlns:ws="urn:jboss:jbossws-jaxws-config:4.0">
+ <ws:config-name>Recording-Endpoint-Config</ws:config-name>
+ <ws:pre-handler-chains>
+ <handler-chain xmlns="http://java.sun.com/xml/ns/javaee">
+ <protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM
+ </protocol-bindings>
+ <handler>
+ <handler-name>RecordingHandler</handler-name>
+ <handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</handler-class>
+ </handler>
+ </handler-chain>
+ </ws:pre-handler-chains>
+ </endpoint-config>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ </profile>
+
+ <interfaces>
+ <interface name="management">
+ <inet-address value="${jboss.bind.address.management:127.0.0.71}"/>
+ </interface>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.71}"/>
+ </interface>
+ </interfaces>
+
+ <socket-binding-group name="standard-sockets" default-interface="public">
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
+ <socket-binding name="jacorb" port="3528"/>
+ <socket-binding name="jacorb-ssl" port="3529"/>
+ <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
+ <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
+ <socket-binding name="management-native" interface="management" port="9999"/>
+ <socket-binding name="management-http" interface="management" port="29990"/>
+ <socket-binding name="messaging" port="5445"/>
+ <socket-binding name="messaging-throughput" port="5455"/>
+ <socket-binding name="osgi-http" interface="management" port="8090"/>
+ <socket-binding name="remoting" port="4447"/>
+ <socket-binding name="txn-recovery-environment" port="4712"/>
+ <socket-binding name="txn-status-manager" port="4713"/>
+ <outbound-socket-binding name="messaging-client">
+ <local-destination socket-binding-ref="messaging"/>
+ </outbound-socket-binding>
+ <outbound-socket-binding name="messaging-throughput-client">
+ <local-destination socket-binding-ref="messaging-throughput"/>
+ </outbound-socket-binding>
+ </socket-binding-group>
+
+</server>
1
0
modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java | 6
modules/enterprise/server/client-api/pom.xml | 347 ----------
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java | 20
modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java | 198 -----
modules/enterprise/server/client-api/src/test/resources/hibernate.properties | 26
modules/enterprise/server/client-api/src/test/resources/security.policy | 10
modules/enterprise/server/container-lib/pom.xml | 6
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java | 230 ------
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej | 122 +++
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java | 36 -
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java | 100 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java | 254 -------
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java | 75 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java | 187 -----
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java | 69 -
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java | 96 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java | 85 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java | 33
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java | 212 ------
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java | 76 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java | 71 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java | 185 -----
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java | 81 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java | 104 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java | 94 --
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java | 45 -
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java | 32
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java | 46 -
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java | 195 -----
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java | 59 -
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java | 145 ----
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java | 180 -----
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml | 7
modules/enterprise/server/itests/pom.xml | 6
modules/enterprise/server/jar/pom.xml | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java | 36 -
modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml | 10
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 315 ---------
modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java | 193 -----
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties | 26
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml | 78 --
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy | 10
modules/integration-tests/jndi-access/pom.xml | 21
modules/integration-tests/jndi-access/remote-server/pom.xml | 72 --
modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java | 79 --
modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties | 2
modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties | 5
modules/integration-tests/pom.xml | 1
48 files changed, 140 insertions(+), 4153 deletions(-)
New commits:
commit 0e36c3ee8f1954486b1c12ee22ddd4b90cf7e685
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 9 16:57:11 2012 +0100
reverting the secured JNDI access... This functionality is still failing
some tests and so it won't re-emerge in master until I fix them.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
index 5822d44..894c953 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java
@@ -20,7 +20,6 @@
package org.rhq.bindings;
import java.io.FilePermission;
-import java.io.SerializablePermission;
import java.lang.reflect.ReflectPermission;
import java.net.SocketPermission;
import java.security.Permission;
@@ -84,11 +83,6 @@ public class StandardScriptPermissions extends PermissionCollection {
add(new PropertyPermission("*", "read"));
add(new ReflectPermission("suppressAccessChecks"));
-
- //these 2 are required for server-side scripts to be able to
- //invoke remote EJBs.
- add(new SerializablePermission("enableSubclassImplementation"));
- add(new RuntimePermission("reflectionFactoryAccess"));
}
public void add(Permission permission) {
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 4dfd109..e777e21 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -17,35 +17,15 @@
<properties>
<persistence-api.version>1.0</persistence-api.version>
- <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
- <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
-
- <!-- dependency versions -->
- <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
-
- <clean.db>true</clean.db>
</properties>
<dependencies>
-
- <!-- Note, the test deps are intentionally placed above the other scoped deps because of classpath
- reasons. Maven orders the [test] classpath in the order listed in the pom. We specifically
- need the embeddable-ejb3 jar above the standard ejb3 jars because we need the embeddble packages
- loaded when testing. -->
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>jboss-ejb3-all</artifactId>
- <version>${jboss-embeddable-ejb3.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-script-bindings</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
@@ -60,333 +40,20 @@
section. -->
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- Test deps - this insane list of deps is needed to get the embedded JBoss server with RHQ server deployed running -->
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
- <!-- The Sun javamail jar isn't available from a public repo due to licensing issues,
- so use the Geronimo one instead. -->
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-oracle</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-cache</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed by the PoolClass annotation used on some
- of our SLSB's -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbosssx</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jbpm</artifactId>
- <version>3.1.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.7</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>1.8</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
-
- <!-- for the transaction interrupt EJB3 interceptor -->
- <dependency>
- <groupId>org.jboss.transaction</groupId>
- <artifactId>jboss-jta</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>5.5.20</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-jk</artifactId>
- <version>4.1.31</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Needed by com.jboss.jbossnetwork.apl.actions.xml.XPathProcessor; TODO: Remove once APL has been excised. -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.29</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jettison-provider</artifactId>
- <version>${resteasy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-links</artifactId>
- <version>${resteasy.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- <version>2.0.1.GA</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.18</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
<plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- Everything but the web service tests, this is the standard test execution -->
- <configuration>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <groups>${rhq.testng.includedGroups}</groups>
- <systemPropertyVariables>
- <embeddedDeployment>true</embeddedDeployment>
- <deploymentDirectory>target/test-classes</deploymentDirectory>
- <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
- <clean.db>${clean.db}</clean.db>
- </systemPropertyVariables>
- <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
- <additionalClasspathElements>
- <!-- The below is required for tests to run against Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <!-- <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE
+ -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</argLine> -->
</configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <!-- in order to get JMS to work properly in embedded test container, extract jms-rs.rar classes -->
- <execution>
- <id>Extract JMS classes from RAR needed for JMS tests</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <unzip src="src/test/resources/jms-ra.rar" dest="target">
- <patternset>
- <include name="jms-ra.jar"/>
- </patternset>
- </unzip>
- <unzip src="target/jms-ra.jar" dest="target/test-classes">
- <patternset>
- <include name="org/**"/>
- </patternset>
- </unzip>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
+ </plugin>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
index e9f1e4d..5f3ff90 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java
@@ -20,8 +20,6 @@
package org.rhq.enterprise.client;
import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
import org.apache.commons.logging.Log;
@@ -56,21 +54,11 @@ public class LocalClientProxy extends AbstractRhqFacadeProxy<LocalClient> {
}
}
- protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, final Object[] args) throws Throwable {
+ protected Object doInvoke(Object proxy, Method originalMethod, java.lang.Class<?>[] argTypes, Object[] args) throws Throwable {
try {
- final Method realMethod = localSLSB.getClass().getMethod(originalMethod.getName(), argTypes);
-
- //run this through the privileged block to elevate the privs of the script
- //the scripts don't have the AllowEjbAccessPermission but this code has
- //all perms (or at least all perms assigned to it by the current context,
- //which at the time of writing is defined by the rhq-server.policy file
- //which gives all code all permissions).
- return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
- @Override
- public Object run() throws Exception {
- return realMethod.invoke(localSLSB, args);
- }
- });
+ Method realMethod = localSLSB.getClass().getMethod(originalMethod.getName(), argTypes);
+
+ return realMethod.invoke(localSLSB, args);
} catch (NoSuchMethodException e) {
throw new IllegalArgumentException("Method [" + originalMethod + "] does not have a desimplified counterpart with arguments " + Arrays.asList(argTypes) + ".", e);
}
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
deleted file mode 100644
index dc1fc83..0000000
--- a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/security/test/EjbAccessTest.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.client.security.test;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.SerializablePermission;
-import java.security.PermissionCollection;
-import java.util.Collections;
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import org.rhq.bindings.SandboxedScriptEngine;
-import org.rhq.bindings.ScriptEngineFactory;
-import org.rhq.bindings.StandardBindings;
-import org.rhq.bindings.StandardScriptPermissions;
-import org.rhq.bindings.util.PackageFinder;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.client.LocalClient;
-import org.rhq.enterprise.server.test.AbstractEJB3Test;
-import org.rhq.enterprise.server.util.LookupUtil;
-import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-@Test
-public class EjbAccessTest extends AbstractEJB3Test {
-
- public void testEjbsAccessibleThroughPrivilegedCode() {
- LookupUtil.getSubjectManager().getOverlord();
- }
-
- public void testEjbsAccessibleThroughLocalClient() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- engine.eval("SubjectManager.getSubjectByName('rhqadmin');");
- }
-
- public void testLocalEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager = context.lookup('SubjectManagerBean/local');\n"
- + "subjectManager.getOverlord();");
-
- Assert.fail("The script shouldn't have been able to call local SLSB method.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- public void testRemoteEjbsInaccessibleThroughJndiLookup() throws ScriptException, IOException {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "subjectManager = context.lookup('SubjectManagerBean/remote');\n"
- + "subjectManager.getSubjectByName('rhqadmin');");
-
- Assert.fail("The script shouldn't have been able to call remote SLSB method directly.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- public void testScriptCantUseSessionManagerMethods() throws Exception {
-
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- final ScriptEngine engine = getEngine(overlord);
-
- class G {
- private String sessionManager = ""
- + "org.rhq.enterprise.server.auth.SessionManager.getInstance().";
-
- public void testInvoke(String methodCall) throws ScriptException {
- String code = sessionManager + methodCall;
-
- try {
- engine.eval(code);
- Assert.fail("The script shouldn't have been able to call a method on a SessionManager: " + methodCall);
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
- };
- G manager = new G();
-
- manager.testInvoke("getlastAccess(0);");
- manager.testInvoke("getOverlord()");
- manager.testInvoke("getSubject(2);");
- manager.testInvoke("invalidate(0);");
- manager.testInvoke("invalidate(\"\");");
- manager.testInvoke("put(new org.rhq.core.domain.auth.Subject());");
- manager.testInvoke("put(new org.rhq.core.domain.auth.Subject(), 0);");
- }
-
- public void testScriptCantObtainRawJDBCConnectionsWithoutCredentials() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "datasource = context.lookup('java:/RHQDS');\n"
- + "con = datasource.getConnection();");
-
- Assert.fail("The script shouldn't have been able to obtain the datasource from the JNDI.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- public void testScriptCantUseEntityManager() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
- + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
-
- Assert.fail("The script shouldn't have been able to use the EntityManager.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
-
- //try harder with manually specifying the initial context factory
- try {
- engine.eval(""
- + "env = new java.util.Hashtable();"
- + "env.put('java.naming.factory.initial', 'org.jnp.interfaces.LocalOnlyContextFactory');"
- + "env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces');"
- + "context = new javax.naming.InitialContext(env);\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
- + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
-
- Assert.fail("The script shouldn't have been able to use the EntityManager even using custom initial context factory.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
- StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
- ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
-
- PermissionCollection perms = new StandardScriptPermissions();
- perms.add(new SerializablePermission("enableSubclassImplementation"));
-
- return new SandboxedScriptEngine(engine, perms);
- }
-
- private static void checkIsDesiredSecurityException(ScriptException e) {
- String message = e.getMessage();
- String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
-
- Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
- }
-}
diff --git a/modules/enterprise/server/client-api/src/test/resources/hibernate.properties b/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
deleted file mode 100644
index 1951b84..0000000
--- a/modules/enterprise/server/client-api/src/test/resources/hibernate.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# FOR SOME STRANGE REASON, THIS FILE NEEDS TO BE HERE FOR THE HIBERNATE TO CORRECTLY
-# INITIALIZE. I DON'T KNOW WHY THE STANDARD default.persistence.properties FILE DOESN'T
-# WORK IN THIS MODULE.
-
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-#hibernate.connection.release_mode=after_statement
-#hibernate.transaction.flush_before_completion=false
-#hibernate.transaction.auto_close_session=false
-#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
-#hibernate.hbm2ddl.auto=create-drop
-#hibernate.hbm2ddl.auto=create
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-# Clustered cache with TreeCache
-#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
-#hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-hibernate.bytecode.use_reflection_optimizer=false
-# I don't think this is honored, but EJB3Deployer uses it
-hibernate.bytecode.provider=javassist
-hibernate.jdbc.use_streams_for_binary=true
-hibernate.show_sql=false
-hibernate.format_sql=true
-hibernate.default_batch_fetch_size=16
-hibernate.jdbc.batch_size=20
diff --git a/modules/enterprise/server/client-api/src/test/resources/security.policy b/modules/enterprise/server/client-api/src/test/resources/security.policy
deleted file mode 100644
index 8860b47..0000000
--- a/modules/enterprise/server/client-api/src/test/resources/security.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-// We need the SecurityManager installed to enable sandboxing of CLI scripts
-// but we don't define any other security measures on the RHQ server itself.
-//
-// Granting all permissions allows us to run the RHQ server as if no security
-// manager was in place (which is assumed by default by JBoss AS) but be able
-// to use it when we need it for our own purposes.
-
-grant {
- permission java.security.AllPermission;
-};
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 0974431..b832b06 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -39,12 +39,6 @@
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jnpserver</artifactId>
- <version>4.2.2.GA</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<profiles>
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
deleted file mode 100644
index 3046af7..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-import javax.naming.event.EventContext;
-import javax.naming.event.EventDirContext;
-import javax.naming.ldap.LdapContext;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.InitialContextFactoryBuilder;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jnp.interfaces.NamingContextFactory;
-
-import org.rhq.jndi.context.AccessCheckingContextDecorator;
-import org.rhq.jndi.context.AccessCheckingContextDecoratorSetContext;
-import org.rhq.jndi.context.ContextDecorator;
-import org.rhq.jndi.context.URLPreferringContextDecoratorSetContext;
-import org.rhq.jndi.util.DecoratorPicker;
-
-/**
- * This initial context factory builder is installed early on during the RHQ server startup
- * and is later on used for obtaining the {@link Context}s for all JNDI lookups in the
- * RHQ server.
- * <p>
- * We use a custom initial context factory builder to prevent the potential malicious 3rd party
- * code (like CLI alert scripts) from supplying custom environment variables to {@link InitialContext}
- * that would modify the JNDI lookup to skip our security access checks.
- * <p>
- * By using a builder we effectively take control of the initial context creation process
- * and are free to ignore whatever the script is trying to supply.
- * <p>
- * This builder makes sure to install the RHQ server's security access checks to whatever
- * initial context that is configured by the standard environment variables
- * ({@link Context#INITIAL_CONTEXT_FACTORY}, etc.)
- * <p>
- * This class is heavily inspired by the implementation of a similar builder in JBoss AS 7.
- *
- * @see AllowRhqServerInternalsAccessPermission
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingInitialContextFactoryBuilder implements InitialContextFactoryBuilder {
- private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
-
- /**
- * The list of JNDI name schemes that should be checked for security permissions
- * (in addition to the names with no scheme).
- *
- * @see AccessCheckingContextDecorator
- */
- private static final String[] CHECKED_SCHEMES = { "java" };
-
- private static final Set<Class<? extends Context>> SUPPORTED_CONTEXT_INTERFACES;
-
- static {
- SUPPORTED_CONTEXT_INTERFACES = new HashSet<Class<? extends Context>>();
- SUPPORTED_CONTEXT_INTERFACES.add(Context.class);
- SUPPORTED_CONTEXT_INTERFACES.add(DirContext.class);
- SUPPORTED_CONTEXT_INTERFACES.add(EventContext.class);
- SUPPORTED_CONTEXT_INTERFACES.add(EventDirContext.class);
- SUPPORTED_CONTEXT_INTERFACES.add(LdapContext.class);
- }
-
- private static final Set<InetAddress> SERVER_BIND_IPS;
- static {
- SERVER_BIND_IPS = new HashSet<InetAddress>();
-
- try {
- String bindingAddressString = System.getProperty("jboss.bind.address");
- InetAddress bindingAddress = InetAddress.getByName(bindingAddressString);
-
- if (bindingAddress.isAnyLocalAddress()) {
- Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();
- while (ifaces.hasMoreElements()) {
- NetworkInterface iface = ifaces.nextElement();
- SERVER_BIND_IPS.addAll(Collections.list(iface.getInetAddresses()));
- }
- } else {
- SERVER_BIND_IPS.add(bindingAddress);
- }
- } catch (SocketException e) {
- LOG.error("Could not obtain the list of local IPs", e);
- } catch (UnknownHostException e) {
- LOG.error("Failed to get the binding address of the RHQ server.", e);
- }
- }
-
- private static final int JNP_PORT = Integer.parseInt(System.getProperty("rhq.server.startup.namingservice.port",
- "2099"));
-
- /**
- * This is the default initial context factory that is returned when no other is
- * configured using the environment variables.
- * <p>
- * It uses {@link NamingContextFactory} as the underlying mechanism - the same
- * as the default configuration in JBoss 4.
- */
- private static final InitialContextFactory DEFAULT_FACTORY = new InitialContextFactory() {
- public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
- return createSecureWrapper(new NamingContextFactory(), environment).getInitialContext(environment);
- }
- };
-
- /**
- * Create a InitialContext factory. If the environment does not override the factory class it will use the
- * default context factory.
- *
- * @param environment The environment
- * @return An initial context factory
- * @throws NamingException If an error occurs loading the factory class.
- */
- public InitialContextFactory createInitialContextFactory(Hashtable<?, ?> environment) throws NamingException {
- final String factoryClassName = (String) environment.get(Context.INITIAL_CONTEXT_FACTORY);
- if (factoryClassName == null) {
- return DEFAULT_FACTORY;
- }
- final ClassLoader classLoader = getContextClassLoader();
- try {
- final Class<?> factoryClass = Class.forName(factoryClassName, true, classLoader);
- InitialContextFactory configuredFactory = (InitialContextFactory) factoryClass.newInstance();
- return createSecureWrapper(configuredFactory, environment);
- } catch (Exception e) {
- throw new NamingException("Failed instantiate InitialContextFactory " + factoryClassName
- + " from classloader " + classLoader);
- }
- }
-
- private ClassLoader getContextClassLoader() {
- return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
- public ClassLoader run() {
- return Thread.currentThread().getContextClassLoader();
- }
- });
- }
-
- private static InitialContextFactory
- createSecureWrapper(InitialContextFactory factory, Hashtable<?, ?> environment) {
- String providerUrl = (String) environment.get(Context.PROVIDER_URL);
-
- if (providerUrl == null) {
- return getAccessCheckingFactory(factory);
- } else {
- try {
- URI uri = new URI(providerUrl);
- InetAddress providerHost = InetAddress.getByName(uri.getHost());
-
- //check if we are accessing the RHQ server through some remoting
- //interface.
- if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
- return getAccessCheckingFactory(factory);
- } else {
- return getURLPreferringFactory(factory);
- }
- } catch (URISyntaxException e) {
- return getAccessCheckingFactory(factory);
- } catch (UnknownHostException e) {
- //let the factory deal with the unknown host...
- //this most probably shouldn't be secured because localhost addresses
- //should be resolvable.
- return getURLPreferringFactory(factory);
- }
- }
- }
-
- private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
- pickers.add(getURLPreferringDecoratorPicker());
- pickers.add(getAccessCheckingDecoratorPicker());
-
- return new DecoratingInitialContextFactory(original, pickers);
- }
-
- private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
- pickers.add(getURLPreferringDecoratorPicker());
-
- return new DecoratingInitialContextFactory(original, pickers);
- }
-
- private static DecoratorPicker<Context, ContextDecorator> getAccessCheckingDecoratorPicker() {
- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
- ret.setContext(new AccessCheckingContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES, CHECKED_SCHEMES));
-
- return ret;
- }
-
- private static DecoratorPicker<Context, ContextDecorator> getURLPreferringDecoratorPicker() {
- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
- ret.setContext(new URLPreferringContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES));
-
- return ret;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej
new file mode 100644
index 0000000..445fa3a
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java.rej
@@ -0,0 +1,122 @@
+--- modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
++++ modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+@@ -27,7 +27,7 @@
+ import java.net.UnknownHostException;
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+-import java.util.ArrayList;
++import java.util.Arrays;
+ import java.util.Collections;
+ import java.util.Enumeration;
+ import java.util.HashSet;
+@@ -37,10 +37,6 @@
+ import javax.naming.Context;
+ import javax.naming.InitialContext;
+ import javax.naming.NamingException;
+-import javax.naming.directory.DirContext;
+-import javax.naming.event.EventContext;
+-import javax.naming.event.EventDirContext;
+-import javax.naming.ldap.LdapContext;
+ import javax.naming.spi.InitialContextFactory;
+ import javax.naming.spi.InitialContextFactoryBuilder;
+
+@@ -49,10 +45,16 @@
+ import org.jnp.interfaces.NamingContextFactory;
+
+ import org.rhq.jndi.context.AccessCheckingContextDecorator;
+-import org.rhq.jndi.context.AccessCheckingContextDecoratorSetContext;
+-import org.rhq.jndi.context.ContextDecorator;
+-import org.rhq.jndi.context.URLPreferringContextDecoratorSetContext;
+-import org.rhq.jndi.util.DecoratorPicker;
++import org.rhq.jndi.context.AccessCheckingDirContextDecorator;
++import org.rhq.jndi.context.AccessCheckingEventContextDecorator;
++import org.rhq.jndi.context.AccessCheckingEventDirContextDecorator;
++import org.rhq.jndi.context.AccessCheckingLdapContextDecorator;
++import org.rhq.jndi.context.ContextDecoratorPicker;
++import org.rhq.jndi.context.URLPreferringContextDecorator;
++import org.rhq.jndi.context.URLPreferringDirContextDecorator;
++import org.rhq.jndi.context.URLPreferringEventContextDecorator;
++import org.rhq.jndi.context.URLPreferringEventDirContextDecorator;
++import org.rhq.jndi.context.URLPreferringLdapContextDecorator;
+
+ /**
+ * This initial context factory builder is installed early on during the RHQ server startup
+@@ -87,17 +89,6 @@
+ */
+ private static final String[] CHECKED_SCHEMES = { "java" };
+
+- private static final Set<Class<? extends Context>> SUPPORTED_CONTEXT_INTERFACES;
+-
+- static {
+- SUPPORTED_CONTEXT_INTERFACES = new HashSet<Class<? extends Context>>();
+- SUPPORTED_CONTEXT_INTERFACES.add(Context.class);
+- SUPPORTED_CONTEXT_INTERFACES.add(DirContext.class);
+- SUPPORTED_CONTEXT_INTERFACES.add(EventContext.class);
+- SUPPORTED_CONTEXT_INTERFACES.add(EventDirContext.class);
+- SUPPORTED_CONTEXT_INTERFACES.add(LdapContext.class);
+- }
+-
+ private static final Set<InetAddress> SERVER_BIND_IPS;
+ static {
+ SERVER_BIND_IPS = new HashSet<InetAddress>();
+@@ -200,31 +191,42 @@
+ }
+
+ private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
+- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+- pickers.add(getURLPreferringDecoratorPicker());
+- pickers.add(getAccessCheckingDecoratorPicker());
+-
+- return new DecoratingInitialContextFactory(original, pickers);
++ return new DecoratingInitialContextFactory(original, Arrays.asList(
++ getURLPreferringDecoratorPicker(), getAccessCheckingDecoratorPicker()));
+ }
+-
++
+ private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
+- ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+- pickers.add(getURLPreferringDecoratorPicker());
+-
+- return new DecoratingInitialContextFactory(original, pickers);
++ return new DecoratingInitialContextFactory(original, Arrays.asList(
++ getURLPreferringDecoratorPicker()));
+ }
+
+- private static DecoratorPicker<Context, ContextDecorator> getAccessCheckingDecoratorPicker() {
+- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+- ret.setContext(new AccessCheckingContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES, CHECKED_SCHEMES));
+-
++ private static ContextDecoratorPicker getAccessCheckingDecoratorPicker() {
++ ContextDecoratorPicker ret = new ContextDecoratorPicker();
++
++ ret.setConstructorParameters(new Object[] { CHECKED_SCHEMES });
++ ret.setConstructorParameterTypes(new Class<?>[] { String[].class });
++
++ ret.getPossibleDecorators().add(AccessCheckingContextDecorator.class);
++ ret.getPossibleDecorators().add(AccessCheckingDirContextDecorator.class);
++ ret.getPossibleDecorators().add(AccessCheckingEventContextDecorator.class);
++ ret.getPossibleDecorators().add(AccessCheckingEventDirContextDecorator.class);
++ ret.getPossibleDecorators().add(AccessCheckingLdapContextDecorator.class);
++
+ return ret;
+ }
+
+- private static DecoratorPicker<Context, ContextDecorator> getURLPreferringDecoratorPicker() {
+- DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+- ret.setContext(new URLPreferringContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES));
+-
++ private static ContextDecoratorPicker getURLPreferringDecoratorPicker() {
++ ContextDecoratorPicker ret = new ContextDecoratorPicker();
++
++ ret.setConstructorParameters(null);
++ ret.setConstructorParameterTypes(null);
++
++ ret.getPossibleDecorators().add(URLPreferringContextDecorator.class);
++ ret.getPossibleDecorators().add(URLPreferringDirContextDecorator.class);
++ ret.getPossibleDecorators().add(URLPreferringEventContextDecorator.class);
++ ret.getPossibleDecorators().add(URLPreferringEventDirContextDecorator.class);
++ ret.getPossibleDecorators().add(URLPreferringLdapContextDecorator.class);
++
+ return ret;
+ }
+ }
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java
deleted file mode 100644
index aa807d6..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.security.BasicPermission;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AllowRhqServerInternalsAccessPermission extends BasicPermission {
-
- private static final long serialVersionUID = 1L;
-
- public AllowRhqServerInternalsAccessPermission() {
- super("org.rhq.allow.server.internals.access");
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
deleted file mode 100644
index 19b30ea..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi;
-
-import java.lang.reflect.Proxy;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-
-import org.rhq.jndi.context.ContextDecorator;
-import org.rhq.jndi.util.DecoratorPicker;
-import org.rhq.jndi.util.DecoratingInvocationHandler;
-
-/**
- * This class implements an initial context factory that decorates the contexts
- * returned from a "wrapped" initial factory passed to this class in the constructor.
- * <p>
- * The contexts returned from the wrapped initial factory are hidden behind a proxy
- * that implements the intersection of interfaces from the <code>supportedContextInterfaces</code>
- * constructor parameter and the actual interfaces the wrapped context implements.
- * <p>
- * The proxy method calls are handled using the {@link DecoratingInvocationHandler} which is initialized
- * with the list of {@link DecoratorPicker pickers} that are used to intercept the method
- * calls on the wrapped context.
- *
- * @see DecoratorPicker
- * @see DecoratingInvocationHandler
- *
- * @author Lukas Krejci
- */
-public class DecoratingInitialContextFactory implements InitialContextFactory {
-
- List<DecoratorPicker<Context, ContextDecorator>> pickers;
- private InitialContextFactory factory;
- private Set<Class<? extends Context>> supportedContextInterfaces;
-
- public DecoratingInitialContextFactory(InitialContextFactory factory, List<DecoratorPicker<Context, ContextDecorator>> decoratorPickers) {
- this.factory = factory;
- this.pickers = decoratorPickers;
- this.supportedContextInterfaces = new HashSet<Class<? extends Context>>();
- for(DecoratorPicker<Context, ContextDecorator> picker : pickers) {
- supportedContextInterfaces.addAll(picker.getContext().getSupportedInterfaces());
- }
- }
-
- public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
- Context ctx = factory.getInitialContext(environment);
-
- Set<Class<?>> implementedIfaces = getAllImplementedInterfaces(ctx.getClass());
- Class<?>[] ii = new Class<?>[implementedIfaces.size()];
- implementedIfaces.toArray(ii);
-
- return (Context) Proxy.newProxyInstance(ctx.getClass().getClassLoader(), ii, new DecoratingInvocationHandler<Context, ContextDecorator>(pickers, ctx));
- }
-
- private Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
- HashSet<Class<?>> ret = new HashSet<Class<?>>();
- getAllImplementedInterfaces(cls, ret);
-
- ret.retainAll(supportedContextInterfaces);
-
- return ret;
- }
-
- private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
- Class<?>[] ifaces = cls.getInterfaces();
-
- for (Class<?> iface : Arrays.asList(ifaces)) {
- output.add(iface);
- getAllImplementedInterfaces(iface, output);
- }
-
- if (cls.getSuperclass() != null) {
- getAllImplementedInterfaces(cls.getSuperclass(), output);
- }
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
deleted file mode 100644
index 6bfec7e..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
-
-/**
- * This is the "meat" of the RHQ's secured JNDI access. This {@link Context} decorator
- * applied security checks in each method (lookups, (un)bindings, etc).
- * <p>
- * The security check consists of checking if the current callstack has the {@link AllowRhqServerInternalsAccessPermission}.
- * <p>
- * This decorator applies the security check on any JNDI name without a scheme and
- * on any name that has a scheme listed in the {@link #checkedSchemes} list supplied
- * in the constructor.
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingContextDecorator implements Context, ContextDecorator, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private static final AllowRhqServerInternalsAccessPermission PERM = new AllowRhqServerInternalsAccessPermission();
- private Context original;
- private List<String> checkedSchemes;
-
- public AccessCheckingContextDecorator(String... checkedSchemes) {
- this.checkedSchemes = Arrays.asList(checkedSchemes);
- }
-
- public AccessCheckingContextDecorator(Context original, String... checkedSchemes) {
- this.original = original;
- this.checkedSchemes = Arrays.asList(checkedSchemes);
- }
-
- public void init(Context ctx) {
- this.original = ctx;
- }
-
- protected Context getOriginal() {
- return original;
- }
-
- protected static void check() {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) sm.checkPermission(PERM);
- }
-
- private void checkScheme(String scheme) {
- if (scheme == null || checkedSchemes.contains(scheme)) {
- check();
- }
- }
-
- protected void check(String name) {
- checkScheme(getURLScheme(name));
- }
-
- protected void check(Name name) {
- if (name.size() == 0) {
- check();
- } else {
- String first = name.get(0);
- checkScheme(getURLScheme(first));
- }
- }
-
- public Object lookup(Name name) throws NamingException {
- check(name);
- return original.lookup(name);
- }
-
- public Object lookup(String name) throws NamingException {
- check(name);
- return original.lookup(name);
- }
-
- public void bind(Name name, Object obj) throws NamingException {
- check(name);
- original.bind(name, obj);
- }
-
- public void bind(String name, Object obj) throws NamingException {
- check(name);
- original.bind(name, obj);
- }
-
- public void rebind(Name name, Object obj) throws NamingException {
- check(name);
- original.rebind(name, obj);
- }
-
- public void rebind(String name, Object obj) throws NamingException {
- check(name);
- original.rebind(name, obj);
- }
-
- public void unbind(Name name) throws NamingException {
- check(name);
- original.unbind(name);
- }
-
- public void unbind(String name) throws NamingException {
- check(name);
- original.unbind(name);
- }
-
- public void rename(Name oldName, Name newName) throws NamingException {
- check(oldName);
- check(newName);
- original.rename(oldName, newName);
- }
-
- public void rename(String oldName, String newName) throws NamingException {
- check(oldName);
- check(newName);
- original.rename(oldName, newName);
- }
-
- public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
- check(name);
- return original.list(name);
- }
-
- public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
- check(name);
- return original.list(name);
- }
-
- public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
- check(name);
- return original.listBindings(name);
- }
-
- public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
- check(name);
- return original.listBindings(name);
- }
-
- public void destroySubcontext(Name name) throws NamingException {
- check(name);
- original.destroySubcontext(name);
- }
-
- public void destroySubcontext(String name) throws NamingException {
- check(name);
- original.destroySubcontext(name);
- }
-
- public Context createSubcontext(Name name) throws NamingException {
- check(name);
- return original.createSubcontext(name);
- }
-
- public Context createSubcontext(String name) throws NamingException {
- check(name);
- return original.createSubcontext(name);
- }
-
- public Object lookupLink(Name name) throws NamingException {
- check(name);
- return original.lookupLink(name);
- }
-
- public Object lookupLink(String name) throws NamingException {
- check(name);
- return original.lookupLink(name);
- }
-
- public NameParser getNameParser(Name name) throws NamingException {
- check(name);
- return original.getNameParser(name);
- }
-
- public NameParser getNameParser(String name) throws NamingException {
- check(name);
- return original.getNameParser(name);
- }
-
- public Name composeName(Name name, Name prefix) throws NamingException {
- check(name);
- return original.composeName(name, prefix);
- }
-
- public String composeName(String name, String prefix) throws NamingException {
- check(name);
- return original.composeName(name, prefix);
- }
-
- public Object addToEnvironment(String propName, Object propVal) throws NamingException {
- check();
- return original.addToEnvironment(propName, propVal);
- }
-
- public Object removeFromEnvironment(String propName) throws NamingException {
- check();
- return original.removeFromEnvironment(propName);
- }
-
- public Hashtable<?, ?> getEnvironment() throws NamingException {
- check();
- return original.getEnvironment();
- }
-
- public void close() throws NamingException {
- check();
- original.close();
- }
-
- public String getNameInNamespace() throws NamingException {
- check();
- return original.getNameInNamespace();
- }
-
- //copied from InitialContext
- private static String getURLScheme(String str) {
- int colon_posn = str.indexOf(':');
- int slash_posn = str.indexOf('/');
-
- if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
- return str.substring(0, colon_posn);
- return null;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
deleted file mode 100644
index 284fd0c..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.lang.reflect.Constructor;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.naming.Context;
-
-import org.rhq.jndi.util.DecoratorSetContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
-
- private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
- static {
- HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
- tmp.add(AccessCheckingContextDecorator.class);
- tmp.add(AccessCheckingDirContextDecorator.class);
- tmp.add(AccessCheckingEventContextDecorator.class);
- tmp.add(AccessCheckingEventDirContextDecorator.class);
- tmp.add(AccessCheckingLdapContextDecorator.class);
-
- DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
- }
-
- private Set<Class<? extends Context>> supportedInterfaces;
- private String[] checkedSchemes;
-
- public AccessCheckingContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces, String... checkedSchemes) {
- this.supportedInterfaces = supportedInterfaces;
- this.checkedSchemes = checkedSchemes;
- }
-
- public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
- Constructor<? extends ContextDecorator> ctor = decoratorClass.getConstructor(String[].class);
-
- return ctor.newInstance((Object)checkedSchemes);
- }
-
- public Set<Class<? extends Context>> getSupportedInterfaces() {
- return supportedInterfaces;
- }
-
- public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
- return DECORATOR_CLASSES;
- }
-
- public void init(ContextDecorator decorator, Context object) throws Exception {
- decorator.init(object);
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
deleted file mode 100644
index 1614180..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Name;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-/**
- * A decorator of {@link DirContext}.
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingDirContextDecorator extends AccessCheckingContextDecorator implements DirContext {
-
- private static final long serialVersionUID = 1L;
-
- public AccessCheckingDirContextDecorator(String... checkedSchemes) {
- super(checkedSchemes);
- }
-
- public AccessCheckingDirContextDecorator(DirContext original, String... checkedSchemes) {
- super(original, checkedSchemes);
- }
-
- @Override
- protected DirContext getOriginal() {
- return (DirContext) super.getOriginal();
- }
-
- public Attributes getAttributes(Name name) throws NamingException {
- check(name);
- return getOriginal().getAttributes(name);
- }
-
- public Attributes getAttributes(String name) throws NamingException {
- check(name);
- return getOriginal().getAttributes(name);
- }
-
- public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
- check(name);
- return getOriginal().getAttributes(name, attrIds);
- }
-
- public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
- check(name);
- return getOriginal().getAttributes(name, attrIds);
- }
-
- public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().modifyAttributes(name, mod_op, attrs);
- }
-
- public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().modifyAttributes(name, mod_op, attrs);
- }
-
- public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
- check(name);
- getOriginal().modifyAttributes(name, mods);
- }
-
- public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
- check(name);
- getOriginal().modifyAttributes(name, mods);
- }
-
- public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().bind(name, obj, attrs);
- }
-
- public void bind(String name, Object obj, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().bind(name, obj, attrs);
- }
-
- public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().rebind(name, obj, attrs);
- }
-
- public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
- check(name);
- getOriginal().rebind(name, obj, attrs);
- }
-
- public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
- check(name);
- return getOriginal().createSubcontext(name, attrs);
- }
-
- public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
- check(name);
- return getOriginal().createSubcontext(name, attrs);
- }
-
- public DirContext getSchema(Name name) throws NamingException {
- check(name);
- return getOriginal().getSchema(name);
- }
-
- public DirContext getSchema(String name) throws NamingException {
- check(name);
- return getOriginal().getSchema(name);
- }
-
- public DirContext getSchemaClassDefinition(Name name) throws NamingException {
- check(name);
- return getOriginal().getSchemaClassDefinition(name);
- }
-
- public DirContext getSchemaClassDefinition(String name) throws NamingException {
- check(name);
- return getOriginal().getSchema(name);
- }
-
- public NamingEnumeration<SearchResult>
- search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
- check(name);
- return getOriginal().search(name, matchingAttributes, attributesToReturn);
- }
-
- public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
- String[] attributesToReturn) throws NamingException {
- check(name);
- return getOriginal().search(name, matchingAttributes, attributesToReturn);
- }
-
- public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
- check(name);
- return getOriginal().search(name, matchingAttributes);
- }
-
- public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
- check(name);
- return getOriginal().search(name, matchingAttributes);
- }
-
- public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
- check(name);
- return getOriginal().search(name, filter, cons);
- }
-
- public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
- throws NamingException {
- check(name);
- return getOriginal().search(name, filter, cons);
- }
-
- public NamingEnumeration<SearchResult>
- search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
- check(name);
- return getOriginal().search(name, filterExpr, filterArgs, cons);
- }
-
- public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
- SearchControls cons) throws NamingException {
- check(name);
- return getOriginal().search(name, filterExpr, filterArgs, cons);
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
deleted file mode 100644
index 67a9527..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.event.EventContext;
-import javax.naming.event.NamingListener;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingEventContextDecorator extends AccessCheckingContextDecorator implements EventContext {
-
- private static final long serialVersionUID = 1L;
-
- public AccessCheckingEventContextDecorator(String... checkedSchemes) {
- super(checkedSchemes);
- }
-
- public AccessCheckingEventContextDecorator(EventContext original, String... checkedSchemes) {
- super(original, checkedSchemes);
- }
-
- @Override
- protected EventContext getOriginal() {
- return (EventContext) super.getOriginal();
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- check();
- getOriginal().removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- check();
- return getOriginal().targetMustExist();
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
deleted file mode 100644
index ed7a848..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.directory.SearchControls;
-import javax.naming.event.EventDirContext;
-import javax.naming.event.NamingListener;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingEventDirContextDecorator extends AccessCheckingDirContextDecorator implements
- EventDirContext {
-
- private static final long serialVersionUID = 1L;
-
- public AccessCheckingEventDirContextDecorator(String... checkedSchemes) {
- super(checkedSchemes);
- }
-
- public AccessCheckingEventDirContextDecorator(EventDirContext original, String... checkedSchemes) {
- super(original, checkedSchemes);
- }
-
- @Override
- protected EventDirContext getOriginal() {
- return (EventDirContext) super.getOriginal();
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- check();
- getOriginal().removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- check();
- return getOriginal().targetMustExist();
- }
-
- public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
- throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, filter, ctls, l);
- }
-
- public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
- throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, filter, ctls, l);
- }
-
- public void
- addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
- throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
- }
-
- public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
- NamingListener l) throws NamingException {
- check(target);
- getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
deleted file mode 100644
index e361db8..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.NamingException;
-import javax.naming.ldap.Control;
-import javax.naming.ldap.ExtendedRequest;
-import javax.naming.ldap.ExtendedResponse;
-import javax.naming.ldap.LdapContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingLdapContextDecorator extends AccessCheckingDirContextDecorator implements LdapContext {
-
- private static final long serialVersionUID = 1L;
-
- public AccessCheckingLdapContextDecorator(String... checkedSchemes) {
- super(checkedSchemes);
- }
-
- public AccessCheckingLdapContextDecorator(LdapContext original, String... checkedSchemes) {
- super(original, checkedSchemes);
- }
-
- @Override
- protected LdapContext getOriginal() {
- return (LdapContext) super.getOriginal();
- }
-
- public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
- check();
- return getOriginal().extendedOperation(request);
- }
-
- public LdapContext newInstance(Control[] requestControls) throws NamingException {
- check();
- return getOriginal().newInstance(requestControls);
- }
-
- public void reconnect(Control[] connCtls) throws NamingException {
- check();
- getOriginal().reconnect(connCtls);
- }
-
- public Control[] getConnectControls() throws NamingException {
- check();
- return getOriginal().getConnectControls();
- }
-
- public void setRequestControls(Control[] requestControls) throws NamingException {
- check();
- getOriginal().setRequestControls(requestControls);
- }
-
- public Control[] getRequestControls() throws NamingException {
- check();
- return getOriginal().getRequestControls();
- }
-
- public Control[] getResponseControls() throws NamingException {
- check();
- return getOriginal().getResponseControls();
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
deleted file mode 100644
index 5755ebd..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public interface ContextDecorator extends Context {
-
- void init(Context context) throws NamingException;
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
deleted file mode 100644
index 20077de..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.io.Serializable;
-import java.util.Hashtable;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
-
-/**
- * This is a wrapper class around another {@link Context} implementation that
- * prefers to use an URL context for some operation if the JNDI name contains
- * a scheme rather than the original. This is the behavior of {@link InitialContext}
- * which we need to restore in the contexts created by the {@link AccessCheckingInitialContextFactoryBuilder}
- * (which an {@link InitialContext} uses exclusively if the builder is set).
- * <p>
- * This is important because RHQ server has its own initial context factory
- * builder that creates factories that in turn create contexts. If the default
- * {@link InitialContext} implementation was used, we'd never be able to lookup
- * scheme-based names because the default implementation of the {@link InitialContext}
- * always uses the default context of the builder if one is installed no matter
- * the scheme in the name.
- * <p>
- * The {@link AccessCheckingInitialContextFactoryBuilder} wraps the context returned
- * by the factory in an instance of this class and thus is restoring the original
- * intended behavior of the {@link InitialContext}. It looks at the name being looked
- * up (bound or whatever) and prefers to use the URL context factories if the name
- * contains the scheme (as does the {@link InitialContext} if no builder is installed).
- * If the name doesn't contain a scheme, the provided default context factory is used to
- * look up the name.
- *
- * @author Lukas Krejci
- */
-public class URLPreferringContextDecorator implements Context, ContextDecorator, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private Context original;
-
- public URLPreferringContextDecorator() {
-
- }
-
- public URLPreferringContextDecorator(Context ctx) {
- original = ctx;
- }
-
- public void init(Context context) {
- original = context;
- }
-
- protected Context getOriginal() throws NamingException {
- return original;
- }
-
- protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
- @SuppressWarnings("unchecked")
- Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
- return urlContext == null ? getOriginal() : urlContext;
- }
-
- protected Context getURLOrDefaultInitCtx(String name) throws NamingException {
- @SuppressWarnings("unchecked")
- Context urlContext = URLPreferringContextDecoratorHelper.getURLContext(name, (Hashtable<Object, Object>) getEnvironment());
- return urlContext == null ? getOriginal() : urlContext;
- }
-
- public Object lookup(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).lookup(name);
- }
-
- public Object lookup(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).lookup(name);
- }
-
- public void bind(Name name, Object obj) throws NamingException {
- getURLOrDefaultInitCtx(name).bind(name, obj);
- }
-
- public void bind(String name, Object obj) throws NamingException {
- getURLOrDefaultInitCtx(name).bind(name, obj);
- }
-
- public void rebind(Name name, Object obj) throws NamingException {
- getURLOrDefaultInitCtx(name).rebind(name, obj);
- }
-
- public void rebind(String name, Object obj) throws NamingException {
- getURLOrDefaultInitCtx(name).rebind(name, obj);
- }
-
- public void unbind(Name name) throws NamingException {
- getURLOrDefaultInitCtx(name).unbind(name);
- }
-
- public void unbind(String name) throws NamingException {
- getURLOrDefaultInitCtx(name).unbind(name);
- }
-
- public void rename(Name oldName, Name newName) throws NamingException {
- getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
- }
-
- public void rename(String oldName, String newName) throws NamingException {
- getURLOrDefaultInitCtx(oldName).rename(oldName, newName);
- }
-
- public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).list(name);
- }
-
- public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).list(name);
- }
-
- public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).listBindings(name);
- }
-
- public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).listBindings(name);
- }
-
- public void destroySubcontext(Name name) throws NamingException {
- getURLOrDefaultInitCtx(name).destroySubcontext(name);
- }
-
- public void destroySubcontext(String name) throws NamingException {
- getURLOrDefaultInitCtx(name).destroySubcontext(name);
- }
-
- public Context createSubcontext(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).createSubcontext(name);
- }
-
- public Context createSubcontext(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).createSubcontext(name);
- }
-
- public Object lookupLink(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).lookupLink(name);
- }
-
- public Object lookupLink(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).lookupLink(name);
- }
-
- public NameParser getNameParser(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getNameParser(name);
- }
-
- public NameParser getNameParser(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getNameParser(name);
- }
-
- public Name composeName(Name name, Name prefix) throws NamingException {
- return getOriginal().composeName(name, prefix);
- }
-
- public String composeName(String name, String prefix) throws NamingException {
- return getOriginal().composeName(name, prefix);
- }
-
- public Object addToEnvironment(String propName, Object propVal) throws NamingException {
- return getOriginal().addToEnvironment(propName, propVal);
- }
-
- public Object removeFromEnvironment(String propName) throws NamingException {
- return getOriginal().removeFromEnvironment(propName);
- }
-
- public Hashtable<?, ?> getEnvironment() throws NamingException {
- return getOriginal().getEnvironment();
- }
-
- public void close() throws NamingException {
- if (getOriginal() != null) {
- getOriginal().close();
- original = null;
- }
- }
-
- public String getNameInNamespace() throws NamingException {
- return getOriginal().getNameInNamespace();
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
deleted file mode 100644
index 6e7debc..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.spi.NamingManager;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringContextDecoratorHelper {
-
- private URLPreferringContextDecoratorHelper() {
-
- }
-
- public static Context getURLContext(String name, Hashtable<Object, Object> env) throws NamingException {
- String scheme = getURLScheme(name);
- if (scheme != null) {
- Context ctx = NamingManager.getURLContext(scheme, env);
- if (ctx != null) {
- return ctx;
- }
- }
-
- return null;
- }
-
- public static Context getURLContext(Name name, Hashtable<Object, Object> env) throws NamingException {
- if (name.size() > 0) {
- String first = name.get(0);
- String scheme = getURLScheme(first);
- if (scheme != null) {
- Context ctx = NamingManager.getURLContext(scheme, env);
- if (ctx != null) {
- return ctx;
- }
- }
- }
-
- return null;
- }
-
- //copied from InitialContext
- private static String getURLScheme(String str) {
- int colon_posn = str.indexOf(':');
- int slash_posn = str.indexOf('/');
-
- if (colon_posn > 0 && (slash_posn == -1 || colon_posn < slash_posn))
- return str.substring(0, colon_posn);
- return null;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
deleted file mode 100644
index 828cd74..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.naming.Context;
-
-import org.rhq.jndi.util.DecoratorSetContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
-
- private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
- static {
- HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
- tmp.add(URLPreferringContextDecorator.class);
- tmp.add(URLPreferringDirContextDecorator.class);
- tmp.add(URLPreferringEventContextDecorator.class);
- tmp.add(URLPreferringEventDirContextDecorator.class);
- tmp.add(URLPreferringLdapContextDecorator.class);
-
- DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
- }
-
- private Set<Class<? extends Context>> supportedInterfaces;
-
- public URLPreferringContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces) {
- this.supportedInterfaces = supportedInterfaces;
- }
-
- public Set<Class<? extends Context>> getSupportedInterfaces() {
- return supportedInterfaces;
- }
-
- public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
- return DECORATOR_CLASSES;
- }
-
- public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
- return decoratorClass.newInstance();
- }
-
- public void init(ContextDecorator decorator, Context object) throws Exception {
- decorator.init(object);
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
deleted file mode 100644
index 6a49942..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
-import javax.naming.NotContextException;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.ModificationItem;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-/**
- * Akin to {@link URLPreferringContextDecorator} this class implements the similar logic
- * for {@link DirContext}s.
- *
- * @author Lukas Krejci
- */
-public class URLPreferringDirContextDecorator extends URLPreferringContextDecorator implements DirContext {
-
- private static final long serialVersionUID = 1L;
-
- public URLPreferringDirContextDecorator() {
- super(null);
- }
-
- public URLPreferringDirContextDecorator(DirContext ctx) {
- super(ctx);
- }
-
- protected DirContext checkAndCast(Context ctx) throws NamingException {
- if (!(ctx instanceof DirContext)) {
- if (ctx == null) {
- throw new NoInitialContextException();
- } else {
- throw new NotContextException(
- "Not an instance of DirContext");
- }
- }
-
- return (DirContext) ctx;
- }
-
- @Override
- protected DirContext getURLOrDefaultInitCtx(Name name) throws NamingException {
- Context ctx = super.getURLOrDefaultInitCtx(name);
- return checkAndCast(ctx);
- }
-
- @Override
- protected DirContext getURLOrDefaultInitCtx(String name) throws NamingException {
- Context ctx = super.getURLOrDefaultInitCtx(name);
- return checkAndCast(ctx);
- }
-
- public Attributes getAttributes(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getAttributes(name);
- }
-
- public Attributes getAttributes(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getAttributes(name);
- }
-
- public Attributes getAttributes(Name name, String[] attrIds) throws NamingException {
- return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
- }
-
- public Attributes getAttributes(String name, String[] attrIds) throws NamingException {
- return getURLOrDefaultInitCtx(name).getAttributes(name, attrIds);
- }
-
- public void modifyAttributes(Name name, int mod_op, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
- }
-
- public void modifyAttributes(String name, int mod_op, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).modifyAttributes(name, mod_op, attrs);
- }
-
- public void modifyAttributes(Name name, ModificationItem[] mods) throws NamingException {
- getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
- }
-
- public void modifyAttributes(String name, ModificationItem[] mods) throws NamingException {
- getURLOrDefaultInitCtx(name).modifyAttributes(name, mods);
- }
-
- public void bind(Name name, Object obj, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
- }
-
- public void bind(String name, Object obj, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).bind(name, obj, attrs);
- }
-
- public void rebind(Name name, Object obj, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
- }
-
- public void rebind(String name, Object obj, Attributes attrs) throws NamingException {
- getURLOrDefaultInitCtx(name).rebind(name, obj, attrs);
- }
-
- public DirContext createSubcontext(Name name, Attributes attrs) throws NamingException {
- return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
- }
-
- public DirContext createSubcontext(String name, Attributes attrs) throws NamingException {
- return getURLOrDefaultInitCtx(name).createSubcontext(name, attrs);
- }
-
- public DirContext getSchema(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getSchema(name);
- }
-
- public DirContext getSchema(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getSchema(name);
- }
-
- public DirContext getSchemaClassDefinition(Name name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
- }
-
- public DirContext getSchemaClassDefinition(String name) throws NamingException {
- return getURLOrDefaultInitCtx(name).getSchemaClassDefinition(name);
- }
-
- public NamingEnumeration<SearchResult>
- search(Name name, Attributes matchingAttributes, String[] attributesToReturn) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
- }
-
- public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes,
- String[] attributesToReturn) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, matchingAttributes, attributesToReturn);
- }
-
- public NamingEnumeration<SearchResult> search(Name name, Attributes matchingAttributes) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
- }
-
- public NamingEnumeration<SearchResult> search(String name, Attributes matchingAttributes) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, matchingAttributes);
- }
-
- public NamingEnumeration<SearchResult> search(Name name, String filter, SearchControls cons) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, filter, cons);
- }
-
- public NamingEnumeration<SearchResult> search(String name, String filter, SearchControls cons)
- throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, filter, cons);
- }
-
- public NamingEnumeration<SearchResult>
- search(Name name, String filterExpr, Object[] filterArgs, SearchControls cons) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
- }
-
- public NamingEnumeration<SearchResult> search(String name, String filterExpr, Object[] filterArgs,
- SearchControls cons) throws NamingException {
- return getURLOrDefaultInitCtx(name).search(name, filterExpr, filterArgs, cons);
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
deleted file mode 100644
index e3298a0..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
-import javax.naming.NotContextException;
-import javax.naming.event.EventContext;
-import javax.naming.event.NamingListener;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringEventContextDecorator extends URLPreferringContextDecorator implements EventContext {
-
- private static final long serialVersionUID = 1L;
-
- public URLPreferringEventContextDecorator() {
- super(null);
- }
-
- public URLPreferringEventContextDecorator(EventContext ctx) {
- super(ctx);
- }
-
- protected EventContext checkAndCast(Context ctx) throws NamingException {
- if (!(ctx instanceof EventContext)) {
- if (ctx == null) {
- throw new NoInitialContextException();
- } else {
- throw new NotContextException(
- "Not an instance of EventContext");
- }
- }
-
- return (EventContext) ctx;
- }
-
- @Override
- protected EventContext getOriginal() throws NamingException {
- return checkAndCast(super.getOriginal());
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- getOriginal().removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- return getOriginal().targetMustExist();
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
deleted file mode 100644
index 4925297..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
-import javax.naming.NotContextException;
-import javax.naming.directory.SearchControls;
-import javax.naming.event.EventDirContext;
-import javax.naming.event.NamingListener;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringEventDirContextDecorator extends URLPreferringDirContextDecorator implements EventDirContext {
-
- private static final long serialVersionUID = 1L;
-
- public URLPreferringEventDirContextDecorator() {
- super(null);
- }
-
- public URLPreferringEventDirContextDecorator(EventDirContext ctx) {
- super(ctx);
- }
-
- @Override
- protected EventDirContext checkAndCast(Context ctx) throws NamingException {
- if (!(ctx instanceof EventDirContext)) {
- if (ctx == null) {
- throw new NoInitialContextException();
- } else {
- throw new NotContextException(
- "Not an instance of EventDirContext");
- }
- }
-
- return (EventDirContext) ctx;
- }
-
- @Override
- protected EventDirContext getOriginal() throws NamingException {
- return checkAndCast(super.getOriginal());
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- getOriginal().removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- return getOriginal().targetMustExist();
- }
-
- public void addNamingListener(Name target, String filter, SearchControls ctls, NamingListener l)
- throws NamingException {
- getOriginal().addNamingListener(target, filter, ctls, l);
- }
-
- public void addNamingListener(String target, String filter, SearchControls ctls, NamingListener l)
- throws NamingException {
- getOriginal().addNamingListener(target, filter, ctls, l);
- }
-
- public void
- addNamingListener(Name target, String filter, Object[] filterArgs, SearchControls ctls, NamingListener l)
- throws NamingException {
- getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
- }
-
- public void addNamingListener(String target, String filter, Object[] filterArgs, SearchControls ctls,
- NamingListener l) throws NamingException {
- getOriginal().addNamingListener(target, filter, filterArgs, ctls, l);
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
deleted file mode 100644
index c74df39..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.NoInitialContextException;
-import javax.naming.NotContextException;
-import javax.naming.ldap.Control;
-import javax.naming.ldap.ExtendedRequest;
-import javax.naming.ldap.ExtendedResponse;
-import javax.naming.ldap.LdapContext;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class URLPreferringLdapContextDecorator extends URLPreferringDirContextDecorator implements LdapContext {
-
- private static final long serialVersionUID = 1L;
-
- public URLPreferringLdapContextDecorator() {
- super(null);
- }
-
- public URLPreferringLdapContextDecorator(LdapContext original) {
- super(original);
- }
-
- @Override
- protected LdapContext checkAndCast(Context ctx) throws NamingException {
- if (!(ctx instanceof LdapContext)) {
- if (ctx == null) {
- throw new NoInitialContextException();
- } else {
- throw new NotContextException("Not an instance of LdapContext");
- }
- }
-
- return (LdapContext) ctx;
- }
-
- @Override
- protected LdapContext getOriginal() throws NamingException {
- return checkAndCast(super.getOriginal());
- }
-
- public ExtendedResponse extendedOperation(ExtendedRequest request) throws NamingException {
- return getOriginal().extendedOperation(request);
- }
-
- public LdapContext newInstance(Control[] requestControls) throws NamingException {
- return new URLPreferringLdapContextDecorator(getOriginal().newInstance(requestControls));
- }
-
- public void reconnect(Control[] connCtls) throws NamingException {
- getOriginal().reconnect(connCtls);
- }
-
- public Control[] getConnectControls() throws NamingException {
- return getOriginal().getConnectControls();
- }
-
- public void setRequestControls(Control[] requestControls) throws NamingException {
- getOriginal().setRequestControls(requestControls);
- }
-
- public Control[] getRequestControls() throws NamingException {
- return getOriginal().getRequestControls();
- }
-
- public Control[] getResponseControls() throws NamingException {
- return getOriginal().getResponseControls();
- }
-
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
deleted file mode 100644
index d938c50..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.mbean;
-
-import javax.naming.spi.NamingManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class AccessCheckingInitialContextFactoryBuilderInstaller implements AccessCheckingInitialContextFactoryBuilderInstallerMBean {
- private static final Log LOG = LogFactory.getLog(AccessCheckingInitialContextFactoryBuilder.class);
-
- public void start() throws Exception {
- LOG.info("Installing RHQ's access permission checking initial context factory builder");
-
- NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
- }
-
- public void stop() throws Exception {
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java
deleted file mode 100644
index 87d19ab..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.mbean;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public interface AccessCheckingInitialContextFactoryBuilderInstallerMBean {
-
- void start() throws Exception;
-
- void stop() throws Exception;
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
deleted file mode 100644
index 356a6e9..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.util;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.util.List;
-
-public class DecoratingInvocationHandler<Type, Decorator extends Type> implements InvocationHandler {
-
- private final List<DecoratorPicker<Type, Decorator>> pickers;
- private Type object;
-
- public DecoratingInvocationHandler(List<DecoratorPicker<Type, Decorator>> pickers, Type object) {
- this.pickers = pickers;
- this.object = object;
- }
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- Type target = object;
- Class<?> methodClass = method.getDeclaringClass();
-
- for(DecoratorPicker<Type, Decorator> picker : pickers) {
- target = picker.decorate(target, methodClass);
- }
-
- return method.invoke(target, args);
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
deleted file mode 100644
index 017d29f..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.util;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Given as set of decorators extending given type, this class can pick
- * the most appropriate set of decorators for a class or a method call.
- * <p>
- * To configure the decorator, one has to provide a {@link DecoratorSetContext} that
- * is then used to obtain the list of
- * {@link DecoratorSetContext#getSupportedInterfaces() supported interfaces}, which are
- * all the interfaces that should be used for decorator resolution (i.e. all other interfaces
- * that a class might implement are ignored during decorator resolution), the list of
- * {@link DecoratorSetContext#getDecoratorClasses() decorator classes}, which is a list
- * of decorators the picker can choose from and is also used to instantiate and initialize
- * the decorators.
- *
- * @author Lukas Krejci
- */
-public class DecoratorPicker<Type, Decorator extends Type> {
-
- private DecoratorSetContext<Type, Decorator> context;
-
- public DecoratorSetContext<Type, Decorator> getContext() {
- return context;
- }
-
- public void setContext(DecoratorSetContext<Type, Decorator> decoratorSetContext) {
- this.context = decoratorSetContext;
- }
-
- /**
- * Returns a set of decorators applicable for given method. The set is established based
- * on the declaring class of the method.
- *
- * @param method the method to inspect
- * @return the set of decorators that can be used to wrap a method call
- * @throws Exception
- */
- public Set<Decorator> getDecoratorsForMethod(Method method) throws Exception {
- return getDecoratorsForClass_Private(method.getDeclaringClass());
- }
-
- /**
- * Returns a set of decorators that can be used on instances of given class.
- * @param cls the class to inspect
- * @return
- * @throws Exception
- */
- public Set<Decorator> getDecoratorsForClass(Class<? extends Type> cls) throws Exception {
- return getDecoratorsForClass_Private(cls);
- }
-
- /**
- * This method first establishes the set of decorators to use based on the class of the supplied
- * object and then chains the decorators (in arbitrary order) with the supplied object at the
- * "root" of the chain.
- * <p>
- * If a method is then called on the returned object, the methods of all the decorators are called
- * in chain (each supposedly calling the next) and finally, at the end of the chain, the method on
- * the original object (the one supplied to this method) is called.
- * <p>
- * Note that the above is only an intended behavior and actually depends on the implementation of
- * the decorators that are resposinble for the chaining. Each decorator is initialized
- * (@{link {@link DecoratorSetContext#init(Object, Object)} which should set it up for such chaining.
- *
- * @param object
- * @return
- * @throws Exception
- */
- public Type decorate(Type object) throws Exception {
- Set<Decorator> decs = getDecoratorsForClass_Private(object.getClass());
- Type ret = object;
- for(Decorator d : decs) {
- context.init(d, ret);
- ret = d;
- }
-
- return ret;
- }
-
- /**
- * Similar to {@link #decorate(Object)} but instead of the class of the object itself,
- * uses the significantSuperClass as the basis for the decorator resolution.
- * <p>
- * This is important, because if the object implements two mutually incompatible sub-interfaces of <code>Type</code>,
- * the chained decorators might fail to execute a method later on if the decorator depends on the upper part
- * of the chain to implement certain sub-interface of <code>Type</code>.
- *
- * @param object the object to wrap in decorators
- * @param significantSuperClass the class to base the decorator resolution on
- * @return
- * @throws Exception
- */
- public Type decorate(Type object, Class<?> significantSuperClass) throws Exception {
- Set<Decorator> decs = getDecoratorsForClass_Private(significantSuperClass);
- Type ret = object;
- for(Decorator d : decs) {
- context.init(d, ret);
- ret = d;
- }
-
- return ret;
- }
-
- private Set<Decorator> getDecoratorsForClass_Private(Class<?> cls) throws Exception {
- Set<Class<? extends Type>> ifaces = getNearestApplicableInterfaces(cls);
-
- HashSet<Decorator> ret = new HashSet<Decorator>();
-
- for (Class<? extends Type> iface : ifaces) {
- for (Class<? extends Decorator> decClass : getMatch(iface)) {
- ret.add(context.instantiate(decClass));
- }
- }
-
- return ret;
- }
-
- private Set<Class<? extends Type>> getNearestApplicableInterfaces(Class<?> cls) {
- List<Class<? extends Type>> ifaces = new ArrayList<Class<? extends Type>>(getAllApplicableInterfaces(cls));
-
- //now compact the set to only contain the most concrete interfaces
-
- Iterator<Class<? extends Type>> it = ifaces.iterator();
- while (it.hasNext()) {
- Class<? extends Type> c = it.next();
-
- for (int i = 0; i < ifaces.size(); ++i) {
- Class<? extends Type> nextC = ifaces.get(i);
- if (!c.equals(nextC) && c.isAssignableFrom(nextC)) {
- it.remove();
- break;
- }
- }
- }
-
- return new HashSet<Class<? extends Type>>(ifaces);
- }
-
- private Set<Class<? extends Type>> getAllApplicableInterfaces(Class<?> cls) {
- Set<Class<? extends Type>> ifaces = new HashSet<Class<? extends Type>>();
-
- for (Class<? extends Type> iface : context.getSupportedInterfaces()) {
- if (iface.isAssignableFrom(cls)) {
- ifaces.add(iface);
- }
- }
-
- if (ifaces.isEmpty()) {
- throw new IllegalArgumentException("Class " + cls
- + " doesn't implement any of the applicable interfaces. Cannot find decorators for it.");
- }
-
- return ifaces;
- }
-
- private Set<Class<? extends Decorator>> getMatch(Class<?> targetIface) {
-
- Set<Class<? extends Decorator>> ret = new HashSet<Class<? extends Decorator>>();
-
- for (Class<? extends Decorator> cls : context.getDecoratorClasses()) {
- if (Arrays.asList(cls.getInterfaces()).contains(targetIface)) {
- ret.add(cls);
- }
- }
-
- return ret;
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
deleted file mode 100644
index d7b1676..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.util;
-
-import java.util.Set;
-
-/**
- * Implementations of this interface provide a context to the {@link DecoratorPicker}.
- *
- * @author Lukas Krejci
- */
-public interface DecoratorSetContext<Type, Decorator> {
-
- /**
- * @return the set of interfaces that the decorators are able support.
- * Usually this should be just a union of all interfaces the decorators implement
- * but can be trimmed down.
- */
- Set<Class<? extends Type>> getSupportedInterfaces();
-
- /**
- * @return the set of all decorator classes in this set
- */
- Set<Class<? extends Decorator>> getDecoratorClasses();
-
- /**
- * Instantiates a new decorator of given class.
- * @param decoratorClass
- * @return
- * @throws Exception
- */
- Decorator instantiate(Class<? extends Decorator> decoratorClass) throws Exception;
-
- /**
- * Initializes the decorator to decorate given object.
- *
- * @param decorator
- * @param object
- * @throws Exception on error
- */
- void init(Decorator decorator, Type object) throws Exception;
-}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
deleted file mode 100644
index 45ba114..0000000
--- a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-import javax.naming.event.EventContext;
-import javax.naming.event.NamingListener;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.NamingManager;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-@Test
-public class DecoratingInvocationHandlerTest {
- private static final Set<String> INVOKED_METHODS = new HashSet<String>();
-
- private static final InvocationHandler NOTE_TAKING_HANDLER = new InvocationHandler() {
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- INVOKED_METHODS.add(method.getName());
-
- if ("hashCode".equals(method.getName())) {
- return 0;
- } else if ("equals".equals(method.getName())) {
- return false;
- }
-
- return null;
- }
- };
-
- private static Class<?>[] CONTEXT_INTERFACES;
-
- public static class Factory implements InitialContextFactory {
- public Context getInitialContext(Hashtable<?, ?> environment)
- throws NamingException {
-
- return (Context) Proxy.newProxyInstance(DecoratingInvocationHandlerTest.class.getClassLoader(), CONTEXT_INTERFACES, NOTE_TAKING_HANDLER);
- }
- }
-
- private static class DummyInitialEventContext extends InitialContext implements EventContext {
-
- /**
- * @param environment
- * @throws NamingException
- */
- public DummyInitialEventContext(Hashtable<?, ?> environment) throws NamingException {
- super(environment);
- }
-
- public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
- ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
- }
-
- public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
- ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
- }
-
- public void removeNamingListener(NamingListener l) throws NamingException {
- ((EventContext)getDefaultInitCtx()).removeNamingListener(l);
- }
-
- public boolean targetMustExist() throws NamingException {
- return ((EventContext)getDefaultInitCtx()).targetMustExist();
- }
-
-
- }
-
- @BeforeClass
- public void setBuilder() throws Exception {
- NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
- }
-
- public void testSimpleDispatch() throws Exception {
- INVOKED_METHODS.clear();
- Properties env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
-
- CONTEXT_INTERFACES = new Class<?>[] { Context.class };
-
- InitialContext ctx = new InitialContext(env);
-
- ctx.lookup("asdf");
-
- assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
- }
-
- public void testMultiInterfaceDispatch() throws Exception {
- INVOKED_METHODS.clear();
- Properties env = new Properties();
- env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
-
- CONTEXT_INTERFACES = new Class<?>[] { EventContext.class, DirContext.class };
-
- InitialContext ctx = new InitialContext(env);
-
- ctx.lookup("asdf");
-
- DummyInitialEventContext ectx = new DummyInitialEventContext(env);
-
- ectx.addNamingListener("hodiny", 0, null);
-
- assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
- assert INVOKED_METHODS.contains("addNamingListener") : "The addNamingListener doesn't seem to have propagated to the actual context to be used.";
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
deleted file mode 100644
index e2d7429..0000000
--- a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.directory.DirContext;
-import javax.naming.event.EventContext;
-import javax.naming.ldap.LdapContext;
-
-import org.testng.annotations.Test;
-
-import org.rhq.jndi.util.DecoratorPicker;
-import org.rhq.jndi.util.DecoratorSetContext;
-
-/**
- * @author Lukas Krejci
- */
-@Test
-public class DecoratorPickerTest {
-
- private static final InvocationHandler DUMMY_HANDLER = new InvocationHandler() {
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- if ("hashCode".equals(method.getName())) {
- return 0;
- } else if ("equals".equals(method.getName())) {
- return false;
- }
-
- return null;
- }
- };
-
- private static final Class<?> TEST_OBJECT_CLASS1 = createProxyClass(Context.class);
- private static final Class<?> TEST_OBJECT_CLASS2 = createProxyClass(DirContext.class);
- private static final Class<?> TEST_OBJECT_CLASS3 = createProxyClass(LdapContext.class);
- private static final Class<?> TEST_OBJECT_CLASS4 = createProxyClass(LdapContext.class, EventContext.class);
- private static final Class<?> DECORATOR_CLASS1 = createProxyClass(Context.class);
- private static final Class<?> DECORATOR_CLASS2 = createProxyClass(EventContext.class);
- private static final Class<?> DECORATOR_CLASS3 = createProxyClass(LdapContext.class);
- private static final Class<?> DECORATOR_CLASS4 = createProxyClass(DirContext.class);
-
- public void testSimpleDecoratorIdentifiedByClass() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS1);
- assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for Context class");
- assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], Context.class);
- }
-
- public void testSuperClassDecoratorHasPrecedenceOverSubClassDecorator() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- //this tests that the LdapContext isn't returned even though it subclasses the DirContext
- Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS2);
- assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for DirContext class");
- assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], DirContext.class);
- }
-
- public void testSubClassDecoratorCorrectlyIdentified() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS3);
- assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for LdapContext class");
- assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
- }
-
- public void testMultipleDecoratorsDetectable() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- Set<Object> decorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS4);
- assertEquals(decorators.size(), 2,
- "Exactly 2 decorators should have been found for a class implementing 2 interfaces.");
-
- boolean ldapContextDecoratorFound = false;
- boolean eventContextDecoratorFound = false;
-
- for (Object d : decorators) {
- if (LdapContext.class.isAssignableFrom(d.getClass())) {
- ldapContextDecoratorFound = true;
- continue; //just to make sure that somehow the decorator doesn't implement both
- }
- if (EventContext.class.isAssignableFrom(d.getClass())) {
- eventContextDecoratorFound = true;
- }
- }
-
- assertTrue(ldapContextDecoratorFound && eventContextDecoratorFound,
- "The found decorators don't implement the desired interfaces.");
- }
-
- public void testDecoratorsIdentifiedByMethod() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- Set<Object> decorators =
- picker.getDecoratorsForMethod(LdapContext.class.getMethod("getConnectControls", (Class<?>[]) null));
- assertEquals(decorators.size(), 1,
- "Expected exactly one decorator for method 'getConnectControls()' from LdapContext class");
- assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
- }
-
- public void testMethodFromSubclassMatchesSubclassDecorator() throws Exception {
- DecoratorPicker<Object, Object> picker = createTestPicker();
-
- //this is a method from the DirContext but we're asking for it from a class
- //that implements also an LdapContext
- //The LdapContext decorator also inherits from the DirContext decorator
- //(by the virtue of LdapContext interface inheriting from the DirContext)
- //The picker should therefore match the LdapContext decorator because its
- //the "closest" one to the actual class.
- Set<Object> decorators =
- picker.getDecoratorsForMethod(TEST_OBJECT_CLASS3.getMethod("getSchemaClassDefinition",
- new Class<?>[] { String.class }));
- assertEquals(decorators.size(), 1,
- "Expected exactly one decorator for method 'getSchemaClassDefinition(String)' from LdapContext class");
- assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
- }
-
- private static Class<?> createProxyClass(Class<?>... ifaces) {
- return Proxy.getProxyClass(DecoratorPickerTest.class.getClassLoader(), ifaces);
- }
-
- private static DecoratorPicker<Object, Object> createTestPicker() {
- DecoratorPicker<Object, Object> picker = new DecoratorPicker<Object, Object>();
-
- DecoratorSetContext<Object, Object> decSet = new DecoratorSetContext<Object, Object>() {
-
- public Object instantiate(Class<? extends Object> decoratorClass) throws Exception {
- Constructor<? extends Object> ctor = decoratorClass.getConstructor(InvocationHandler.class);
- return ctor.newInstance(DUMMY_HANDLER);
- }
-
- public void init(Object decorator, Object object) throws Exception {
- }
-
- @SuppressWarnings("unchecked")
- public Set<Class<? extends Object>> getSupportedInterfaces() {
- return new HashSet<Class<? extends Object>>(Arrays.asList(Context.class, EventContext.class,
- LdapContext.class, DirContext.class));
- }
-
- @SuppressWarnings("unchecked")
- public Set<Class<? extends Object>> getDecoratorClasses() {
- return new HashSet<Class<? extends Object>>(Arrays.asList(DECORATOR_CLASS1, DECORATOR_CLASS2, DECORATOR_CLASS3, DECORATOR_CLASS4));
- }
- };
-
- picker.setContext(decSet);
-
- return picker;
- }
-}
diff --git a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
index f231f15..859b552 100644
--- a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
+++ b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml
@@ -225,13 +225,6 @@
<!-- JNDI -->
<!-- ==================================================================== -->
- <!-- This installs a custom initial context factory builder into the JVM
- that will ensure that all the default InitialContexts are going to check
- for the permission to access the RHQ internals. -->
- <mbean code="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
- name="org.rhq:service=AccessCheckingInitialContextFactoryBuilderInstaller">
- </mbean>
-
<!-- A simple mbean wrapper around the jndi Naming object. This
only handles an in memory instance. The NamingService uses this
as the JNDI store and exposes it remotely.
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 6898621..8753e6f 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -56,12 +56,6 @@
<dependency>
<groupId>org.rhq</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 92f4cf1..6eaf304 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -78,13 +78,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<dependency>
<groupId>com.googlecode.java-diff-utils</groupId>
<artifactId>diffutils</artifactId>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
index ecf2f6f..39b6076 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
@@ -26,41 +26,29 @@ import java.util.Random;
import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.server.util.LookupUtil;
-import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
/**
* This is the JON Server's own session ID generator. It is outside any container-provided session mechanism. Its sole
* purpose is to provide session IDs to logged in {@link Subject}s. It will timeout those sessions regardless of any
* container-provided session-timeout mechanism.
- * <p>
- * Because this is a very security-sensitive class, any public method requires the caller to
- * have the {@link AllowEjbAccessPermission} as any other calls to the EJB layer. This is so that the
- * malicious users can't trick the EJB layer into thinking that some users are logged in or log out other
- * users.
- * <p>
- * Also, for security reasons, this class is final so that malicious code can't subclass it and modify its
- * behavior.
- *
+ *
* <p>This object is a {@link #getInstance() singleton}.</p>
*/
-public final class SessionManager {
-
- private static final AllowRhqServerInternalsAccessPermission ACCESS_PERMISSION = new AllowRhqServerInternalsAccessPermission();
-
+public class SessionManager {
/**
* Our source for random session IDs.
*/
- private static final Random _random = new Random();
+ private static Random _random = new Random();
/**
* Our session cache that is keyed on the session ID.
*/
- private static final Map<Integer, AuthSession> _cache = new HashMap<Integer, AuthSession>();
+ private static Map<Integer, AuthSession> _cache = new HashMap<Integer, AuthSession>();
/**
* The singleton instance
*/
- private static final SessionManager _manager = new SessionManager();
+ private static SessionManager _manager = new SessionManager();
/**
* The timeout for all user sessions.
@@ -90,7 +78,7 @@ public final class SessionManager {
/**
* Return the singleton object.
- *
+ *
* @return the {@link SessionManager}
*/
public static SessionManager getInstance() {
@@ -107,7 +95,6 @@ public final class SessionManager {
* sessionId will be assigned.
*/
public Subject put(Subject subject) {
- checkPermission();
return put(subject, DEFAULT_TIMEOUT);
}
@@ -121,7 +108,6 @@ public final class SessionManager {
* that Subject is overlord). The sessionId will be assigned.
*/
public synchronized Subject put(Subject subject, long timeout) {
- checkPermission();
Integer key;
do {
@@ -155,7 +141,6 @@ public final class SessionManager {
* @throws SessionTimeoutException
*/
public synchronized Subject getSubject(int sessionId) throws SessionNotFoundException, SessionTimeoutException {
- checkPermission();
Integer id = new Integer(sessionId);
AuthSession session = _cache.get(id);
@@ -177,7 +162,6 @@ public final class SessionManager {
* @param sessionId session id to invalidate
*/
public synchronized void invalidate(int sessionId) {
- checkPermission();
_cache.remove(new Integer(sessionId));
// while we are here, let's go through the entire session cache and remove expired sessions
@@ -203,7 +187,6 @@ public final class SessionManager {
* @param username username for the sessions to be invalidated
*/
public synchronized void invalidate(String username) {
- checkPermission();
List<Integer> doomedSessionIds = new ArrayList<Integer>(_cache.size());
for (AuthSession s : _cache.values()) {
if (username.equals(s.getSubject(false).getName())) {
@@ -218,7 +201,6 @@ public final class SessionManager {
}
public long getlastAccess(int sessionId) {
- checkPermission();
AuthSession session = _cache.get(sessionId);
if (session == null) {
return -1;
@@ -227,7 +209,6 @@ public final class SessionManager {
}
public Subject getOverlord() {
- checkPermission();
if (overlordSubject == null) {
overlordSubject = LookupUtil.getSubjectManager().getSubjectById(OVERLORD_SUBJECT_ID);
@@ -275,9 +256,4 @@ public final class SessionManager {
return copy;
}
-
- private static void checkPermission() {
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) sm.checkPermission(ACCESS_PERMISSION);
- }
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml b/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
index 85e2fb3..05edefa 100644
--- a/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
+++ b/modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml
@@ -4,14 +4,6 @@
xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
- <!-- This installs a custom initial context factory builder into the JVM
- that will ensure that all the default InitialContexts are going to check
- for the permission to access the RHQ internals. -->
- <bean class="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
- name="AccessCheckingInitialContextFactoryBuilderInstaller">
- </bean>
-
-
<bean name="Naming" class="org.jnp.server.SingletonNamingServer"/>
<bean name="InitialContextProperties" class="java.util.Hashtable">
@@ -28,7 +20,7 @@
</entry>
</map>
</parameter>
- </constructor>
+ </constructor>
</bean>
<bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer">
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
deleted file mode 100644
index 1991e0e..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<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>
- <artifactId>jndi-access-test-parent</artifactId>
- <groupId>org.rhq</groupId>
- <version>4.3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>jndi-access-test</artifactId>
- <packaging>jar</packaging>
-
- <name>JNDI access integration test</name>
- <description>Tests for local and remote JNDI access from within serverside scripts.</description>
-
- <properties>
- <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
- <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
- <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
- <jnp.port>54987</jnp.port>
- <jnp.rmiPort>54988</jnp.rmiPort>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>runtime</scope>
- </dependency>
-
- <!--================ Test Deps ================ -->
-
- <!-- Note, the test deps are intentionally placed above the other
- scoped deps because of classpath reasons. Maven orders the [test] classpath
- in the order listed in the pom. We specifically need the embeddable-ejb3
- jar above the standard ejb3 jars because we need the embeddble packages loaded
- when testing. -->
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-core-client-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-server-client-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>jndi-access-remote-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>jboss-ejb3-all</artifactId>
- <version>${jboss-embeddable-ejb3.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- NOTE: The remaining test deps correspond to the classes contained
- in hibernate-all.jar and thirdparty-all.jar. -->
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- needed by embedded ejb container -->
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
- <!-- needed by embedded ejb container -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <!-- 3rd Party Deps -->
-
- <!-- required by RHQ server classes, as well as EJB3 Embedded -->
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1-jboss</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed
- by the PoolClass annotation used on some of our SLSB's -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- for the transaction interrupt EJB3 interceptor -->
- <dependency>
- <groupId>org.jboss.transaction</groupId>
- <artifactId>jboss-jta</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-oracle</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
- </dependency>
-
- <!-- This is needed cglib which is in turn needed by hibernate -->
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.18</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!-- in order to get JMS to work properly in embedded
- test container, extract jms-rs.rar classes -->
- <execution>
- <id>Extract JMS classes from RAR needed for JMS tests</id>
- <phase>process-classes</phase>
- <configuration>
- <tasks>
- <unzip src="src/test/resources/jms-ra.rar"
- dest="target">
- <patternset>
- <include name="jms-ra.jar" />
- </patternset>
- </unzip>
- <unzip src="target/jms-ra.jar"
- dest="target/test-classes">
- <patternset>
- <include name="org/**" />
- </patternset>
- </unzip>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- Everything but the web service tests, this is the standard
- test execution -->
- <configuration>
- <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <groups>${rhq.testng.includedGroups}</groups>
- <systemPropertyVariables>
- <embeddedDeployment>true</embeddedDeployment>
- <deploymentDirectory>target/test-classes</deploymentDirectory>
- <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
- <clean.db>${clean.db}</clean.db>
- <test.server.jar.path>${settings.localRepository}/org/rhq/jndi-access-remote-server/${project.version}/jndi-access-remote-server-${project.version}.jar</test.server.jar.path>
- <jnp.port>${jnp.port}</jnp.port>
- <jnp.rmiPort>${jnp.rmiPort}</jnp.rmiPort>
- </systemPropertyVariables>
- <argLine>-Djava.security.manager -Djava.security.policy==target/test-classes/security.policy</argLine>
- <additionalClasspathElements>
- <!-- The below is required for tests to run against
- Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
-</project>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
deleted file mode 100644
index f20d4f1..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.test;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.SerializablePermission;
-import java.security.PermissionCollection;
-import java.util.Collections;
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-
-import org.rhq.bindings.SandboxedScriptEngine;
-import org.rhq.bindings.ScriptEngineFactory;
-import org.rhq.bindings.StandardBindings;
-import org.rhq.bindings.StandardScriptPermissions;
-import org.rhq.bindings.util.PackageFinder;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.client.LocalClient;
-import org.rhq.enterprise.server.test.AbstractEJB3Test;
-import org.rhq.enterprise.server.util.LookupUtil;
-import org.rhq.jndi.AllowRhqServerInternalsAccessPermission;
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-@Test
-public class JndiAccessTest extends AbstractEJB3Test {
- private static final Log JNP_SERVER_LOG = LogFactory.getLog("Test JNP Server");
-
- private Process testServerProcess;
- private Thread testServerStdErrReader;
- private Thread testServerStdOutReader;
-
- @BeforeClass
- @Parameters({"test.server.jar.path", "jnp.port", "jnp.rmiPort"})
- public void startTestJnpServer(String testServerJar, int jnpPort, int rmiPort) throws Exception {
- ProcessBuilder bld = new ProcessBuilder("java", "-Djnp.port=" + jnpPort, "-Djnp.rmiPort=" + rmiPort, "-jar", testServerJar);
-
- testServerProcess = bld.start();
-
- testServerStdErrReader = new Thread(new Runnable() {
- @Override
- public void run() {
- BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getErrorStream()));
- try {
- String line;
- while((line = rdr.readLine()) != null) {
- JNP_SERVER_LOG.warn(line);
- }
- } catch (IOException e) {
- JNP_SERVER_LOG.error("Reading test JNP server error output failed.", e);
- } finally {
- try {
- rdr.close();
- } catch (IOException e) {
- JNP_SERVER_LOG.error("Failed to close the test server error stream.", e);
- }
- }
- }
- });
- testServerStdErrReader.start();
-
- testServerStdOutReader = new Thread(new Runnable() {
- @Override
- public void run() {
- BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getInputStream()));
- try {
- String line;
- while((line = rdr.readLine()) != null) {
- JNP_SERVER_LOG.debug(line);
- }
- } catch (IOException e) {
- JNP_SERVER_LOG.error("Reading test JNP server standard output failed.", e);
- } finally {
- try {
- rdr.close();
- } catch (IOException e) {
- JNP_SERVER_LOG.error("Failed to close the test server standard output stream.", e);
- }
- }
- }
- });
- testServerStdOutReader.start();
-
- //give the JNP server some time to start up
- Thread.sleep(5000);
- }
-
- @AfterClass
- public void stopTestJnpServer() throws Exception {
- testServerProcess.destroy();
- testServerStdErrReader.join();
- testServerStdOutReader.join();
- }
-
- @Parameters("jnp.port")
- public void testRemoteConnectionWorkingFromJava(int jnpPort) throws Exception {
- Properties env = new Properties();
- env.put("java.naming.factory.initial", "org.jboss.naming.NamingContextFactory");
- env.put("java.naming.provider.url", "jnp://localhost:" + jnpPort);
- InitialContext ctx = new InitialContext(env);
- Object kachny = ctx.lookup("kachny");
-
- assert kachny != null;
- }
-
- public void testLocalJNDILookupFailsFromScripts() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "context = new javax.naming.InitialContext();\n"
- + "entityManagerFactory = context.lookup('java:/RHQEntityManagerFactory');\n"
- + "entityManager = entityManagerFactory.createEntityManager();\n"
- + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
-
- Assert.fail("The script shouldn't have been able to use the EntityManager.");
- } catch (ScriptException e) {
- checkIsDesiredSecurityException(e);
- }
- }
-
- @Parameters("jnp.port")
- public void testRemoteJNDILookupWorksFromScripts(int jnpPort) throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
-
- try {
- engine.eval(""
- + "env = new java.util.Hashtable();"
- + "env.put('java.naming.factory.initial', 'org.jboss.naming.NamingContextFactory');"
- + "env.put('java.naming.provider.url', 'jnp://localhost:" + jnpPort + "');"
- + "context = new javax.naming.InitialContext(env);\n"
- + "kachny = context.lookup('kachny');\n"
- + "assertNotNull(kachny);\n");
- } catch (ScriptException e) {
- Assert.fail("The script should have been able to access a remote JNDI server.", e);
- }
- }
-
- private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
- StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
- ScriptEngine engine = ScriptEngineFactory.getScriptEngine("JavaScript", new PackageFinder(Collections.<File>emptyList()), bindings);
-
- PermissionCollection perms = new StandardScriptPermissions();
-
- return new SandboxedScriptEngine(engine, perms);
- }
-
- private static void checkIsDesiredSecurityException(ScriptException e) {
- String message = e.getMessage();
- String permissionTrace = AllowRhqServerInternalsAccessPermission.class.getName();
-
- Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
- }
-}
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties
deleted file mode 100644
index 1951b84..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-# FOR SOME STRANGE REASON, THIS FILE NEEDS TO BE HERE FOR THE HIBERNATE TO CORRECTLY
-# INITIALIZE. I DON'T KNOW WHY THE STANDARD default.persistence.properties FILE DOESN'T
-# WORK IN THIS MODULE.
-
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-#hibernate.connection.release_mode=after_statement
-#hibernate.transaction.flush_before_completion=false
-#hibernate.transaction.auto_close_session=false
-#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
-#hibernate.hbm2ddl.auto=create-drop
-#hibernate.hbm2ddl.auto=create
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-# Clustered cache with TreeCache
-#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
-#hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-hibernate.bytecode.use_reflection_optimizer=false
-# I don't think this is honored, but EJB3Deployer uses it
-hibernate.bytecode.provider=javassist
-hibernate.jdbc.use_streams_for_binary=true
-hibernate.show_sql=false
-hibernate.format_sql=true
-hibernate.default_batch_fetch_size=16
-hibernate.jdbc.batch_size=20
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml
deleted file mode 100644
index ec09ed7..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml 39945 2006-01-12 02:44:07Z bill $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="true">
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="WARN"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Messagen -->
- <!--
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- -->
- <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="target/server-jar-test.log"/>
- <param name="Threshold" value="WARN"/>
- <param name="Append" value="false"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Messagen -->
- <!--
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- -->
- <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
- </layout>
- </appender>
-
- <category name="Test JNP Server">
- <priority value="DEBUG"/>
- </category>
-
- <!-- Hibernate logs WARNINGS frequent from this class, in test envs. -->
- <category name="org.hibernate.hql.ast.QueryTranslatorImpl">
- <priority value="ERROR"/>
- </category>
-
- <!-- hides the TIMER SERVICE IS NOT INSTALLED warning - we know embedded EJB3 container doesn't support timers -->
- <category name="org.jboss.ejb3.timerservice.jboss.JBossTimerServiceFactory">
- <priority value="ERROR"/>
- </category>
-
- <!-- hides the shutdown warnings - for some reason, the container spits out some warnings when shutting down -->
- <category name="org.jboss.kernel.plugins.dependency.StartStopLifecycleAction">
- <priority value="ERROR"/>
- </category>
-
- <!-- Hibernate SQL logs -->
- <!--
- <category name="org.hibernate.SQL">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy
deleted file mode 100644
index 8860b47..0000000
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-// We need the SecurityManager installed to enable sandboxing of CLI scripts
-// but we don't define any other security measures on the RHQ server itself.
-//
-// Granting all permissions allows us to run the RHQ server as if no security
-// manager was in place (which is assumed by default by JBoss AS) but be able
-// to use it when we need it for our own purposes.
-
-grant {
- permission java.security.AllPermission;
-};
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
deleted file mode 100644
index 6e9c673..0000000
--- a/modules/integration-tests/jndi-access/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<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>
- <artifactId>rhq-integration-tests</artifactId>
- <groupId>org.rhq</groupId>
- <version>4.3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>jndi-access-test-parent</artifactId>
- <packaging>pom</packaging>
-
- <name>JNDI access tests</name>
- <description>Tests for the secured JNDI access tests</description>
-
- <modules>
- <module>remote-server</module>
- <module>jndi-access-test</module>
- </modules>
-</project>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
deleted file mode 100644
index 9046e6f..0000000
--- a/modules/integration-tests/jndi-access/remote-server/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<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>
- <artifactId>jndi-access-test-parent</artifactId>
- <groupId>org.rhq</groupId>
- <version>4.3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.rhq</groupId>
- <artifactId>jndi-access-remote-server</artifactId>
- <packaging>jar</packaging>
-
- <name>Test JNDI-enabled remote server</name>
- <description>
- A testing JNDI-enabled server to test the ability to connect to remote servers without security
- checks from within the scripts running inside the RHQ server.
- </description>
-
- <dependencies>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jnpserver</artifactId>
- <version>4.2.2.GA</version>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- <version>4.2.2.GA</version>
- </dependency>
-
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>package</id>
- <phase>package</phase>
- <goals><goal>single</goal></goals>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.rhq.jndi.test.Server</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java b/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java
deleted file mode 100644
index 7bfb8e8..0000000
--- a/modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.rhq.jndi.test;
-import java.util.Properties;
-
-import javax.naming.CompoundName;
-
-import org.jnp.server.Main;
-import org.jnp.server.NamingBeanImpl;
-
-import org.jboss.logging.Logger;
-
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/**
- *
- *
- * @author Lukas Krejci
- */
-public class Server {
- private static final Logger LOG = Logger.getLogger(Server.class);
-
- private static Server INSTANCE;
-
- private Main jnpServer;
-
- public static void main(String[] args) throws Exception {
- LOG.debug("System properties: " + System.getProperties());
- Server.start();
- }
-
- private Server() {
- jnpServer = new Main("org.rhq.jndi.access.test.server");
- }
-
- public static synchronized Server getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new Server();
- }
-
- return INSTANCE;
- }
-
- public static void start() throws Exception {
- LOG.debug("Initializing the JNP server");
-
- NamingBeanImpl nbi = new NamingBeanImpl();
- getInstance().jnpServer.setNamingInfo(nbi);
- nbi.start();
-
- LOG.debug("Binding kachny");
-
- nbi.getNamingInstance().bind(new CompoundName("kachny", new Properties()), "KACHNY!", String.class.getName());
-
- LOG.debug("Starting the JNP server");
-
- getInstance().jnpServer.start();
- }
-
- public static void stop() {
- LOG.debug("Stopping the JNP server");
- getInstance().jnpServer.stop();
- }
-}
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties b/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties
deleted file mode 100644
index a45f2ce..0000000
--- a/modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-java.naming.factory.initial=org.jboss.naming.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
diff --git a/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties b/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties
deleted file mode 100644
index 2d41f83..0000000
--- a/modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-log4j.rootCategory=TRACE, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 969b94a..0290729 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -62,7 +62,6 @@
<id>integration-tests</id>
<modules>
<module>apache-plugin-test</module>
- <module>jndi-access</module>
<!--<module>mod_cluster-plugin-test</module>-->
</modules>
</profile>
1
0
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java | 78 +---
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java | 67 ++-
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java | 75 +++
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java | 162 --------
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java | 71 +++
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java | 46 ++
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java | 195 ++++++++++
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java | 59 +++
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java | 145 +++++++
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java | 180 +++++++++
10 files changed, 861 insertions(+), 217 deletions(-)
New commits:
commit 772e9d247e524071a86d6a25b8e1615ed77e9fcf
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Jan 9 14:05:09 2012 +0100
Fixing the application of various decorators to JNDI contexts to support
contexts that implement more than 1 context interface (like LdapCtx which
implements both LdapContext and EventDirContext).
This should fix the RHQ's LDAP integration for good.
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
index 60e9bf6..3046af7 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java
@@ -27,7 +27,7 @@ import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.security.AccessController;
import java.security.PrivilegedAction;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
@@ -37,6 +37,10 @@ import java.util.Set;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.event.EventDirContext;
+import javax.naming.ldap.LdapContext;
import javax.naming.spi.InitialContextFactory;
import javax.naming.spi.InitialContextFactoryBuilder;
@@ -45,16 +49,10 @@ import org.apache.commons.logging.LogFactory;
import org.jnp.interfaces.NamingContextFactory;
import org.rhq.jndi.context.AccessCheckingContextDecorator;
-import org.rhq.jndi.context.AccessCheckingDirContextDecorator;
-import org.rhq.jndi.context.AccessCheckingEventContextDecorator;
-import org.rhq.jndi.context.AccessCheckingEventDirContextDecorator;
-import org.rhq.jndi.context.AccessCheckingLdapContextDecorator;
-import org.rhq.jndi.context.ContextDecoratorPicker;
-import org.rhq.jndi.context.URLPreferringContextDecorator;
-import org.rhq.jndi.context.URLPreferringDirContextDecorator;
-import org.rhq.jndi.context.URLPreferringEventContextDecorator;
-import org.rhq.jndi.context.URLPreferringEventDirContextDecorator;
-import org.rhq.jndi.context.URLPreferringLdapContextDecorator;
+import org.rhq.jndi.context.AccessCheckingContextDecoratorSetContext;
+import org.rhq.jndi.context.ContextDecorator;
+import org.rhq.jndi.context.URLPreferringContextDecoratorSetContext;
+import org.rhq.jndi.util.DecoratorPicker;
/**
* This initial context factory builder is installed early on during the RHQ server startup
@@ -89,6 +87,17 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
*/
private static final String[] CHECKED_SCHEMES = { "java" };
+ private static final Set<Class<? extends Context>> SUPPORTED_CONTEXT_INTERFACES;
+
+ static {
+ SUPPORTED_CONTEXT_INTERFACES = new HashSet<Class<? extends Context>>();
+ SUPPORTED_CONTEXT_INTERFACES.add(Context.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(DirContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(EventContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(EventDirContext.class);
+ SUPPORTED_CONTEXT_INTERFACES.add(LdapContext.class);
+ }
+
private static final Set<InetAddress> SERVER_BIND_IPS;
static {
SERVER_BIND_IPS = new HashSet<InetAddress>();
@@ -191,42 +200,31 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
}
private static InitialContextFactory getAccessCheckingFactory(InitialContextFactory original) {
- return new DecoratingInitialContextFactory(original, Arrays.asList(
- getURLPreferringDecoratorPicker(), getAccessCheckingDecoratorPicker()));
- }
-
- private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
- return new DecoratingInitialContextFactory(original, Arrays.asList(
- getURLPreferringDecoratorPicker()));
+ ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+ pickers.add(getURLPreferringDecoratorPicker());
+ pickers.add(getAccessCheckingDecoratorPicker());
+
+ return new DecoratingInitialContextFactory(original, pickers);
}
- private static ContextDecoratorPicker getAccessCheckingDecoratorPicker() {
- ContextDecoratorPicker ret = new ContextDecoratorPicker();
-
- ret.setConstructorParameters(new Object[] { CHECKED_SCHEMES });
- ret.setConstructorParameterTypes(new Class<?>[] { String[].class });
+ private static InitialContextFactory getURLPreferringFactory(InitialContextFactory original) {
+ ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context,ContextDecorator>>();
+ pickers.add(getURLPreferringDecoratorPicker());
- ret.getPossibleDecorators().add(AccessCheckingContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingDirContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingEventContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingEventDirContextDecorator.class);
- ret.getPossibleDecorators().add(AccessCheckingLdapContextDecorator.class);
+ return new DecoratingInitialContextFactory(original, pickers);
+ }
+ private static DecoratorPicker<Context, ContextDecorator> getAccessCheckingDecoratorPicker() {
+ DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+ ret.setContext(new AccessCheckingContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES, CHECKED_SCHEMES));
+
return ret;
}
- private static ContextDecoratorPicker getURLPreferringDecoratorPicker() {
- ContextDecoratorPicker ret = new ContextDecoratorPicker();
-
- ret.setConstructorParameters(null);
- ret.setConstructorParameterTypes(null);
-
- ret.getPossibleDecorators().add(URLPreferringContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringDirContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringEventContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringEventDirContextDecorator.class);
- ret.getPossibleDecorators().add(URLPreferringLdapContextDecorator.class);
-
+ private static DecoratorPicker<Context, ContextDecorator> getURLPreferringDecoratorPicker() {
+ DecoratorPicker<Context, ContextDecorator> ret = new DecoratorPicker<Context, ContextDecorator>();
+ ret.setContext(new URLPreferringContextDecoratorSetContext(SUPPORTED_CONTEXT_INTERFACES));
+
return ret;
}
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
index 2414c98..19b30ea 100644
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java
@@ -19,45 +19,82 @@
package org.rhq.jndi;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
+import java.util.Set;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import org.rhq.jndi.context.ContextDecoratorPicker;
+import org.rhq.jndi.context.ContextDecorator;
+import org.rhq.jndi.util.DecoratorPicker;
+import org.rhq.jndi.util.DecoratingInvocationHandler;
/**
+ * This class implements an initial context factory that decorates the contexts
+ * returned from a "wrapped" initial factory passed to this class in the constructor.
+ * <p>
+ * The contexts returned from the wrapped initial factory are hidden behind a proxy
+ * that implements the intersection of interfaces from the <code>supportedContextInterfaces</code>
+ * constructor parameter and the actual interfaces the wrapped context implements.
+ * <p>
+ * The proxy method calls are handled using the {@link DecoratingInvocationHandler} which is initialized
+ * with the list of {@link DecoratorPicker pickers} that are used to intercept the method
+ * calls on the wrapped context.
+ *
+ * @see DecoratorPicker
+ * @see DecoratingInvocationHandler
*
- *
* @author Lukas Krejci
*/
public class DecoratingInitialContextFactory implements InitialContextFactory {
- private List<ContextDecoratorPicker> pickers;
+ List<DecoratorPicker<Context, ContextDecorator>> pickers;
private InitialContextFactory factory;
+ private Set<Class<? extends Context>> supportedContextInterfaces;
- public DecoratingInitialContextFactory(InitialContextFactory factory, List<ContextDecoratorPicker> decoratorPickers) {
+ public DecoratingInitialContextFactory(InitialContextFactory factory, List<DecoratorPicker<Context, ContextDecorator>> decoratorPickers) {
this.factory = factory;
this.pickers = decoratorPickers;
+ this.supportedContextInterfaces = new HashSet<Class<? extends Context>>();
+ for(DecoratorPicker<Context, ContextDecorator> picker : pickers) {
+ supportedContextInterfaces.addAll(picker.getContext().getSupportedInterfaces());
+ }
}
public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
Context ctx = factory.getInitialContext(environment);
- try {
- for(ContextDecoratorPicker picker : pickers) {
- ctx = picker.wrapInAppropriateDecorator(ctx);
- }
- } catch (IllegalArgumentException e) {
- NamingException ex = new NamingException();
- ex.initCause(ex);
-
- throw e;
- }
+ Set<Class<?>> implementedIfaces = getAllImplementedInterfaces(ctx.getClass());
+ Class<?>[] ii = new Class<?>[implementedIfaces.size()];
+ implementedIfaces.toArray(ii);
- return ctx;
+ return (Context) Proxy.newProxyInstance(ctx.getClass().getClassLoader(), ii, new DecoratingInvocationHandler<Context, ContextDecorator>(pickers, ctx));
+ }
+
+ private Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
+ HashSet<Class<?>> ret = new HashSet<Class<?>>();
+ getAllImplementedInterfaces(cls, ret);
+
+ ret.retainAll(supportedContextInterfaces);
+
+ return ret;
}
+ private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
+ Class<?>[] ifaces = cls.getInterfaces();
+
+ for (Class<?> iface : Arrays.asList(ifaces)) {
+ output.add(iface);
+ getAllImplementedInterfaces(iface, output);
+ }
+
+ if (cls.getSuperclass() != null) {
+ getAllImplementedInterfaces(cls.getSuperclass(), output);
+ }
+ }
}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
new file mode 100644
index 0000000..284fd0c
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java
@@ -0,0 +1,75 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.Constructor;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class AccessCheckingContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
+
+ private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
+ static {
+ HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
+ tmp.add(AccessCheckingContextDecorator.class);
+ tmp.add(AccessCheckingDirContextDecorator.class);
+ tmp.add(AccessCheckingEventContextDecorator.class);
+ tmp.add(AccessCheckingEventDirContextDecorator.class);
+ tmp.add(AccessCheckingLdapContextDecorator.class);
+
+ DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
+ }
+
+ private Set<Class<? extends Context>> supportedInterfaces;
+ private String[] checkedSchemes;
+
+ public AccessCheckingContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces, String... checkedSchemes) {
+ this.supportedInterfaces = supportedInterfaces;
+ this.checkedSchemes = checkedSchemes;
+ }
+
+ public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
+ Constructor<? extends ContextDecorator> ctor = decoratorClass.getConstructor(String[].class);
+
+ return ctor.newInstance((Object)checkedSchemes);
+ }
+
+ public Set<Class<? extends Context>> getSupportedInterfaces() {
+ return supportedInterfaces;
+ }
+
+ public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
+ return DECORATOR_CLASSES;
+ }
+
+ public void init(ContextDecorator decorator, Context object) throws Exception {
+ decorator.init(object);
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
deleted file mode 100644
index a088aa2..0000000
--- a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecoratorPicker.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.jndi.context;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-/**
- * @author Lukas Krejci
- */
-public class ContextDecoratorPicker {
-
- private Set<Class<? extends ContextDecorator>> possibleDecorators = new HashSet<Class<? extends ContextDecorator>>();
- private Class<?>[] constructorParameterTypes;
- private Object[] constructorParameters;
-
- public ContextDecoratorPicker() {
- }
-
- public ContextDecoratorPicker(Collection<? extends Class<? extends ContextDecorator>> c) {
- possibleDecorators.addAll(c);
- }
-
- public Set<Class<? extends ContextDecorator>> getPossibleDecorators() {
- return possibleDecorators;
- }
-
- public Class<?>[] getConstructorParameterTypes() {
- return constructorParameterTypes;
- }
-
- public void setConstructorParameterTypes(Class<?>[] constructorParameterTypes) {
- this.constructorParameterTypes = constructorParameterTypes;
- }
-
- public Object[] getConstructorParameters() {
- return constructorParameters;
- }
-
- public void setConstructorParameters(Object[] constructorParameters) {
- this.constructorParameters = constructorParameters;
- }
-
- public Context wrapInAppropriateDecorator(Context context) throws NamingException {
- Class<? extends ContextDecorator> cls = getMatchByInterfaces(context, possibleDecorators);
-
- if (cls == null) {
- throw new IllegalArgumentException("Could not find a matching context decorator for " + context.getClass() + " in " + this);
- }
-
- Constructor<? extends ContextDecorator> ctor = null;
- try {
- ctor = cls.getConstructor(constructorParameterTypes);
- ContextDecorator ctx = ctor.newInstance(constructorParameters);
-
- ctx.init(context);
-
- return ctx;
- } catch (SecurityException e) {
- throw new IllegalStateException("Could not instantiate a class through reflection.", e);
- } catch (NoSuchMethodException e) {
- throw new IllegalArgumentException(
- "Could not construct a context decorator - unable to find a constructor with parameters "
- + (constructorParameterTypes == null ? "[no parameters]" : Arrays.asList(constructorParameterTypes)) + " on class " + cls.getName(), e);
- } catch (IllegalArgumentException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- } catch (InstantiationException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- } catch (IllegalAccessException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- } catch (InvocationTargetException e) {
- throw new IllegalArgumentException("Could not instantiate a context decorator " + cls + " using constructor " + ctor, e);
- }
- }
-
- private static <T> Class<? extends T> getMatchByInterfaces(Object obj, Set<Class<? extends T>> classes) {
- Set<Class<?>> ifaces = getAllImplementedInterfaces(obj.getClass());
-
- Class<? extends T> match = null;
- int maxMatchCnt = Integer.MIN_VALUE;
-
- for(Class<? extends T> cls : classes) {
- int cnt = getBestMatchByIfaces(cls, ifaces);
- if (cnt > maxMatchCnt) {
- maxMatchCnt = cnt;
- match = cls;
- }
- }
-
- return match;
- }
-
- private static int getBestMatchByIfaces(Class<?> cls, Set<Class<?>> ifaces) {
- int ret = 0;
-
- //count how many interfaces from the supplied array the class implements
- for(Class<?> iface : ifaces) {
- if (iface.isAssignableFrom(cls)) {
- ++ret;
- } else {
- --ret;
- }
- }
-
- //that's not all - to get the best possible match, we need to take into account
- //the fact that the class might implement more than just the interfaces provided
- Set<Class<?>> clsIfaces = getAllImplementedInterfaces(cls);
-
- for(Class<?> clsIface : clsIfaces) {
- if (!(ifaces.contains(clsIface))) {
- --ret;
- }
- }
-
- return ret;
- }
-
- private static Set<Class<?>> getAllImplementedInterfaces(Class<?> cls) {
- HashSet<Class<?>> ret = new HashSet<Class<?>>();
- getAllImplementedInterfaces(cls, ret);
-
- return ret;
- }
-
- private static void getAllImplementedInterfaces(Class<?> cls, Set<Class<?>> output) {
- Class<?>[] ifaces = cls.getInterfaces();
-
- for(Class<?> iface : Arrays.asList(ifaces)) {
- output.add(iface);
- getAllImplementedInterfaces(iface, output);
- }
-
- if (cls.getSuperclass() != null) {
- getAllImplementedInterfaces(cls.getSuperclass(), output);
- }
- }
-}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
new file mode 100644
index 0000000..828cd74
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java
@@ -0,0 +1,71 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class URLPreferringContextDecoratorSetContext implements DecoratorSetContext<Context, ContextDecorator> {
+
+ private static final Set<Class<? extends ContextDecorator>> DECORATOR_CLASSES;
+ static {
+ HashSet<Class<? extends ContextDecorator>> tmp = new HashSet<Class<? extends ContextDecorator>>();
+ tmp.add(URLPreferringContextDecorator.class);
+ tmp.add(URLPreferringDirContextDecorator.class);
+ tmp.add(URLPreferringEventContextDecorator.class);
+ tmp.add(URLPreferringEventDirContextDecorator.class);
+ tmp.add(URLPreferringLdapContextDecorator.class);
+
+ DECORATOR_CLASSES = Collections.unmodifiableSet(tmp);
+ }
+
+ private Set<Class<? extends Context>> supportedInterfaces;
+
+ public URLPreferringContextDecoratorSetContext(Set<Class<? extends Context>> supportedInterfaces) {
+ this.supportedInterfaces = supportedInterfaces;
+ }
+
+ public Set<Class<? extends Context>> getSupportedInterfaces() {
+ return supportedInterfaces;
+ }
+
+ public Set<Class<? extends ContextDecorator>> getDecoratorClasses() {
+ return DECORATOR_CLASSES;
+ }
+
+ public ContextDecorator instantiate(Class<? extends ContextDecorator> decoratorClass) throws Exception {
+ return decoratorClass.newInstance();
+ }
+
+ public void init(ContextDecorator decorator, Context object) throws Exception {
+ decorator.init(object);
+ }
+
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
new file mode 100644
index 0000000..356a6e9
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java
@@ -0,0 +1,46 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.util.List;
+
+public class DecoratingInvocationHandler<Type, Decorator extends Type> implements InvocationHandler {
+
+ private final List<DecoratorPicker<Type, Decorator>> pickers;
+ private Type object;
+
+ public DecoratingInvocationHandler(List<DecoratorPicker<Type, Decorator>> pickers, Type object) {
+ this.pickers = pickers;
+ this.object = object;
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ Type target = object;
+ Class<?> methodClass = method.getDeclaringClass();
+
+ for(DecoratorPicker<Type, Decorator> picker : pickers) {
+ target = picker.decorate(target, methodClass);
+ }
+
+ return method.invoke(target, args);
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
new file mode 100644
index 0000000..017d29f
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java
@@ -0,0 +1,195 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Given as set of decorators extending given type, this class can pick
+ * the most appropriate set of decorators for a class or a method call.
+ * <p>
+ * To configure the decorator, one has to provide a {@link DecoratorSetContext} that
+ * is then used to obtain the list of
+ * {@link DecoratorSetContext#getSupportedInterfaces() supported interfaces}, which are
+ * all the interfaces that should be used for decorator resolution (i.e. all other interfaces
+ * that a class might implement are ignored during decorator resolution), the list of
+ * {@link DecoratorSetContext#getDecoratorClasses() decorator classes}, which is a list
+ * of decorators the picker can choose from and is also used to instantiate and initialize
+ * the decorators.
+ *
+ * @author Lukas Krejci
+ */
+public class DecoratorPicker<Type, Decorator extends Type> {
+
+ private DecoratorSetContext<Type, Decorator> context;
+
+ public DecoratorSetContext<Type, Decorator> getContext() {
+ return context;
+ }
+
+ public void setContext(DecoratorSetContext<Type, Decorator> decoratorSetContext) {
+ this.context = decoratorSetContext;
+ }
+
+ /**
+ * Returns a set of decorators applicable for given method. The set is established based
+ * on the declaring class of the method.
+ *
+ * @param method the method to inspect
+ * @return the set of decorators that can be used to wrap a method call
+ * @throws Exception
+ */
+ public Set<Decorator> getDecoratorsForMethod(Method method) throws Exception {
+ return getDecoratorsForClass_Private(method.getDeclaringClass());
+ }
+
+ /**
+ * Returns a set of decorators that can be used on instances of given class.
+ * @param cls the class to inspect
+ * @return
+ * @throws Exception
+ */
+ public Set<Decorator> getDecoratorsForClass(Class<? extends Type> cls) throws Exception {
+ return getDecoratorsForClass_Private(cls);
+ }
+
+ /**
+ * This method first establishes the set of decorators to use based on the class of the supplied
+ * object and then chains the decorators (in arbitrary order) with the supplied object at the
+ * "root" of the chain.
+ * <p>
+ * If a method is then called on the returned object, the methods of all the decorators are called
+ * in chain (each supposedly calling the next) and finally, at the end of the chain, the method on
+ * the original object (the one supplied to this method) is called.
+ * <p>
+ * Note that the above is only an intended behavior and actually depends on the implementation of
+ * the decorators that are resposinble for the chaining. Each decorator is initialized
+ * (@{link {@link DecoratorSetContext#init(Object, Object)} which should set it up for such chaining.
+ *
+ * @param object
+ * @return
+ * @throws Exception
+ */
+ public Type decorate(Type object) throws Exception {
+ Set<Decorator> decs = getDecoratorsForClass_Private(object.getClass());
+ Type ret = object;
+ for(Decorator d : decs) {
+ context.init(d, ret);
+ ret = d;
+ }
+
+ return ret;
+ }
+
+ /**
+ * Similar to {@link #decorate(Object)} but instead of the class of the object itself,
+ * uses the significantSuperClass as the basis for the decorator resolution.
+ * <p>
+ * This is important, because if the object implements two mutually incompatible sub-interfaces of <code>Type</code>,
+ * the chained decorators might fail to execute a method later on if the decorator depends on the upper part
+ * of the chain to implement certain sub-interface of <code>Type</code>.
+ *
+ * @param object the object to wrap in decorators
+ * @param significantSuperClass the class to base the decorator resolution on
+ * @return
+ * @throws Exception
+ */
+ public Type decorate(Type object, Class<?> significantSuperClass) throws Exception {
+ Set<Decorator> decs = getDecoratorsForClass_Private(significantSuperClass);
+ Type ret = object;
+ for(Decorator d : decs) {
+ context.init(d, ret);
+ ret = d;
+ }
+
+ return ret;
+ }
+
+ private Set<Decorator> getDecoratorsForClass_Private(Class<?> cls) throws Exception {
+ Set<Class<? extends Type>> ifaces = getNearestApplicableInterfaces(cls);
+
+ HashSet<Decorator> ret = new HashSet<Decorator>();
+
+ for (Class<? extends Type> iface : ifaces) {
+ for (Class<? extends Decorator> decClass : getMatch(iface)) {
+ ret.add(context.instantiate(decClass));
+ }
+ }
+
+ return ret;
+ }
+
+ private Set<Class<? extends Type>> getNearestApplicableInterfaces(Class<?> cls) {
+ List<Class<? extends Type>> ifaces = new ArrayList<Class<? extends Type>>(getAllApplicableInterfaces(cls));
+
+ //now compact the set to only contain the most concrete interfaces
+
+ Iterator<Class<? extends Type>> it = ifaces.iterator();
+ while (it.hasNext()) {
+ Class<? extends Type> c = it.next();
+
+ for (int i = 0; i < ifaces.size(); ++i) {
+ Class<? extends Type> nextC = ifaces.get(i);
+ if (!c.equals(nextC) && c.isAssignableFrom(nextC)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+
+ return new HashSet<Class<? extends Type>>(ifaces);
+ }
+
+ private Set<Class<? extends Type>> getAllApplicableInterfaces(Class<?> cls) {
+ Set<Class<? extends Type>> ifaces = new HashSet<Class<? extends Type>>();
+
+ for (Class<? extends Type> iface : context.getSupportedInterfaces()) {
+ if (iface.isAssignableFrom(cls)) {
+ ifaces.add(iface);
+ }
+ }
+
+ if (ifaces.isEmpty()) {
+ throw new IllegalArgumentException("Class " + cls
+ + " doesn't implement any of the applicable interfaces. Cannot find decorators for it.");
+ }
+
+ return ifaces;
+ }
+
+ private Set<Class<? extends Decorator>> getMatch(Class<?> targetIface) {
+
+ Set<Class<? extends Decorator>> ret = new HashSet<Class<? extends Decorator>>();
+
+ for (Class<? extends Decorator> cls : context.getDecoratorClasses()) {
+ if (Arrays.asList(cls.getInterfaces()).contains(targetIface)) {
+ ret.add(cls);
+ }
+ }
+
+ return ret;
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
new file mode 100644
index 0000000..d7b1676
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java
@@ -0,0 +1,59 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.util;
+
+import java.util.Set;
+
+/**
+ * Implementations of this interface provide a context to the {@link DecoratorPicker}.
+ *
+ * @author Lukas Krejci
+ */
+public interface DecoratorSetContext<Type, Decorator> {
+
+ /**
+ * @return the set of interfaces that the decorators are able support.
+ * Usually this should be just a union of all interfaces the decorators implement
+ * but can be trimmed down.
+ */
+ Set<Class<? extends Type>> getSupportedInterfaces();
+
+ /**
+ * @return the set of all decorator classes in this set
+ */
+ Set<Class<? extends Decorator>> getDecoratorClasses();
+
+ /**
+ * Instantiates a new decorator of given class.
+ * @param decoratorClass
+ * @return
+ * @throws Exception
+ */
+ Decorator instantiate(Class<? extends Decorator> decoratorClass) throws Exception;
+
+ /**
+ * Initializes the decorator to decorate given object.
+ *
+ * @param decorator
+ * @param object
+ * @throws Exception on error
+ */
+ void init(Decorator decorator, Type object) throws Exception;
+}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
new file mode 100644
index 0000000..45ba114
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java
@@ -0,0 +1,145 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.event.NamingListener;
+import javax.naming.spi.InitialContextFactory;
+import javax.naming.spi.NamingManager;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.jndi.AccessCheckingInitialContextFactoryBuilder;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class DecoratingInvocationHandlerTest {
+ private static final Set<String> INVOKED_METHODS = new HashSet<String>();
+
+ private static final InvocationHandler NOTE_TAKING_HANDLER = new InvocationHandler() {
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ INVOKED_METHODS.add(method.getName());
+
+ if ("hashCode".equals(method.getName())) {
+ return 0;
+ } else if ("equals".equals(method.getName())) {
+ return false;
+ }
+
+ return null;
+ }
+ };
+
+ private static Class<?>[] CONTEXT_INTERFACES;
+
+ public static class Factory implements InitialContextFactory {
+ public Context getInitialContext(Hashtable<?, ?> environment)
+ throws NamingException {
+
+ return (Context) Proxy.newProxyInstance(DecoratingInvocationHandlerTest.class.getClassLoader(), CONTEXT_INTERFACES, NOTE_TAKING_HANDLER);
+ }
+ }
+
+ private static class DummyInitialEventContext extends InitialContext implements EventContext {
+
+ /**
+ * @param environment
+ * @throws NamingException
+ */
+ public DummyInitialEventContext(Hashtable<?, ?> environment) throws NamingException {
+ super(environment);
+ }
+
+ public void addNamingListener(Name target, int scope, NamingListener l) throws NamingException {
+ ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
+ }
+
+ public void addNamingListener(String target, int scope, NamingListener l) throws NamingException {
+ ((EventContext)getURLOrDefaultInitCtx(target)).addNamingListener(target, scope, l);
+ }
+
+ public void removeNamingListener(NamingListener l) throws NamingException {
+ ((EventContext)getDefaultInitCtx()).removeNamingListener(l);
+ }
+
+ public boolean targetMustExist() throws NamingException {
+ return ((EventContext)getDefaultInitCtx()).targetMustExist();
+ }
+
+
+ }
+
+ @BeforeClass
+ public void setBuilder() throws Exception {
+ NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder());
+ }
+
+ public void testSimpleDispatch() throws Exception {
+ INVOKED_METHODS.clear();
+ Properties env = new Properties();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
+
+ CONTEXT_INTERFACES = new Class<?>[] { Context.class };
+
+ InitialContext ctx = new InitialContext(env);
+
+ ctx.lookup("asdf");
+
+ assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
+ }
+
+ public void testMultiInterfaceDispatch() throws Exception {
+ INVOKED_METHODS.clear();
+ Properties env = new Properties();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, Factory.class.getName());
+
+ CONTEXT_INTERFACES = new Class<?>[] { EventContext.class, DirContext.class };
+
+ InitialContext ctx = new InitialContext(env);
+
+ ctx.lookup("asdf");
+
+ DummyInitialEventContext ectx = new DummyInitialEventContext(env);
+
+ ectx.addNamingListener("hodiny", 0, null);
+
+ assert INVOKED_METHODS.contains("lookup") : "The lookup doesn't seem to have propagated to the actual context to be used.";
+ assert INVOKED_METHODS.contains("addNamingListener") : "The addNamingListener doesn't seem to have propagated to the actual context to be used.";
+ }
+}
diff --git a/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
new file mode 100644
index 0000000..e2d7429
--- /dev/null
+++ b/modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java
@@ -0,0 +1,180 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.jndi.context;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.Context;
+import javax.naming.directory.DirContext;
+import javax.naming.event.EventContext;
+import javax.naming.ldap.LdapContext;
+
+import org.testng.annotations.Test;
+
+import org.rhq.jndi.util.DecoratorPicker;
+import org.rhq.jndi.util.DecoratorSetContext;
+
+/**
+ * @author Lukas Krejci
+ */
+@Test
+public class DecoratorPickerTest {
+
+ private static final InvocationHandler DUMMY_HANDLER = new InvocationHandler() {
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ if ("hashCode".equals(method.getName())) {
+ return 0;
+ } else if ("equals".equals(method.getName())) {
+ return false;
+ }
+
+ return null;
+ }
+ };
+
+ private static final Class<?> TEST_OBJECT_CLASS1 = createProxyClass(Context.class);
+ private static final Class<?> TEST_OBJECT_CLASS2 = createProxyClass(DirContext.class);
+ private static final Class<?> TEST_OBJECT_CLASS3 = createProxyClass(LdapContext.class);
+ private static final Class<?> TEST_OBJECT_CLASS4 = createProxyClass(LdapContext.class, EventContext.class);
+ private static final Class<?> DECORATOR_CLASS1 = createProxyClass(Context.class);
+ private static final Class<?> DECORATOR_CLASS2 = createProxyClass(EventContext.class);
+ private static final Class<?> DECORATOR_CLASS3 = createProxyClass(LdapContext.class);
+ private static final Class<?> DECORATOR_CLASS4 = createProxyClass(DirContext.class);
+
+ public void testSimpleDecoratorIdentifiedByClass() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS1);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for Context class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], Context.class);
+ }
+
+ public void testSuperClassDecoratorHasPrecedenceOverSubClassDecorator() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ //this tests that the LdapContext isn't returned even though it subclasses the DirContext
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS2);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for DirContext class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], DirContext.class);
+ }
+
+ public void testSubClassDecoratorCorrectlyIdentified() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> contextDecorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS3);
+ assertEquals(contextDecorators.size(), 1, "Expected exactly one decorator for LdapContext class");
+ assertEquals(contextDecorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ public void testMultipleDecoratorsDetectable() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> decorators = picker.getDecoratorsForClass(TEST_OBJECT_CLASS4);
+ assertEquals(decorators.size(), 2,
+ "Exactly 2 decorators should have been found for a class implementing 2 interfaces.");
+
+ boolean ldapContextDecoratorFound = false;
+ boolean eventContextDecoratorFound = false;
+
+ for (Object d : decorators) {
+ if (LdapContext.class.isAssignableFrom(d.getClass())) {
+ ldapContextDecoratorFound = true;
+ continue; //just to make sure that somehow the decorator doesn't implement both
+ }
+ if (EventContext.class.isAssignableFrom(d.getClass())) {
+ eventContextDecoratorFound = true;
+ }
+ }
+
+ assertTrue(ldapContextDecoratorFound && eventContextDecoratorFound,
+ "The found decorators don't implement the desired interfaces.");
+ }
+
+ public void testDecoratorsIdentifiedByMethod() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ Set<Object> decorators =
+ picker.getDecoratorsForMethod(LdapContext.class.getMethod("getConnectControls", (Class<?>[]) null));
+ assertEquals(decorators.size(), 1,
+ "Expected exactly one decorator for method 'getConnectControls()' from LdapContext class");
+ assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ public void testMethodFromSubclassMatchesSubclassDecorator() throws Exception {
+ DecoratorPicker<Object, Object> picker = createTestPicker();
+
+ //this is a method from the DirContext but we're asking for it from a class
+ //that implements also an LdapContext
+ //The LdapContext decorator also inherits from the DirContext decorator
+ //(by the virtue of LdapContext interface inheriting from the DirContext)
+ //The picker should therefore match the LdapContext decorator because its
+ //the "closest" one to the actual class.
+ Set<Object> decorators =
+ picker.getDecoratorsForMethod(TEST_OBJECT_CLASS3.getMethod("getSchemaClassDefinition",
+ new Class<?>[] { String.class }));
+ assertEquals(decorators.size(), 1,
+ "Expected exactly one decorator for method 'getSchemaClassDefinition(String)' from LdapContext class");
+ assertEquals(decorators.iterator().next().getClass().getInterfaces()[0], LdapContext.class);
+ }
+
+ private static Class<?> createProxyClass(Class<?>... ifaces) {
+ return Proxy.getProxyClass(DecoratorPickerTest.class.getClassLoader(), ifaces);
+ }
+
+ private static DecoratorPicker<Object, Object> createTestPicker() {
+ DecoratorPicker<Object, Object> picker = new DecoratorPicker<Object, Object>();
+
+ DecoratorSetContext<Object, Object> decSet = new DecoratorSetContext<Object, Object>() {
+
+ public Object instantiate(Class<? extends Object> decoratorClass) throws Exception {
+ Constructor<? extends Object> ctor = decoratorClass.getConstructor(InvocationHandler.class);
+ return ctor.newInstance(DUMMY_HANDLER);
+ }
+
+ public void init(Object decorator, Object object) throws Exception {
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set<Class<? extends Object>> getSupportedInterfaces() {
+ return new HashSet<Class<? extends Object>>(Arrays.asList(Context.class, EventContext.class,
+ LdapContext.class, DirContext.class));
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set<Class<? extends Object>> getDecoratorClasses() {
+ return new HashSet<Class<? extends Object>>(Arrays.asList(DECORATOR_CLASS1, DECORATOR_CLASS2, DECORATOR_CLASS3, DECORATOR_CLASS4));
+ }
+ };
+
+ picker.setContext(decSet);
+
+ return picker;
+ }
+}
1
0
modules/enterprise/gui/rest-war/src/main/webapp/index.html | 1
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html | 7
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html | 228 ++++++++++
3 files changed, 235 insertions(+), 1 deletion(-)
New commits:
commit d61a7d5a1852c017a75a13636d0f410b6d6a5dd4
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Jan 9 11:07:36 2012 +0100
Add a graph where each days metrics consist of a certain color
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 7162c24..80472f6 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -29,6 +29,7 @@ an empty database (meaning resource ids and schedule ids starting at 10001).
<li><a href="whisker2.html">Multiple Whisker charts</a></li>
<li><a href="tree.html">Resource tree</a></li>
<li><a href="raw_graph.html">7 days of raw metrics as dot- or line- chart</a></li>
+ <li><a href="raw_graph7.html">7 days of raw metrics as dot- or line- chart - comparing daily values</a></li>
</ul>
</body>
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
new file mode 100644
index 0000000..62b2ec5
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html
@@ -0,0 +1,228 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Raw mertic last 7 days</title>
+ <script type="text/javascript" src="js/d3.js"></script>
+ <script type="text/javascript" src="js/d3.layout.js"></script>
+ <script type="text/javascript" src="js/d3.time.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <style type="text/css">
+
+svg {
+ width: 960px;
+ height: 600px;
+ border: solid 1px #ccc;
+ font: 10px sans-serif;
+ shape-rendering: crispEdges;
+}
+.axis text
+{
+ fill: #333;
+ font-family: sans-serif;
+ font-size: 10px;
+}
+.axis .domain
+{
+ opacity: 0;
+}
+.tick
+{
+ stroke: #ccc;
+ stroke-dasharray: 1 5;
+}
+
+path {
+ stroke: steelblue;
+ stroke-width: 2;
+ fill: none;
+}
+
+line {
+ stroke: black;
+}
+
+ </style>
+ </head>
+ <body>
+ <h1 id="resId">Resource</h1>
+ <h2 id="header">Schedule</h2>
+<button id="dotsButton" onClick="transitionDots() ">Dots</button>
+<button id="lineButton" onClick="transitionLine()"/>Lines</button>
+<button id="bothButton" onClick="transitionBoth()"/>Both</button>
+
+ <div id="one"></div>
+ <script type="text/javascript">
+
+// Width and height of the chart to print
+var w = 960,
+ h = 600;
+
+// Get the platforms and then the first one
+$.getJSON('/rest/1/resource/platforms.json', function (json) {
+ var res = json[0];
+ var rid = res.resourceId;
+ $("#resId").text("Resource " + rid + " (" + res.resourceName + ")");
+
+ // Now get the metrical schedules of the platform
+ $.getJSON("/rest/1/resource/"+rid+"/schedules.json?type=metric", function (json2) {
+
+ // Take the first and render it
+ var schId = json2[0].scheduleId;
+ $("#header").text("Schedule " + schId + " (" + json2[0].scheduleName + "), base unit: " + json2[0].unit);
+
+
+// '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ d3.json(
+ '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ function (jsondata) {
+
+
+
+ var w = 960,
+ h = 600;
+ // compute min/max values for x and y a
+ var minVal = d3.min(jsondata,function(d) { return d.value;});
+ var maxVal = d3.max(jsondata,function(d) { return d.value;});
+ var minTsD = 0;
+ var maxTsD = 86400*1000;
+
+ var minTimestamp = d3.min(jsondata,function(d) { return d.timeStamp;});
+
+ var avg = d3.sum(jsondata,function(d) { return d.value;}) / jsondata.length;
+
+
+
+ WIDTH = w;
+ HEIGHT = h;
+ MARGINS = {top: 10, right: 10, bottom: 20, left: 10};
+
+ var xRange = d3.time.scale().range ([MARGINS.left, WIDTH - MARGINS.right]).domain([new Date(minTsD),new Date(maxTsD)]);
+ var yRange = d3.scale.linear().range ([HEIGHT - MARGINS.top, MARGINS.bottom]).domain([minVal, maxVal]);
+
+ // X axis range goes from lowest to highest timestamp
+ var x = d3.time.scale().domain([new Date(0),new Date(86400*1000)]).range([50, w-10]); // 50-> make room for label
+//var x = xRange;
+ var y = yRange;
+ // Y axis range goes from lowest to highest value
+ // var y = d3.scale.linear().domain([minVal, maxVal]).rangeRound([0, h]);
+ format = d3.time.format("%H:%M");
+
+
+ xAxis = d3.svg.axis() // generate an axis
+ .scale(x) // set the range of the axis
+ .tickSize(580) // height of the ticks
+ .tickSubdivide(true); // display ticks between text labels
+ yAxis = d3.svg.axis() // generate an axis
+ .scale(yRange) // set the range of the axis
+ .tickSize(3) // width of the ticks
+ .orient("right") // have the text labels on the right hand side
+ .tickFormat(d3.format("0e"))
+ .tickSubdivide(true); // display ticks between text labels
+
+// create the SVG
+ var svg = d3.select("body").append("svg:svg")
+ .attr("width", w)
+ .attr("height", h);
+
+// Create axes
+ svg.append("svg:g")
+ .attr("class","x axis")
+ .call(xAxis);
+
+ svg.append("svg:g")
+ .attr("class","y axis")
+ .attr("transform", "translate(" + (MARGINS.left) + ",0)")
+ .call(yAxis);
+
+ svg.append("svg:line")
+ .attr("x1","50")
+ .attr("x2","950")
+ .attr("y1",y(avg))
+ .attr("y2",y(avg))
+ .style("stroke","red")
+ .attr("style","stroke-dasharray:2 2; stroke:red")
+ ;
+
+// split the data into 7 data sets (1 per day)
+
+//var dat = d3.split(jsondata,function(d) { return (d.timeStamp-minTimestamp % 86400*1000) < 3*60*0000; });
+
+var colors = ["black","blue","green","cyan","red","orange","yellow"];
+var dat = putToBuckets(jsondata,7);
+
+for (day = 0 ; day < 7 ; day ++ ) {
+ var daydat = dat[day];
+ // Now lets "loop" over the data and show the dots
+ var lines = svg.append("svg:g").attr("class","linechart")
+ .attr("opacity","0");
+;
+ var dayMinTs = d3.min(daydat,function(d) { return d.timeStamp;});
+
+var line = d3.svg.line()
+ .x(function(d,i) { return x(d.timeStamp-dayMinTs); })
+ .y(function(d) { return y(d.value); })
+
+lines.append("svg:path").attr("d", line(daydat)).style("stroke",colors[day]);
+
+
+ var dot = svg.append("svg:g").attr("class","dotschart")
+ .selectAll("dot").data(jsondata)
+
+ dot.enter().append("svg:circle")
+ .attr("cx", function (d) {
+ return x(d.timeStamp-dayMinTs);
+ })
+ .attr("cy", function (d) {
+ return y(d.value);
+ })
+ .style("stroke", colors[day])
+ .attr("r", 1)
+
+}
+ });
+ })
+})
+
+function transitionDots() {
+ $(".linechart").attr("opacity",0);
+ $(".dotschart").attr("opacity",1);
+}
+
+function transitionLine() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",0);
+}
+function transitionBoth() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",1);
+}
+
+// put the data in d into n buckets
+function putToBuckets(data,n) {
+
+ var band = d3.extent(data,function(d){ return d.timeStamp;});
+ var bs = band[1] - band[0];
+// var bs = bs / n;
+ var bs = 86400*1000;
+
+console.log("bs : " + bs );
+console.log("min ts : " + band[0]);
+
+var dat = new Array(n);
+for (i = 0; i < n ; i++ ) {
+ dat[i]=new Array();
+}
+
+data.forEach(function (d) {
+ var diff = d.timeStamp-band[0];
+ var bucket = parseInt(diff / bs);
+console.log(d.timeStamp + ", " + diff + " buck : " + bucket);
+ dat[bucket].push(d);
+});
+
+return dat;
+}
+
+ </script>
+ </body>
+</html>
commit 9ada46462f71b39e160e215fce7b4676e2aadd87
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sun Jan 8 17:15:57 2012 +0100
Allow to also show lines and dots.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
index 598a0b8..44c42a5 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
@@ -46,8 +46,9 @@ line {
<body>
<h1 id="resId">Resource</h1>
<h2 id="header">Schedule</h2>
-<button id="dotsButton" onClick="transitionDots() ">Dots</button>
+<button id="dotsButton" onClick="transitionDots()">Dots</button>
<button id="lineButton" onClick="transitionLine()">Lines</button>
+<button id="bothButton" onClick="transitionBoth()">Both</button>
<div id="one"></div>
<script type="text/javascript">
@@ -174,6 +175,10 @@ function transitionLine() {
$(".linechart").attr("opacity",1);
$(".dotschart").attr("opacity",0);
}
+function transitionBoth() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",1);
+}
</script>
</body>
</html>
1
0
modules/enterprise/gui/rest-war/src/main/webapp/index.html | 3
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js | 92
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js | 938 ++
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js | 835 ++
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js | 3135 ++++++----
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js | 454 -
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js | 61
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html | 179
8 files changed, 4419 insertions(+), 1278 deletions(-)
New commits:
commit 3fa0177b1a7c943bd83291f35f4027c128f26984
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Jan 6 14:16:40 2012 +0100
Add an example of graphing raw data with D3.js as dots or lines.
Use D3 helpers for max/min, draw a line for the avg.
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/index.html b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
index 9e96d76..7162c24 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/index.html
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/index.html
@@ -1,7 +1,7 @@
<html>
<body>
<h2>RHQ Rest API</h2>
-<b>Please note: the API is not stable at this point. Do not rely on it.</b><br/>
+<strong>Please note: the API is not stable at this point. Do not rely on it.</strong><br/>
Join us in making it great by providing feedback and contributions of code and examples
that use the api.
@@ -28,6 +28,7 @@ an empty database (meaning resource ids and schedule ids starting at 10001).
<li><a href="whisker.html">Whisker chart 1</a></li>
<li><a href="whisker2.html">Multiple Whisker charts</a></li>
<li><a href="tree.html">Resource tree</a></li>
+ <li><a href="raw_graph.html">7 days of raw metrics as dot- or line- chart</a></li>
</ul>
</body>
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
new file mode 100644
index 0000000..598a0b8
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html
@@ -0,0 +1,179 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Raw mertic last 7 days</title>
+ <script type="text/javascript" src="js/d3.js"></script>
+ <script type="text/javascript" src="js/d3.layout.js"></script>
+ <script type="text/javascript" src="js/d3.time.js"></script>
+ <script type="text/javascript" src="js/jquery.js"></script>
+ <style type="text/css">
+
+svg {
+ width: 960px;
+ height: 600px;
+ border: solid 1px #ccc;
+ font: 10px sans-serif;
+ shape-rendering: crispEdges;
+}
+.axis text
+{
+ fill: #333;
+ font-family: sans-serif;
+ font-size: 10px;
+}
+.axis .domain
+{
+ opacity: 0;
+}
+.tick
+{
+ stroke: #ccc;
+ stroke-dasharray: 1 5;
+}
+
+path {
+ stroke: steelblue;
+ stroke-width: 2;
+ fill: none;
+}
+
+line {
+ stroke: black;
+}
+
+ </style>
+ </head>
+ <body>
+ <h1 id="resId">Resource</h1>
+ <h2 id="header">Schedule</h2>
+<button id="dotsButton" onClick="transitionDots() ">Dots</button>
+<button id="lineButton" onClick="transitionLine()">Lines</button>
+
+ <div id="one"></div>
+ <script type="text/javascript">
+
+// Width and height of the chart to print
+var w = 960,
+ h = 600;
+
+// Get the platforms and then the first one
+$.getJSON('/rest/1/resource/platforms.json', function (json) {
+ var res = json[0];
+ var rid = res.resourceId;
+ $("#resId").text("Resource " + rid + " (" + res.resourceName + ")");
+
+ // Now get the metrical schedules of the platform
+ $.getJSON("/rest/1/resource/"+rid+"/schedules.json?type=metric", function (json2) {
+
+ // Take the first and render it
+ var schId = json2[0].scheduleId;
+ $("#header").text("Schedule " + schId + " (" + json2[0].scheduleName + "), base unit: " + json2[0].unit);
+
+ d3.json(
+ '/rest/1/metric/data/' + schId + '/raw.json?duration=604800',
+ function (jsondata) {
+
+ var w = 960,
+ h = 600;
+ // compute min/max values for x and y
+ var minVal = d3.min(jsondata,function(d) { return d.value;});
+ var maxVal = d3.max(jsondata,function(d) { return d.value;});
+ var minTsD = d3.min(jsondata,function(d) { return d.timeStamp;});
+ var maxTsD = d3.max(jsondata,function(d) { return d.timeStamp;});
+
+ var avg = d3.sum(jsondata,function(d) { return d.value;}) / jsondata.length;
+
+
+ WIDTH = w;
+ HEIGHT = h;
+ MARGINS = {top: 10, right: 10, bottom: 20, left: 10};
+
+ var xRange = d3.time.scale().range ([MARGINS.left, WIDTH - MARGINS.right]).domain([new Date(minTsD),new Date(maxTsD)]);
+ var yRange = d3.scale.linear().range ([HEIGHT - MARGINS.top, MARGINS.bottom]).domain([minVal, maxVal]);
+
+ // X axis range goes from lowest to highest timestamp
+ var x = d3.time.scale().domain([new Date(minTsD),new Date(maxTsD)]).range([50, w-10]); // 50-> make room for label
+ var y = yRange;
+ // Y axis range goes from lowest to highest value
+ // var y = d3.scale.linear().domain([minVal, maxVal]).rangeRound([0, h]);
+ format = d3.time.format("%H:%M");
+
+
+ xAxis = d3.svg.axis() // generate an axis
+ .scale(x) // set the range of the axis
+ .tickSize(580) // height of the ticks
+ .tickSubdivide(true); // display ticks between text labels
+ yAxis = d3.svg.axis() // generate an axis
+ .scale(yRange) // set the range of the axis
+ .tickSize(3) // width of the ticks
+ .orient("right") // have the text labels on the right hand side
+ .tickFormat(d3.format("0e"))
+ .tickSubdivide(true); // display ticks between text labels
+
+ // create the SVG
+ var svg = d3.select("body").append("svg:svg")
+ .attr("width", w)
+ .attr("height", h);
+
+ // Create axes
+ svg.append("svg:g")
+ .attr("class","x axis")
+ .call(xAxis);
+
+ svg.append("svg:g")
+ .attr("class","y axis")
+ .attr("transform", "translate(" + (MARGINS.left) + ",0)")
+ .call(yAxis);
+
+ // create horizontal line for avg
+ svg.append("svg:line")
+ .attr("x1","50")
+ .attr("x2","950")
+ .attr("y1",y(avg))
+ .attr("y2",y(avg))
+ .style("stroke","red")
+ .attr("style","stroke-dasharray:2 2; stroke:red")
+ ;
+
+
+ // Now lets "loop" over the data and show the dots
+ var lines = svg.append("svg:g").attr("class","linechart")
+ .attr("opacity","0");
+
+ var line = d3.svg.line()
+ .x(function(d,i) { return x(d.timeStamp); })
+ .y(function(d) { return y(d.value); });
+
+ lines.append("svg:path").attr("d", line(jsondata));
+
+
+ var dot = svg.append("svg:g").attr("class","dotschart")
+ .selectAll("dot").data(jsondata);
+
+ dot.enter().append("svg:circle")
+ .attr("cx", function (d) {
+ return x(d.timeStamp);
+ })
+ .attr("cy", function (d) {
+ return y(d.value);
+ })
+ .style("stroke", "blue")
+ .attr("r", 1)
+
+
+ });
+ })
+});
+
+function transitionDots() {
+ $(".linechart").attr("opacity",0);
+ $(".dotschart").attr("opacity",1);
+}
+
+function transitionLine() {
+ $(".linechart").attr("opacity",1);
+ $(".dotschart").attr("opacity",0);
+}
+ </script>
+ </body>
+</html>
commit 625f20d6922eaa4cad999cb583821a90ba9cef44
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jan 5 22:18:14 2012 +0100
Upgrade D3.js to version 2.7.1
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js
new file mode 100644
index 0000000..7565b83
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js
@@ -0,0 +1,92 @@
+(function(){d3.csv = function(url, callback) {
+ d3.text(url, "text/csv", function(text) {
+ callback(text && d3.csv.parse(text));
+ });
+};
+d3.csv.parse = function(text) {
+ var header;
+ return d3.csv.parseRows(text, function(row, i) {
+ if (i) {
+ var o = {}, j = -1, m = header.length;
+ while (++j < m) o[header[j]] = row[j];
+ return o;
+ } else {
+ header = row;
+ return null;
+ }
+ });
+};
+
+d3.csv.parseRows = function(text, f) {
+ var EOL = {}, // sentinel value for end-of-line
+ EOF = {}, // sentinel value for end-of-file
+ rows = [], // output rows
+ re = /\r\n|[,\r\n]/g, // field separator regex
+ n = 0, // the current line number
+ t, // the current token
+ eol; // is the current token followed by EOL?
+
+ re.lastIndex = 0; // work-around bug in FF 3.6
+
+ /** @private Returns the next token. */
+ function token() {
+ if (re.lastIndex >= text.length) return EOF; // special case: end of file
+ if (eol) { eol = false; return EOL; } // special case: end of line
+
+ // special case: quotes
+ var j = re.lastIndex;
+ if (text.charCodeAt(j) === 34) {
+ var i = j;
+ while (i++ < text.length) {
+ if (text.charCodeAt(i) === 34) {
+ if (text.charCodeAt(i + 1) !== 34) break;
+ i++;
+ }
+ }
+ re.lastIndex = i + 2;
+ var c = text.charCodeAt(i + 1);
+ if (c === 13) {
+ eol = true;
+ if (text.charCodeAt(i + 2) === 10) re.lastIndex++;
+ } else if (c === 10) {
+ eol = true;
+ }
+ return text.substring(j + 1, i).replace(/""/g, "\"");
+ }
+
+ // common case
+ var m = re.exec(text);
+ if (m) {
+ eol = m[0].charCodeAt(0) !== 44;
+ return text.substring(j, m.index);
+ }
+ re.lastIndex = text.length;
+ return text.substring(j);
+ }
+
+ while ((t = token()) !== EOF) {
+ var a = [];
+ while ((t !== EOL) && (t !== EOF)) {
+ a.push(t);
+ t = token();
+ }
+ if (f && !(a = f(a, n++))) continue;
+ rows.push(a);
+ }
+
+ return rows;
+};
+d3.csv.format = function(rows) {
+ return rows.map(d3_csv_formatRow).join("\n");
+};
+
+function d3_csv_formatRow(row) {
+ return row.map(d3_csv_formatValue).join(",");
+}
+
+function d3_csv_formatValue(text) {
+ return /[",\n]/.test(text)
+ ? "\"" + text.replace(/\"/g, "\"\"") + "\""
+ : text;
+}
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js
new file mode 100644
index 0000000..2b40252
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js
@@ -0,0 +1,938 @@
+(function(){d3.geo = {};
+
+var d3_geo_radians = Math.PI / 180;
+// TODO clip input coordinates on opposite hemisphere
+d3.geo.azimuthal = function() {
+ var mode = "orthographic", // or stereographic, gnomonic, equidistant or equalarea
+ origin,
+ scale = 200,
+ translate = [480, 250],
+ x0,
+ y0,
+ cy0,
+ sy0;
+
+ function azimuthal(coordinates) {
+ var x1 = coordinates[0] * d3_geo_radians - x0,
+ y1 = coordinates[1] * d3_geo_radians,
+ cx1 = Math.cos(x1),
+ sx1 = Math.sin(x1),
+ cy1 = Math.cos(y1),
+ sy1 = Math.sin(y1),
+ cc = mode !== "orthographic" ? sy0 * sy1 + cy0 * cy1 * cx1 : null,
+ c,
+ k = mode === "stereographic" ? 1 / (1 + cc)
+ : mode === "gnomonic" ? 1 / cc
+ : mode === "equidistant" ? (c = Math.acos(cc), c ? c / Math.sin(c) : 0)
+ : mode === "equalarea" ? Math.sqrt(2 / (1 + cc))
+ : 1,
+ x = k * cy1 * sx1,
+ y = k * (sy0 * cy1 * cx1 - cy0 * sy1);
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ azimuthal.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale,
+ p = Math.sqrt(x * x + y * y),
+ c = mode === "stereographic" ? 2 * Math.atan(p)
+ : mode === "gnomonic" ? Math.atan(p)
+ : mode === "equidistant" ? p
+ : mode === "equalarea" ? 2 * Math.asin(.5 * p)
+ : Math.asin(p),
+ sc = Math.sin(c),
+ cc = Math.cos(c);
+ return [
+ (x0 + Math.atan2(x * sc, p * cy0 * cc + y * sy0 * sc)) / d3_geo_radians,
+ Math.asin(cc * sy0 - (p ? (y * sc * cy0) / p : 0)) / d3_geo_radians
+ ];
+ };
+
+ azimuthal.mode = function(x) {
+ if (!arguments.length) return mode;
+ mode = x + "";
+ return azimuthal;
+ };
+
+ azimuthal.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ x0 = origin[0] * d3_geo_radians;
+ y0 = origin[1] * d3_geo_radians;
+ cy0 = Math.cos(y0);
+ sy0 = Math.sin(y0);
+ return azimuthal;
+ };
+
+ azimuthal.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return azimuthal;
+ };
+
+ azimuthal.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return azimuthal;
+ };
+
+ return azimuthal.origin([0, 0]);
+};
+// Derived from Tom Carden's Albers implementation for Protovis.
+// http://gist.github.com/476238
+// http://mathworld.wolfram.com/AlbersEqual-AreaConicProjection.html
+
+d3.geo.albers = function() {
+ var origin = [-98, 38],
+ parallels = [29.5, 45.5],
+ scale = 1000,
+ translate = [480, 250],
+ lng0, // d3_geo_radians * origin[0]
+ n,
+ C,
+ p0;
+
+ function albers(coordinates) {
+ var t = n * (d3_geo_radians * coordinates[0] - lng0),
+ p = Math.sqrt(C - 2 * n * Math.sin(d3_geo_radians * coordinates[1])) / n;
+ return [
+ scale * p * Math.sin(t) + translate[0],
+ scale * (p * Math.cos(t) - p0) + translate[1]
+ ];
+ }
+
+ albers.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale,
+ p0y = p0 + y,
+ t = Math.atan2(x, p0y),
+ p = Math.sqrt(x * x + p0y * p0y);
+ return [
+ (lng0 + t / n) / d3_geo_radians,
+ Math.asin((C - p * p * n * n) / (2 * n)) / d3_geo_radians
+ ];
+ };
+
+ function reload() {
+ var phi1 = d3_geo_radians * parallels[0],
+ phi2 = d3_geo_radians * parallels[1],
+ lat0 = d3_geo_radians * origin[1],
+ s = Math.sin(phi1),
+ c = Math.cos(phi1);
+ lng0 = d3_geo_radians * origin[0];
+ n = .5 * (s + Math.sin(phi2));
+ C = c * c + 2 * n * s;
+ p0 = Math.sqrt(C - 2 * n * Math.sin(lat0)) / n;
+ return albers;
+ }
+
+ albers.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = [+x[0], +x[1]];
+ return reload();
+ };
+
+ albers.parallels = function(x) {
+ if (!arguments.length) return parallels;
+ parallels = [+x[0], +x[1]];
+ return reload();
+ };
+
+ albers.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return albers;
+ };
+
+ albers.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return albers;
+ };
+
+ return reload();
+};
+
+// A composite projection for the United States, 960x500. The set of standard
+// parallels for each region comes from USGS, which is published here:
+// http://egsc.usgs.gov/isb/pubs/MapProjections/projections.html#albers
+// TODO allow the composite projection to be rescaled?
+d3.geo.albersUsa = function() {
+ var lower48 = d3.geo.albers();
+
+ var alaska = d3.geo.albers()
+ .origin([-160, 60])
+ .parallels([55, 65]);
+
+ var hawaii = d3.geo.albers()
+ .origin([-160, 20])
+ .parallels([8, 18]);
+
+ var puertoRico = d3.geo.albers()
+ .origin([-60, 10])
+ .parallels([8, 18]);
+
+ function albersUsa(coordinates) {
+ var lon = coordinates[0],
+ lat = coordinates[1];
+ return (lat > 50 ? alaska
+ : lon < -140 ? hawaii
+ : lat < 21 ? puertoRico
+ : lower48)(coordinates);
+ }
+
+ albersUsa.scale = function(x) {
+ if (!arguments.length) return lower48.scale();
+ lower48.scale(x);
+ alaska.scale(x * .6);
+ hawaii.scale(x);
+ puertoRico.scale(x * 1.5);
+ return albersUsa.translate(lower48.translate());
+ };
+
+ albersUsa.translate = function(x) {
+ if (!arguments.length) return lower48.translate();
+ var dz = lower48.scale() / 1000,
+ dx = x[0],
+ dy = x[1];
+ lower48.translate(x);
+ alaska.translate([dx - 400 * dz, dy + 170 * dz]);
+ hawaii.translate([dx - 190 * dz, dy + 200 * dz]);
+ puertoRico.translate([dx + 580 * dz, dy + 430 * dz]);
+ return albersUsa;
+ };
+
+ return albersUsa.scale(lower48.scale());
+};
+d3.geo.bonne = function() {
+ var scale = 200,
+ translate = [480, 250],
+ x0, // origin longitude in radians
+ y0, // origin latitude in radians
+ y1, // parallel latitude in radians
+ c1; // cot(y1)
+
+ function bonne(coordinates) {
+ var x = coordinates[0] * d3_geo_radians - x0,
+ y = coordinates[1] * d3_geo_radians - y0;
+ if (y1) {
+ var p = c1 + y1 - y, E = x * Math.cos(y) / p;
+ x = p * Math.sin(E);
+ y = p * Math.cos(E) - c1;
+ } else {
+ x *= Math.cos(y);
+ y *= -1;
+ }
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ bonne.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ if (y1) {
+ var c = c1 + y, p = Math.sqrt(x * x + c * c);
+ y = c1 + y1 - p;
+ x = x0 + p * Math.atan2(x, c) / Math.cos(y);
+ } else {
+ y *= -1;
+ x /= Math.cos(y);
+ }
+ return [
+ x / d3_geo_radians,
+ y / d3_geo_radians
+ ];
+ };
+
+ // 90° for Werner, 0° for Sinusoidal
+ bonne.parallel = function(x) {
+ if (!arguments.length) return y1 / d3_geo_radians;
+ c1 = 1 / Math.tan(y1 = x * d3_geo_radians);
+ return bonne;
+ };
+
+ bonne.origin = function(x) {
+ if (!arguments.length) return [x0 / d3_geo_radians, y0 / d3_geo_radians];
+ x0 = x[0] * d3_geo_radians;
+ y0 = x[1] * d3_geo_radians;
+ return bonne;
+ };
+
+ bonne.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return bonne;
+ };
+
+ bonne.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return bonne;
+ };
+
+ return bonne.origin([0, 0]).parallel(45);
+};
+d3.geo.equirectangular = function() {
+ var scale = 500,
+ translate = [480, 250];
+
+ function equirectangular(coordinates) {
+ var x = coordinates[0] / 360,
+ y = -coordinates[1] / 360;
+ return [
+ scale * x + translate[0],
+ scale * y + translate[1]
+ ];
+ }
+
+ equirectangular.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ return [
+ 360 * x,
+ -360 * y
+ ];
+ };
+
+ equirectangular.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return equirectangular;
+ };
+
+ equirectangular.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return equirectangular;
+ };
+
+ return equirectangular;
+};
+d3.geo.mercator = function() {
+ var scale = 500,
+ translate = [480, 250];
+
+ function mercator(coordinates) {
+ var x = coordinates[0] / 360,
+ y = -(Math.log(Math.tan(Math.PI / 4 + coordinates[1] * d3_geo_radians / 2)) / d3_geo_radians) / 360;
+ return [
+ scale * x + translate[0],
+ scale * Math.max(-.5, Math.min(.5, y)) + translate[1]
+ ];
+ }
+
+ mercator.invert = function(coordinates) {
+ var x = (coordinates[0] - translate[0]) / scale,
+ y = (coordinates[1] - translate[1]) / scale;
+ return [
+ 360 * x,
+ 2 * Math.atan(Math.exp(-360 * y * d3_geo_radians)) / d3_geo_radians - 90
+ ];
+ };
+
+ mercator.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = +x;
+ return mercator;
+ };
+
+ mercator.translate = function(x) {
+ if (!arguments.length) return translate;
+ translate = [+x[0], +x[1]];
+ return mercator;
+ };
+
+ return mercator;
+};
+function d3_geo_type(types, defaultValue) {
+ return function(object) {
+ return object && object.type in types ? types[object.type](object) : defaultValue;
+ };
+}
+/**
+ * Returns a function that, given a GeoJSON object (e.g., a feature), returns
+ * the corresponding SVG path. The function can be customized by overriding the
+ * projection. Point features are mapped to circles with a default radius of
+ * 4.5px; the radius can be specified either as a constant or a function that
+ * is evaluated per object.
+ */
+d3.geo.path = function() {
+ var pointRadius = 4.5,
+ pointCircle = d3_path_circle(pointRadius),
+ projection = d3.geo.albersUsa();
+
+ function path(d, i) {
+ if (typeof pointRadius === "function") {
+ pointCircle = d3_path_circle(pointRadius.apply(this, arguments));
+ }
+ return pathType(d) || null;
+ }
+
+ function project(coordinates) {
+ return projection(coordinates).join(",");
+ }
+
+ var pathType = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var path = [],
+ features = o.features,
+ i = -1, // features.index
+ n = features.length;
+ while (++i < n) path.push(pathType(features[i].geometry));
+ return path.join("");
+ },
+
+ Feature: function(o) {
+ return pathType(o.geometry);
+ },
+
+ Point: function(o) {
+ return "M" + project(o.coordinates) + pointCircle;
+ },
+
+ MultiPoint: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) path.push("M", project(coordinates[i]), pointCircle);
+ return path.join("");
+ },
+
+ LineString: function(o) {
+ var path = ["M"],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) path.push(project(coordinates[i]), "L");
+ path.pop();
+ return path.join("");
+ },
+
+ MultiLineString: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates.index
+ m; // subcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ m = subcoordinates.length;
+ path.push("M");
+ while (++j < m) path.push(project(subcoordinates[j]), "L");
+ path.pop();
+ }
+ return path.join("");
+ },
+
+ Polygon: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates.index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates.index
+ m; // subcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ if ((m = subcoordinates.length - 1) > 0) {
+ path.push("M");
+ while (++j < m) path.push(project(subcoordinates[j]), "L");
+ path[path.length - 1] = "Z";
+ }
+ }
+ return path.join("");
+ },
+
+ MultiPolygon: function(o) {
+ var path = [],
+ coordinates = o.coordinates,
+ i = -1, // coordinates index
+ n = coordinates.length,
+ subcoordinates, // coordinates[i]
+ j, // subcoordinates index
+ m, // subcoordinates.length
+ subsubcoordinates, // subcoordinates[j]
+ k, // subsubcoordinates index
+ p; // subsubcoordinates.length
+ while (++i < n) {
+ subcoordinates = coordinates[i];
+ j = -1;
+ m = subcoordinates.length;
+ while (++j < m) {
+ subsubcoordinates = subcoordinates[j];
+ k = -1;
+ if ((p = subsubcoordinates.length - 1) > 0) {
+ path.push("M");
+ while (++k < p) path.push(project(subsubcoordinates[k]), "L");
+ path[path.length - 1] = "Z";
+ }
+ }
+ }
+ return path.join("");
+ },
+
+ GeometryCollection: function(o) {
+ var path = [],
+ geometries = o.geometries,
+ i = -1, // geometries index
+ n = geometries.length;
+ while (++i < n) path.push(pathType(geometries[i]));
+ return path.join("");
+ }
+
+ });
+
+ var areaType = path.area = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var area = 0,
+ features = o.features,
+ i = -1, // features.index
+ n = features.length;
+ while (++i < n) area += areaType(features[i]);
+ return area;
+ },
+
+ Feature: function(o) {
+ return areaType(o.geometry);
+ },
+
+ Polygon: function(o) {
+ return polygonArea(o.coordinates);
+ },
+
+ MultiPolygon: function(o) {
+ var sum = 0,
+ coordinates = o.coordinates,
+ i = -1, // coordinates index
+ n = coordinates.length;
+ while (++i < n) sum += polygonArea(coordinates[i]);
+ return sum;
+ },
+
+ GeometryCollection: function(o) {
+ var sum = 0,
+ geometries = o.geometries,
+ i = -1, // geometries index
+ n = geometries.length;
+ while (++i < n) sum += areaType(geometries[i]);
+ return sum;
+ }
+
+ }, 0);
+
+ function polygonArea(coordinates) {
+ var sum = area(coordinates[0]), // exterior ring
+ i = 0, // coordinates.index
+ n = coordinates.length;
+ while (++i < n) sum -= area(coordinates[i]); // holes
+ return sum;
+ }
+
+ function polygonCentroid(coordinates) {
+ var polygon = d3.geom.polygon(coordinates[0].map(projection)), // exterior ring
+ area = polygon.area(),
+ centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1),
+ x = centroid[0],
+ y = centroid[1],
+ z = area,
+ i = 0, // coordinates index
+ n = coordinates.length;
+ while (++i < n) {
+ polygon = d3.geom.polygon(coordinates[i].map(projection)); // holes
+ area = polygon.area();
+ centroid = polygon.centroid(area < 0 ? (area *= -1, 1) : -1);
+ x -= centroid[0];
+ y -= centroid[1];
+ z -= area;
+ }
+ return [x, y, 6 * z]; // weighted centroid
+ }
+
+ var centroidType = path.centroid = d3_geo_type({
+
+ // TODO FeatureCollection
+ // TODO Point
+ // TODO MultiPoint
+ // TODO LineString
+ // TODO MultiLineString
+ // TODO GeometryCollection
+
+ Feature: function(o) {
+ return centroidType(o.geometry);
+ },
+
+ Polygon: function(o) {
+ var centroid = polygonCentroid(o.coordinates);
+ return [centroid[0] / centroid[2], centroid[1] / centroid[2]];
+ },
+
+ MultiPolygon: function(o) {
+ var area = 0,
+ coordinates = o.coordinates,
+ centroid,
+ x = 0,
+ y = 0,
+ z = 0,
+ i = -1, // coordinates index
+ n = coordinates.length;
+ while (++i < n) {
+ centroid = polygonCentroid(coordinates[i]);
+ x += centroid[0];
+ y += centroid[1];
+ z += centroid[2];
+ }
+ return [x / z, y / z];
+ }
+
+ });
+
+ function area(coordinates) {
+ return Math.abs(d3.geom.polygon(coordinates.map(projection)).area());
+ }
+
+ path.projection = function(x) {
+ projection = x;
+ return path;
+ };
+
+ path.pointRadius = function(x) {
+ if (typeof x === "function") pointRadius = x;
+ else {
+ pointRadius = +x;
+ pointCircle = d3_path_circle(pointRadius);
+ }
+ return path;
+ };
+
+ return path;
+};
+
+function d3_path_circle(radius) {
+ return "m0," + radius
+ + "a" + radius + "," + radius + " 0 1,1 0," + (-2 * radius)
+ + "a" + radius + "," + radius + " 0 1,1 0," + (+2 * radius)
+ + "z";
+}
+/**
+ * Given a GeoJSON object, returns the corresponding bounding box. The bounding
+ * box is represented by a two-dimensional array: [[left, bottom], [right,
+ * top]], where left is the minimum longitude, bottom is the minimum latitude,
+ * right is maximum longitude, and top is the maximum latitude.
+ */
+d3.geo.bounds = function(feature) {
+ var left = Infinity,
+ bottom = Infinity,
+ right = -Infinity,
+ top = -Infinity;
+ d3_geo_bounds(feature, function(x, y) {
+ if (x < left) left = x;
+ if (x > right) right = x;
+ if (y < bottom) bottom = y;
+ if (y > top) top = y;
+ });
+ return [[left, bottom], [right, top]];
+};
+
+function d3_geo_bounds(o, f) {
+ if (o.type in d3_geo_boundsTypes) d3_geo_boundsTypes[o.type](o, f);
+}
+
+var d3_geo_boundsTypes = {
+ Feature: d3_geo_boundsFeature,
+ FeatureCollection: d3_geo_boundsFeatureCollection,
+ GeometryCollection: d3_geo_boundsGeometryCollection,
+ LineString: d3_geo_boundsLineString,
+ MultiLineString: d3_geo_boundsMultiLineString,
+ MultiPoint: d3_geo_boundsLineString,
+ MultiPolygon: d3_geo_boundsMultiPolygon,
+ Point: d3_geo_boundsPoint,
+ Polygon: d3_geo_boundsPolygon
+};
+
+function d3_geo_boundsFeature(o, f) {
+ d3_geo_bounds(o.geometry, f);
+}
+
+function d3_geo_boundsFeatureCollection(o, f) {
+ for (var a = o.features, i = 0, n = a.length; i < n; i++) {
+ d3_geo_bounds(a[i].geometry, f);
+ }
+}
+
+function d3_geo_boundsGeometryCollection(o, f) {
+ for (var a = o.geometries, i = 0, n = a.length; i < n; i++) {
+ d3_geo_bounds(a[i], f);
+ }
+}
+
+function d3_geo_boundsLineString(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ f.apply(null, a[i]);
+ }
+}
+
+function d3_geo_boundsMultiLineString(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ for (var b = a[i], j = 0, m = b.length; j < m; j++) {
+ f.apply(null, b[j]);
+ }
+ }
+}
+
+function d3_geo_boundsMultiPolygon(o, f) {
+ for (var a = o.coordinates, i = 0, n = a.length; i < n; i++) {
+ for (var b = a[i][0], j = 0, m = b.length; j < m; j++) {
+ f.apply(null, b[j]);
+ }
+ }
+}
+
+function d3_geo_boundsPoint(o, f) {
+ f.apply(null, o.coordinates);
+}
+
+function d3_geo_boundsPolygon(o, f) {
+ for (var a = o.coordinates[0], i = 0, n = a.length; i < n; i++) {
+ f.apply(null, a[i]);
+ }
+}
+// TODO breakAtDateLine?
+
+d3.geo.circle = function() {
+ var origin = [0, 0],
+ degrees = 90 - 1e-2,
+ radians = degrees * d3_geo_radians,
+ arc = d3.geo.greatArc().target(Object);
+
+ function circle() {
+ // TODO render a circle as a Polygon
+ }
+
+ function visible(point) {
+ return arc.distance(point) < radians;
+ }
+
+ circle.clip = function(d) {
+ arc.source(typeof origin === "function" ? origin.apply(this, arguments) : origin);
+ return clipType(d);
+ };
+
+ var clipType = d3_geo_type({
+
+ FeatureCollection: function(o) {
+ var features = o.features.map(clipType).filter(Object);
+ return features && (o = Object.create(o), o.features = features, o);
+ },
+
+ Feature: function(o) {
+ var geometry = clipType(o.geometry);
+ return geometry && (o = Object.create(o), o.geometry = geometry, o);
+ },
+
+ Point: function(o) {
+ return visible(o.coordinates) && o;
+ },
+
+ MultiPoint: function(o) {
+ var coordinates = o.coordinates.filter(visible);
+ return coordinates.length && {
+ type: o.type,
+ coordinates: coordinates
+ };
+ },
+
+ LineString: function(o) {
+ var coordinates = clip(o.coordinates);
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ MultiLineString: function(o) {
+ var coordinates = o.coordinates.map(clip).filter(function(d) { return d.length; });
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ Polygon: function(o) {
+ var coordinates = o.coordinates.map(clip);
+ return coordinates[0].length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ MultiPolygon: function(o) {
+ var coordinates = o.coordinates.map(function(d) { return d.map(clip); }).filter(function(d) { return d[0].length; });
+ return coordinates.length && (o = Object.create(o), o.coordinates = coordinates, o);
+ },
+
+ GeometryCollection: function(o) {
+ var geometries = o.geometries.map(clipType).filter(Object);
+ return geometries.length && (o = Object.create(o), o.geometries = geometries, o);
+ }
+
+ });
+
+ function clip(coordinates) {
+ var i = -1,
+ n = coordinates.length,
+ clipped = [],
+ p0,
+ p1,
+ p2,
+ d0,
+ d1;
+
+ while (++i < n) {
+ d1 = arc.distance(p2 = coordinates[i]);
+ if (d1 < radians) {
+ if (p1) clipped.push(d3_geo_greatArcInterpolate(p1, p2)((d0 - radians) / (d0 - d1)));
+ clipped.push(p2);
+ p0 = p1 = null;
+ } else {
+ p1 = p2;
+ if (!p0 && clipped.length) {
+ clipped.push(d3_geo_greatArcInterpolate(clipped[clipped.length - 1], p1)((radians - d0) / (d1 - d0)));
+ p0 = p1;
+ }
+ }
+ d0 = d1;
+ }
+
+ if (p1 && clipped.length) {
+ d1 = arc.distance(p2 = clipped[0]);
+ clipped.push(d3_geo_greatArcInterpolate(p1, p2)((d0 - radians) / (d0 - d1)));
+ }
+
+ return resample(clipped);
+ }
+
+ // Resample coordinates, creating great arcs between each.
+ function resample(coordinates) {
+ var i = 0,
+ n = coordinates.length,
+ j,
+ m,
+ resampled = n ? [coordinates[0]] : coordinates,
+ resamples,
+ origin = arc.source();
+
+ while (++i < n) {
+ resamples = arc.source(coordinates[i - 1])(coordinates[i]).coordinates;
+ for (j = 0, m = resamples.length; ++j < m;) resampled.push(resamples[j]);
+ }
+
+ arc.source(origin);
+ return resampled;
+ }
+
+ circle.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ return circle;
+ };
+
+ circle.angle = function(x) {
+ if (!arguments.length) return degrees;
+ radians = (degrees = +x) * d3_geo_radians;
+ return circle;
+ };
+
+ // Precision is specified in degrees.
+ circle.precision = function(x) {
+ if (!arguments.length) return arc.precision();
+ arc.precision(x);
+ return circle;
+ };
+
+ return circle;
+}
+d3.geo.greatArc = function() {
+ var source = d3_geo_greatArcSource,
+ target = d3_geo_greatArcTarget,
+ precision = 6 * d3_geo_radians;
+
+ function greatArc() {
+ var a = typeof source === "function" ? source.apply(this, arguments) : source,
+ b = typeof target === "function" ? target.apply(this, arguments) : target,
+ i = d3_geo_greatArcInterpolate(a, b),
+ dt = precision / i.d,
+ t = 0,
+ coordinates = [a];
+ while ((t += dt) < 1) coordinates.push(i(t));
+ coordinates.push(b);
+ return {
+ type: "LineString",
+ coordinates: coordinates
+ };
+ }
+
+ // Length returned in radians; multiply by radius for distance.
+ greatArc.distance = function() {
+ var a = typeof source === "function" ? source.apply(this, arguments) : source,
+ b = typeof target === "function" ? target.apply(this, arguments) : target;
+ return d3_geo_greatArcInterpolate(a, b).d;
+ };
+
+ greatArc.source = function(x) {
+ if (!arguments.length) return source;
+ source = x;
+ return greatArc;
+ };
+
+ greatArc.target = function(x) {
+ if (!arguments.length) return target;
+ target = x;
+ return greatArc;
+ };
+
+ // Precision is specified in degrees.
+ greatArc.precision = function(x) {
+ if (!arguments.length) return precision / d3_geo_radians;
+ precision = x * d3_geo_radians;
+ return greatArc;
+ };
+
+ return greatArc;
+};
+
+function d3_geo_greatArcSource(d) {
+ return d.source;
+}
+
+function d3_geo_greatArcTarget(d) {
+ return d.target;
+}
+
+function d3_geo_greatArcInterpolate(a, b) {
+ var x0 = a[0] * d3_geo_radians, cx0 = Math.cos(x0), sx0 = Math.sin(x0),
+ y0 = a[1] * d3_geo_radians, cy0 = Math.cos(y0), sy0 = Math.sin(y0),
+ x1 = b[0] * d3_geo_radians, cx1 = Math.cos(x1), sx1 = Math.sin(x1),
+ y1 = b[1] * d3_geo_radians, cy1 = Math.cos(y1), sy1 = Math.sin(y1),
+ d = interpolate.d = Math.acos(Math.max(-1, Math.min(1, sy0 * sy1 + cy0 * cy1 * Math.cos(x1 - x0)))),
+ sd = Math.sin(d);
+
+ // From http://williams.best.vwh.net/avform.htm#Intermediate
+ function interpolate(t) {
+ var A = Math.sin(d - (t *= d)) / sd,
+ B = Math.sin(t) / sd,
+ x = A * cy0 * cx0 + B * cy1 * cx1,
+ y = A * cy0 * sx0 + B * cy1 * sx1,
+ z = A * sy0 + B * sy1;
+ return [
+ Math.atan2(y, x) / d3_geo_radians,
+ Math.atan2(z, Math.sqrt(x * x + y * y)) / d3_geo_radians
+ ];
+ }
+
+ return interpolate;
+}
+d3.geo.greatCircle = d3.geo.circle;
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js
new file mode 100644
index 0000000..d860c2b
--- /dev/null
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js
@@ -0,0 +1,835 @@
+(function(){d3.geom = {};
+/**
+ * Computes a contour for a given input grid function using the <a
+ * href="http://en.wikipedia.org/wiki/Marching_squares">marching
+ * squares</a> algorithm. Returns the contour polygon as an array of points.
+ *
+ * @param grid a two-input function(x, y) that returns true for values
+ * inside the contour and false for values outside the contour.
+ * @param start an optional starting point [x, y] on the grid.
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.contour = function(grid, start) {
+ var s = start || d3_geom_contourStart(grid), // starting point
+ c = [], // contour polygon
+ x = s[0], // current x position
+ y = s[1], // current y position
+ dx = 0, // next x direction
+ dy = 0, // next y direction
+ pdx = NaN, // previous x direction
+ pdy = NaN, // previous y direction
+ i = 0;
+
+ do {
+ // determine marching squares index
+ i = 0;
+ if (grid(x-1, y-1)) i += 1;
+ if (grid(x, y-1)) i += 2;
+ if (grid(x-1, y )) i += 4;
+ if (grid(x, y )) i += 8;
+
+ // determine next direction
+ if (i === 6) {
+ dx = pdy === -1 ? -1 : 1;
+ dy = 0;
+ } else if (i === 9) {
+ dx = 0;
+ dy = pdx === 1 ? -1 : 1;
+ } else {
+ dx = d3_geom_contourDx[i];
+ dy = d3_geom_contourDy[i];
+ }
+
+ // update contour polygon
+ if (dx != pdx && dy != pdy) {
+ c.push([x, y]);
+ pdx = dx;
+ pdy = dy;
+ }
+
+ x += dx;
+ y += dy;
+ } while (s[0] != x || s[1] != y);
+
+ return c;
+};
+
+// lookup tables for marching directions
+var d3_geom_contourDx = [1, 0, 1, 1,-1, 0,-1, 1,0, 0,0,0,-1, 0,-1,NaN],
+ d3_geom_contourDy = [0,-1, 0, 0, 0,-1, 0, 0,1,-1,1,1, 0,-1, 0,NaN];
+
+function d3_geom_contourStart(grid) {
+ var x = 0,
+ y = 0;
+
+ // search for a starting point; begin at origin
+ // and proceed along outward-expanding diagonals
+ while (true) {
+ if (grid(x,y)) {
+ return [x,y];
+ }
+ if (x === 0) {
+ x = y + 1;
+ y = 0;
+ } else {
+ x = x - 1;
+ y = y + 1;
+ }
+ }
+}
+/**
+ * Computes the 2D convex hull of a set of points using Graham's scanning
+ * algorithm. The algorithm has been implemented as described in Cormen,
+ * Leiserson, and Rivest's Introduction to Algorithms. The running time of
+ * this algorithm is O(n log n), where n is the number of input points.
+ *
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygon [[x1, y1], [x2, y2], …]
+ */
+d3.geom.hull = function(vertices) {
+ if (vertices.length < 3) return [];
+
+ var len = vertices.length,
+ plen = len - 1,
+ points = [],
+ stack = [],
+ i, j, h = 0, x1, y1, x2, y2, u, v, a, sp;
+
+ // find the starting ref point: leftmost point with the minimum y coord
+ for (i=1; i<len; ++i) {
+ if (vertices[i][1] < vertices[h][1]) {
+ h = i;
+ } else if (vertices[i][1] == vertices[h][1]) {
+ h = (vertices[i][0] < vertices[h][0] ? i : h);
+ }
+ }
+
+ // calculate polar angles from ref point and sort
+ for (i=0; i<len; ++i) {
+ if (i === h) continue;
+ y1 = vertices[i][1] - vertices[h][1];
+ x1 = vertices[i][0] - vertices[h][0];
+ points.push({angle: Math.atan2(y1, x1), index: i});
+ }
+ points.sort(function(a, b) { return a.angle - b.angle; });
+
+ // toss out duplicate angles
+ a = points[0].angle;
+ v = points[0].index;
+ u = 0;
+ for (i=1; i<plen; ++i) {
+ j = points[i].index;
+ if (a == points[i].angle) {
+ // keep angle for point most distant from the reference
+ x1 = vertices[v][0] - vertices[h][0];
+ y1 = vertices[v][1] - vertices[h][1];
+ x2 = vertices[j][0] - vertices[h][0];
+ y2 = vertices[j][1] - vertices[h][1];
+ if ((x1*x1 + y1*y1) >= (x2*x2 + y2*y2)) {
+ points[i].index = -1;
+ } else {
+ points[u].index = -1;
+ a = points[i].angle;
+ u = i;
+ v = j;
+ }
+ } else {
+ a = points[i].angle;
+ u = i;
+ v = j;
+ }
+ }
+
+ // initialize the stack
+ stack.push(h);
+ for (i=0, j=0; i<2; ++j) {
+ if (points[j].index !== -1) {
+ stack.push(points[j].index);
+ i++;
+ }
+ }
+ sp = stack.length;
+
+ // do graham's scan
+ for (; j<plen; ++j) {
+ if (points[j].index === -1) continue; // skip tossed out points
+ while (!d3_geom_hullCCW(stack[sp-2], stack[sp-1], points[j].index, vertices)) {
+ --sp;
+ }
+ stack[sp++] = points[j].index;
+ }
+
+ // construct the hull
+ var poly = [];
+ for (i=0; i<sp; ++i) {
+ poly.push(vertices[stack[i]]);
+ }
+ return poly;
+}
+
+// are three points in counter-clockwise order?
+function d3_geom_hullCCW(i1, i2, i3, v) {
+ var t, a, b, c, d, e, f;
+ t = v[i1]; a = t[0]; b = t[1];
+ t = v[i2]; c = t[0]; d = t[1];
+ t = v[i3]; e = t[0]; f = t[1];
+ return ((f-b)*(c-a) - (d-b)*(e-a)) > 0;
+}
+// Note: requires coordinates to be counterclockwise and convex!
+d3.geom.polygon = function(coordinates) {
+
+ coordinates.area = function() {
+ var i = 0,
+ n = coordinates.length,
+ a = coordinates[n - 1][0] * coordinates[0][1],
+ b = coordinates[n - 1][1] * coordinates[0][0];
+ while (++i < n) {
+ a += coordinates[i - 1][0] * coordinates[i][1];
+ b += coordinates[i - 1][1] * coordinates[i][0];
+ }
+ return (b - a) * .5;
+ };
+
+ coordinates.centroid = function(k) {
+ var i = -1,
+ n = coordinates.length - 1,
+ x = 0,
+ y = 0,
+ a,
+ b,
+ c;
+ if (!arguments.length) k = -1 / (6 * coordinates.area());
+ while (++i < n) {
+ a = coordinates[i];
+ b = coordinates[i + 1];
+ c = a[0] * b[1] - b[0] * a[1];
+ x += (a[0] + b[0]) * c;
+ y += (a[1] + b[1]) * c;
+ }
+ return [x * k, y * k];
+ };
+
+ // The Sutherland-Hodgman clipping algorithm.
+ coordinates.clip = function(subject) {
+ var input,
+ i = -1,
+ n = coordinates.length,
+ j,
+ m,
+ a = coordinates[n - 1],
+ b,
+ c,
+ d;
+ while (++i < n) {
+ input = subject.slice();
+ subject.length = 0;
+ b = coordinates[i];
+ c = input[(m = input.length) - 1];
+ j = -1;
+ while (++j < m) {
+ d = input[j];
+ if (d3_geom_polygonInside(d, a, b)) {
+ if (!d3_geom_polygonInside(c, a, b)) {
+ subject.push(d3_geom_polygonIntersect(c, d, a, b));
+ }
+ subject.push(d);
+ } else if (d3_geom_polygonInside(c, a, b)) {
+ subject.push(d3_geom_polygonIntersect(c, d, a, b));
+ }
+ c = d;
+ }
+ a = b;
+ }
+ return subject;
+ };
+
+ return coordinates;
+};
+
+function d3_geom_polygonInside(p, a, b) {
+ return (b[0] - a[0]) * (p[1] - a[1]) < (b[1] - a[1]) * (p[0] - a[0]);
+}
+
+// Intersect two infinite lines cd and ab.
+function d3_geom_polygonIntersect(c, d, a, b) {
+ var x1 = c[0], x2 = d[0], x3 = a[0], x4 = b[0],
+ y1 = c[1], y2 = d[1], y3 = a[1], y4 = b[1],
+ x13 = x1 - x3,
+ x21 = x2 - x1,
+ x43 = x4 - x3,
+ y13 = y1 - y3,
+ y21 = y2 - y1,
+ y43 = y4 - y3,
+ ua = (x43 * y13 - y43 * x13) / (y43 * x21 - x43 * y21);
+ return [x1 + ua * x21, y1 + ua * y21];
+}
+// Adapted from Nicolas Garcia Belmonte's JIT implementation:
+// http://blog.thejit.org/2010/02/12/voronoi-tessellation/
+// http://blog.thejit.org/assets/voronoijs/voronoi.js
+// See lib/jit/LICENSE for details.
+
+// Notes:
+//
+// This implementation does not clip the returned polygons, so if you want to
+// clip them to a particular shape you will need to do that either in SVG or by
+// post-processing with d3.geom.polygon's clip method.
+//
+// If any vertices are coincident or have NaN positions, the behavior of this
+// method is undefined. Most likely invalid polygons will be returned. You
+// should filter invalid points, and consolidate coincident points, before
+// computing the tessellation.
+
+/**
+ * @param vertices [[x1, y1], [x2, y2], …]
+ * @returns polygons [[[x1, y1], [x2, y2], …], …]
+ */
+d3.geom.voronoi = function(vertices) {
+ var polygons = vertices.map(function() { return []; });
+
+ d3_voronoi_tessellate(vertices, function(e) {
+ var s1,
+ s2,
+ x1,
+ x2,
+ y1,
+ y2;
+ if (e.a === 1 && e.b >= 0) {
+ s1 = e.ep.r;
+ s2 = e.ep.l;
+ } else {
+ s1 = e.ep.l;
+ s2 = e.ep.r;
+ }
+ if (e.a === 1) {
+ y1 = s1 ? s1.y : -1e6;
+ x1 = e.c - e.b * y1;
+ y2 = s2 ? s2.y : 1e6;
+ x2 = e.c - e.b * y2;
+ } else {
+ x1 = s1 ? s1.x : -1e6;
+ y1 = e.c - e.a * x1;
+ x2 = s2 ? s2.x : 1e6;
+ y2 = e.c - e.a * x2;
+ }
+ var v1 = [x1, y1],
+ v2 = [x2, y2];
+ polygons[e.region.l.index].push(v1, v2);
+ polygons[e.region.r.index].push(v1, v2);
+ });
+
+ // Reconnect the polygon segments into counterclockwise loops.
+ return polygons.map(function(polygon, i) {
+ var cx = vertices[i][0],
+ cy = vertices[i][1];
+ polygon.forEach(function(v) {
+ v.angle = Math.atan2(v[0] - cx, v[1] - cy);
+ });
+ return polygon.sort(function(a, b) {
+ return a.angle - b.angle;
+ }).filter(function(d, i) {
+ return !i || (d.angle - polygon[i - 1].angle > 1e-10);
+ });
+ });
+};
+
+var d3_voronoi_opposite = {"l": "r", "r": "l"};
+
+function d3_voronoi_tessellate(vertices, callback) {
+
+ var Sites = {
+ list: vertices
+ .map(function(v, i) {
+ return {
+ index: i,
+ x: v[0],
+ y: v[1]
+ };
+ })
+ .sort(function(a, b) {
+ return a.y < b.y ? -1
+ : a.y > b.y ? 1
+ : a.x < b.x ? -1
+ : a.x > b.x ? 1
+ : 0;
+ }),
+ bottomSite: null
+ };
+
+ var EdgeList = {
+ list: [],
+ leftEnd: null,
+ rightEnd: null,
+
+ init: function() {
+ EdgeList.leftEnd = EdgeList.createHalfEdge(null, "l");
+ EdgeList.rightEnd = EdgeList.createHalfEdge(null, "l");
+ EdgeList.leftEnd.r = EdgeList.rightEnd;
+ EdgeList.rightEnd.l = EdgeList.leftEnd;
+ EdgeList.list.unshift(EdgeList.leftEnd, EdgeList.rightEnd);
+ },
+
+ createHalfEdge: function(edge, side) {
+ return {
+ edge: edge,
+ side: side,
+ vertex: null,
+ "l": null,
+ "r": null
+ };
+ },
+
+ insert: function(lb, he) {
+ he.l = lb;
+ he.r = lb.r;
+ lb.r.l = he;
+ lb.r = he;
+ },
+
+ leftBound: function(p) {
+ var he = EdgeList.leftEnd;
+ do {
+ he = he.r;
+ } while (he != EdgeList.rightEnd && Geom.rightOf(he, p));
+ he = he.l;
+ return he;
+ },
+
+ del: function(he) {
+ he.l.r = he.r;
+ he.r.l = he.l;
+ he.edge = null;
+ },
+
+ right: function(he) {
+ return he.r;
+ },
+
+ left: function(he) {
+ return he.l;
+ },
+
+ leftRegion: function(he) {
+ return he.edge == null
+ ? Sites.bottomSite
+ : he.edge.region[he.side];
+ },
+
+ rightRegion: function(he) {
+ return he.edge == null
+ ? Sites.bottomSite
+ : he.edge.region[d3_voronoi_opposite[he.side]];
+ }
+ };
+
+ var Geom = {
+
+ bisect: function(s1, s2) {
+ var newEdge = {
+ region: {"l": s1, "r": s2},
+ ep: {"l": null, "r": null}
+ };
+
+ var dx = s2.x - s1.x,
+ dy = s2.y - s1.y,
+ adx = dx > 0 ? dx : -dx,
+ ady = dy > 0 ? dy : -dy;
+
+ newEdge.c = s1.x * dx + s1.y * dy
+ + (dx * dx + dy * dy) * .5;
+
+ if (adx > ady) {
+ newEdge.a = 1;
+ newEdge.b = dy / dx;
+ newEdge.c /= dx;
+ } else {
+ newEdge.b = 1;
+ newEdge.a = dx / dy;
+ newEdge.c /= dy;
+ }
+
+ return newEdge;
+ },
+
+ intersect: function(el1, el2) {
+ var e1 = el1.edge,
+ e2 = el2.edge;
+ if (!e1 || !e2 || (e1.region.r == e2.region.r)) {
+ return null;
+ }
+ var d = (e1.a * e2.b) - (e1.b * e2.a);
+ if (Math.abs(d) < 1e-10) {
+ return null;
+ }
+ var xint = (e1.c * e2.b - e2.c * e1.b) / d,
+ yint = (e2.c * e1.a - e1.c * e2.a) / d,
+ e1r = e1.region.r,
+ e2r = e2.region.r,
+ el,
+ e;
+ if ((e1r.y < e2r.y) ||
+ (e1r.y == e2r.y && e1r.x < e2r.x)) {
+ el = el1;
+ e = e1;
+ } else {
+ el = el2;
+ e = e2;
+ }
+ var rightOfSite = (xint >= e.region.r.x);
+ if ((rightOfSite && (el.side === "l")) ||
+ (!rightOfSite && (el.side === "r"))) {
+ return null;
+ }
+ return {
+ x: xint,
+ y: yint
+ };
+ },
+
+ rightOf: function(he, p) {
+ var e = he.edge,
+ topsite = e.region.r,
+ rightOfSite = (p.x > topsite.x);
+
+ if (rightOfSite && (he.side === "l")) {
+ return 1;
+ }
+ if (!rightOfSite && (he.side === "r")) {
+ return 0;
+ }
+ if (e.a === 1) {
+ var dyp = p.y - topsite.y,
+ dxp = p.x - topsite.x,
+ fast = 0,
+ above = 0;
+
+ if ((!rightOfSite && (e.b < 0)) ||
+ (rightOfSite && (e.b >= 0))) {
+ above = fast = (dyp >= e.b * dxp);
+ } else {
+ above = ((p.x + p.y * e.b) > e.c);
+ if (e.b < 0) {
+ above = !above;
+ }
+ if (!above) {
+ fast = 1;
+ }
+ }
+ if (!fast) {
+ var dxs = topsite.x - e.region.l.x;
+ above = (e.b * (dxp * dxp - dyp * dyp)) <
+ (dxs * dyp * (1 + 2 * dxp / dxs + e.b * e.b));
+
+ if (e.b < 0) {
+ above = !above;
+ }
+ }
+ } else /* e.b == 1 */ {
+ var yl = e.c - e.a * p.x,
+ t1 = p.y - yl,
+ t2 = p.x - topsite.x,
+ t3 = yl - topsite.y;
+
+ above = (t1 * t1) > (t2 * t2 + t3 * t3);
+ }
+ return he.side === "l" ? above : !above;
+ },
+
+ endPoint: function(edge, side, site) {
+ edge.ep[side] = site;
+ if (!edge.ep[d3_voronoi_opposite[side]]) return;
+ callback(edge);
+ },
+
+ distance: function(s, t) {
+ var dx = s.x - t.x,
+ dy = s.y - t.y;
+ return Math.sqrt(dx * dx + dy * dy);
+ }
+ };
+
+ var EventQueue = {
+ list: [],
+
+ insert: function(he, site, offset) {
+ he.vertex = site;
+ he.ystar = site.y + offset;
+ for (var i=0, list=EventQueue.list, l=list.length; i<l; i++) {
+ var next = list[i];
+ if (he.ystar > next.ystar ||
+ (he.ystar == next.ystar &&
+ site.x > next.vertex.x)) {
+ continue;
+ } else {
+ break;
+ }
+ }
+ list.splice(i, 0, he);
+ },
+
+ del: function(he) {
+ for (var i=0, ls=EventQueue.list, l=ls.length; i<l && (ls[i] != he); ++i) {}
+ ls.splice(i, 1);
+ },
+
+ empty: function() { return EventQueue.list.length === 0; },
+
+ nextEvent: function(he) {
+ for (var i=0, ls=EventQueue.list, l=ls.length; i<l; ++i) {
+ if (ls[i] == he) return ls[i+1];
+ }
+ return null;
+ },
+
+ min: function() {
+ var elem = EventQueue.list[0];
+ return {
+ x: elem.vertex.x,
+ y: elem.ystar
+ };
+ },
+
+ extractMin: function() {
+ return EventQueue.list.shift();
+ }
+ };
+
+ EdgeList.init();
+ Sites.bottomSite = Sites.list.shift();
+
+ var newSite = Sites.list.shift(), newIntStar;
+ var lbnd, rbnd, llbnd, rrbnd, bisector;
+ var bot, top, temp, p, v;
+ var e, pm;
+
+ while (true) {
+ if (!EventQueue.empty()) {
+ newIntStar = EventQueue.min();
+ }
+ if (newSite && (EventQueue.empty()
+ || newSite.y < newIntStar.y
+ || (newSite.y == newIntStar.y
+ && newSite.x < newIntStar.x))) { //new site is smallest
+ lbnd = EdgeList.leftBound(newSite);
+ rbnd = EdgeList.right(lbnd);
+ bot = EdgeList.rightRegion(lbnd);
+ e = Geom.bisect(bot, newSite);
+ bisector = EdgeList.createHalfEdge(e, "l");
+ EdgeList.insert(lbnd, bisector);
+ p = Geom.intersect(lbnd, bisector);
+ if (p) {
+ EventQueue.del(lbnd);
+ EventQueue.insert(lbnd, p, Geom.distance(p, newSite));
+ }
+ lbnd = bisector;
+ bisector = EdgeList.createHalfEdge(e, "r");
+ EdgeList.insert(lbnd, bisector);
+ p = Geom.intersect(bisector, rbnd);
+ if (p) {
+ EventQueue.insert(bisector, p, Geom.distance(p, newSite));
+ }
+ newSite = Sites.list.shift();
+ } else if (!EventQueue.empty()) { //intersection is smallest
+ lbnd = EventQueue.extractMin();
+ llbnd = EdgeList.left(lbnd);
+ rbnd = EdgeList.right(lbnd);
+ rrbnd = EdgeList.right(rbnd);
+ bot = EdgeList.leftRegion(lbnd);
+ top = EdgeList.rightRegion(rbnd);
+ v = lbnd.vertex;
+ Geom.endPoint(lbnd.edge, lbnd.side, v);
+ Geom.endPoint(rbnd.edge, rbnd.side, v);
+ EdgeList.del(lbnd);
+ EventQueue.del(rbnd);
+ EdgeList.del(rbnd);
+ pm = "l";
+ if (bot.y > top.y) {
+ temp = bot;
+ bot = top;
+ top = temp;
+ pm = "r";
+ }
+ e = Geom.bisect(bot, top);
+ bisector = EdgeList.createHalfEdge(e, pm);
+ EdgeList.insert(llbnd, bisector);
+ Geom.endPoint(e, d3_voronoi_opposite[pm], v);
+ p = Geom.intersect(llbnd, bisector);
+ if (p) {
+ EventQueue.del(llbnd);
+ EventQueue.insert(llbnd, p, Geom.distance(p, bot));
+ }
+ p = Geom.intersect(bisector, rrbnd);
+ if (p) {
+ EventQueue.insert(bisector, p, Geom.distance(p, bot));
+ }
+ } else {
+ break;
+ }
+ }//end while
+
+ for (lbnd = EdgeList.right(EdgeList.leftEnd);
+ lbnd != EdgeList.rightEnd;
+ lbnd = EdgeList.right(lbnd)) {
+ callback(lbnd.edge);
+ }
+}
+/**
+* @param vertices [[x1, y1], [x2, y2], …]
+* @returns triangles [[[x1, y1], [x2, y2], [x3, y3]], …]
+ */
+d3.geom.delaunay = function(vertices) {
+ var edges = vertices.map(function() { return []; }),
+ triangles = [];
+
+ // Use the Voronoi tessellation to determine Delaunay edges.
+ d3_voronoi_tessellate(vertices, function(e) {
+ edges[e.region.l.index].push(vertices[e.region.r.index]);
+ });
+
+ // Reconnect the edges into counterclockwise triangles.
+ edges.forEach(function(edge, i) {
+ var v = vertices[i],
+ cx = v[0],
+ cy = v[1];
+ edge.forEach(function(v) {
+ v.angle = Math.atan2(v[0] - cx, v[1] - cy);
+ });
+ edge.sort(function(a, b) {
+ return a.angle - b.angle;
+ });
+ for (var j = 0, m = edge.length - 1; j < m; j++) {
+ triangles.push([v, edge[j], edge[j + 1]]);
+ }
+ });
+
+ return triangles;
+};
+// Constructs a new quadtree for the specified array of points. A quadtree is a
+// two-dimensional recursive spatial subdivision. This implementation uses
+// square partitions, dividing each square into four equally-sized squares. Each
+// point exists in a unique node; if multiple points are in the same position,
+// some points may be stored on internal nodes rather than leaf nodes. Quadtrees
+// can be used to accelerate various spatial operations, such as the Barnes-Hut
+// approximation for computing n-body forces, or collision detection.
+d3.geom.quadtree = function(points, x1, y1, x2, y2) {
+ var p,
+ i = -1,
+ n = points.length;
+
+ // Type conversion for deprecated API.
+ if (n && isNaN(points[0].x)) points = points.map(d3_geom_quadtreePoint);
+
+ // Allow bounds to be specified explicitly.
+ if (arguments.length < 5) {
+ if (arguments.length === 3) {
+ y2 = x2 = y1;
+ y1 = x1;
+ } else {
+ x1 = y1 = Infinity;
+ x2 = y2 = -Infinity;
+
+ // Compute bounds.
+ while (++i < n) {
+ p = points[i];
+ if (p.x < x1) x1 = p.x;
+ if (p.y < y1) y1 = p.y;
+ if (p.x > x2) x2 = p.x;
+ if (p.y > y2) y2 = p.y;
+ }
+
+ // Squarify the bounds.
+ var dx = x2 - x1,
+ dy = y2 - y1;
+ if (dx > dy) y2 = y1 + dx;
+ else x2 = x1 + dy;
+ }
+ }
+
+ // Recursively inserts the specified point p at the node n or one of its
+ // descendants. The bounds are defined by [x1, x2] and [y1, y2].
+ function insert(n, p, x1, y1, x2, y2) {
+ if (isNaN(p.x) || isNaN(p.y)) return; // ignore invalid points
+ if (n.leaf) {
+ var v = n.point;
+ if (v) {
+ // If the point at this leaf node is at the same position as the new
+ // point we are adding, we leave the point associated with the
+ // internal node while adding the new point to a child node. This
+ // avoids infinite recursion.
+ if ((Math.abs(v.x - p.x) + Math.abs(v.y - p.y)) < .01) {
+ insertChild(n, p, x1, y1, x2, y2);
+ } else {
+ n.point = null;
+ insertChild(n, v, x1, y1, x2, y2);
+ insertChild(n, p, x1, y1, x2, y2);
+ }
+ } else {
+ n.point = p;
+ }
+ } else {
+ insertChild(n, p, x1, y1, x2, y2);
+ }
+ }
+
+ // Recursively inserts the specified point p into a descendant of node n. The
+ // bounds are defined by [x1, x2] and [y1, y2].
+ function insertChild(n, p, x1, y1, x2, y2) {
+ // Compute the split point, and the quadrant in which to insert p.
+ var sx = (x1 + x2) * .5,
+ sy = (y1 + y2) * .5,
+ right = p.x >= sx,
+ bottom = p.y >= sy,
+ i = (bottom << 1) + right;
+
+ // Recursively insert into the child node.
+ n.leaf = false;
+ n = n.nodes[i] || (n.nodes[i] = d3_geom_quadtreeNode());
+
+ // Update the bounds as we recurse.
+ if (right) x1 = sx; else x2 = sx;
+ if (bottom) y1 = sy; else y2 = sy;
+ insert(n, p, x1, y1, x2, y2);
+ }
+
+ // Create the root node.
+ var root = d3_geom_quadtreeNode();
+
+ root.add = function(p) {
+ insert(root, p, x1, y1, x2, y2);
+ };
+
+ root.visit = function(f) {
+ d3_geom_quadtreeVisit(f, root, x1, y1, x2, y2);
+ };
+
+ // Insert all points.
+ points.forEach(root.add);
+ return root;
+};
+
+function d3_geom_quadtreeNode() {
+ return {
+ leaf: true,
+ nodes: [],
+ point: null
+ };
+}
+
+function d3_geom_quadtreeVisit(f, node, x1, y1, x2, y2) {
+ if (!f(node, x1, y1, x2, y2)) {
+ var sx = (x1 + x2) * .5,
+ sy = (y1 + y2) * .5,
+ children = node.nodes;
+ if (children[0]) d3_geom_quadtreeVisit(f, children[0], x1, y1, sx, sy);
+ if (children[1]) d3_geom_quadtreeVisit(f, children[1], sx, y1, x2, sy);
+ if (children[2]) d3_geom_quadtreeVisit(f, children[2], x1, sy, sx, y2);
+ if (children[3]) d3_geom_quadtreeVisit(f, children[3], sx, sy, x2, y2);
+ }
+}
+
+function d3_geom_quadtreePoint(p) {
+ return {
+ x: p[0],
+ y: p[1]
+ };
+}
+})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
index bfbc7ee..77ee372 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js
@@ -1,22 +1,26 @@
-(function(){d3 = {version: "1.29.1"}; // semver
-if (!Date.now) Date.now = function() {
+(function(){if (!Date.now) Date.now = function() {
return +new Date;
};
-if (!Object.create) Object.create = function(o) {
- /** @constructor */ function f() {}
- f.prototype = o;
- return new f;
-};
+try {
+ document.createElement("div").style.setProperty("opacity", 0, "");
+} catch (error) {
+ var d3_style_prototype = CSSStyleDeclaration.prototype,
+ d3_style_setProperty = d3_style_prototype.setProperty;
+ d3_style_prototype.setProperty = function(name, value, priority) {
+ d3_style_setProperty.call(this, name, value + "", priority);
+ };
+}
+d3 = {version: "2.7.1"}; // semver
var d3_array = d3_arraySlice; // conversion for NodeLists
-function d3_arrayCopy(psuedoarray) {
- var i = -1, n = psuedoarray.length, array = [];
- while (++i < n) array.push(psuedoarray[i]);
+function d3_arrayCopy(pseudoarray) {
+ var i = -1, n = pseudoarray.length, array = [];
+ while (++i < n) array.push(pseudoarray[i]);
return array;
}
-function d3_arraySlice(psuedoarray) {
- return Array.prototype.slice.call(psuedoarray);
+function d3_arraySlice(pseudoarray) {
+ return Array.prototype.slice.call(pseudoarray);
}
try {
@@ -24,21 +28,63 @@ try {
} catch(e) {
d3_array = d3_arrayCopy;
}
+
+var d3_arraySubclass = [].__proto__?
+
+// Until ECMAScript supports array subclassing, prototype injection works well.
+function(array, prototype) {
+ array.__proto__ = prototype;
+}:
+
+// And if your browser doesn't support __proto__, we'll use direct extension.
+function(array, prototype) {
+ for (var property in prototype) array[property] = prototype[property];
+};
+function d3_this() {
+ return this;
+}
d3.functor = function(v) {
return typeof v === "function" ? v : function() { return v; };
};
-// A getter-setter method that preserves the appropriate `this` context.
-d3.rebind = function(object, method) {
+// Copies a variable number of methods from source to target.
+d3.rebind = function(target, source) {
+ var i = 1, n = arguments.length, method;
+ while (++i < n) target[method = arguments[i]] = d3_rebind(target, source, source[method]);
+ return target;
+};
+
+// Method is assumed to be a standard D3 getter-setter:
+// If passed with no arguments, gets the value.
+// If passed with arguments, sets the value and returns the target.
+function d3_rebind(target, source, method) {
return function() {
- var x = method.apply(object, arguments);
- return arguments.length ? object : x;
+ var value = method.apply(source, arguments);
+ return arguments.length ? target : value;
};
-};
+}
d3.ascending = function(a, b) {
- return a < b ? -1 : a > b ? 1 : 0;
+ return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
};
d3.descending = function(a, b) {
- return b < a ? -1 : b > a ? 1 : 0;
+ return b < a ? -1 : b > a ? 1 : b >= a ? 0 : NaN;
+};
+d3.mean = function(array, f) {
+ var n = array.length,
+ a,
+ m = 0,
+ i = -1,
+ j = 0;
+ if (arguments.length === 1) {
+ while (++i < n) if (d3_number(a = array[i])) m += (a - m) / ++j;
+ } else {
+ while (++i < n) if (d3_number(a = f.call(array, array[i], i))) m += (a - m) / ++j;
+ }
+ return j ? m : undefined;
+};
+d3.median = function(array, f) {
+ if (arguments.length > 1) array = array.map(f);
+ array = array.filter(d3_number);
+ return array.length ? d3.quantile(array.sort(d3.ascending), .5) : undefined;
};
d3.min = function(array, f) {
var i = -1,
@@ -68,6 +114,45 @@ d3.max = function(array, f) {
}
return a;
};
+d3.extent = function(array, f) {
+ var i = -1,
+ n = array.length,
+ a,
+ b,
+ c;
+ if (arguments.length === 1) {
+ while (++i < n && ((a = c = array[i]) == null || a != a)) a = c = undefined;
+ while (++i < n) if ((b = array[i]) != null) {
+ if (a > b) a = b;
+ if (c < b) c = b;
+ }
+ } else {
+ while (++i < n && ((a = c = f.call(array, array[i], i)) == null || a != a)) a = undefined;
+ while (++i < n) if ((b = f.call(array, array[i], i)) != null) {
+ if (a > b) a = b;
+ if (c < b) c = b;
+ }
+ }
+ return [a, c];
+};
+d3.random = {
+ normal: function(mean, deviation) {
+ if (arguments.length < 2) deviation = 1;
+ if (arguments.length < 1) mean = 0;
+ return function() {
+ var x, y, r;
+ do {
+ x = Math.random() * 2 - 1;
+ y = Math.random() * 2 - 1;
+ r = x * x + y * y;
+ } while (!r || r > 1);
+ return mean + deviation * x * Math.sqrt(-2 * Math.log(r) / r);
+ };
+ }
+};
+function d3_number(x) {
+ return x != null && !isNaN(x);
+}
d3.sum = function(array, f) {
var s = 0,
n = array.length,
@@ -90,6 +175,9 @@ d3.quantile = function(values, p) {
e = H - h;
return e ? v + e * (values[h] - v) : v;
};
+d3.transpose = function(matrix) {
+ return d3.zip.apply(d3, matrix);
+};
d3.zip = function() {
if (!(n = arguments.length)) return [];
for (var i = -1, m = d3.min(arguments, d3_zipLength), zips = new Array(m); ++i < m;) {
@@ -303,27 +391,19 @@ function d3_splitter(d) {
function d3_collapse(s) {
return s.replace(/(^\s+)|(\s+$)/g, "").replace(/\s+/g, " ");
}
-//
-// Note: assigning to the arguments array simultaneously changes the value of
-// the corresponding argument!
-//
-// TODO The `this` argument probably shouldn't be the first argument to the
-// callback, anyway, since it's redundant. However, that will require a major
-// version bump due to backwards compatibility, so I'm not changing it right
-// away.
-//
-function d3_call(callback) {
- callback.apply(this, (arguments[0] = this, arguments));
- return this;
-}
/**
* @param {number} start
* @param {number=} stop
* @param {number=} step
*/
d3.range = function(start, stop, step) {
- if (arguments.length === 1) { stop = start; start = 0; }
- if (step == null) step = 1;
+ if (arguments.length < 3) {
+ step = 1;
+ if (arguments.length < 2) {
+ stop = start;
+ start = 0;
+ }
+ }
if ((stop - start) / step == Infinity) throw new Error("infinite range");
var range = [],
i = -1,
@@ -336,7 +416,7 @@ d3.requote = function(s) {
return s.replace(d3_requote_re, "\\$&");
};
-var d3_requote_re = /[\\\^\$\*\+\?\[\]\(\)\.\{\}]/g;
+var d3_requote_re = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
d3.round = function(x, n) {
return n
? Math.round(x * Math.pow(10, n)) * Math.pow(10, -n)
@@ -344,9 +424,10 @@ d3.round = function(x, n) {
};
d3.xhr = function(url, mime, callback) {
var req = new XMLHttpRequest;
- if (arguments.length < 3) callback = mime;
+ if (arguments.length < 3) callback = mime, mime = null;
else if (mime && req.overrideMimeType) req.overrideMimeType(mime);
req.open("GET", url, true);
+ if (mime) req.setRequestHeader("Accept", mime);
req.onreadystatechange = function() {
if (req.readyState === 4) callback(req.status < 300 ? req : null);
};
@@ -387,66 +468,79 @@ d3.xml = function(url, mime, callback) {
}
d3.xhr(url, mime, ready);
};
-d3.ns = {
-
- prefix: {
- svg: "http://www.w3.org/2000/svg",
- xhtml: "http://www.w3.org/1999/xhtml",
- xlink: "http://www.w3.org/1999/xlink",
- xml: "http://www.w3.org/XML/1998/namespace",
- xmlns: "http://www.w3.org/2000/xmlns/"
- },
+var d3_nsPrefix = {
+ svg: "http://www.w3.org/2000/svg",
+ xhtml: "http://www.w3.org/1999/xhtml",
+ xlink: "http://www.w3.org/1999/xlink",
+ xml: "http://www.w3.org/XML/1998/namespace",
+ xmlns: "http://www.w3.org/2000/xmlns/"
+};
+d3.ns = {
+ prefix: d3_nsPrefix,
qualify: function(name) {
var i = name.indexOf(":");
- return i < 0 ? name : {
- space: d3.ns.prefix[name.substring(0, i)],
- local: name.substring(i + 1)
- };
+ return i < 0 ? (name in d3_nsPrefix
+ ? {space: d3_nsPrefix[name], local: name} : name)
+ : {space: d3_nsPrefix[name.substring(0, i)], local: name.substring(i + 1)};
}
-
};
-/** @param {...string} types */
-d3.dispatch = function(types) {
- var dispatch = {},
- type;
- for (var i = 0, n = arguments.length; i < n; i++) {
- type = arguments[i];
- dispatch[type] = d3_dispatch(type);
- }
+d3.dispatch = function() {
+ var dispatch = new d3_dispatch(),
+ i = -1,
+ n = arguments.length;
+ while (++i < n) dispatch[arguments[i]] = d3_dispatch_event();
return dispatch;
};
-function d3_dispatch(type) {
- var dispatch = {},
- listeners = [];
+function d3_dispatch() {}
- dispatch.add = function(listener) {
- for (var i = 0; i < listeners.length; i++) {
- if (listeners[i].listener == listener) return dispatch; // already registered
- }
- listeners.push({listener: listener, on: true});
- return dispatch;
- };
+d3_dispatch.prototype.on = function(type, listener) {
+ var i = type.indexOf("."),
+ name = "";
- dispatch.remove = function(listener) {
- for (var i = 0; i < listeners.length; i++) {
- var l = listeners[i];
- if (l.listener == listener) {
- l.on = false;
- listeners = listeners.slice(0, i).concat(listeners.slice(i + 1));
- break;
- }
+ // Extract optional namespace, e.g., "click.foo"
+ if (i > 0) {
+ name = type.substring(i + 1);
+ type = type.substring(0, i);
+ }
+
+ return arguments.length < 2
+ ? this[type].on(name)
+ : (this[type].on(name, listener), this);
+};
+
+function d3_dispatch_event() {
+ var listeners = [],
+ listenerByName = {};
+
+ function dispatch() {
+ var z = listeners, // defensive reference
+ i = -1,
+ n = z.length,
+ l;
+ while (++i < n) if (l = z[i].on) l.apply(this, arguments);
+ }
+
+ dispatch.on = function(name, listener) {
+ var l, i;
+
+ // return the current listener, if any
+ if (arguments.length < 2) return (l = listenerByName[name]) && l.on;
+
+ // remove the old listener, if any (with copy-on-write)
+ if (l = listenerByName[name]) {
+ l.on = null;
+ listeners = listeners.slice(0, i = listeners.indexOf(l)).concat(listeners.slice(i + 1));
+ delete listenerByName[name];
}
- return dispatch;
- };
- dispatch.dispatch = function() {
- var ls = listeners; // defensive reference
- for (var i = 0, n = ls.length; i < n; i++) {
- var l = ls[i];
- if (l.on) l.listener.apply(this, arguments);
+ // add the new listener, if any
+ if (listener) {
+ listeners.push(listenerByName[name] = {on: listener});
}
+
+ return dispatch;
};
return dispatch;
@@ -461,10 +555,11 @@ d3.format = function(specifier) {
comma = match[7],
precision = match[8],
type = match[9],
- percentage = false,
+ scale = 1,
+ suffix = "",
integer = false;
- if (precision) precision = precision.substring(1);
+ if (precision) precision = +precision.substring(1);
if (zfill) {
fill = "0"; // TODO align = "=";
@@ -473,22 +568,36 @@ d3.format = function(specifier) {
switch (type) {
case "n": comma = true; type = "g"; break;
- case "%": percentage = true; type = "f"; break;
- case "p": percentage = true; type = "r"; break;
- case "d": integer = true; precision = "0"; break;
+ case "%": scale = 100; suffix = "%"; type = "f"; break;
+ case "p": scale = 100; suffix = "%"; type = "r"; break;
+ case "d": integer = true; precision = 0; break;
+ case "s": scale = -1; type = "r"; break;
}
+ // If no precision is specified for r, fallback to general notation.
+ if (type == "r" && !precision) type = "g";
+
type = d3_format_types[type] || d3_format_typeDefault;
return function(value) {
- var number = percentage ? value * 100 : +value,
- negative = (number < 0) && (number = -number) ? "\u2212" : sign;
// Return the empty string for floats formatted as ints.
- if (integer && (number % 1)) return "";
+ if (integer && (value % 1)) return "";
+
+ // Convert negative to positive, and record the sign prefix.
+ var negative = (value < 0) && (value = -value) ? "\u2212" : sign;
- // Convert the input value to the desired precision.
- value = type(number, precision);
+ // Apply the scale, computing it from the value's exponent for si format.
+ if (scale < 0) {
+ var prefix = d3.formatPrefix(value, precision);
+ value *= prefix.scale;
+ suffix = prefix.symbol;
+ } else {
+ value *= scale;
+ }
+
+ // Convert to the desired precision.
+ value = type(value, precision);
// If the fill character is 0, the sign and group is applied after the fill.
if (zfill) {
@@ -505,9 +614,8 @@ d3.format = function(specifier) {
var length = value.length;
if (length < width) value = new Array(width - length + 1).join(fill) + value;
}
- if (percentage) value += "%";
- return value;
+ return value + suffix;
};
};
@@ -518,12 +626,13 @@ var d3_format_types = {
g: function(x, p) { return x.toPrecision(p); },
e: function(x, p) { return x.toExponential(p); },
f: function(x, p) { return x.toFixed(p); },
- r: function(x, p) {
- var n = 1 + Math.floor(1e-15 + Math.log(x) / Math.LN10);
- return d3.round(x, p - n).toFixed(Math.max(0, p - n));
- }
+ r: function(x, p) { return d3.round(x, p = d3_format_precision(x, p)).toFixed(Math.max(0, Math.min(20, p))); }
};
+function d3_format_precision(x, p) {
+ return p - (x ? 1 + Math.floor(Math.log(x + Math.pow(10, 1 + Math.floor(Math.log(x) / Math.LN10) - p)) / Math.LN10) : 1);
+}
+
function d3_format_typeDefault(x) {
return x + "";
}
@@ -536,6 +645,26 @@ function d3_format_group(value) {
while (i > 0) t.push(value.substring(i -= 3, i + 3));
return t.reverse().join(",") + f;
}
+var d3_formatPrefixes = ["y","z","a","f","p","n","μ","m","","k","M","G","T","P","E","Z","Y"].map(d3_formatPrefix);
+
+d3.formatPrefix = function(value, precision) {
+ var i = 0;
+ if (value) {
+ if (value < 0) value *= -1;
+ if (precision) value = d3.round(value, d3_format_precision(value, precision));
+ i = 1 + Math.floor(1e-12 + Math.log(value) / Math.LN10);
+ i = Math.max(-24, Math.min(24, Math.floor((i <= 0 ? i + 1 : i - 1) / 3) * 3));
+ }
+ return d3_formatPrefixes[8 + i / 3];
+};
+
+function d3_formatPrefix(d, i) {
+ return {
+ scale: Math.pow(10, (8 - i) * 3),
+ symbol: d
+ };
+}
+
/*
* TERMS OF USE - EASING EQUATIONS
*
@@ -598,9 +727,15 @@ d3.ease = function(name) {
var i = name.indexOf("-"),
t = i >= 0 ? name.substring(0, i) : name,
m = i >= 0 ? name.substring(i + 1) : "in";
- return d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1)));
+ return d3_ease_clamp(d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1))));
};
+function d3_ease_clamp(f) {
+ return function(t) {
+ return t <= 0 ? 0 : t >= 1 ? 1 : f(t);
+ };
+}
+
function d3_ease_reverse(f) {
return function(t) {
return 1 - f(1 - t);
@@ -628,7 +763,7 @@ function d3_ease_sin(t) {
}
function d3_ease_exp(t) {
- return t ? Math.pow(2, 10 * (t - 1)) - 1e-3 : 0;
+ return Math.pow(2, 10 * (t - 1));
}
function d3_ease_circle(t) {
@@ -659,6 +794,11 @@ function d3_ease_bounce(t) {
: 7.5625 * (t -= 2.625 / 2.75) * t + .984375;
}
d3.event = null;
+
+function d3_eventCancel() {
+ d3.event.stopPropagation();
+ d3.event.preventDefault();
+}
d3.interpolate = function(a, b) {
var i = d3.interpolators.length, f;
while (--i >= 0 && !(f = d3.interpolators[i](a, b)));
@@ -753,6 +893,10 @@ d3.interpolateString = function(a, b) {
};
};
+d3.interpolateTransform = function(a, b) {
+ return d3.interpolateString(d3.transform(a) + "", d3.transform(b) + "");
+};
+
d3.interpolateRgb = function(a, b) {
a = d3.rgb(a);
b = d3.rgb(b);
@@ -763,10 +907,10 @@ d3.interpolateRgb = function(a, b) {
bg = b.g - ag,
bb = b.b - ab;
return function(t) {
- return "rgb(" + Math.round(ar + br * t)
- + "," + Math.round(ag + bg * t)
- + "," + Math.round(ab + bb * t)
- + ")";
+ return "#"
+ + d3_rgb_hex(Math.round(ar + br * t))
+ + d3_rgb_hex(Math.round(ag + bg * t))
+ + d3_rgb_hex(Math.round(ab + bb * t));
};
};
@@ -823,34 +967,34 @@ d3.interpolateObject = function(a, b) {
};
}
-var d3_interpolate_number = /[-+]?(?:\d+\.\d+|\d+\.|\.\d+|\d+)(?:[eE][-]?\d+)?/g,
- d3_interpolate_rgb = {background: 1, fill: 1, stroke: 1};
+var d3_interpolate_number = /[-+]?(?:\d*\.?\d+)(?:[eE][-+]?\d+)?/g;
function d3_interpolateByName(n) {
- return n in d3_interpolate_rgb || /\bcolor\b/.test(n)
- ? d3.interpolateRgb
+ return n == "transform"
+ ? d3.interpolateTransform
: d3.interpolate;
}
d3.interpolators = [
d3.interpolateObject,
function(a, b) { return (b instanceof Array) && d3.interpolateArray(a, b); },
- function(a, b) { return (typeof b === "string") && d3.interpolateString(String(a), b); },
- function(a, b) { return (b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b)) && d3.interpolateRgb(String(a), b); },
- function(a, b) { return (typeof b === "number") && d3.interpolateNumber(+a, b); }
+ function(a, b) { return (typeof a === "string" || typeof b === "string") && d3.interpolateString(a + "", b + ""); },
+ function(a, b) { return (typeof b === "string" ? b in d3_rgb_names || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Rgb || b instanceof d3_Hsl) && d3.interpolateRgb(a, b); },
+ function(a, b) { return !isNaN(a = +a) && !isNaN(b = +b) && d3.interpolateNumber(a, b); }
];
function d3_uninterpolateNumber(a, b) {
- b = 1 / (b - (a = +a));
+ b = b - (a = +a) ? 1 / (b - a) : 0;
return function(x) { return (x - a) * b; };
}
function d3_uninterpolateClamp(a, b) {
- b = 1 / (b - (a = +a));
+ b = b - (a = +a) ? 1 / (b - a) : 0;
return function(x) { return Math.max(0, Math.min(1, (x - a) * b)); };
}
d3.rgb = function(r, g, b) {
return arguments.length === 1
- ? d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb)
+ ? (r instanceof d3_Rgb ? d3_rgb(r.r, r.g, r.b)
+ : d3_rgb_parse("" + r, d3_rgb, d3_hsl_rgb))
: d3_rgb(~~r, ~~g, ~~b);
};
@@ -875,17 +1019,17 @@ d3_Rgb.prototype.brighter = function(k) {
if (g && g < i) g = i;
if (b && b < i) b = i;
return d3_rgb(
- Math.min(255, Math.floor(r / k)),
- Math.min(255, Math.floor(g / k)),
- Math.min(255, Math.floor(b / k)));
+ Math.min(255, Math.floor(r / k)),
+ Math.min(255, Math.floor(g / k)),
+ Math.min(255, Math.floor(b / k)));
};
d3_Rgb.prototype.darker = function(k) {
k = Math.pow(0.7, arguments.length ? k : 1);
return d3_rgb(
- Math.max(0, Math.floor(k * this.r)),
- Math.max(0, Math.floor(k * this.g)),
- Math.max(0, Math.floor(k * this.b)));
+ Math.floor(k * this.r),
+ Math.floor(k * this.g),
+ Math.floor(k * this.b));
};
d3_Rgb.prototype.hsl = function() {
@@ -897,7 +1041,9 @@ d3_Rgb.prototype.toString = function() {
};
function d3_rgb_hex(v) {
- return v < 0x10 ? "0" + v.toString(16) : v.toString(16);
+ return v < 0x10
+ ? "0" + Math.max(0, v).toString(16)
+ : Math.min(255, v).toString(16);
}
function d3_rgb_parse(format, rgb, hsl) {
@@ -1134,7 +1280,8 @@ for (var d3_rgb_name in d3_rgb_names) {
}
d3.hsl = function(h, s, l) {
return arguments.length === 1
- ? d3_rgb_parse("" + h, d3_rgb_hsl, d3_hsl)
+ ? (h instanceof d3_Hsl ? d3_hsl(h.h, h.s, h.l)
+ : d3_rgb_parse("" + h, d3_rgb_hsl, d3_hsl))
: d3_hsl(+h, +s, +l);
};
@@ -1163,7 +1310,7 @@ d3_Hsl.prototype.rgb = function() {
};
d3_Hsl.prototype.toString = function() {
- return "hsl(" + this.h + "," + this.s * 100 + "%," + this.l * 100 + "%)";
+ return this.rgb().toString();
};
function d3_hsl_rgb(h, s, l) {
@@ -1194,906 +1341,859 @@ function d3_hsl_rgb(h, s, l) {
return d3_rgb(vv(h + 120), vv(h), vv(h - 120));
}
+function d3_selection(groups) {
+ d3_arraySubclass(groups, d3_selectionPrototype);
+ return groups;
+}
+
var d3_select = function(s, n) { return n.querySelector(s); },
- d3_selectAll = function(s, n) { return d3_array(n.querySelectorAll(s)); };
+ d3_selectAll = function(s, n) { return n.querySelectorAll(s); },
+ d3_selectRoot = document.documentElement,
+ d3_selectMatcher = d3_selectRoot.matchesSelector || d3_selectRoot.webkitMatchesSelector || d3_selectRoot.mozMatchesSelector || d3_selectRoot.msMatchesSelector || d3_selectRoot.oMatchesSelector,
+ d3_selectMatches = function(n, s) { return d3_selectMatcher.call(n, s); };
-// Use Sizzle, if available.
+// Prefer Sizzle, if available.
if (typeof Sizzle === "function") {
d3_select = function(s, n) { return Sizzle(s, n)[0]; };
d3_selectAll = function(s, n) { return Sizzle.uniqueSort(Sizzle(s, n)); };
+ d3_selectMatches = Sizzle.matchesSelector;
}
-var d3_root = d3_selection([[document]]);
-d3_root[0].parentNode = document.documentElement;
-
-// TODO fast singleton implementation!
-d3.select = function(selector) {
- return typeof selector === "string"
- ? d3_root.select(selector)
- : d3_selection([[selector]]); // assume node
-};
+var d3_selectionPrototype = [];
-d3.selectAll = function(selector) {
- return typeof selector === "string"
- ? d3_root.selectAll(selector)
- : d3_selection([d3_array(selector)]); // assume node[]
+d3.selection = function() {
+ return d3_selectionRoot;
};
-function d3_selection(groups) {
-
- function select(select) {
- var subgroups = [],
- subgroup,
- subnode,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroup.push(subnode = select(node));
- if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
- } else {
- subgroup.push(null);
- }
- }
- }
- return d3_selection(subgroups);
- }
-
- function selectAll(selectAll) {
- var subgroups = [],
- subgroup,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroups.push(subgroup = selectAll(node));
- subgroup.parentNode = node;
- }
- }
- }
- return d3_selection(subgroups);
- }
-
- // TODO select(function)?
- groups.select = function(selector) {
- return select(function(node) {
- return d3_select(selector, node);
- });
- };
-
- // TODO selectAll(function)?
- groups.selectAll = function(selector) {
- return selectAll(function(node) {
- return d3_selectAll(selector, node);
- });
- };
-
- // TODO preserve null elements to maintain index?
- groups.filter = function(filter) {
- var subgroups = [],
- subgroup,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if ((node = group[i]) && filter.call(node, node.__data__, i)) {
- subgroup.push(node);
- }
- }
- }
- return d3_selection(subgroups);
- };
-
- groups.map = function(map) {
- var group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) node.__data__ = map.call(node, node.__data__, i);
- }
- }
- return groups;
- };
-
- // TODO data(null) for clearing data?
- groups.data = function(data, join) {
- var enter = [],
- update = [],
- exit = [];
-
- function bind(group, groupData) {
- var i = 0,
- n = group.length,
- m = groupData.length,
- n0 = Math.min(n, m),
- n1 = Math.max(n, m),
- updateNodes = [],
- enterNodes = [],
- exitNodes = [],
- node,
- nodeData;
-
- if (join) {
- var nodeByKey = {},
- keys = [],
- key,
- j = groupData.length;
-
- for (i = 0; i < n; i++) {
- key = join.call(node = group[i], node.__data__, i);
- if (key in nodeByKey) {
- exitNodes[j++] = node; // duplicate key
- } else {
- nodeByKey[key] = node;
- }
- keys.push(key);
- }
-
- for (i = 0; i < m; i++) {
- node = nodeByKey[key = join.call(groupData, nodeData = groupData[i], i)];
- if (node) {
- node.__data__ = nodeData;
- updateNodes[i] = node;
- enterNodes[i] = exitNodes[i] = null;
- } else {
- enterNodes[i] = d3_selection_enterNode(nodeData);
- updateNodes[i] = exitNodes[i] = null;
- }
- delete nodeByKey[key];
- }
-
- for (i = 0; i < n; i++) {
- if (keys[i] in nodeByKey) {
- exitNodes[i] = group[i];
- }
- }
+d3.selection.prototype = d3_selectionPrototype;
+d3_selectionPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ group,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selector(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = (group = this[j]).parentNode;
+ for (var i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroup.push(subnode = selector.call(node, node.__data__, i));
+ if (subnode && "__data__" in node) subnode.__data__ = node.__data__;
} else {
- for (; i < n0; i++) {
- node = group[i];
- nodeData = groupData[i];
- if (node) {
- node.__data__ = nodeData;
- updateNodes[i] = node;
- enterNodes[i] = exitNodes[i] = null;
- } else {
- enterNodes[i] = d3_selection_enterNode(nodeData);
- updateNodes[i] = exitNodes[i] = null;
- }
- }
- for (; i < m; i++) {
- enterNodes[i] = d3_selection_enterNode(groupData[i]);
- updateNodes[i] = exitNodes[i] = null;
- }
- for (; i < n1; i++) {
- exitNodes[i] = group[i];
- enterNodes[i] = updateNodes[i] = null;
- }
- }
-
- enterNodes.parentNode
- = updateNodes.parentNode
- = exitNodes.parentNode
- = group.parentNode;
-
- enter.push(enterNodes);
- update.push(updateNodes);
- exit.push(exitNodes);
- }
-
- var i = -1,
- n = groups.length,
- group;
- if (typeof data === "function") {
- while (++i < n) {
- bind(group = groups[i], data.call(group, group.parentNode.__data__, i));
- }
- } else {
- while (++i < n) {
- bind(group = groups[i], data);
+ subgroup.push(null);
}
}
+ }
- var selection = d3_selection(update);
- selection.enter = function() {
- return d3_selectionEnter(enter);
- };
- selection.exit = function() {
- return d3_selection(exit);
- };
- return selection;
- };
+ return d3_selection(subgroups);
+};
- // TODO mask forEach? or rename for eachData?
- // TODO offer the same semantics for map, reduce, etc.?
- groups.each = function(callback) {
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- var node = group[i];
- if (node) callback.call(node, node.__data__, i);
- }
- }
- return groups;
+function d3_selection_selector(selector) {
+ return function() {
+ return d3_select(selector, this);
};
-
- function first(callback) {
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- for (var i = 0, n = group.length; i < n; i++) {
- var node = group[i];
- if (node) return callback.call(node, node.__data__, i);
+}
+d3_selectionPrototype.selectAll = function(selector) {
+ var subgroups = [],
+ subgroup,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selectorAll(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroups.push(subgroup = d3_array(selector.call(node, node.__data__, i)));
+ subgroup.parentNode = node;
}
}
- return null;
}
- groups.empty = function() {
- return !first(function() { return true; });
- };
+ return d3_selection(subgroups);
+};
- groups.node = function() {
- return first(function() { return this; });
+function d3_selection_selectorAll(selector) {
+ return function() {
+ return d3_selectAll(selector, this);
};
+}
+d3_selectionPrototype.attr = function(name, value) {
+ name = d3.ns.qualify(name);
+
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) {
+ var node = this.node();
+ return name.local
+ ? node.getAttributeNS(name.space, name.local)
+ : node.getAttribute(name);
+ }
- groups.attr = function(name, value) {
- name = d3.ns.qualify(name);
-
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(name.local
- ? function() { return this.getAttributeNS(name.space, name.local); }
- : function() { return this.getAttribute(name); });
- }
-
- /** @this {Element} */
- function attrNull() {
- this.removeAttribute(name);
- }
+ function attrNull() {
+ this.removeAttribute(name);
+ }
- /** @this {Element} */
- function attrNullNS() {
- this.removeAttributeNS(name.space, name.local);
- }
+ function attrNullNS() {
+ this.removeAttributeNS(name.space, name.local);
+ }
- /** @this {Element} */
- function attrConstant() {
- this.setAttribute(name, value);
- }
+ function attrConstant() {
+ this.setAttribute(name, value);
+ }
- /** @this {Element} */
- function attrConstantNS() {
- this.setAttributeNS(name.space, name.local, value);
- }
+ function attrConstantNS() {
+ this.setAttributeNS(name.space, name.local, value);
+ }
- /** @this {Element} */
- function attrFunction() {
- var x = value.apply(this, arguments);
- if (x == null) this.removeAttribute(name);
- else this.setAttribute(name, x);
- }
+ function attrFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.removeAttribute(name);
+ else this.setAttribute(name, x);
+ }
- /** @this {Element} */
- function attrFunctionNS() {
- var x = value.apply(this, arguments);
- if (x == null) this.removeAttributeNS(name.space, name.local);
- else this.setAttributeNS(name.space, name.local, x);
- }
+ function attrFunctionNS() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.removeAttributeNS(name.space, name.local);
+ else this.setAttributeNS(name.space, name.local, x);
+ }
- return groups.each(value == null
- ? (name.local ? attrNullNS : attrNull) : (typeof value === "function"
- ? (name.local ? attrFunctionNS : attrFunction)
- : (name.local ? attrConstantNS : attrConstant)));
- };
+ return this.each(value == null
+ ? (name.local ? attrNullNS : attrNull) : (typeof value === "function"
+ ? (name.local ? attrFunctionNS : attrFunction)
+ : (name.local ? attrConstantNS : attrConstant)));
+};
+d3_selectionPrototype.classed = function(name, value) {
+ var names = name.split(d3_selection_classedWhitespace),
+ n = names.length,
+ i = -1;
+ if (arguments.length > 1) {
+ while (++i < n) d3_selection_classed.call(this, names[i], value);
+ return this;
+ } else {
+ while (++i < n) if (!d3_selection_classed.call(this, names[i])) return false;
+ return true;
+ }
+};
- groups.classed = function(name, value) {
- var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
+var d3_selection_classedWhitespace = /\s+/g;
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- if (c = this.classList) return c.contains(name);
- var c = this.className;
- re.lastIndex = 0;
- return re.test(c.baseVal != null ? c.baseVal : c);
- });
- }
+function d3_selection_classed(name, value) {
+ var re = new RegExp("(^|\\s+)" + d3.requote(name) + "(\\s+|$)", "g");
- /** @this {Element} */
- function classedAdd() {
- if (c = this.classList) return c.add(name);
- var c = this.className,
- cb = c.baseVal != null,
- cv = cb ? c.baseVal : c;
- re.lastIndex = 0;
- if (!re.test(cv)) {
- cv = d3_collapse(cv + " " + name);
- if (cb) c.baseVal = cv;
- else this.className = cv;
- }
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) {
+ var node = this.node();
+ if (c = node.classList) return c.contains(name);
+ var c = node.className;
+ re.lastIndex = 0;
+ return re.test(c.baseVal != null ? c.baseVal : c);
+ }
- /** @this {Element} */
- function classedRemove() {
- if (c = this.classList) return c.remove(name);
- var c = this.className,
- cb = c.baseVal != null,
- cv = cb ? c.baseVal : c;
- cv = d3_collapse(cv.replace(re, " "));
+ function classedAdd() {
+ if (c = this.classList) return c.add(name);
+ var c = this.className,
+ cb = c.baseVal != null,
+ cv = cb ? c.baseVal : c;
+ re.lastIndex = 0;
+ if (!re.test(cv)) {
+ cv = d3_collapse(cv + " " + name);
if (cb) c.baseVal = cv;
else this.className = cv;
}
+ }
- /** @this {Element} */
- function classedFunction() {
- (value.apply(this, arguments)
- ? classedAdd
- : classedRemove).call(this);
- }
+ function classedRemove() {
+ if (c = this.classList) return c.remove(name);
+ var c = this.className,
+ cb = c.baseVal != null,
+ cv = cb ? c.baseVal : c;
+ cv = d3_collapse(cv.replace(re, " "));
+ if (cb) c.baseVal = cv;
+ else this.className = cv;
+ }
- return groups.each(typeof value === "function"
- ? classedFunction : value
+ function classedFunction() {
+ (value.apply(this, arguments)
? classedAdd
- : classedRemove);
- };
-
- groups.style = function(name, value, priority) {
- if (arguments.length < 3) priority = "";
+ : classedRemove).call(this);
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- return window.getComputedStyle(this, null).getPropertyValue(name);
- });
- }
+ return this.each(typeof value === "function"
+ ? classedFunction : value
+ ? classedAdd
+ : classedRemove);
+}
+d3_selectionPrototype.style = function(name, value, priority) {
+ if (arguments.length < 3) priority = "";
- /** @this {Element} */
- function styleNull() {
- this.style.removeProperty(name);
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) return window
+ .getComputedStyle(this.node(), null)
+ .getPropertyValue(name);
- /** @this {Element} */
- function styleConstant() {
- this.style.setProperty(name, value, priority);
- }
+ function styleNull() {
+ this.style.removeProperty(name);
+ }
- /** @this {Element} */
- function styleFunction() {
- var x = value.apply(this, arguments);
- if (x == null) this.style.removeProperty(name);
- else this.style.setProperty(name, x, priority);
- }
+ function styleConstant() {
+ this.style.setProperty(name, value, priority);
+ }
- return groups.each(value == null
- ? styleNull : (typeof value === "function"
- ? styleFunction : styleConstant));
- };
+ function styleFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) this.style.removeProperty(name);
+ else this.style.setProperty(name, x, priority);
+ }
- groups.property = function(name, value) {
- name = d3.ns.qualify(name);
+ return this.each(value == null
+ ? styleNull : (typeof value === "function"
+ ? styleFunction : styleConstant));
+};
+d3_selectionPrototype.property = function(name, value) {
- // If no value is specified, return the first value.
- if (arguments.length < 2) {
- return first(function() {
- return this[name];
- });
- }
+ // If no value is specified, return the first value.
+ if (arguments.length < 2) return this.node()[name];
- /** @this {Element} */
- function propertyNull() {
- delete this[name];
- }
+ function propertyNull() {
+ delete this[name];
+ }
- /** @this {Element} */
- function propertyConstant() {
- this[name] = value;
- }
+ function propertyConstant() {
+ this[name] = value;
+ }
- /** @this {Element} */
- function propertyFunction() {
- var x = value.apply(this, arguments);
- if (x == null) delete this[name];
- else this[name] = x;
- }
+ function propertyFunction() {
+ var x = value.apply(this, arguments);
+ if (x == null) delete this[name];
+ else this[name] = x;
+ }
- return groups.each(value == null
- ? propertyNull : (typeof value === "function"
- ? propertyFunction : propertyConstant));
- };
+ return this.each(value == null
+ ? propertyNull : (typeof value === "function"
+ ? propertyFunction : propertyConstant));
+};
+d3_selectionPrototype.text = function(value) {
+ return arguments.length < 1
+ ? this.node().textContent : this.each(typeof value === "function"
+ ? function() { var v = value.apply(this, arguments); this.textContent = v == null ? "" : v; } : value == null
+ ? function() { this.textContent = ""; }
+ : function() { this.textContent = value; });
+};
+d3_selectionPrototype.html = function(value) {
+ return arguments.length < 1
+ ? this.node().innerHTML : this.each(typeof value === "function"
+ ? function() { var v = value.apply(this, arguments); this.innerHTML = v == null ? "" : v; } : value == null
+ ? function() { this.innerHTML = ""; }
+ : function() { this.innerHTML = value; });
+};
+// TODO append(node)?
+// TODO append(function)?
+d3_selectionPrototype.append = function(name) {
+ name = d3.ns.qualify(name);
- groups.text = function(value) {
+ function append() {
+ return this.appendChild(document.createElementNS(this.namespaceURI, name));
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 1) {
- return first(function() {
- return this.textContent;
- });
- }
+ function appendNS() {
+ return this.appendChild(document.createElementNS(name.space, name.local));
+ }
- /** @this {Element} */
- function textConstant() {
- this.textContent = value;
- }
+ return this.select(name.local ? appendNS : append);
+};
+// TODO insert(node, function)?
+// TODO insert(function, string)?
+// TODO insert(function, function)?
+d3_selectionPrototype.insert = function(name, before) {
+ name = d3.ns.qualify(name);
+
+ function insert() {
+ return this.insertBefore(
+ document.createElementNS(this.namespaceURI, name),
+ d3_select(before, this));
+ }
- /** @this {Element} */
- function textFunction() {
- this.textContent = value.apply(this, arguments);
- }
+ function insertNS() {
+ return this.insertBefore(
+ document.createElementNS(name.space, name.local),
+ d3_select(before, this));
+ }
- return groups.each(typeof value === "function"
- ? textFunction : textConstant);
- };
+ return this.select(name.local ? insertNS : insert);
+};
+// TODO remove(selector)?
+// TODO remove(node)?
+// TODO remove(function)?
+d3_selectionPrototype.remove = function() {
+ return this.each(function() {
+ var parent = this.parentNode;
+ if (parent) parent.removeChild(this);
+ });
+};
+// TODO data(null) for clearing data?
+d3_selectionPrototype.data = function(data, join) {
+ var enter = [],
+ update = [],
+ exit = [];
+
+ function bind(group, groupData) {
+ var i,
+ n = group.length,
+ m = groupData.length,
+ n0 = Math.min(n, m),
+ n1 = Math.max(n, m),
+ updateNodes = [],
+ enterNodes = [],
+ exitNodes = [],
+ node,
+ nodeData;
+
+ if (join) {
+ var nodeByKey = {},
+ keys = [],
+ key,
+ j = groupData.length;
+
+ for (i = -1; ++i < n;) {
+ key = join.call(node = group[i], node.__data__, i);
+ if (key in nodeByKey) {
+ exitNodes[j++] = node; // duplicate key
+ } else {
+ nodeByKey[key] = node;
+ }
+ keys.push(key);
+ }
- groups.html = function(value) {
+ for (i = -1; ++i < m;) {
+ node = nodeByKey[key = join.call(groupData, nodeData = groupData[i], i)];
+ if (node) {
+ node.__data__ = nodeData;
+ updateNodes[i] = node;
+ enterNodes[i] = exitNodes[i] = null;
+ } else {
+ enterNodes[i] = d3_selection_dataNode(nodeData);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ delete nodeByKey[key];
+ }
- // If no value is specified, return the first value.
- if (arguments.length < 1) {
- return first(function() {
- return this.innerHTML;
- });
- }
-
- /** @this {Element} */
- function htmlConstant() {
- this.innerHTML = value;
+ for (i = -1; ++i < n;) {
+ if (keys[i] in nodeByKey) {
+ exitNodes[i] = group[i];
+ }
+ }
+ } else {
+ for (i = -1; ++i < n0;) {
+ node = group[i];
+ nodeData = groupData[i];
+ if (node) {
+ node.__data__ = nodeData;
+ updateNodes[i] = node;
+ enterNodes[i] = exitNodes[i] = null;
+ } else {
+ enterNodes[i] = d3_selection_dataNode(nodeData);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ }
+ for (; i < m; ++i) {
+ enterNodes[i] = d3_selection_dataNode(groupData[i]);
+ updateNodes[i] = exitNodes[i] = null;
+ }
+ for (; i < n1; ++i) {
+ exitNodes[i] = group[i];
+ enterNodes[i] = updateNodes[i] = null;
+ }
}
- /** @this {Element} */
- function htmlFunction() {
- this.innerHTML = value.apply(this, arguments);
- }
+ enterNodes.update
+ = updateNodes;
- return groups.each(typeof value === "function"
- ? htmlFunction : htmlConstant);
- };
+ enterNodes.parentNode
+ = updateNodes.parentNode
+ = exitNodes.parentNode
+ = group.parentNode;
- // TODO append(node)?
- // TODO append(function)?
- groups.append = function(name) {
- name = d3.ns.qualify(name);
+ enter.push(enterNodes);
+ update.push(updateNodes);
+ exit.push(exitNodes);
+ }
- function append(node) {
- return node.appendChild(document.createElement(name));
+ var i = -1,
+ n = this.length,
+ group;
+ if (typeof data === "function") {
+ while (++i < n) {
+ bind(group = this[i], data.call(group, group.parentNode.__data__, i));
}
-
- function appendNS(node) {
- return node.appendChild(document.createElementNS(name.space, name.local));
+ } else {
+ while (++i < n) {
+ bind(group = this[i], data);
}
+ }
- return select(name.local ? appendNS : append);
- };
-
- // TODO insert(node, function)?
- // TODO insert(function, string)?
- // TODO insert(function, function)?
- groups.insert = function(name, before) {
- name = d3.ns.qualify(name);
+ var selection = d3_selection(update);
+ selection.enter = function() { return d3_selection_enter(enter); };
+ selection.exit = function() { return d3_selection(exit); };
+ return selection;
+};
- function insert(node) {
- return node.insertBefore(
- document.createElement(name),
- d3_select(before, node));
+function d3_selection_dataNode(data) {
+ return {__data__: data};
+}
+d3_selectionPrototype.filter = function(filter) {
+ var subgroups = [],
+ subgroup,
+ group,
+ node;
+
+ if (typeof filter !== "function") filter = d3_selection_filter(filter);
+
+ for (var j = 0, m = this.length; j < m; j++) {
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = (group = this[j]).parentNode;
+ for (var i = 0, n = group.length; i < n; i++) {
+ if ((node = group[i]) && filter.call(node, node.__data__, i)) {
+ subgroup.push(node);
+ }
}
+ }
- function insertNS(node) {
- return node.insertBefore(
- document.createElementNS(name.space, name.local),
- d3_select(before, node));
- }
+ return d3_selection(subgroups);
+};
- return select(name.local ? insertNS : insert);
+function d3_selection_filter(selector) {
+ return function() {
+ return d3_selectMatches(this, selector);
};
+}
+d3_selectionPrototype.map = function(map) {
+ return this.each(function() {
+ this.__data__ = map.apply(this, arguments);
+ });
+};
+d3_selectionPrototype.order = function() {
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = group.length - 1, next = group[i], node; --i >= 0;) {
+ if (node = group[i]) {
+ if (next) next.parentNode.insertBefore(node, next);
+ next = node;
+ }
+ }
+ }
+ return this;
+};
+d3_selectionPrototype.sort = function(comparator) {
+ comparator = d3_selection_sortComparator.apply(this, arguments);
+ for (var j = -1, m = this.length; ++j < m;) this[j].sort(comparator);
+ return this.order();
+};
- // TODO remove(selector)?
- // TODO remove(node)?
- // TODO remove(function)?
- groups.remove = function() {
- return groups.each(function() {
- var parent = this.parentNode;
- if (parent) parent.removeChild(this);
- });
+function d3_selection_sortComparator(comparator) {
+ if (!arguments.length) comparator = d3.ascending;
+ return function(a, b) {
+ return comparator(a && a.__data__, b && b.__data__);
};
-
- groups.sort = function(comparator) {
- comparator = d3_selection_comparator.apply(this, arguments);
- for (var j = 0, m = groups.length; j < m; j++) {
- var group = groups[j];
- group.sort(comparator);
- for (var i = 1, n = group.length, prev = group[0]; i < n; i++) {
- var node = group[i];
- if (node) {
- if (prev) prev.parentNode.insertBefore(node, prev.nextSibling);
- prev = node;
- }
+}
+// type can be namespaced, e.g., "click.foo"
+// listener can be null for removal
+d3_selectionPrototype.on = function(type, listener, capture) {
+ if (arguments.length < 3) capture = false;
+
+ // parse the type specifier
+ var name = "__on" + type, i = type.indexOf(".");
+ if (i > 0) type = type.substring(0, i);
+
+ // if called with only one argument, return the current listener
+ if (arguments.length < 2) return (i = this.node()[name]) && i._;
+
+ // remove the old event listener, and add the new event listener
+ return this.each(function(d, i) {
+ var node = this;
+
+ if (node[name]) node.removeEventListener(type, node[name], capture);
+ if (listener) node.addEventListener(type, node[name] = l, capture);
+
+ // wrapped event listener that preserves i
+ function l(e) {
+ var o = d3.event; // Events can be reentrant (e.g., focus).
+ d3.event = e;
+ try {
+ listener.call(node, node.__data__, i);
+ } finally {
+ d3.event = o;
}
}
- return groups;
- };
-
- // type can be namespaced, e.g., "click.foo"
- // listener can be null for removal
- groups.on = function(type, listener, capture) {
- if (arguments.length < 3) capture = false;
-
- // parse the type specifier
- var i = type.indexOf("."),
- typo = i === -1 ? type : type.substring(0, i),
- name = "__on" + type;
- // remove the old event listener, and add the new event listener
- return groups.each(function(d, i) {
- if (this[name]) this.removeEventListener(typo, this[name], capture);
- if (listener) this.addEventListener(typo, this[name] = l, capture);
-
- // wrapped event listener that preserves i
- var node = this;
- function l(e) {
- var o = d3.event; // Events can be reentrant (e.g., focus).
- d3.event = e;
- try {
- listener.call(this, node.__data__, i);
- } finally {
- d3.event = o;
- }
- }
- });
- };
+ // stash the unwrapped listener for retrieval
+ l._ = listener;
+ });
+};
+d3_selectionPrototype.each = function(callback) {
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ var node = group[i];
+ if (node) callback.call(node, node.__data__, i, j);
+ }
+ }
+ return this;
+};
+//
+// Note: assigning to the arguments array simultaneously changes the value of
+// the corresponding argument!
+//
+// TODO The `this` argument probably shouldn't be the first argument to the
+// callback, anyway, since it's redundant. However, that will require a major
+// version bump due to backwards compatibility, so I'm not changing it right
+// away.
+//
+d3_selectionPrototype.call = function(callback) {
+ callback.apply(this, (arguments[0] = this, arguments));
+ return this;
+};
+d3_selectionPrototype.empty = function() {
+ return !this.node();
+};
+d3_selectionPrototype.node = function(callback) {
+ for (var j = 0, m = this.length; j < m; j++) {
+ for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+ var node = group[i];
+ if (node) return node;
+ }
+ }
+ return null;
+};
+d3_selectionPrototype.transition = function() {
+ var subgroups = [],
+ subgroup,
+ node;
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ subgroup.push((node = group[i]) ? {node: node, delay: 0, duration: 250} : null);
+ }
+ }
- // TODO slice?
+ return d3_transition(subgroups, d3_transitionInheritId || ++d3_transitionId, Date.now());
+};
+var d3_selectionRoot = d3_selection([[document]]);
- groups.transition = function() {
- return d3_transition(groups);
- };
+d3_selectionRoot[0].parentNode = d3_selectRoot;
- groups.call = d3_call;
+// TODO fast singleton implementation!
+// TODO select(function)
+d3.select = function(selector) {
+ return typeof selector === "string"
+ ? d3_selectionRoot.select(selector)
+ : d3_selection([[selector]]); // assume node
+};
- return groups;
+// TODO selectAll(function)
+d3.selectAll = function(selector) {
+ return typeof selector === "string"
+ ? d3_selectionRoot.selectAll(selector)
+ : d3_selection([d3_array(selector)]); // assume node[]
+};
+function d3_selection_enter(selection) {
+ d3_arraySubclass(selection, d3_selection_enterPrototype);
+ return selection;
}
-function d3_selectionEnter(groups) {
-
- function select(select) {
- var subgroups = [],
- subgroup,
- subnode,
- group,
- node;
- for (var j = 0, m = groups.length; j < m; j++) {
- group = groups[j];
- subgroups.push(subgroup = []);
- subgroup.parentNode = group.parentNode;
- for (var i = 0, n = group.length; i < n; i++) {
- if (node = group[i]) {
- subgroup.push(subnode = select(group.parentNode));
- subnode.__data__ = node.__data__;
- } else {
- subgroup.push(null);
- }
+var d3_selection_enterPrototype = [];
+
+d3_selection_enterPrototype.append = d3_selectionPrototype.append;
+d3_selection_enterPrototype.insert = d3_selectionPrototype.insert;
+d3_selection_enterPrototype.empty = d3_selectionPrototype.empty;
+d3_selection_enterPrototype.node = d3_selectionPrototype.node;
+d3_selection_enterPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ upgroup,
+ group,
+ node;
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ upgroup = (group = this[j]).update;
+ subgroups.push(subgroup = []);
+ subgroup.parentNode = group.parentNode;
+ for (var i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subgroup.push(upgroup[i] = subnode = selector.call(group.parentNode, node.__data__, i));
+ subnode.__data__ = node.__data__;
+ } else {
+ subgroup.push(null);
}
}
- return d3_selection(subgroups);
}
- // TODO append(node)?
- // TODO append(function)?
- groups.append = function(name) {
- name = d3.ns.qualify(name);
-
- function append(node) {
- return node.appendChild(document.createElement(name));
- }
-
- function appendNS(node) {
- return node.appendChild(document.createElementNS(name.space, name.local));
- }
-
- return select(name.local ? appendNS : append);
- };
+ return d3_selection(subgroups);
+};
+function d3_transition(groups, id, time) {
+ d3_arraySubclass(groups, d3_transitionPrototype);
- // TODO insert(node, function)?
- // TODO insert(function, string)?
- // TODO insert(function, function)?
- groups.insert = function(name, before) {
- name = d3.ns.qualify(name);
+ var tweens = {},
+ event = d3.dispatch("start", "end"),
+ ease = d3_transitionEase;
- function insert(node) {
- return node.insertBefore(
- document.createElement(name),
- d3_select(before, node));
- }
+ groups.id = id;
- function insertNS(node) {
- return node.insertBefore(
- document.createElementNS(name.space, name.local),
- d3_select(before, node));
- }
+ groups.time = time;
- return select(name.local ? insertNS : insert);
+ groups.tween = function(name, tween) {
+ if (arguments.length < 2) return tweens[name];
+ if (tween == null) delete tweens[name];
+ else tweens[name] = tween;
+ return groups;
};
- return groups;
-}
+ groups.ease = function(value) {
+ if (!arguments.length) return ease;
+ ease = typeof value === "function" ? value : d3.ease.apply(d3, arguments);
+ return groups;
+ };
-function d3_selection_comparator(comparator) {
- if (!arguments.length) comparator = d3.ascending;
- return function(a, b) {
- return comparator(a && a.__data__, b && b.__data__);
+ groups.each = function(type, listener) {
+ if (arguments.length < 2) return d3_transition_each.call(groups, type);
+ event.on(type, listener);
+ return groups;
};
-}
-function d3_selection_enterNode(data) {
- return {__data__: data};
-}
-d3.transition = d3_root.transition;
+ d3.timer(function(elapsed) {
+ groups.each(function(d, i, j) {
+ var tweened = [],
+ node = this,
+ delay = groups[j][i].delay,
+ duration = groups[j][i].duration,
+ lock = node.__transition__ || (node.__transition__ = {active: 0, count: 0});
-var d3_transitionId = 0,
- d3_transitionInheritId = 0;
+ ++lock.count;
-function d3_transition(groups) {
- var transition = {},
- transitionId = d3_transitionInheritId || ++d3_transitionId,
- tweens = {},
- interpolators = [],
- remove = false,
- event = d3.dispatch("start", "end"),
- stage = [],
- delay = [],
- duration = [],
- durationMax,
- ease = d3.ease("cubic-in-out");
-
- //
- // Be careful with concurrent transitions!
- //
- // Say transition A causes an exit. Before A finishes, a transition B is
- // created, and believes it only needs to do an update, because the elements
- // haven't been removed yet (which happens at the very end of the exit
- // transition).
- //
- // Even worse, what if either transition A or B has a staggered delay? Then,
- // some elements may be removed, while others remain. Transition B does not
- // know to enter the elements because they were still present at the time
- // the transition B was created (but not yet started).
- //
- // To prevent such confusion, we only trigger end events for transitions if
- // the transition ending is the only one scheduled for the given element.
- // Similarly, we only allow one transition to be active for any given
- // element, so that concurrent transitions do not overwrite each other's
- // properties.
- //
- // TODO Support transition namespaces, so that transitions can proceed
- // concurrently on the same element if needed. Hopefully, this is rare!
- //
-
- groups.each(function() {
- (this.__transition__ || (this.__transition__ = {})).owner = transitionId;
- });
+ delay <= elapsed ? start(elapsed) : d3.timer(start, delay, time);
- function step(elapsed) {
- var clear = true,
- k = -1;
- groups.each(function() {
- if (stage[++k] === 2) return; // ended
- var t = (elapsed - delay[k]) / duration[k],
- tx = this.__transition__,
- te, // ease(t)
- tk, // tween key
- ik = interpolators[k];
-
- // Check if the (un-eased) time is outside the range [0,1].
- if (t < 1) {
- clear = false;
- if (t < 0) return;
- } else {
- t = 1;
- }
+ function start(elapsed) {
+ if (lock.active > id) return stop();
+ lock.active = id;
- // Determine the stage of this transition.
- // 0 - Not yet started.
- // 1 - In progress.
- // 2 - Ended.
- if (stage[k]) {
- if (!tx || tx.active !== transitionId) {
- stage[k] = 2;
- return;
- }
- } else if (!tx || tx.active > transitionId) {
- stage[k] = 2;
- return;
- } else {
- stage[k] = 1;
- event.start.dispatch.apply(this, arguments);
- ik = interpolators[k] = {};
- tx.active = transitionId;
- for (tk in tweens) {
- if (te = tweens[tk].apply(this, arguments)) {
- ik[tk] = te;
+ for (var tween in tweens) {
+ if (tween = tweens[tween].call(node, d, i)) {
+ tweened.push(tween);
}
}
+
+ event.start.call(node, d, i);
+ if (!tick(elapsed)) d3.timer(tick, 0, time);
+ return 1;
}
- // Apply the interpolators!
- te = ease(t);
- for (tk in ik) ik[tk].call(this, te);
-
- // Handle ending transitions.
- if (t === 1) {
- stage[k] = 2;
- if (tx.active === transitionId) {
- var owner = tx.owner;
- if (owner === transitionId) {
- delete this.__transition__;
- if (remove && this.parentNode) this.parentNode.removeChild(this);
- }
- d3_transitionInheritId = transitionId;
- event.end.dispatch.apply(this, arguments);
+ function tick(elapsed) {
+ if (lock.active !== id) return stop();
+
+ var t = (elapsed - delay) / duration,
+ e = ease(t),
+ n = tweened.length;
+
+ while (n > 0) {
+ tweened[--n].call(node, e);
+ }
+
+ if (t >= 1) {
+ stop();
+ d3_transitionInheritId = id;
+ event.end.call(node, d, i);
d3_transitionInheritId = 0;
- tx.owner = owner;
+ return 1;
}
}
- });
- return clear;
- }
- transition.delay = function(value) {
- var delayMin = Infinity,
- k = -1;
- if (typeof value === "function") {
- groups.each(function(d, i) {
- var x = delay[++k] = +value.apply(this, arguments);
- if (x < delayMin) delayMin = x;
- });
- } else {
- delayMin = +value;
- groups.each(function(d, i) {
- delay[++k] = delayMin;
- });
- }
- d3_timer(step, delayMin);
- return transition;
- };
-
- transition.duration = function(value) {
- var k = -1;
- if (typeof value === "function") {
- durationMax = 0;
- groups.each(function(d, i) {
- var x = duration[++k] = +value.apply(this, arguments);
- if (x > durationMax) durationMax = x;
- });
- } else {
- durationMax = +value;
- groups.each(function(d, i) {
- duration[++k] = durationMax;
- });
- }
- return transition;
- };
+ function stop() {
+ if (!--lock.count) delete node.__transition__;
+ return 1;
+ }
+ });
+ return 1;
+ }, 0, time);
- transition.ease = function(value) {
- ease = typeof value === "function" ? value : d3.ease.apply(d3, arguments);
- return transition;
- };
+ return groups;
+}
- transition.attrTween = function(name, tween) {
+var d3_transitionRemove = {};
- /** @this {Element} */
- function attrTween(d, i) {
- var f = tween.call(this, d, i, this.getAttribute(name));
- return f && function(t) {
- this.setAttribute(name, f(t));
- };
- }
+function d3_transitionNull(d, i, a) {
+ return a != "" && d3_transitionRemove;
+}
- /** @this {Element} */
- function attrTweenNS(d, i) {
- var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
- return f && function(t) {
- this.setAttributeNS(name.space, name.local, f(t));
- };
- }
+function d3_transitionTween(name, b) {
+ var interpolate = d3_interpolateByName(name);
- tweens["attr." + name] = name.local ? attrTweenNS : attrTween;
- return transition;
- };
+ function transitionFunction(d, i, a) {
+ var v = b.call(this, d, i);
+ return v == null
+ ? a != "" && d3_transitionRemove
+ : a != v && interpolate(a, v);
+ }
- transition.attr = function(name, value) {
- return transition.attrTween(name, d3_transitionTween(value));
- };
+ function transitionString(d, i, a) {
+ return a != b && interpolate(a, b);
+ }
- transition.styleTween = function(name, tween, priority) {
- if (arguments.length < 3) priority = null;
+ return typeof b === "function" ? transitionFunction
+ : b == null ? d3_transitionNull
+ : (b += "", transitionString);
+}
- /** @this {Element} */
- function styleTween(d, i) {
- var f = tween.call(this, d, i, window.getComputedStyle(this, null).getPropertyValue(name));
- return f && function(t) {
- this.style.setProperty(name, f(t), priority);
- };
- }
+var d3_transitionPrototype = [],
+ d3_transitionId = 0,
+ d3_transitionInheritId = 0,
+ d3_transitionEase = d3.ease("cubic-in-out");
- tweens["style." + name] = styleTween;
- return transition;
- };
+d3_transitionPrototype.call = d3_selectionPrototype.call;
- transition.style = function(name, value, priority) {
- if (arguments.length < 3) priority = null;
- return transition.styleTween(name, d3_transitionTween(value), priority);
- };
+d3.transition = function() {
+ return d3_selectionRoot.transition();
+};
- transition.text = function(value) {
- tweens.text = function(d, i) {
- this.textContent = typeof value === "function"
- ? value.call(this, d, i)
- : value;
- };
- return transition;
- };
+d3.transition.prototype = d3_transitionPrototype;
+d3_transitionPrototype.select = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnode,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selector(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ subgroups.push(subgroup = []);
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if ((node = group[i]) && (subnode = selector.call(node.node, node.node.__data__, i))) {
+ if ("__data__" in node.node) subnode.__data__ = node.node.__data__;
+ subgroup.push({node: subnode, delay: node.delay, duration: node.duration});
+ } else {
+ subgroup.push(null);
+ }
+ }
+ }
- transition.select = function(query) {
- var k, t = d3_transition(groups.select(query)).ease(ease);
- k = -1; t.delay(function(d, i) { return delay[++k]; });
- k = -1; t.duration(function(d, i) { return duration[++k]; });
- return t;
- };
+ return d3_transition(subgroups, this.id, this.time).ease(this.ease());
+};
+d3_transitionPrototype.selectAll = function(selector) {
+ var subgroups = [],
+ subgroup,
+ subnodes,
+ node;
+
+ if (typeof selector !== "function") selector = d3_selection_selectorAll(selector);
+
+ for (var j = -1, m = this.length; ++j < m;) {
+ for (var group = this[j], i = -1, n = group.length; ++i < n;) {
+ if (node = group[i]) {
+ subnodes = selector.call(node.node, node.node.__data__, i);
+ subgroups.push(subgroup = []);
+ for (var k = -1, o = subnodes.length; ++k < o;) {
+ subgroup.push({node: subnodes[k], delay: node.delay, duration: node.duration});
+ }
+ }
+ }
+ }
- transition.selectAll = function(query) {
- var k, t = d3_transition(groups.selectAll(query)).ease(ease);
- k = -1; t.delay(function(d, i) { return delay[i ? k : ++k]; })
- k = -1; t.duration(function(d, i) { return duration[i ? k : ++k]; });
- return t;
- };
+ return d3_transition(subgroups, this.id, this.time).ease(this.ease());
+};
+d3_transitionPrototype.attr = function(name, value) {
+ return this.attrTween(name, d3_transitionTween(name, value));
+};
- transition.remove = function() {
- remove = true;
- return transition;
- };
+d3_transitionPrototype.attrTween = function(nameNS, tween) {
+ var name = d3.ns.qualify(nameNS);
- transition.each = function(type, listener) {
- event[type].add(listener);
- return transition;
- };
+ function attrTween(d, i) {
+ var f = tween.call(this, d, i, this.getAttribute(name));
+ return f === d3_transitionRemove
+ ? (this.removeAttribute(name), null)
+ : f && function(t) { this.setAttribute(name, f(t)); };
+ }
- transition.call = d3_call;
+ function attrTweenNS(d, i) {
+ var f = tween.call(this, d, i, this.getAttributeNS(name.space, name.local));
+ return f === d3_transitionRemove
+ ? (this.removeAttributeNS(name.space, name.local), null)
+ : f && function(t) { this.setAttributeNS(name.space, name.local, f(t)); };
+ }
- return transition.delay(0).duration(250);
-}
+ return this.tween("attr." + nameNS, name.local ? attrTweenNS : attrTween);
+};
+d3_transitionPrototype.style = function(name, value, priority) {
+ if (arguments.length < 3) priority = "";
+ return this.styleTween(name, d3_transitionTween(name, value), priority);
+};
-function d3_transitionTween(b) {
- return typeof b === "function"
- ? function(d, i, a) { var v = b.call(this, d, i) + ""; return a != v && d3.interpolate(a, v); }
- : (b = b + "", function(d, i, a) { return a != b && d3.interpolate(a, b); });
+d3_transitionPrototype.styleTween = function(name, tween, priority) {
+ if (arguments.length < 3) priority = "";
+ return this.tween("style." + name, function(d, i) {
+ var f = tween.call(this, d, i, window.getComputedStyle(this, null).getPropertyValue(name));
+ return f === d3_transitionRemove
+ ? (this.style.removeProperty(name), null)
+ : f && function(t) { this.style.setProperty(name, f(t), priority); };
+ });
+};
+d3_transitionPrototype.text = function(value) {
+ return this.tween("text", function(d, i) {
+ this.textContent = typeof value === "function"
+ ? value.call(this, d, i)
+ : value;
+ });
+};
+d3_transitionPrototype.remove = function() {
+ return this.each("end", function() {
+ var p;
+ if (!this.__transition__ && (p = this.parentNode)) p.removeChild(this);
+ });
+};
+d3_transitionPrototype.delay = function(value) {
+ var groups = this;
+ return groups.each(typeof value === "function"
+ ? function(d, i, j) { groups[j][i].delay = +value.apply(this, arguments); }
+ : (value = +value, function(d, i, j) { groups[j][i].delay = value; }));
+};
+d3_transitionPrototype.duration = function(value) {
+ var groups = this;
+ return groups.each(typeof value === "function"
+ ? function(d, i, j) { groups[j][i].duration = +value.apply(this, arguments); }
+ : (value = +value, function(d, i, j) { groups[j][i].duration = value; }));
+};
+function d3_transition_each(callback) {
+ for (var j = 0, m = this.length; j < m; j++) {
+ for (var group = this[j], i = 0, n = group.length; i < n; i++) {
+ var node = group[i];
+ if (node) callback.call(node = node.node, node.__data__, i, j);
+ }
+ }
+ return this;
}
+d3_transitionPrototype.transition = function() {
+ return this.select(d3_this);
+};
var d3_timer_queue = null,
d3_timer_interval, // is an interval (or frame) active?
d3_timer_timeout; // is a timeout active?
// The timer will continue to fire until callback returns true.
-d3.timer = function(callback) {
- d3_timer(callback, 0);
-};
-
-function d3_timer(callback, delay) {
- var now = Date.now(),
- found = false,
+d3.timer = function(callback, delay, then) {
+ var found = false,
t0,
t1 = d3_timer_queue;
- if (!isFinite(delay)) return;
+ if (arguments.length < 3) {
+ if (arguments.length < 2) delay = 0;
+ else if (!isFinite(delay)) return;
+ then = Date.now();
+ }
// See if the callback's already in the queue.
while (t1) {
if (t1.callback === callback) {
- t1.then = now;
+ t1.then = then;
t1.delay = delay;
found = true;
break;
@@ -2105,7 +2205,7 @@ function d3_timer(callback, delay) {
// Otherwise, add the callback to the queue.
if (!found) d3_timer_queue = {
callback: callback,
- then: now,
+ then: then,
delay: delay,
next: d3_timer_queue
};
@@ -2125,7 +2225,7 @@ function d3_timer_step() {
while (t1) {
elapsed = now - t1.then;
- if (elapsed > t1.delay) t1.flush = t1.callback(elapsed);
+ if (elapsed >= t1.delay) t1.flush = t1.callback(elapsed);
t1 = t1.next;
}
@@ -2178,6 +2278,66 @@ var d3_timer_frame = window.requestAnimationFrame
|| window.oRequestAnimationFrame
|| window.msRequestAnimationFrame
|| function(callback) { setTimeout(callback, 17); };
+d3.transform = function(string) {
+ var g = document.createElementNS(d3.ns.prefix.svg, "g"),
+ identity = {a: 1, b: 0, c: 0, d: 1, e: 0, f: 0};
+ return (d3.transform = function(string) {
+ g.setAttribute("transform", string);
+ var t = g.transform.baseVal.consolidate();
+ return new d3_transform(t ? t.matrix : identity);
+ })(string);
+};
+
+// Compute x-scale and normalize the first row.
+// Compute shear and make second row orthogonal to first.
+// Compute y-scale and normalize the second row.
+// Finally, compute the rotation.
+function d3_transform(m) {
+ var r0 = [m.a, m.b],
+ r1 = [m.c, m.d],
+ kx = d3_transformNormalize(r0),
+ kz = d3_transformDot(r0, r1),
+ ky = d3_transformNormalize(d3_transformCombine(r1, r0, -kz)) || 0;
+ if (r0[0] * r1[1] < r1[0] * r0[1]) {
+ r0[0] *= -1;
+ r0[1] *= -1;
+ kx *= -1;
+ kz *= -1;
+ }
+ this.rotate = (kx ? Math.atan2(r0[1], r0[0]) : Math.atan2(-r1[0], r1[1])) * d3_transformDegrees;
+ this.translate = [m.e, m.f];
+ this.scale = [kx, ky];
+ this.skew = ky ? Math.atan2(kz, ky) * d3_transformDegrees : 0;
+};
+
+d3_transform.prototype.toString = function() {
+ return "translate(" + this.translate
+ + ")rotate(" + this.rotate
+ + ")skewX(" + this.skew
+ + ")scale(" + this.scale
+ + ")";
+};
+
+function d3_transformDot(a, b) {
+ return a[0] * b[0] + a[1] * b[1];
+}
+
+function d3_transformNormalize(a) {
+ var k = Math.sqrt(d3_transformDot(a, a));
+ if (k) {
+ a[0] /= k;
+ a[1] /= k;
+ }
+ return k;
+}
+
+function d3_transformCombine(a, b, k) {
+ a[0] += k * b[0];
+ a[1] += k * b[1];
+ return a;
+}
+
+var d3_transformDegrees = 180 / Math.PI;
function d3_noop() {}
d3.scale = {};
@@ -2185,6 +2345,10 @@ function d3_scaleExtent(domain) {
var start = domain[0], stop = domain[domain.length - 1];
return start < stop ? [start, stop] : [stop, start];
}
+
+function d3_scaleRange(scale) {
+ return scale.rangeExtent ? scale.rangeExtent() : d3_scaleExtent(scale.range());
+}
function d3_scale_nice(domain, nice) {
var i0 = 0,
i1 = domain.length - 1,
@@ -2197,9 +2361,12 @@ function d3_scale_nice(domain, nice) {
dx = x0; x0 = x1; x1 = dx;
}
- nice = nice(x1 - x0);
- domain[i0] = nice.floor(x0);
- domain[i1] = nice.ceil(x1);
+ if (dx = x1 - x0) {
+ nice = nice(dx);
+ domain[i0] = nice.floor(x0);
+ domain[i1] = nice.ceil(x1);
+ }
+
return domain;
}
@@ -2207,11 +2374,11 @@ function d3_scale_niceDefault() {
return Math;
}
d3.scale.linear = function() {
- var domain = [0, 1],
- range = [0, 1],
- interpolate = d3.interpolate,
- clamp = false,
- output,
+ return d3_scale_linear([0, 1], [0, 1], d3.interpolate, false);
+};
+
+function d3_scale_linear(domain, range, interpolate, clamp) {
+ var output,
input;
function rescale() {
@@ -2272,15 +2439,15 @@ d3.scale.linear = function() {
return rescale();
};
+ scale.copy = function() {
+ return d3_scale_linear(domain, range, interpolate, clamp);
+ };
+
return rescale();
};
function d3_scale_linearRebind(scale, linear) {
- scale.range = d3.rebind(scale, linear.range);
- scale.rangeRound = d3.rebind(scale, linear.rangeRound);
- scale.interpolate = d3.rebind(scale, linear.interpolate);
- scale.clamp = d3.rebind(scale, linear.clamp);
- return scale;
+ return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
}
function d3_scale_linearNice(dx) {
@@ -2341,9 +2508,11 @@ function d3_scale_polylinear(domain, range, uninterpolate, interpolate) {
};
}
d3.scale.log = function() {
- var linear = d3.scale.linear(),
- log = d3_scale_log,
- pow = log.pow;
+ return d3_scale_log(d3.scale.linear(), d3_scale_logp);
+};
+
+function d3_scale_log(linear, log) {
+ var pow = log.pow;
function scale(x) {
return linear(log(x));
@@ -2355,7 +2524,7 @@ d3.scale.log = function() {
scale.domain = function(x) {
if (!arguments.length) return linear.domain().map(pow);
- log = x[0] < 0 ? d3_scale_logn : d3_scale_log;
+ log = x[0] < 0 ? d3_scale_logn : d3_scale_logp;
pow = log.pow;
linear.domain(x.map(log));
return scale;
@@ -2388,14 +2557,27 @@ d3.scale.log = function() {
return ticks;
};
- scale.tickFormat = function() {
- return d3_scale_logTickFormat;
+ scale.tickFormat = function(n, format) {
+ if (arguments.length < 2) format = d3_scale_logFormat;
+ if (arguments.length < 1) return format;
+ var k = n / scale.ticks().length,
+ f = log === d3_scale_logn ? (e = -1e-12, Math.floor) : (e = 1e-12, Math.ceil),
+ e;
+ return function(d) {
+ return d / pow(f(log(d) + e)) < k ? format(d) : "";
+ };
+ };
+
+ scale.copy = function() {
+ return d3_scale_log(linear.copy(), log);
};
return d3_scale_linearRebind(scale, linear);
};
-function d3_scale_log(x) {
+var d3_scale_logFormat = d3.format(".0e");
+
+function d3_scale_logp(x) {
return Math.log(x) / Math.LN10;
}
@@ -2403,22 +2585,20 @@ function d3_scale_logn(x) {
return -Math.log(-x) / Math.LN10;
}
-d3_scale_log.pow = function(x) {
+d3_scale_logp.pow = function(x) {
return Math.pow(10, x);
};
d3_scale_logn.pow = function(x) {
return -Math.pow(10, -x);
};
-
-function d3_scale_logTickFormat(d) {
- return d.toPrecision(1);
-}
d3.scale.pow = function() {
- var linear = d3.scale.linear(),
- exponent = 1,
- powp = Number,
- powb = powp;
+ return d3_scale_pow(d3.scale.linear(), 1);
+};
+
+function d3_scale_pow(linear, exponent) {
+ var powp = d3_scale_powPow(exponent),
+ powb = d3_scale_powPow(1 / exponent);
function scale(x) {
return linear(powp(x));
@@ -2430,8 +2610,6 @@ d3.scale.pow = function() {
scale.domain = function(x) {
if (!arguments.length) return linear.domain().map(powb);
- powp = d3_scale_powPow(exponent);
- powb = d3_scale_powPow(1 / exponent);
linear.domain(x.map(powp));
return scale;
};
@@ -2451,10 +2629,15 @@ d3.scale.pow = function() {
scale.exponent = function(x) {
if (!arguments.length) return exponent;
var domain = scale.domain();
- exponent = x;
+ powp = d3_scale_powPow(exponent = x);
+ powb = d3_scale_powPow(1 / exponent);
return scale.domain(domain);
};
+ scale.copy = function() {
+ return d3_scale_pow(linear.copy(), exponent);
+ };
+
return d3_scale_linearRebind(scale, linear);
};
@@ -2467,73 +2650,69 @@ d3.scale.sqrt = function() {
return d3.scale.pow().exponent(.5);
};
d3.scale.ordinal = function() {
- var domain = [],
- index = {},
- range = [],
- rangeBand = 0,
- rerange = d3_noop;
+ return d3_scale_ordinal([], {t: "range", x: []});
+};
+
+function d3_scale_ordinal(domain, ranger) {
+ var index,
+ range,
+ rangeBand;
function scale(x) {
- var i = x in index ? index[x] : (index[x] = domain.push(x) - 1);
- return range[i % range.length];
+ return range[((index[x] || (index[x] = domain.push(x))) - 1) % range.length];
+ }
+
+ function steps(start, step) {
+ return d3.range(domain.length).map(function(i) { return start + step * i; });
}
scale.domain = function(x) {
if (!arguments.length) return domain;
- domain = x;
+ domain = [];
index = {};
- var i = -1, j = -1, n = domain.length; while (++i < n) {
- x = domain[i];
- if (!(x in index)) index[x] = ++j;
- }
- rerange();
- return scale;
+ var i = -1, n = x.length, xi;
+ while (++i < n) if (!index[xi = x[i]]) index[xi] = domain.push(xi);
+ return scale[ranger.t](ranger.x, ranger.p);
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- rerange = d3_noop;
+ rangeBand = 0;
+ ranger = {t: "range", x: x};
return scale;
};
scale.rangePoints = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- step = (stop - start) / (domain.length - 1 + padding);
- range = domain.length == 1
- ? [(start + stop) / 2]
- : d3.range(start + step * padding / 2, stop + step / 2, step);
- rangeBand = 0;
- })();
+ var start = x[0],
+ stop = x[1],
+ step = (stop - start) / (domain.length - 1 + padding);
+ range = steps(domain.length < 2 ? (start + stop) / 2 : start + step * padding / 2, step);
+ rangeBand = 0;
+ ranger = {t: "rangePoints", x: x, p: padding};
return scale;
};
scale.rangeBands = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- step = (stop - start) / (domain.length + padding);
- range = d3.range(start + step * padding, stop, step);
- rangeBand = step * (1 - padding);
- })();
+ var start = x[0],
+ stop = x[1],
+ step = (stop - start) / (domain.length + padding);
+ range = steps(start + step * padding, step);
+ rangeBand = step * (1 - padding);
+ ranger = {t: "rangeBands", x: x, p: padding};
return scale;
};
scale.rangeRoundBands = function(x, padding) {
if (arguments.length < 2) padding = 0;
- (rerange = function() {
- var start = x[0],
- stop = x[1],
- diff = stop - start,
- step = Math.floor(diff / (domain.length + padding)),
- err = diff - (domain.length - padding) * step;
- range = d3.range(start + Math.round(err / 2), stop, step);
- rangeBand = Math.round(step * (1 - padding));
- })();
+ var start = x[0],
+ stop = x[1],
+ step = Math.floor((stop - start) / (domain.length + padding));
+ range = steps(start + Math.round((stop - start - (domain.length - padding) * step) / 2), step);
+ rangeBand = Math.round(step * (1 - padding));
+ ranger = {t: "rangeRoundBands", x: x, p: padding};
return scale;
};
@@ -2541,7 +2720,15 @@ d3.scale.ordinal = function() {
return rangeBand;
};
- return scale;
+ scale.rangeExtent = function() {
+ return ranger.t === "range" ? d3_scaleExtent(ranger.x) : ranger.x;
+ };
+
+ scale.copy = function() {
+ return d3_scale_ordinal(domain, ranger);
+ };
+
+ return scale.domain(domain);
};
/*
* This product includes color specifications and designs developed by Cynthia
@@ -2598,16 +2785,19 @@ var d3_category20c = [
"#636363", "#969696", "#bdbdbd", "#d9d9d9"
];
d3.scale.quantile = function() {
- var domain = [],
- range = [],
- thresholds = [];
+ return d3_scale_quantile([], []);
+};
+
+function d3_scale_quantile(domain, range) {
+ var thresholds;
function rescale() {
var k = 0,
n = domain.length,
q = range.length;
- thresholds.length = Math.max(0, q - 1);
+ thresholds = [];
while (++k < q) thresholds[k - 1] = d3.quantile(domain, k / q);
+ return scale;
}
function scale(x) {
@@ -2618,51 +2808,60 @@ d3.scale.quantile = function() {
scale.domain = function(x) {
if (!arguments.length) return domain;
domain = x.filter(function(d) { return !isNaN(d); }).sort(d3.ascending);
- rescale();
- return scale;
+ return rescale();
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- rescale();
- return scale;
+ return rescale();
};
scale.quantiles = function() {
return thresholds;
};
- return scale;
+ scale.copy = function() {
+ return d3_scale_quantile(domain, range); // copy on write!
+ };
+
+ return rescale();
};
d3.scale.quantize = function() {
- var x0 = 0,
- x1 = 1,
- kx = 2,
- i = 1,
- range = [0, 1];
+ return d3_scale_quantize(0, 1, [0, 1]);
+};
+
+function d3_scale_quantize(x0, x1, range) {
+ var kx, i;
function scale(x) {
return range[Math.max(0, Math.min(i, Math.floor(kx * (x - x0))))];
}
- scale.domain = function(x) {
- if (!arguments.length) return [x0, x1];
- x0 = x[0];
- x1 = x[1];
+ function rescale() {
kx = range.length / (x1 - x0);
+ i = range.length - 1;
return scale;
+ }
+
+ scale.domain = function(x) {
+ if (!arguments.length) return [x0, x1];
+ x0 = +x[0];
+ x1 = +x[x.length - 1];
+ return rescale();
};
scale.range = function(x) {
if (!arguments.length) return range;
range = x;
- kx = range.length / (x1 - x0);
- i = range.length - 1;
- return scale;
+ return rescale();
+ };
+
+ scale.copy = function() {
+ return d3_scale_quantize(x0, x1, range); // copy on write
};
- return scale;
+ return rescale();
};
d3.svg = {};
d3.svg.arc = function() {
@@ -2676,7 +2875,7 @@ d3.svg.arc = function() {
r1 = outerRadius.apply(this, arguments),
a0 = startAngle.apply(this, arguments) + d3_svg_arcOffset,
a1 = endAngle.apply(this, arguments) + d3_svg_arcOffset,
- da = a1 - a0,
+ da = (a1 < a0 && (da = a0, a0 = a1, a1 = da), a1 - a0),
df = da < Math.PI ? "0" : "1",
c0 = Math.cos(a0),
s0 = Math.sin(a0),
@@ -2688,8 +2887,8 @@ d3.svg.arc = function() {
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
+ "A" + r1 + "," + r1 + " 0 1,1 0," + r1
+ "M0," + r0
- + "A" + r0 + "," + r0 + " 0 1,1 0," + (-r0)
- + "A" + r0 + "," + r0 + " 0 1,1 0," + r0
+ + "A" + r0 + "," + r0 + " 0 1,0 0," + (-r0)
+ + "A" + r0 + "," + r0 + " 0 1,0 0," + r0
+ "Z"
: "M0," + r1
+ "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
@@ -2855,33 +3054,30 @@ var d3_svg_lineInterpolators = {
// Linear interpolation; generates "L" commands.
function d3_svg_lineLinear(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("L", (p = points[i])[0], ",", p[1]);
return path.join("");
}
// Step interpolation; generates "H" and "V" commands.
function d3_svg_lineStepBefore(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("V", (p = points[i])[1], "H", p[0]);
return path.join("");
}
// Step interpolation; generates "H" and "V" commands.
function d3_svg_lineStepAfter(points) {
- var path = [],
- i = 0,
+ var i = 0,
n = points.length,
- p = points[0];
- path.push(p[0], ",", p[1]);
+ p = points[0],
+ path = [p[0], ",", p[1]];
while (++i < n) path.push("H", (p = points[i])[0], "V", p[1]);
return path.join("");
}
@@ -2979,15 +3175,14 @@ function d3_svg_lineCardinalTangents(points, tension) {
// B-spline interpolation; generates "C" commands.
function d3_svg_lineBasis(points) {
if (points.length < 3) return d3_svg_lineLinear(points);
- var path = [],
- i = 1,
+ var i = 1,
n = points.length,
pi = points[0],
x0 = pi[0],
y0 = pi[1],
px = [x0, x0, x0, (pi = points[1])[0]],
- py = [y0, y0, y0, pi[1]];
- path.push(x0, ",", y0);
+ py = [y0, y0, y0, pi[1]],
+ path = [x0, ",", y0];
d3_svg_lineBasisBezier(path, px, py);
while (++i < n) {
pi = points[i];
@@ -3206,16 +3401,17 @@ function d3_svg_area(projection) {
x1 = d3_svg_lineX,
y0 = 0,
y1 = d3_svg_lineY,
- interpolate = "linear",
- interpolator = d3_svg_lineInterpolators[interpolate],
+ interpolate,
+ i0,
+ i1,
tension = .7;
function area(d) {
if (d.length < 1) return null;
var points0 = d3_svg_linePoints(this, d, x0, y0),
points1 = d3_svg_linePoints(this, d, x0 === x1 ? d3_svg_areaX(points0) : x1, y0 === y1 ? d3_svg_areaY(points0) : y1);
- return "M" + interpolator(projection(points1), tension)
- + "L" + interpolator(projection(points0.reverse()), tension)
+ return "M" + i0(projection(points1), tension)
+ + "L" + i1(projection(points0.reverse()), tension)
+ "Z";
}
@@ -3257,7 +3453,8 @@ function d3_svg_area(projection) {
area.interpolate = function(x) {
if (!arguments.length) return interpolate;
- interpolator = d3_svg_lineInterpolators[interpolate = x];
+ i0 = d3_svg_lineInterpolators[interpolate = x];
+ i1 = i0.reverse || i0;
return area;
};
@@ -3267,9 +3464,12 @@ function d3_svg_area(projection) {
return area;
};
- return area;
+ return area.interpolate("linear");
}
+d3_svg_lineStepBefore.reverse = d3_svg_lineStepAfter;
+d3_svg_lineStepAfter.reverse = d3_svg_lineStepBefore;
+
d3.svg.area = function() {
return d3_svg_area(Object);
};
@@ -3308,10 +3508,10 @@ d3.svg.chord = function() {
var s = subgroup(this, source, d, i),
t = subgroup(this, target, d, i);
return "M" + s.p0
- + arc(s.r, s.p1) + (equals(s, t)
+ + arc(s.r, s.p1, s.a1 - s.a0) + (equals(s, t)
? curve(s.r, s.p1, s.r, s.p0)
: curve(s.r, s.p1, t.r, t.p0)
- + arc(t.r, t.p1)
+ + arc(t.r, t.p1, t.a1 - t.a0)
+ curve(t.r, t.p1, s.r, s.p0))
+ "Z";
}
@@ -3334,8 +3534,8 @@ d3.svg.chord = function() {
return a.a0 == b.a0 && a.a1 == b.a1;
}
- function arc(r, p) {
- return "A" + r + "," + r + " 0 0,1 " + p;
+ function arc(r, p, a) {
+ return "A" + r + "," + r + " 0 " + +(a > Math.PI) + ",1 " + p;
}
function curve(r0, p0, r1, p1) {
@@ -3465,7 +3665,7 @@ function d3_svg_mousePoint(container, e) {
var point = (container.ownerSVGElement || container).createSVGPoint();
if ((d3_mouse_bug44083 < 0) && (window.scrollX || window.scrollY)) {
var svg = d3.select(document.body)
- .append("svg:svg")
+ .append("svg")
.style("position", "absolute")
.style("top", 0)
.style("left", 0);
@@ -3483,8 +3683,9 @@ function d3_svg_mousePoint(container, e) {
point = point.matrixTransform(container.getScreenCTM().inverse());
return [point.x, point.y];
};
-d3.svg.touches = function(container) {
- var touches = d3.event.touches;
+d3.svg.touches = function(container, touches) {
+ if (arguments.length < 2) touches = d3.event.touches;
+
return touches ? d3_array(touches).map(function(touch) {
var point = d3_svg_mousePoint(container, touch);
point.identifier = touch.identifier;
@@ -3589,4 +3790,906 @@ d3.svg.symbolTypes = d3.keys(d3_svg_symbols);
var d3_svg_symbolSqrt3 = Math.sqrt(3),
d3_svg_symbolTan30 = Math.tan(30 * Math.PI / 180);
+d3.svg.axis = function() {
+ var scale = d3.scale.linear(),
+ orient = "bottom",
+ tickMajorSize = 6,
+ tickMinorSize = 6,
+ tickEndSize = 6,
+ tickPadding = 3,
+ tickArguments_ = [10],
+ tickFormat_,
+ tickSubdivide = 0;
+
+ function axis(selection) {
+ selection.each(function(d, i, j) {
+ var g = d3.select(this);
+
+ // If selection is a transition, create subtransitions.
+ var transition = selection.delay ? function(o) {
+ var id = d3_transitionInheritId;
+ try {
+ d3_transitionInheritId = selection.id;
+ return o.transition()
+ .delay(selection[j][i].delay)
+ .duration(selection[j][i].duration)
+ .ease(selection.ease());
+ } finally {
+ d3_transitionInheritId = id;
+ }
+ } : Object;
+
+ // Ticks, or domain values for ordinal scales.
+ var ticks = scale.ticks ? scale.ticks.apply(scale, tickArguments_) : scale.domain(),
+ tickFormat = tickFormat_ == null ? (scale.tickFormat ? scale.tickFormat.apply(scale, tickArguments_) : String) : tickFormat_;
+
+ // Minor ticks.
+ var subticks = d3_svg_axisSubdivide(scale, ticks, tickSubdivide),
+ subtick = g.selectAll(".minor").data(subticks, String),
+ subtickEnter = subtick.enter().insert("line", "g").attr("class", "tick minor").style("opacity", 1e-6),
+ subtickExit = transition(subtick.exit()).style("opacity", 1e-6).remove(),
+ subtickUpdate = transition(subtick).style("opacity", 1);
+
+ // Major ticks.
+ var tick = g.selectAll("g").data(ticks, String),
+ tickEnter = tick.enter().insert("g", "path").style("opacity", 1e-6),
+ tickExit = transition(tick.exit()).style("opacity", 1e-6).remove(),
+ tickUpdate = transition(tick).style("opacity", 1),
+ tickTransform;
+
+ // Domain.
+ var range = d3_scaleRange(scale),
+ path = g.selectAll(".domain").data([0]),
+ pathEnter = path.enter().append("path").attr("class", "domain"),
+ pathUpdate = transition(path);
+
+ // Stash a snapshot of the new scale, and retrieve the old snapshot.
+ var scale1 = scale.copy(),
+ scale0 = this.__chart__ || scale1;
+ this.__chart__ = scale1;
+
+ tickEnter.append("line").attr("class", "tick");
+ tickEnter.append("text");
+ tickUpdate.select("text").text(tickFormat);
+
+ switch (orient) {
+ case "bottom": {
+ tickTransform = d3_svg_axisX;
+ subtickUpdate.attr("x2", 0).attr("y2", tickMinorSize);
+ tickUpdate.select("line").attr("x2", 0).attr("y2", tickMajorSize);
+ tickUpdate.select("text").attr("x", 0).attr("y", Math.max(tickMajorSize, 0) + tickPadding).attr("dy", ".71em").attr("text-anchor", "middle");
+ pathUpdate.attr("d", "M" + range[0] + "," + tickEndSize + "V0H" + range[1] + "V" + tickEndSize);
+ break;
+ }
+ case "top": {
+ tickTransform = d3_svg_axisX;
+ subtickUpdate.attr("x2", 0).attr("y2", -tickMinorSize);
+ tickUpdate.select("line").attr("x2", 0).attr("y2", -tickMajorSize);
+ tickUpdate.select("text").attr("x", 0).attr("y", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("dy", "0em").attr("text-anchor", "middle");
+ pathUpdate.attr("d", "M" + range[0] + "," + -tickEndSize + "V0H" + range[1] + "V" + -tickEndSize);
+ break;
+ }
+ case "left": {
+ tickTransform = d3_svg_axisY;
+ subtickUpdate.attr("x2", -tickMinorSize).attr("y2", 0);
+ tickUpdate.select("line").attr("x2", -tickMajorSize).attr("y2", 0);
+ tickUpdate.select("text").attr("x", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "end");
+ pathUpdate.attr("d", "M" + -tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + -tickEndSize);
+ break;
+ }
+ case "right": {
+ tickTransform = d3_svg_axisY;
+ subtickUpdate.attr("x2", tickMinorSize).attr("y2", 0);
+ tickUpdate.select("line").attr("x2", tickMajorSize).attr("y2", 0);
+ tickUpdate.select("text").attr("x", Math.max(tickMajorSize, 0) + tickPadding).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "start");
+ pathUpdate.attr("d", "M" + tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + tickEndSize);
+ break;
+ }
+ }
+
+ // For quantitative scales:
+ // - enter new ticks from the old scale
+ // - exit old ticks to the new scale
+ if (scale.ticks) {
+ tickEnter.call(tickTransform, scale0);
+ tickUpdate.call(tickTransform, scale1);
+ tickExit.call(tickTransform, scale1);
+ subtickEnter.call(tickTransform, scale0);
+ subtickUpdate.call(tickTransform, scale1);
+ subtickExit.call(tickTransform, scale1);
+ }
+
+ // For ordinal scales:
+ // - any entering ticks are undefined in the old scale
+ // - any exiting ticks are undefined in the new scale
+ // Therefore, we only need to transition updating ticks.
+ else {
+ var dx = scale1.rangeBand() / 2, x = function(d) { return scale1(d) + dx; };
+ tickEnter.call(tickTransform, x);
+ tickUpdate.call(tickTransform, x);
+ }
+ });
+ }
+
+ axis.scale = function(x) {
+ if (!arguments.length) return scale;
+ scale = x;
+ return axis;
+ };
+
+ axis.orient = function(x) {
+ if (!arguments.length) return orient;
+ orient = x;
+ return axis;
+ };
+
+ axis.ticks = function() {
+ if (!arguments.length) return tickArguments_;
+ tickArguments_ = arguments;
+ return axis;
+ };
+
+ axis.tickFormat = function(x) {
+ if (!arguments.length) return tickFormat_;
+ tickFormat_ = x;
+ return axis;
+ };
+
+ axis.tickSize = function(x, y, z) {
+ if (!arguments.length) return tickMajorSize;
+ var n = arguments.length - 1;
+ tickMajorSize = +x;
+ tickMinorSize = n > 1 ? +y : tickMajorSize;
+ tickEndSize = n > 0 ? +arguments[n] : tickMajorSize;
+ return axis;
+ };
+
+ axis.tickPadding = function(x) {
+ if (!arguments.length) return tickPadding;
+ tickPadding = +x;
+ return axis;
+ };
+
+ axis.tickSubdivide = function(x) {
+ if (!arguments.length) return tickSubdivide;
+ tickSubdivide = +x;
+ return axis;
+ };
+
+ return axis;
+};
+
+function d3_svg_axisX(selection, x) {
+ selection.attr("transform", function(d) { return "translate(" + x(d) + ",0)"; });
+}
+
+function d3_svg_axisY(selection, y) {
+ selection.attr("transform", function(d) { return "translate(0," + y(d) + ")"; });
+}
+
+function d3_svg_axisSubdivide(scale, ticks, m) {
+ subticks = [];
+ if (m && ticks.length > 1) {
+ var extent = d3_scaleExtent(scale.domain()),
+ subticks,
+ i = -1,
+ n = ticks.length,
+ d = (ticks[1] - ticks[0]) / ++m,
+ j,
+ v;
+ while (++i < n) {
+ for (j = m; --j > 0;) {
+ if ((v = +ticks[i] - j * d) >= extent[0]) {
+ subticks.push(v);
+ }
+ }
+ }
+ for (--i, j = 0; ++j < m && (v = +ticks[i] + j * d) < extent[1];) {
+ subticks.push(v);
+ }
+ }
+ return subticks;
+}
+d3.svg.brush = function() {
+ var event = d3.dispatch("brushstart", "brush", "brushend"),
+ x, // x-scale, optional
+ y, // y-scale, optional
+ extent = [[0, 0], [0, 0]]; // [x0, y0], [x1, y1]
+
+ function brush(g) {
+ var resizes = x && y ? ["n", "e", "s", "w", "nw", "ne", "se", "sw"]
+ : x ? ["e", "w"]
+ : y ? ["n", "s"]
+ : [];
+
+ g.each(function() {
+ var g = d3.select(this).on("mousedown.brush", down),
+ bg = g.selectAll(".background").data([,]),
+ fg = g.selectAll(".extent").data([,]),
+ tz = g.selectAll(".resize").data(resizes, String),
+ e;
+
+ // An invisible, mouseable area for starting a new brush.
+ bg.enter().append("rect")
+ .attr("class", "background")
+ .style("visibility", "hidden")
+ .style("pointer-events", "all")
+ .style("cursor", "crosshair");
+
+ // The visible brush extent; style this as you like!
+ fg.enter().append("rect")
+ .attr("class", "extent")
+ .style("cursor", "move");
+
+ // More invisible rects for resizing the extent.
+ tz.enter().append("rect")
+ .attr("class", function(d) { return "resize " + d; })
+ .attr("width", 6)
+ .attr("height", 6)
+ .style("visibility", "hidden")
+ .style("pointer-events", brush.empty() ? "none" : "all")
+ .style("cursor", function(d) { return d3_svg_brushCursor[d]; });
+
+ // Remove any superfluous resizers.
+ tz.exit().remove();
+
+ // Initialize the background to fill the defined range.
+ // If the range isn't defined, you can post-process.
+ if (x) {
+ e = d3_scaleRange(x);
+ bg.attr("x", e[0]).attr("width", e[1] - e[0]);
+ d3_svg_brushRedrawX(g, extent);
+ }
+ if (y) {
+ e = d3_scaleRange(y);
+ bg.attr("y", e[0]).attr("height", e[1] - e[0]);
+ d3_svg_brushRedrawY(g, extent);
+ }
+ });
+ }
+
+ function down() {
+ var target = d3.select(d3.event.target);
+
+ // Store some global state for the duration of the brush gesture.
+ d3_svg_brush = brush;
+ d3_svg_brushTarget = this;
+ d3_svg_brushExtent = extent;
+ d3_svg_brushOffset = d3.svg.mouse(d3_svg_brushTarget);
+
+ // If the extent was clicked on, drag rather than brush;
+ // store the offset between the mouse and extent origin instead.
+ if (d3_svg_brushDrag = target.classed("extent")) {
+ d3_svg_brushOffset[0] = extent[0][0] - d3_svg_brushOffset[0];
+ d3_svg_brushOffset[1] = extent[0][1] - d3_svg_brushOffset[1];
+ }
+
+ // If a resizer was clicked on, record which side is to be resized.
+ // Also, set the offset to the opposite side.
+ else if (target.classed("resize")) {
+ d3_svg_brushResize = d3.event.target.__data__;
+ d3_svg_brushOffset[0] = extent[+/w$/.test(d3_svg_brushResize)][0];
+ d3_svg_brushOffset[1] = extent[+/^n/.test(d3_svg_brushResize)][1];
+ }
+
+ // If the ALT key is down when starting a brush, the center is at the mouse.
+ else if (d3.event.altKey) {
+ d3_svg_brushCenter = d3_svg_brushOffset.slice();
+ }
+
+ // Restrict which dimensions are resized.
+ d3_svg_brushX = !/^(n|s)$/.test(d3_svg_brushResize) && x;
+ d3_svg_brushY = !/^(e|w)$/.test(d3_svg_brushResize) && y;
+
+ // Notify listeners.
+ d3_svg_brushDispatch = dispatcher(this, arguments);
+ d3_svg_brushDispatch("brushstart");
+ d3_svg_brushMove();
+ d3_eventCancel();
+ }
+
+ function dispatcher(that, argumentz) {
+ return function(type) {
+ var e = d3.event;
+ try {
+ d3.event = {type: type, target: brush};
+ event[type].apply(that, argumentz);
+ } finally {
+ d3.event = e;
+ }
+ };
+ }
+
+ brush.x = function(z) {
+ if (!arguments.length) return x;
+ x = z;
+ return brush;
+ };
+
+ brush.y = function(z) {
+ if (!arguments.length) return y;
+ y = z;
+ return brush;
+ };
+
+ brush.extent = function(z) {
+ var x0, x1, y0, y1, t;
+
+ // Invert the pixel extent to data-space.
+ if (!arguments.length) {
+ if (x) {
+ x0 = extent[0][0], x1 = extent[1][0];
+ if (x.invert) x0 = x.invert(x0), x1 = x.invert(x1);
+ if (x1 < x0) t = x0, x0 = x1, x1 = t;
+ }
+ if (y) {
+ y0 = extent[0][1], y1 = extent[1][1];
+ if (y.invert) y0 = y.invert(y0), y1 = y.invert(y1);
+ if (y1 < y0) t = y0, y0 = y1, y1 = t;
+ }
+ return x && y ? [[x0, y0], [x1, y1]] : x ? [x0, x1] : y && [y0, y1];
+ }
+
+ // Scale the data-space extent to pixels.
+ if (x) {
+ x0 = z[0], x1 = z[1];
+ if (y) x0 = x0[0], x1 = x1[0];
+ if (x.invert) x0 = x(x0), x1 = x(x1);
+ if (x1 < x0) t = x0, x0 = x1, x1 = t;
+ extent[0][0] = x0, extent[1][0] = x1;
+ }
+ if (y) {
+ y0 = z[0], y1 = z[1];
+ if (x) y0 = y0[1], y1 = y1[1];
+ if (y.invert) y0 = y(y0), y1 = y(y1);
+ if (y1 < y0) t = y0, y0 = y1, y1 = t;
+ extent[0][1] = y0, extent[1][1] = y1;
+ }
+
+ return brush;
+ };
+
+ brush.clear = function() {
+ extent[0][0] =
+ extent[0][1] =
+ extent[1][0] =
+ extent[1][1] = 0;
+ return brush;
+ };
+
+ brush.empty = function() {
+ return (x && extent[0][0] === extent[1][0])
+ || (y && extent[0][1] === extent[1][1]);
+ };
+
+ d3.select(window)
+ .on("mousemove.brush", d3_svg_brushMove)
+ .on("mouseup.brush", d3_svg_brushUp)
+ .on("keydown.brush", d3_svg_brushKeydown)
+ .on("keyup.brush", d3_svg_brushKeyup);
+
+ return d3.rebind(brush, event, "on");
+};
+
+var d3_svg_brush,
+ d3_svg_brushDispatch,
+ d3_svg_brushTarget,
+ d3_svg_brushX,
+ d3_svg_brushY,
+ d3_svg_brushExtent,
+ d3_svg_brushDrag,
+ d3_svg_brushResize,
+ d3_svg_brushCenter,
+ d3_svg_brushOffset;
+
+function d3_svg_brushRedrawX(g, extent) {
+ g.select(".extent").attr("x", extent[0][0]);
+ g.selectAll(".n,.s,.w,.nw,.sw").attr("x", extent[0][0] - 2);
+ g.selectAll(".e,.ne,.se").attr("x", extent[1][0] - 3);
+ g.selectAll(".extent,.n,.s").attr("width", extent[1][0] - extent[0][0]);
+}
+
+function d3_svg_brushRedrawY(g, extent) {
+ g.select(".extent").attr("y", extent[0][1]);
+ g.selectAll(".n,.e,.w,.nw,.ne").attr("y", extent[0][1] - 3);
+ g.selectAll(".s,.se,.sw").attr("y", extent[1][1] - 4);
+ g.selectAll(".extent,.e,.w").attr("height", extent[1][1] - extent[0][1]);
+}
+
+function d3_svg_brushKeydown() {
+ if (d3.event.keyCode == 32 && d3_svg_brushTarget && !d3_svg_brushDrag) {
+ d3_svg_brushCenter = null;
+ d3_svg_brushOffset[0] -= d3_svg_brushExtent[1][0];
+ d3_svg_brushOffset[1] -= d3_svg_brushExtent[1][1];
+ d3_svg_brushDrag = 2;
+ d3_eventCancel();
+ }
+}
+
+function d3_svg_brushKeyup() {
+ if (d3.event.keyCode == 32 && d3_svg_brushDrag == 2) {
+ d3_svg_brushOffset[0] += d3_svg_brushExtent[1][0];
+ d3_svg_brushOffset[1] += d3_svg_brushExtent[1][1];
+ d3_svg_brushDrag = 0;
+ d3_eventCancel();
+ }
+}
+
+function d3_svg_brushMove() {
+ if (d3_svg_brushOffset) {
+ var mouse = d3.svg.mouse(d3_svg_brushTarget),
+ g = d3.select(d3_svg_brushTarget);
+
+ if (!d3_svg_brushDrag) {
+
+ // If needed, determine the center from the current extent.
+ if (d3.event.altKey) {
+ if (!d3_svg_brushCenter) {
+ d3_svg_brushCenter = [
+ (d3_svg_brushExtent[0][0] + d3_svg_brushExtent[1][0]) / 2,
+ (d3_svg_brushExtent[0][1] + d3_svg_brushExtent[1][1]) / 2
+ ];
+ }
+
+ // Update the offset, for when the ALT key is released.
+ d3_svg_brushOffset[0] = d3_svg_brushExtent[+(mouse[0] < d3_svg_brushCenter[0])][0];
+ d3_svg_brushOffset[1] = d3_svg_brushExtent[+(mouse[1] < d3_svg_brushCenter[1])][1];
+ }
+
+ // When the ALT key is released, we clear the center.
+ else d3_svg_brushCenter = null;
+ }
+
+ // Update the brush extent for each dimension.
+ if (d3_svg_brushX) {
+ d3_svg_brushMove1(mouse, d3_svg_brushX, 0);
+ d3_svg_brushRedrawX(g, d3_svg_brushExtent);
+ }
+ if (d3_svg_brushY) {
+ d3_svg_brushMove1(mouse, d3_svg_brushY, 1);
+ d3_svg_brushRedrawY(g, d3_svg_brushExtent);
+ }
+
+ // Notify listeners.
+ d3_svg_brushDispatch("brush");
+ }
+}
+
+function d3_svg_brushMove1(mouse, scale, i) {
+ var range = d3_scaleRange(scale),
+ r0 = range[0],
+ r1 = range[1],
+ offset = d3_svg_brushOffset[i],
+ size = d3_svg_brushExtent[1][i] - d3_svg_brushExtent[0][i],
+ min,
+ max;
+
+ // When dragging, reduce the range by the extent size and offset.
+ if (d3_svg_brushDrag) {
+ r0 -= offset;
+ r1 -= size + offset;
+ }
+
+ // Clamp the mouse so that the extent fits within the range extent.
+ min = Math.max(r0, Math.min(r1, mouse[i]));
+
+ // Compute the new extent bounds.
+ if (d3_svg_brushDrag) {
+ max = (min += offset) + size;
+ } else {
+
+ // If the ALT key is pressed, then preserve the center of the extent.
+ if (d3_svg_brushCenter) offset = Math.max(r0, Math.min(r1, 2 * d3_svg_brushCenter[i] - min));
+
+ // Compute the min and max of the offset and mouse.
+ if (offset < min) {
+ max = min;
+ min = offset;
+ } else {
+ max = offset;
+ }
+ }
+
+ // Update the stored bounds.
+ d3_svg_brushExtent[0][i] = min;
+ d3_svg_brushExtent[1][i] = max;
+}
+
+function d3_svg_brushUp() {
+ if (d3_svg_brushOffset) {
+ d3_svg_brushMove();
+ d3.select(d3_svg_brushTarget).selectAll(".resize").style("pointer-events", d3_svg_brush.empty() ? "none" : "all");
+ d3_svg_brushDispatch("brushend");
+ d3_svg_brush =
+ d3_svg_brushDispatch =
+ d3_svg_brushTarget =
+ d3_svg_brushX =
+ d3_svg_brushY =
+ d3_svg_brushExtent =
+ d3_svg_brushDrag =
+ d3_svg_brushResize =
+ d3_svg_brushCenter =
+ d3_svg_brushOffset = null;
+ d3_eventCancel();
+ }
+}
+
+var d3_svg_brushCursor = {
+ n: "ns-resize",
+ e: "ew-resize",
+ s: "ns-resize",
+ w: "ew-resize",
+ nw: "nwse-resize",
+ ne: "nesw-resize",
+ se: "nwse-resize",
+ sw: "nesw-resize"
+};
+d3.behavior = {};
+// TODO Track touch points by identifier.
+
+d3.behavior.drag = function() {
+ var event = d3.dispatch("drag", "dragstart", "dragend"),
+ origin = null;
+
+ function drag() {
+ this
+ .on("mousedown.drag", mousedown)
+ .on("touchstart.drag", mousedown);
+
+ d3.select(window)
+ .on("mousemove.drag", d3_behavior_dragMove)
+ .on("touchmove.drag", d3_behavior_dragMove)
+ .on("mouseup.drag", d3_behavior_dragUp, true)
+ .on("touchend.drag", d3_behavior_dragUp, true)
+ .on("click.drag", d3_behavior_dragClick, true);
+ }
+
+ // snapshot the local context for subsequent dispatch
+ function start() {
+ d3_behavior_dragEvent = event;
+ d3_behavior_dragEventTarget = d3.event.target;
+ d3_behavior_dragTarget = this;
+ d3_behavior_dragArguments = arguments;
+ d3_behavior_dragOrigin = d3_behavior_dragPoint();
+ if (origin) {
+ d3_behavior_dragOffset = origin.apply(d3_behavior_dragTarget, d3_behavior_dragArguments);
+ d3_behavior_dragOffset = [d3_behavior_dragOffset.x - d3_behavior_dragOrigin[0], d3_behavior_dragOffset.y - d3_behavior_dragOrigin[1]];
+ } else {
+ d3_behavior_dragOffset = [0, 0];
+ }
+ d3_behavior_dragMoved = 0;
+ }
+
+ function mousedown() {
+ start.apply(this, arguments);
+ d3_behavior_dragDispatch("dragstart");
+ }
+
+ drag.origin = function(x) {
+ if (!arguments.length) return origin;
+ origin = x;
+ return drag;
+ };
+
+ return d3.rebind(drag, event, "on");
+};
+
+var d3_behavior_dragEvent,
+ d3_behavior_dragEventTarget,
+ d3_behavior_dragTarget,
+ d3_behavior_dragArguments,
+ d3_behavior_dragOffset,
+ d3_behavior_dragOrigin,
+ d3_behavior_dragMoved;
+
+function d3_behavior_dragDispatch(type) {
+ var p = d3_behavior_dragPoint(),
+ o = d3.event,
+ e = d3.event = {type: type};
+
+ if (p) {
+ e.x = p[0] + d3_behavior_dragOffset[0];
+ e.y = p[1] + d3_behavior_dragOffset[1];
+ e.dx = p[0] - d3_behavior_dragOrigin[0];
+ e.dy = p[1] - d3_behavior_dragOrigin[1];
+ d3_behavior_dragMoved |= e.dx | e.dy;
+ d3_behavior_dragOrigin = p;
+ }
+
+ try {
+ d3_behavior_dragEvent[type].apply(d3_behavior_dragTarget, d3_behavior_dragArguments);
+ } finally {
+ d3.event = o;
+ }
+
+ o.stopPropagation();
+ o.preventDefault();
+}
+
+function d3_behavior_dragPoint() {
+ var p = d3_behavior_dragTarget.parentNode,
+ t = d3.event.changedTouches;
+ return p && (t
+ ? d3.svg.touches(p, t)[0]
+ : d3.svg.mouse(p));
+}
+
+function d3_behavior_dragMove() {
+ if (!d3_behavior_dragTarget) return;
+ var parent = d3_behavior_dragTarget.parentNode;
+
+ // O NOES! The drag element was removed from the DOM.
+ if (!parent) return d3_behavior_dragUp();
+
+ d3_behavior_dragDispatch("drag");
+ d3_eventCancel();
+}
+
+function d3_behavior_dragUp() {
+ if (!d3_behavior_dragTarget) return;
+ d3_behavior_dragDispatch("dragend");
+
+ // If the node was moved, prevent the mouseup from propagating.
+ // Also prevent the subsequent click from propagating (e.g., for anchors).
+ if (d3_behavior_dragMoved) {
+ d3_eventCancel();
+ d3_behavior_dragMoved = d3.event.target === d3_behavior_dragEventTarget;
+ }
+
+ d3_behavior_dragEvent =
+ d3_behavior_dragEventTarget =
+ d3_behavior_dragTarget =
+ d3_behavior_dragArguments =
+ d3_behavior_dragOffset =
+ d3_behavior_dragOrigin = null;
+}
+
+function d3_behavior_dragClick() {
+ if (d3_behavior_dragMoved) {
+ d3_eventCancel();
+ d3_behavior_dragMoved = 0;
+ }
+}
+// TODO unbind zoom behavior?
+d3.behavior.zoom = function() {
+ var xyz = [0, 0, 0],
+ event = d3.dispatch("zoom"),
+ extent = d3_behavior_zoomInfiniteExtent;
+
+ function zoom() {
+ this
+ .on("mousedown.zoom", mousedown)
+ .on("mousewheel.zoom", mousewheel)
+ .on("DOMMouseScroll.zoom", mousewheel)
+ .on("dblclick.zoom", dblclick)
+ .on("touchstart.zoom", touchstart);
+
+ d3.select(window)
+ .on("mousemove.zoom", d3_behavior_zoomMousemove)
+ .on("mouseup.zoom", d3_behavior_zoomMouseup)
+ .on("touchmove.zoom", d3_behavior_zoomTouchmove)
+ .on("touchend.zoom", d3_behavior_zoomTouchup)
+ .on("click.zoom", d3_behavior_zoomClick, true);
+ }
+
+ // snapshot the local context for subsequent dispatch
+ function start() {
+ d3_behavior_zoomXyz = xyz;
+ d3_behavior_zoomExtent = extent;
+ d3_behavior_zoomDispatch = event.zoom;
+ d3_behavior_zoomEventTarget = d3.event.target;
+ d3_behavior_zoomTarget = this;
+ d3_behavior_zoomArguments = arguments;
+ }
+
+ function mousedown() {
+ start.apply(this, arguments);
+ d3_behavior_zoomPanning = d3_behavior_zoomLocation(d3.svg.mouse(d3_behavior_zoomTarget));
+ d3_behavior_zoomMoved = 0;
+ d3.event.preventDefault();
+ window.focus();
+ }
+
+ // store starting mouse location
+ function mousewheel() {
+ start.apply(this, arguments);
+ if (!d3_behavior_zoomZooming) d3_behavior_zoomZooming = d3_behavior_zoomLocation(d3.svg.mouse(d3_behavior_zoomTarget));
+ d3_behavior_zoomTo(d3_behavior_zoomDelta() + xyz[2], d3.svg.mouse(d3_behavior_zoomTarget), d3_behavior_zoomZooming);
+ }
+
+ function dblclick() {
+ start.apply(this, arguments);
+ var mouse = d3.svg.mouse(d3_behavior_zoomTarget);
+ d3_behavior_zoomTo(d3.event.shiftKey ? Math.ceil(xyz[2] - 1) : Math.floor(xyz[2] + 1), mouse, d3_behavior_zoomLocation(mouse));
+ }
+
+ // doubletap detection
+ function touchstart() {
+ start.apply(this, arguments);
+ var touches = d3_behavior_zoomTouchup(),
+ touch,
+ now = Date.now();
+ if ((touches.length === 1) && (now - d3_behavior_zoomLast < 300)) {
+ d3_behavior_zoomTo(1 + Math.floor(xyz[2]), touch = touches[0], d3_behavior_zoomLocations[touch.identifier]);
+ }
+ d3_behavior_zoomLast = now;
+ }
+
+ zoom.extent = function(x) {
+ if (!arguments.length) return extent;
+ extent = x == null ? d3_behavior_zoomInfiniteExtent : x;
+ return zoom;
+ };
+
+ return d3.rebind(zoom, event, "on");
+};
+
+var d3_behavior_zoomDiv,
+ d3_behavior_zoomPanning,
+ d3_behavior_zoomZooming,
+ d3_behavior_zoomLocations = {}, // identifier -> location
+ d3_behavior_zoomLast = 0,
+ d3_behavior_zoomXyz,
+ d3_behavior_zoomExtent,
+ d3_behavior_zoomDispatch,
+ d3_behavior_zoomEventTarget,
+ d3_behavior_zoomTarget,
+ d3_behavior_zoomArguments,
+ d3_behavior_zoomMoved;
+
+function d3_behavior_zoomLocation(point) {
+ return [
+ point[0] - d3_behavior_zoomXyz[0],
+ point[1] - d3_behavior_zoomXyz[1],
+ d3_behavior_zoomXyz[2]
+ ];
+}
+
+// detect the pixels that would be scrolled by this wheel event
+function d3_behavior_zoomDelta() {
+
+ // mousewheel events are totally broken!
+ // https://bugs.webkit.org/show_bug.cgi?id=40441
+ // not only that, but Chrome and Safari differ in re. to acceleration!
+ if (!d3_behavior_zoomDiv) {
+ d3_behavior_zoomDiv = d3.select("body").append("div")
+ .style("visibility", "hidden")
+ .style("top", 0)
+ .style("height", 0)
+ .style("width", 0)
+ .style("overflow-y", "scroll")
+ .append("div")
+ .style("height", "2000px")
+ .node().parentNode;
+ }
+
+ var e = d3.event, delta;
+ try {
+ d3_behavior_zoomDiv.scrollTop = 1000;
+ d3_behavior_zoomDiv.dispatchEvent(e);
+ delta = 1000 - d3_behavior_zoomDiv.scrollTop;
+ } catch (error) {
+ delta = e.wheelDelta || (-e.detail * 5);
+ }
+
+ return delta * .005;
+}
+
+// Note: Since we don't rotate, it's possible for the touches to become
+// slightly detached from their original positions. Thus, we recompute the
+// touch points on touchend as well as touchstart!
+function d3_behavior_zoomTouchup() {
+ var touches = d3.svg.touches(d3_behavior_zoomTarget),
+ i = -1,
+ n = touches.length,
+ touch;
+ while (++i < n) d3_behavior_zoomLocations[(touch = touches[i]).identifier] = d3_behavior_zoomLocation(touch);
+ return touches;
+}
+
+function d3_behavior_zoomTouchmove() {
+ var touches = d3.svg.touches(d3_behavior_zoomTarget);
+ switch (touches.length) {
+
+ // single-touch pan
+ case 1: {
+ var touch = touches[0];
+ d3_behavior_zoomTo(d3_behavior_zoomXyz[2], touch, d3_behavior_zoomLocations[touch.identifier]);
+ break;
+ }
+
+ // double-touch pan + zoom
+ case 2: {
+ var p0 = touches[0],
+ p1 = touches[1],
+ p2 = [(p0[0] + p1[0]) / 2, (p0[1] + p1[1]) / 2],
+ l0 = d3_behavior_zoomLocations[p0.identifier],
+ l1 = d3_behavior_zoomLocations[p1.identifier],
+ l2 = [(l0[0] + l1[0]) / 2, (l0[1] + l1[1]) / 2, l0[2]];
+ d3_behavior_zoomTo(Math.log(d3.event.scale) / Math.LN2 + l0[2], p2, l2);
+ break;
+ }
+ }
+}
+
+function d3_behavior_zoomMousemove() {
+ d3_behavior_zoomZooming = null;
+ if (d3_behavior_zoomPanning) {
+ d3_behavior_zoomMoved = 1;
+ d3_behavior_zoomTo(d3_behavior_zoomXyz[2], d3.svg.mouse(d3_behavior_zoomTarget), d3_behavior_zoomPanning);
+ }
+}
+
+function d3_behavior_zoomMouseup() {
+ if (d3_behavior_zoomPanning) {
+ if (d3_behavior_zoomMoved) {
+ d3_eventCancel();
+ d3_behavior_zoomMoved = d3_behavior_zoomEventTarget === d3.event.target;
+ }
+
+ d3_behavior_zoomXyz =
+ d3_behavior_zoomExtent =
+ d3_behavior_zoomDispatch =
+ d3_behavior_zoomEventTarget =
+ d3_behavior_zoomTarget =
+ d3_behavior_zoomArguments =
+ d3_behavior_zoomPanning = null;
+ }
+}
+
+function d3_behavior_zoomClick() {
+ if (d3_behavior_zoomMoved) {
+ d3_eventCancel();
+ d3_behavior_zoomMoved = 0;
+ }
+}
+
+function d3_behavior_zoomTo(z, x0, x1) {
+ z = d3_behavior_zoomExtentClamp(z, 2);
+ var j = Math.pow(2, d3_behavior_zoomXyz[2]),
+ k = Math.pow(2, z),
+ K = Math.pow(2, (d3_behavior_zoomXyz[2] = z) - x1[2]),
+ x_ = d3_behavior_zoomXyz[0],
+ y_ = d3_behavior_zoomXyz[1],
+ x = d3_behavior_zoomXyz[0] = d3_behavior_zoomExtentClamp((x0[0] - x1[0] * K), 0, k),
+ y = d3_behavior_zoomXyz[1] = d3_behavior_zoomExtentClamp((x0[1] - x1[1] * K), 1, k),
+ o = d3.event; // Events can be reentrant (e.g., focus).
+
+ d3.event = {
+ scale: k,
+ translate: [x, y],
+ transform: function(sx, sy) {
+ if (sx) transform(sx, x_, x);
+ if (sy) transform(sy, y_, y);
+ }
+ };
+
+ function transform(scale, a, b) {
+ scale.domain(scale.range().map(function(v) { return scale.invert(((v - b) * j) / k + a); }));
+ }
+
+ try {
+ d3_behavior_zoomDispatch.apply(d3_behavior_zoomTarget, d3_behavior_zoomArguments);
+ } finally {
+ d3.event = o;
+ }
+
+ o.preventDefault();
+}
+
+var d3_behavior_zoomInfiniteExtent = [
+ [-Infinity, Infinity],
+ [-Infinity, Infinity],
+ [-Infinity, Infinity]
+];
+
+function d3_behavior_zoomExtentClamp(x, i, k) {
+ var range = d3_behavior_zoomExtent[i],
+ r0 = range[0],
+ r1 = range[1];
+ return arguments.length === 3
+ ? Math.max(r1 * (r1 === Infinity ? -Infinity : 1 / k - 1),
+ Math.min(r0 === -Infinity ? Infinity : r0, x / k)) * k
+ : Math.max(r0, Math.min(r1, x));
+}
})();
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
index 76ddee0..24bcc42 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js
@@ -113,16 +113,19 @@ d3.layout.chord = function() {
k = (2 * Math.PI - padding * n) / k;
// Compute the start and end angle for each group and subgroup.
+ // Note: Opera has a bug reordering object literal properties!
x = 0, i = -1; while (++i < n) {
x0 = x, j = -1; while (++j < n) {
var di = groupIndex[i],
- dj = subgroupIndex[i][j],
- v = matrix[di][dj];
+ dj = subgroupIndex[di][j],
+ v = matrix[di][dj],
+ a0 = x,
+ a1 = x += v * k;
subgroups[di + "-" + dj] = {
index: di,
subindex: dj,
- startAngle: x,
- endAngle: x += v * k,
+ startAngle: a0,
+ endAngle: a1,
value: v
};
}
@@ -143,7 +146,7 @@ d3.layout.chord = function() {
if (source.value || target.value) {
chords.push(source.value < target.value
? {source: target, target: source}
- : {source: source, target: target})
+ : {source: source, target: target});
}
}
}
@@ -153,7 +156,9 @@ d3.layout.chord = function() {
function resort() {
chords.sort(function(a, b) {
- return sortChords(a.target.value, b.target.value);
+ return sortChords(
+ (a.source.value + a.target.value) / 2,
+ (b.source.value + b.target.value) / 2);
});
}
@@ -209,6 +214,7 @@ d3.layout.force = function() {
var force = {},
event = d3.dispatch("tick"),
size = [1, 1],
+ drag,
alpha,
friction = .9,
linkDistance = d3_layout_forceLinkDistance,
@@ -220,9 +226,10 @@ d3.layout.force = function() {
nodes = [],
links = [],
distances,
- strengths;
+ strengths,
+ charges;
- function repulse(node, kc) {
+ function repulse(node) {
return function(quad, x1, y1, x2, y2) {
if (quad.point !== node) {
var dx = quad.cx - node.x,
@@ -231,30 +238,32 @@ d3.layout.force = function() {
/* Barnes-Hut criterion. */
if ((x2 - x1) * dn < theta) {
- var k = kc * quad.count * dn * dn;
- node.x += dx * k;
- node.y += dy * k;
+ var k = quad.charge * dn * dn;
+ node.px -= dx * k;
+ node.py -= dy * k;
return true;
}
if (quad.point && isFinite(dn)) {
- var k = kc * dn * dn;
- node.x += dx * k;
- node.y += dy * k;
+ var k = quad.pointCharge * dn * dn;
+ node.px -= dx * k;
+ node.py -= dy * k;
}
}
+ return !quad.charge;
};
}
function tick() {
var n = nodes.length,
m = links.length,
- q = d3.geom.quadtree(nodes),
+ q,
i, // current index
o, // current object
s, // current source
t, // current target
l, // current distance
+ k, // current force
x, // x-distance
y; // y-distance
@@ -269,30 +278,32 @@ d3.layout.force = function() {
l = alpha * strengths[i] * ((l = Math.sqrt(l)) - distances[i]) / l;
x *= l;
y *= l;
- t.x -= x;
- t.y -= y;
- s.x += x;
- s.y += y;
+ t.x -= x * (k = s.weight / (t.weight + s.weight));
+ t.y -= y * k;
+ s.x += x * (k = 1 - k);
+ s.y += y * k;
}
}
// apply gravity forces
- var kg = alpha * gravity;
- x = size[0] / 2;
- y = size[1] / 2;
- i = -1; while (++i < n) {
- o = nodes[i];
- o.x += (x - o.x) * kg;
- o.y += (y - o.y) * kg;
+ if (k = alpha * gravity) {
+ x = size[0] / 2;
+ y = size[1] / 2;
+ i = -1; if (k) while (++i < n) {
+ o = nodes[i];
+ o.x += (x - o.x) * k;
+ o.y += (y - o.y) * k;
+ }
}
- // compute quadtree center of mass
- d3_layout_forceAccumulate(q);
-
- // apply charge forces
- var kc = alpha * charge;
- i = -1; while (++i < n) {
- q.visit(repulse(nodes[i], kc));
+ // compute quadtree center of mass and apply charge forces
+ if (charge) {
+ d3_layout_forceAccumulate(q = d3.geom.quadtree(nodes), alpha, charges);
+ i = -1; while (++i < n) {
+ if (!(o = nodes[i]).fixed) {
+ q.visit(repulse(o));
+ }
+ }
}
// position verlet integration
@@ -307,17 +318,12 @@ d3.layout.force = function() {
}
}
- event.tick.dispatch({type: "tick", alpha: alpha});
+ event.tick({type: "tick", alpha: alpha});
// simulated annealing, basically
return (alpha *= .99) < .005;
}
- force.on = function(type, listener) {
- event[type].add(listener);
- return force;
- };
-
force.nodes = function(x) {
if (!arguments.length) return nodes;
nodes = x;
@@ -359,7 +365,7 @@ d3.layout.force = function() {
force.charge = function(x) {
if (!arguments.length) return charge;
- charge = x;
+ charge = typeof x === "function" ? x : +x;
return force;
};
@@ -387,6 +393,7 @@ d3.layout.force = function() {
for (i = 0; i < n; ++i) {
(o = nodes[i]).index = i;
+ o.weight = 0;
}
distances = [];
@@ -397,6 +404,8 @@ d3.layout.force = function() {
if (typeof o.target == "number") o.target = nodes[o.target];
distances[i] = linkDistance.call(this, o, i);
strengths[i] = linkStrength.call(this, o, i);
+ ++o.source.weight;
+ ++o.target.weight;
}
for (i = 0; i < n; ++i) {
@@ -407,6 +416,17 @@ d3.layout.force = function() {
if (isNaN(o.py)) o.py = o.y;
}
+ charges = [];
+ if (typeof charge === "function") {
+ for (i = 0; i < n; ++i) {
+ charges[i] = +charge.call(this, nodes[i], i);
+ }
+ } else {
+ for (i = 0; i < n; ++i) {
+ charges[i] = charge;
+ }
+ }
+
// initialize node position based on first neighbor
function position(dimension, size) {
var neighbors = neighbor(i),
@@ -449,116 +469,52 @@ d3.layout.force = function() {
// use `node.call(force.drag)` to make nodes draggable
force.drag = function() {
-
- this
- .on("mouseover.force", d3_layout_forceDragOver)
- .on("mouseout.force", d3_layout_forceDragOut)
- .on("mousedown.force", dragdown)
- .on("touchstart.force", dragdown);
-
- d3.select(window)
- .on("mousemove.force", d3_layout_forceDragMove)
- .on("touchmove.force", d3_layout_forceDragMove)
- .on("mouseup.force", d3_layout_forceDragUp, true)
- .on("touchend.force", d3_layout_forceDragUp, true)
- .on("click.force", d3_layout_forceDragClick, true);
-
- return force;
+ if (!drag) drag = d3.behavior.drag()
+ .origin(Object)
+ .on("dragstart", dragstart)
+ .on("drag", d3_layout_forceDrag)
+ .on("dragend", d3_layout_forceDragEnd);
+
+ this.on("mouseover.force", d3_layout_forceDragOver)
+ .on("mouseout.force", d3_layout_forceDragOut)
+ .call(drag);
};
- function dragdown(d, i) {
- var m = d3_layout_forcePoint(this.parentNode);
- (d3_layout_forceDragNode = d).fixed = true;
- d3_layout_forceDragMoved = false;
- d3_layout_forceDragElement = this;
+ function dragstart(d) {
+ d3_layout_forceDragOver(d3_layout_forceDragNode = d);
d3_layout_forceDragForce = force;
- d3_layout_forceDragOffset = [m[0] - d.x, m[1] - d.y];
- d3_layout_forceCancel();
}
- return force;
+ return d3.rebind(force, event, "on");
};
var d3_layout_forceDragForce,
- d3_layout_forceDragNode,
- d3_layout_forceDragMoved,
- d3_layout_forceDragOffset,
- d3_layout_forceStopClick,
- d3_layout_forceDragElement;
+ d3_layout_forceDragNode;
function d3_layout_forceDragOver(d) {
- d.fixed = true;
+ d.fixed |= 2;
}
function d3_layout_forceDragOut(d) {
- if (d !== d3_layout_forceDragNode) {
- d.fixed = false;
- }
+ if (d !== d3_layout_forceDragNode) d.fixed &= 1;
}
-function d3_layout_forcePoint(container) {
- return d3.event.touches
- ? d3.svg.touches(container)[0]
- : d3.svg.mouse(container);
+function d3_layout_forceDragEnd() {
+ d3_layout_forceDrag();
+ d3_layout_forceDragNode.fixed &= 1;
+ d3_layout_forceDragForce = d3_layout_forceDragNode = null;
}
-function d3_layout_forceDragMove() {
- if (!d3_layout_forceDragNode) return;
- var parent = d3_layout_forceDragElement.parentNode;
-
- // O NOES! The drag element was removed from the DOM.
- if (!parent) {
- d3_layout_forceDragNode.fixed = false;
- d3_layout_forceDragOffset = d3_layout_forceDragNode = d3_layout_forceDragElement = null;
- return;
- }
-
- var m = d3_layout_forcePoint(parent);
- d3_layout_forceDragMoved = true;
- d3_layout_forceDragNode.px = m[0] - d3_layout_forceDragOffset[0];
- d3_layout_forceDragNode.py = m[1] - d3_layout_forceDragOffset[1];
- d3_layout_forceCancel();
+function d3_layout_forceDrag() {
+ d3_layout_forceDragNode.px = d3.event.x;
+ d3_layout_forceDragNode.py = d3.event.y;
d3_layout_forceDragForce.resume(); // restart annealing
}
-function d3_layout_forceDragUp() {
- if (!d3_layout_forceDragNode) return;
-
- // If the node was moved, prevent the mouseup from propagating.
- // Also prevent the subsequent click from propagating (e.g., for anchors).
- if (d3_layout_forceDragMoved) {
- d3_layout_forceStopClick = true;
- d3_layout_forceCancel();
- }
-
- // Don't trigger this for touchend.
- if (d3.event.type === "mouseup") {
- d3_layout_forceDragMove();
- }
-
- d3_layout_forceDragNode.fixed = false;
- d3_layout_forceDragForce =
- d3_layout_forceDragOffset =
- d3_layout_forceDragNode =
- d3_layout_forceDragElement = null;
-}
-
-function d3_layout_forceDragClick() {
- if (d3_layout_forceStopClick) {
- d3_layout_forceCancel();
- d3_layout_forceStopClick = false;
- }
-}
-
-function d3_layout_forceCancel() {
- d3.event.stopPropagation();
- d3.event.preventDefault();
-}
-
-function d3_layout_forceAccumulate(quad) {
+function d3_layout_forceAccumulate(quad, alpha, charges) {
var cx = 0,
cy = 0;
- quad.count = 0;
+ quad.charge = 0;
if (!quad.leaf) {
var nodes = quad.nodes,
n = nodes.length,
@@ -567,10 +523,10 @@ function d3_layout_forceAccumulate(quad) {
while (++i < n) {
c = nodes[i];
if (c == null) continue;
- d3_layout_forceAccumulate(c);
- quad.count += c.count;
- cx += c.count * c.cx;
- cy += c.count * c.cy;
+ d3_layout_forceAccumulate(c, alpha, charges);
+ quad.charge += c.charge;
+ cx += c.charge * c.cx;
+ cy += c.charge * c.cy;
}
}
if (quad.point) {
@@ -579,12 +535,13 @@ function d3_layout_forceAccumulate(quad) {
quad.point.x += Math.random() - .5;
quad.point.y += Math.random() - .5;
}
- quad.count++;
- cx += quad.point.x;
- cy += quad.point.y;
+ var k = alpha * charges[quad.point.index];
+ quad.charge += quad.pointCharge = k;
+ cx += k * quad.point.x;
+ cy += k * quad.point.y;
}
- quad.cx = cx / quad.count;
- quad.cy = cy / quad.count;
+ quad.cx = cx / quad.charge;
+ quad.cy = cy / quad.charge;
}
function d3_layout_forceLinkDistance(link) {
@@ -604,12 +561,12 @@ d3.layout.partition = function() {
node.y = node.depth * dy;
node.dx = dx;
node.dy = dy;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length,
+ n,
c,
d;
- dx /= node.value;
+ dx = node.value ? dx / node.value : 0;
while (++i < n) {
position(c = children[i], x, d = c.value * dx, dy);
x += d;
@@ -620,9 +577,9 @@ d3.layout.partition = function() {
function depth(node) {
var children = node.children,
d = 0;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length;
+ n;
while (++i < n) d = Math.max(d, depth(children[i]));
}
return 1 + d;
@@ -644,48 +601,44 @@ d3.layout.partition = function() {
};
d3.layout.pie = function() {
var value = Number,
- sort = null,
+ sort = d3_layout_pieSortByValue,
startAngle = 0,
endAngle = 2 * Math.PI;
function pie(data, i) {
+ // Compute the numeric values for each data element.
+ var values = data.map(function(d, i) { return +value.call(pie, d, i); });
+
// Compute the start angle.
var a = +(typeof startAngle === "function"
? startAngle.apply(this, arguments)
: startAngle);
- // Compute the angular range (end - start).
- var k = (typeof endAngle === "function"
+ // Compute the angular scale factor: from value to radians.
+ var k = ((typeof endAngle === "function"
? endAngle.apply(this, arguments)
- : endAngle) - startAngle;
+ : endAngle) - startAngle)
+ / d3.sum(values);
// Optionally sort the data.
var index = d3.range(data.length);
- if (sort != null) index.sort(function(i, j) {
- return sort(data[i], data[j]);
- });
-
- // Compute the numeric values for each data element.
- var values = data.map(value);
-
- // Convert k into a scale factor from value to angle, using the sum.
- k /= values.reduce(function(p, d) { return p + d; }, 0);
+ if (sort != null) index.sort(sort === d3_layout_pieSortByValue
+ ? function(i, j) { return values[j] - values[i]; }
+ : function(i, j) { return sort(data[i], data[j]); });
// Compute the arcs!
- var arcs = index.map(function(i) {
- return {
+ // They are stored in the original data's order.
+ var arcs = [];
+ index.forEach(function(i) {
+ arcs[i] = {
data: data[i],
value: d = values[i],
startAngle: a,
endAngle: a += d * k
};
});
-
- // Return the arcs in the original data's order.
- return data.map(function(d, i) {
- return arcs[index[i]];
- });
+ return arcs;
}
/**
@@ -737,6 +690,8 @@ d3.layout.pie = function() {
return pie;
};
+
+var d3_layout_pieSortByValue = {};
// data is two-dimensional array of x,y; we populate y0
d3.layout.stack = function() {
var values = Object,
@@ -1088,9 +1043,9 @@ d3.layout.hierarchy = function() {
node = d3_layout_hierarchyInline ? data : {data: data};
node.depth = depth;
nodes.push(node);
- if (childs) {
+ if (childs && (n = childs.length)) {
var i = -1,
- n = childs.length,
+ n,
c = node.children = [],
v = 0,
j = depth + 1;
@@ -1103,7 +1058,7 @@ d3.layout.hierarchy = function() {
if (sort) c.sort(sort);
if (value) node.value = v;
} else if (value) {
- node.value = value.call(hierarchy, data, depth);
+ node.value = +value.call(hierarchy, data, depth) || 0;
}
return node;
}
@@ -1112,13 +1067,13 @@ d3.layout.hierarchy = function() {
function revalue(node, depth) {
var children = node.children,
v = 0;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length,
+ n,
j = depth + 1;
while (++i < n) v += revalue(children[i], j);
} else if (value) {
- v = value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth);
+ v = +value.call(hierarchy, d3_layout_hierarchyInline ? node : node.data, depth) || 0;
}
if (value) node.value = v;
return v;
@@ -1159,10 +1114,10 @@ d3.layout.hierarchy = function() {
// A method assignment helper for hierarchy subclasses.
function d3_layout_hierarchyRebind(object, hierarchy) {
- object.sort = d3.rebind(object, hierarchy.sort);
- object.children = d3.rebind(object, hierarchy.children);
+ d3.rebind(object, hierarchy, "sort", "children", "value");
+
+ // Add an alias for links, for convenience.
object.links = d3_layout_hierarchyLinks;
- object.value = d3.rebind(object, hierarchy.value);
// If the new API is used, enabling inlining.
object.nodes = function(d) {
@@ -1362,7 +1317,7 @@ function d3_layout_packUnlink(node) {
function d3_layout_packTree(node) {
var children = node.children;
- if (children) {
+ if (children && children.length) {
children.forEach(d3_layout_packTree);
node.r = d3_layout_packCircle(children);
} else {
@@ -1382,19 +1337,22 @@ function d3_layout_packTransform(node, x, y, k) {
}
function d3_layout_packPlace(a, b, c) {
- var da = b.r + c.r,
- db = a.r + c.r,
+ var db = a.r + c.r,
dx = b.x - a.x,
- dy = b.y - a.y,
- dc = Math.sqrt(dx * dx + dy * dy),
- cos = (db * db + dc * dc - da * da) / (2 * db * dc),
- theta = Math.acos(cos),
- x = cos * db,
- h = Math.sin(theta) * db;
- dx /= dc;
- dy /= dc;
- c.x = a.x + x * dx + h * dy;
- c.y = a.y + x * dy - h * dx;
+ dy = b.y - a.y;
+ if (db && (dx || dy)) {
+ var da = b.r + c.r,
+ dc = Math.sqrt(dx * dx + dy * dy),
+ cos = Math.max(-1, Math.min(1, (db * db + dc * dc - da * da) / (2 * db * dc))),
+ theta = Math.acos(cos),
+ x = cos * (db /= dc),
+ y = Math.sin(theta) * db;
+ c.x = a.x + x * dx + y * dy;
+ c.y = a.y + x * dy - y * dx;
+ } else {
+ c.x = a.x + db;
+ c.y = a.y;
+ }
}
// Implements a hierarchical layout using the cluster (or dendogram) algorithm.
d3.layout.cluster = function() {
@@ -1412,9 +1370,10 @@ d3.layout.cluster = function() {
// First walk, computing the initial x & y values.
d3_layout_treeVisitAfter(root, function(node) {
- if (node.children) {
- node.x = d3_layout_clusterX(node.children);
- node.y = d3_layout_clusterY(node.children);
+ var children = node.children;
+ if (children && children.length) {
+ node.x = d3_layout_clusterX(children);
+ node.y = d3_layout_clusterY(children);
} else {
node.x = previousNode ? x += separation(node, previousNode) : 0;
node.y = 0;
@@ -1431,7 +1390,7 @@ d3.layout.cluster = function() {
// Second walk, normalizing x & y to the desired size.
d3_layout_treeVisitAfter(root, function(node) {
node.x = (node.x - x0) / (x1 - x0) * size[0];
- node.y = (1 - node.y / root.y) * size[1];
+ node.y = (1 - (root.y ? node.y / root.y : 1)) * size[1];
});
return nodes;
@@ -1466,12 +1425,12 @@ function d3_layout_clusterX(children) {
function d3_layout_clusterLeft(node) {
var children = node.children;
- return children ? d3_layout_clusterLeft(children[0]) : node;
+ return children && children.length ? d3_layout_clusterLeft(children[0]) : node;
}
function d3_layout_clusterRight(node) {
- var children = node.children;
- return children ? d3_layout_clusterRight(children[children.length - 1]) : node;
+ var children = node.children, n;
+ return children && (n = children.length) ? d3_layout_clusterRight(children[n - 1]) : node;
}
// Node-link tree diagram using the Reingold-Tilford "tidy" algorithm
d3.layout.tree = function() {
@@ -1486,8 +1445,8 @@ d3.layout.tree = function() {
function firstWalk(node, previousSibling) {
var children = node.children,
layout = node._tree;
- if (children && children.length) {
- var n = children.length,
+ if (children && (n = children.length)) {
+ var n,
firstChild = children[0],
previousChild,
ancestor = firstChild,
@@ -1517,9 +1476,9 @@ d3.layout.tree = function() {
function secondWalk(node, x) {
node.x = node._tree.prelim + x;
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var i = -1,
- n = children.length;
+ n;
x += node._tree.mod;
while (++i < n) {
secondWalk(children[i], x);
@@ -1624,18 +1583,21 @@ function d3_layout_treeSeparation(a, b) {
// }
function d3_layout_treeLeft(node) {
- return node.children ? node.children[0] : node._tree.thread;
+ var children = node.children;
+ return children && children.length ? children[0] : node._tree.thread;
}
function d3_layout_treeRight(node) {
- return node.children ? node.children[node.children.length - 1] : node._tree.thread;
+ var children = node.children,
+ n;
+ return children && (n = children.length) ? children[n - 1] : node._tree.thread;
}
function d3_layout_treeSearch(node, compare) {
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var child,
- n = children.length,
+ n,
i = -1;
while (++i < n) {
if (compare(child = d3_layout_treeSearch(children[i], compare), node) > 0) {
@@ -1661,11 +1623,11 @@ function d3_layout_treeDeepest(a, b) {
function d3_layout_treeVisitAfter(node, callback) {
function visit(node, previousSibling) {
var children = node.children;
- if (children) {
+ if (children && (n = children.length)) {
var child,
previousChild = null,
i = -1,
- n = children.length;
+ n;
while (++i < n) {
child = children[i];
visit(child, previousChild);
@@ -1733,57 +1695,61 @@ d3.layout.treemap = function() {
// Recursively arranges the specified node's children into squarified rows.
function squarify(node) {
- if (!node.children) return;
- var rect = pad(node),
- row = [],
- children = node.children.slice(), // copy-on-write
- child,
- best = Infinity, // the best row score so far
- score, // the current row score
- u = Math.min(rect.dx, rect.dy), // initial orientation
- n;
- scale(children, rect.dx * rect.dy / node.value);
- row.area = 0;
- while ((n = children.length) > 0) {
- row.push(child = children[n - 1]);
- row.area += child.area;
- if ((score = worst(row, u)) <= best) { // continue with this orientation
- children.pop();
- best = score;
- } else { // abort, and try a different orientation
- row.area -= row.pop().area;
- position(row, u, rect, false);
- u = Math.min(rect.dx, rect.dy);
+ var children = node.children;
+ if (children && children.length) {
+ var rect = pad(node),
+ row = [],
+ remaining = children.slice(), // copy-on-write
+ child,
+ best = Infinity, // the best row score so far
+ score, // the current row score
+ u = Math.min(rect.dx, rect.dy), // initial orientation
+ n;
+ scale(remaining, rect.dx * rect.dy / node.value);
+ row.area = 0;
+ while ((n = remaining.length) > 0) {
+ row.push(child = remaining[n - 1]);
+ row.area += child.area;
+ if ((score = worst(row, u)) <= best) { // continue with this orientation
+ remaining.pop();
+ best = score;
+ } else { // abort, and try a different orientation
+ row.area -= row.pop().area;
+ position(row, u, rect, false);
+ u = Math.min(rect.dx, rect.dy);
+ row.length = row.area = 0;
+ best = Infinity;
+ }
+ }
+ if (row.length) {
+ position(row, u, rect, true);
row.length = row.area = 0;
- best = Infinity;
}
+ children.forEach(squarify);
}
- if (row.length) {
- position(row, u, rect, true);
- row.length = row.area = 0;
- }
- node.children.forEach(squarify);
}
// Recursively resizes the specified node's children into existing rows.
// Preserves the existing layout!
function stickify(node) {
- if (!node.children) return;
- var rect = pad(node),
- children = node.children.slice(), // copy-on-write
- child,
- row = [];
- scale(children, rect.dx * rect.dy / node.value);
- row.area = 0;
- while (child = children.pop()) {
- row.push(child);
- row.area += child.area;
- if (child.z != null) {
- position(row, child.z ? rect.dx : rect.dy, rect, !children.length);
- row.length = row.area = 0;
+ var children = node.children;
+ if (children && children.length) {
+ var rect = pad(node),
+ remaining = children.slice(), // copy-on-write
+ child,
+ row = [];
+ scale(remaining, rect.dx * rect.dy / node.value);
+ row.area = 0;
+ while (child = remaining.pop()) {
+ row.push(child);
+ row.area += child.area;
+ if (child.z != null) {
+ position(row, child.z ? rect.dx : rect.dy, rect, !remaining.length);
+ row.length = row.area = 0;
+ }
}
+ children.forEach(stickify);
}
- node.children.forEach(stickify);
}
// Computes the score for the specified row, as the worst aspect ratio.
@@ -1815,7 +1781,7 @@ d3.layout.treemap = function() {
v = u ? round(row.area / u) : 0,
o;
if (u == rect.dx) { // horizontal subdivision
- if (flush || v > rect.dy) v = rect.dy; // over+underflow
+ if (flush || v > rect.dy) v = v ? rect.dy : 0; // over+underflow
while (++i < n) {
o = row[i];
o.x = x;
@@ -1828,7 +1794,7 @@ d3.layout.treemap = function() {
rect.y += v;
rect.dy -= v;
} else { // vertical subdivision
- if (flush || v > rect.dx) v = rect.dx; // over+underflow
+ if (flush || v > rect.dx) v = v ? rect.dx : 0; // over+underflow
while (++i < n) {
o = row[i];
o.x = x;
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
index 3a3409f..4c1cda4 100755
--- a/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js
@@ -78,6 +78,7 @@ var d3_time_formats = {
H: function(d) { return d3_time_zfill2(d.getHours()); },
I: function(d) { return d3_time_zfill2(d.getHours() % 12 || 12); },
j: d3_time_dayOfYear,
+ L: function(d) { return d3_time_zfill3(d.getMilliseconds()); },
m: function(d) { return d3_time_zfill2(d.getMonth() + 1); },
M: function(d) { return d3_time_zfill2(d.getMinutes()); },
p: function(d) { return d.getHours() >= 12 ? "PM" : "AM"; },
@@ -104,6 +105,7 @@ var d3_time_parsers = {
H: d3_time_parseHour24,
I: d3_time_parseHour12,
// j: function(d, s, i) { /*TODO day of year [001,366] */ return i; },
+ L: d3_time_parseMilliseconds,
m: d3_time_parseMonthNumber,
M: d3_time_parseMinutes,
p: d3_time_parseAmPm,
@@ -277,6 +279,12 @@ function d3_time_parseSeconds(date, string, i) {
return n ? (date.setSeconds(+n[0]), i += n[0].length) : -1;
}
+function d3_time_parseMilliseconds(date, string, i) {
+ d3_time_numberRe.lastIndex = 0;
+ var n = d3_time_numberRe.exec(string.substring(i, i + 3));
+ return n ? (date.setMilliseconds(+n[0]), i += n[0].length) : -1;
+}
+
// Note: we don't look at the next directive.
var d3_time_numberRe = /\s*\d+/;
@@ -294,18 +302,22 @@ function d3_time_year(d) {
return new d3_time(d.getFullYear(), 0, 1);
}
+function d3_time_daysElapsed(d0, d1) {
+ return ~~((d1 - d0) / 864e5 - (d1.getTimezoneOffset() - d0.getTimezoneOffset()) / 1440);
+}
+
function d3_time_dayOfYear(d) {
- return d3_time_zfill3(1 + ~~((d - d3_time_year(d)) / 864e5));
+ return d3_time_zfill3(1 + d3_time_daysElapsed(d3_time_year(d), d));
}
function d3_time_weekNumberSunday(d) {
var d0 = d3_time_year(d);
- return d3_time_zfill2(~~(((d - d0) / 864e5 + d0.getDay()) / 7));
+ return d3_time_zfill2(~~((d3_time_daysElapsed(d0, d) + d0.getDay()) / 7));
}
function d3_time_weekNumberMonday(d) {
var d0 = d3_time_year(d);
- return d3_time_zfill2(~~(((d - d0) / 864e5 + (d0.getDay() + 6) % 7) / 7));
+ return d3_time_zfill2(~~((d3_time_daysElapsed(d0, d) + (d0.getDay() + 6) % 7) / 7));
}
// TODO table of time zone offset names?
@@ -320,9 +332,14 @@ d3.time.format.utc = function(template) {
var local = d3.time.format(template);
function format(date) {
- var utc = new d3_time_format_utc();
- utc._ = date;
- return local(utc);
+ try {
+ d3_time = d3_time_format_utc;
+ var utc = new d3_time();
+ utc._ = date;
+ return local(utc);
+ } finally {
+ d3_time = Date;
+ }
}
format.parse = function(string) {
@@ -364,7 +381,19 @@ d3_time_format_utc.prototype = {
setMonth: function(x) { this._.setUTCMonth(x); },
setSeconds: function(x) { this._.setUTCSeconds(x); }
};
-d3.time.format.iso = d3.time.format.utc("%Y-%m-%dT%H:%M:%SZ");
+var d3_time_formatIso = d3.time.format.utc("%Y-%m-%dT%H:%M:%S.%LZ");
+
+d3.time.format.iso = Date.prototype.toISOString ? d3_time_formatIsoNative : d3_time_formatIso;
+
+function d3_time_formatIsoNative(date) {
+ return date.toISOString();
+}
+
+d3_time_formatIsoNative.parse = function(string) {
+ return new Date(string);
+};
+
+d3_time_formatIsoNative.toString = d3_time_formatIso.toString;
function d3_time_range(floor, step, number) {
return function(t0, t1, dt) {
var time = floor(t0), times = [];
@@ -502,8 +531,7 @@ d3.time.years.utc = d3_time_range(d3.time.year.utc, function(date) {
return date.getUTCFullYear();
});
// TODO nice
-function d3_time_scale(methods, format) {
- var linear = d3.scale.linear();
+function d3_time_scale(linear, methods, format) {
function scale(x) {
return linear(x);
@@ -537,13 +565,12 @@ function d3_time_scale(methods, format) {
return format;
};
- // TOOD expose d3_scale_linear_rebind?
- scale.range = d3.rebind(scale, linear.range);
- scale.rangeRound = d3.rebind(scale, linear.rangeRound);
- scale.interpolate = d3.rebind(scale, linear.interpolate);
- scale.clamp = d3.rebind(scale, linear.clamp);
+ scale.copy = function() {
+ return d3_time_scale(linear.copy(), methods, format);
+ };
- return scale;
+ // TOOD expose d3_scale_linear_rebind?
+ return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
}
// TODO expose d3_scaleExtent?
@@ -619,7 +646,7 @@ var d3_time_scaleLocalFormats = [
var d3_time_scaleLocalFormat = d3_time_scaleFormat(d3_time_scaleLocalFormats);
d3.time.scale = function() {
- return d3_time_scale(d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
+ return d3_time_scale(d3.scale.linear(), d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
};
var d3_time_scaleUTCMethods = [
[d3.time.seconds.utc, 1],
@@ -655,6 +682,6 @@ var d3_time_scaleUTCFormats = [
var d3_time_scaleUTCFormat = d3_time_scaleFormat(d3_time_scaleUTCFormats);
d3.time.scale.utc = function() {
- return d3_time_scale(d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
+ return d3_time_scale(d3.scale.linear(), d3_time_scaleUTCMethods, d3_time_scaleUTCFormat);
};
})();
1
0
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3f2e1dd08dfcfb38ef22aba22d6609c1a44b20da
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Jan 6 16:18:07 2012 -0600
[BZ 765795] Removed the recursive call that was creating StackOverflowError and added the correct call to create a resource.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
index 2395503..37131c2 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
@@ -521,9 +521,9 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal,
@XmlJavaTypeAdapter(value = ConfigurationAdapter.class)//
Configuration deploymentTimeConfiguration, byte[] packageBits, Integer timeout) {
- return createPackageBackedResource(subject, parentResourceId, newResourceTypeId, newResourceName,//
+ return createResource(subject, parentResourceId, newResourceTypeId, newResourceName,//
pluginConfiguration, packageName, packageVersionNumber, architectureId,//
- deploymentTimeConfiguration, packageBits, (Integer) null);
+ deploymentTimeConfiguration, new ByteArrayInputStream(packageBits), (Map<String, String>) null, timeout);
}
@Override
1
0