Property changes on: deployment\autodeploy
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: deployment\javaee-full
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: persistence\cmp\model
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: persistence\cmp\utility
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: persistence\cmp\enhancer
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: persistence\cmp\support-sqlstore
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: persistence\cmp\generator-database
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: persistence\cmp\ejb-mapping
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: persistence\cmp\support-ejb
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: persistence\common
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: persistence\oracle-jdbc-driver-packages
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: core\api-exporter
___________________________________________________________________
Name: svn:ignore
+ target
Index: core/kernel/src/main/java/org/glassfish/kernel/admin/monitor/ThreadPoolProbeProvider.java
===================================================================
--- core/kernel/src/main/java/org/glassfish/kernel/admin/monitor/ThreadPoolProbeProvider.java (revision 29260)
+++ core/kernel/src/main/java/org/glassfish/kernel/admin/monitor/ThreadPoolProbeProvider.java (working copy)
@@ -36,7 +36,7 @@
package org.glassfish.kernel.admin.monitor;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
/**
* Probe provider interface for thread pool related events.
Index: core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java
===================================================================
--- core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java (revision 29260)
+++ core/kernel/src/main/java/com/sun/enterprise/v3/admin/GetCommand.java (working copy)
@@ -58,8 +58,8 @@
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.glassfish.api.statistics.Statistic;
-import org.glassfish.api.statistics.impl.StatisticImpl;
+import org.glassfish.external.statistics.Statistic;
+import org.glassfish.external.statistics.impl.StatisticImpl;
/**
* User: Jerome Dochez
Index: core/kernel/pom.xml
===================================================================
--- core/kernel/pom.xml (revision 29260)
+++ core/kernel/pom.xml (working copy)
@@ -153,11 +153,10 @@
1.1
true
-
+
+ org.glassfish.external
+ management-api
+
Property changes on: core\extra-jre-packages
___________________________________________________________________
Name: svn:ignore
+ target
Index: pom.xml
===================================================================
--- pom.xml (revision 29260)
+++ pom.xml (working copy)
@@ -159,8 +159,8 @@
1.1.1-ea
1.0
1.6.2
- 3.0.0-b008
- 3.0.0-b008
+ 3.0.0-b009
+ 3.0.0-b002
@@ -882,16 +882,16 @@
${wsdl4j.version}
+ org.glassfish.external
+ management-api
+ ${management-api.version}
+
+
org.glassfish.gmbal
gmbal
${gmbal.version}
- org.glassfish.provider
- gfprobe-provider-client
- ${gfprobe-provider-client.version}
-
-
org.jboss.webbeans
webbeans-osgi-bundle
${webbeans.version}
Property changes on: extras\osgi-container
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: extras\embedded-shell
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: web\web-ajp
___________________________________________________________________
Name: svn:ignore
+ target
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java (working copy)
@@ -37,9 +37,9 @@
package org.glassfish.web.admin.monitor;
import javax.servlet.Servlet;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
* Provider interface for JSP related probes.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/WebRequestStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/WebRequestStatsProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/WebRequestStatsProvider.java (working copy)
@@ -38,14 +38,15 @@
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.TimeStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.TimeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.TimeStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.TimeStatisticImpl;
import org.glassfish.flashlight.statistics.*;
import org.glassfish.flashlight.statistics.factory.CounterFactory;
import org.glassfish.flashlight.statistics.factory.TimeStatsFactory;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.probe.provider.annotations.*;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedObject;
import org.glassfish.gmbal.ManagedAttribute;
@@ -55,23 +56,24 @@
*
* @author Prashanth Abbagani
*/
+//@AMXMetadata(type="web-request-mon", group="monitoring")
@ManagedObject
@Description("Web Request Statistics")
public class WebRequestStatsProvider {
- //Provides the longest response time for a request - not a cumulative value,
+ //Provides the longest response time for a request - not a cumulative value,
//but the largest response time from among the response times.
//private Counter maxTime = CounterFactory.createCount();
- //Provides cumulative value of the times taken to process each request.
+ //Provides cumulative value of the times taken to process each request.
//The processing time is the average of request processing times over the request count.
//private Counter processingTime = CounterFactory.createCount();
//Provides cumulative number of the requests processed so far.
//private Counter requestCount = CounterFactory.createCount();
- //Provides the cumulative value of the error count. The error count represents
+ //Provides the cumulative value of the error count. The error count represents
//the number of cases where the response code was greater than or equal to 400.
private Counter errorCount = CounterFactory.createCount();
private TimeStats requestProcessTime = TimeStatsFactory.createTimeStatsMilli();
private Logger logger;
-
+
private String virtualServerName = null;
private String moduleName = null;
@@ -127,7 +129,7 @@
@ProbeParam("response") HttpServletResponse response,
@ProbeParam("hostName") String hostName) {
logger.finest("[TM]requestStartEvent Unprocessed received - virtual-server = " +
- request.getServerName() + ":" + request.getServerPort() +
+ request.getServerName() + ":" + request.getServerPort() +
": application = " + request.getContextPath() + " : servlet = " +
request.getServletPath() + " : Expecting (vsName, appName) = (" +
virtualServerName + ", " + moduleName + ")");
@@ -135,7 +137,7 @@
//String vs = WebTelemetryBootstrap.getVirtualServerName(
// hostName, String.valueOf(request.getServerPort()));
String contextPath = request.getContextPath();
- String appName = (contextPath == null)? null :
+ String appName = (contextPath == null)? null :
WebStatsProviderBootstrap.getAppName(contextPath);
if ((appName != null && hostName != null) && hostName.equals(virtualServerName) && appName.equals(moduleName)){
//increment counts
@@ -172,7 +174,7 @@
//String vs = WebTelemetryBootstrap.getVirtualServerName(
// hostName, String.valueOf(request.getServerPort()));
String contextPath = request.getContextPath();
- String appName = (contextPath == null)? null :
+ String appName = (contextPath == null)? null :
WebStatsProviderBootstrap.getAppName(contextPath);
if ((appName != null && hostName != null) && hostName.equals(virtualServerName) && appName.equals(moduleName)){
//increment counts
@@ -202,7 +204,7 @@
}
}
-
+
public long getProcessTime() {
return requestProcessTime.getTotalTime()/requestProcessTime.getCount();
}
@@ -210,7 +212,7 @@
public String getModuleName() {
return moduleName;
}
-
+
public String getVSName() {
return virtualServerName;
}
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/WebStatsProviderBootstrap.java (working copy)
@@ -29,8 +29,8 @@
import org.glassfish.api.monitoring.TelemetryProvider;
import org.glassfish.flashlight.datatree.TreeNode;
import org.glassfish.flashlight.datatree.factory.TreeNodeFactory;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
import org.jvnet.hk2.annotations.Inject;
import org.jvnet.hk2.annotations.Scoped;
import org.jvnet.hk2.annotations.Service;
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/WebModuleProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/WebModuleProbeProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/WebModuleProbeProvider.java (working copy)
@@ -36,9 +36,9 @@
package org.glassfish.web.admin.monitor;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
* Provider interface for web module lifecycle related probe events.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionProbeProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionProbeProvider.java (working copy)
@@ -37,9 +37,9 @@
package org.glassfish.web.admin.monitor;
import javax.servlet.http.HttpSession;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
* Provider interface for HTTP session related probes.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/JspStatsProvider.java (working copy)
@@ -37,9 +37,10 @@
import java.util.logging.Logger;
import javax.servlet.Servlet;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.*;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
@@ -49,14 +50,15 @@
*
* @author Prashanth Abbagani
*/
+//@AMXMetadata(type="jsp-mon", group="monitoring")
@ManagedObject
@Description("Web Container JSP Statistics")
public class JspStatsProvider{
private String moduleName;
- private String vsName;
+ private String vsName;
private Logger logger;
-
- public JspStatsProvider(String moduleName, String vsName, Logger logger) {
+
+ public JspStatsProvider(String moduleName, String vsName, Logger logger) {
this.moduleName = moduleName;
this.vsName = vsName;
}
@@ -82,15 +84,15 @@
public CountStatistic getTotalJspsLoaded() {
return totalJspsLoadedCount;
}
-
+
@ProbeListener("glassfish:web:jsp:jspLoadedEvent")
public void jspLoadedEvent(
@ProbeParam("jsp") Servlet jsp,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName) {
// handle the servlet loaded probe events
- logger.finest("JSP Loaded event received - jspName = " +
- jsp.getServletConfig().getServletName() +
+ logger.finest("JSP Loaded event received - jspName = " +
+ jsp.getServletConfig().getServletName() +
": appName = " + appName + ": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -100,7 +102,7 @@
if (activeJspsLoadedCount.getCount() > maxJspsLoadedCount.getCount()) {
maxJspsLoadedCount.setCount(activeJspsLoadedCount.getCount());
}
-
+
}
/*
@ProbeListener("web:jsp::jspDestroyedEvent")
@@ -109,22 +111,22 @@
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName) {
// handle the jsp destroyed probe events
- logger.finest("JSP Destroyed event received - jspName = " +
- jsp.getServletConfig().getServletName() +
+ logger.finest("JSP Destroyed event received - jspName = " +
+ jsp.getServletConfig().getServletName() +
": appName = " + appName + ": hostName = " + hostName);
activeJspsLoadedCount.decrement();
}
*/
-
+
public String getModuleName() {
return moduleName;
}
-
+
public String getVSName() {
return vsName;
}
-
+
private boolean isValidEvent(String mName, String hostName) {
//Temp fix, get the appname from the context root
if ((moduleName == null) || (vsName == null)) {
@@ -133,7 +135,7 @@
if ((moduleName.equals(mName)) && (vsName.equals(hostName))) {
return true;
}
-
+
return false;
}
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java (working copy)
@@ -38,9 +38,9 @@
import java.security.Principal;
import javax.servlet.Servlet;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
* Provider interface for servlet related probes.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProviderBootstrap.java (working copy)
@@ -23,8 +23,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
/**
*
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/statistics/WebModuleVirtualServerStatsImpl.java (working copy)
@@ -45,7 +45,7 @@
import org.glassfish.j2ee.statistics.CountStatistic;
import org.glassfish.j2ee.statistics.TimeStatistic;
import org.glassfish.j2ee.statistics.Stats;
-import org.glassfish.api.statistics.StringStatistic;
+import org.glassfish.external.statistics.StringStatistic;
import org.glassfish.admin.monitor.cli.MonitorContract;
import org.glassfish.flashlight.datatree.TreeNode;
import org.glassfish.flashlight.MonitoringRuntimeDataRegistry;
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java (working copy)
@@ -39,16 +39,18 @@
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.TimeStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.TimeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.TimeStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.TimeStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.*;
import org.glassfish.flashlight.statistics.*;
import org.glassfish.flashlight.statistics.factory.TimeStatsFactory;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
+
import org.jvnet.hk2.component.PostConstruct;
/**
@@ -56,18 +58,19 @@
*
* @author Prashanth Abbagani
*/
+//@AMXMetadata(type="http-service-mon", group="monitoring")
@ManagedObject
@Description( "Web Container HTTP Service Statistics" )
public class HttpServiceStatsProvider implements PostConstruct {
- //Provides the longest response time for a request - not a cumulative value,
+ //Provides the longest response time for a request - not a cumulative value,
//but the largest response time from among the response times.
//private Counter maxTime = CounterFactory.createCount();
- //Provides cumulative value of the times taken to process each request.
+ //Provides cumulative value of the times taken to process each request.
//The processing time is the average of request processing times over the request count.
//private Counter processingTime = CounterFactory.createCount();
//Provides cumulative number of the requests processed so far.
//private Counter requestCount = CounterFactory.createCount();
- //Provides the cumulative value of the error count. The error count represents
+ //Provides the cumulative value of the error count. The error count represents
//the number of cases where the response code was greater than or equal to 400.
private CountStatisticImpl errorCount = new CountStatisticImpl("ErrorCount", "count", "Number of responses with a status code greater than 400");
private CountStatisticImpl error200Count = new CountStatisticImpl("Count200", "count", "Number of responses with a status code equal to 200");
@@ -157,25 +160,25 @@
public CountStatistic getErrorCount() {
return errorCount.getStatistic();
}
-
+
@ManagedAttribute(id="count200")
@Description( "" )
public CountStatistic getError200Count() {
return error200Count.getStatistic();
}
-
+
@ManagedAttribute(id="count2xx")
@Description( "" )
public CountStatistic getError2xxCount() {
return error2xxCount.getStatistic();
}
-
+
@ManagedAttribute(id="count302")
@Description( "" )
public CountStatistic getError302Count() {
return error302Count.getStatistic();
}
-
+
@ManagedAttribute(id="count304")
@Description( "" )
public CountStatistic getError304Count() {
@@ -278,14 +281,14 @@
}
}
-
+
public long getProcessTime() {
return requestProcessTime.getTotalTime()/requestProcessTime.getCount();
}
private void incrementStatsCounter(int statusCode) {
CountStatisticImpl errorCounter = errorMap.get(Integer.toString(statusCode));
- if (errorCounter == null)
+ if (errorCounter == null)
errorCounter = errorMap.get(Integer.toString(Math.round(statusCode/100)));
if (errorCounter == null)
errorCounter = errorMap.get("9");
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java (working copy)
@@ -39,7 +39,7 @@
import java.security.Principal;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.probe.provider.annotations.*;
/**
* Provider interface for HTTP request/response related probes.
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/SessionStatsProvider.java (working copy)
@@ -37,9 +37,10 @@
import java.util.logging.Logger;
import javax.servlet.http.HttpSession;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.*;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
@@ -49,13 +50,14 @@
*
* @author Prashanth Abbagani
*/
+//@AMXMetadata(type="session-mon", group="monitoring")
@ManagedObject
@Description( "Web Container Session Statistics" )
public class SessionStatsProvider{
private String moduleName;
private String vsName;
- private Logger logger;
-
+ private Logger logger;
+
public SessionStatsProvider(String moduleName, String vsName, Logger logger) {
this.logger = logger;
this.moduleName = moduleName;
@@ -70,7 +72,7 @@
private CountStatisticImpl persistedSessionsTotal = new CountStatisticImpl("PersistedSessionsTotal", "count", "Total number of persisted sessions");
private CountStatisticImpl passivatedSessionsTotal = new CountStatisticImpl("PassivatedSessionsTotal", "count", "Total number of passivated sessions");
private CountStatisticImpl activatedSessionsTotal = new CountStatisticImpl("ActivatedSessionsTotal", "count", "Total number of activated sessions");
-
+
@ManagedAttribute(id="activesessionscurrent")
@Description("Number of currently active sessions")
public CountStatistic getActiveSessionsCurrent() {
@@ -118,15 +120,15 @@
public CountStatistic getActivatedSessionsTotal() {
return activatedSessionsTotal;
}
-
+
@ProbeListener("glassfish:web:session:sessionCreatedEvent")
public void sessionCreatedEvent(
@ProbeParam("session") HttpSession session,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
- logger.finest("[TM]sessionCreatedEvent received - session = " +
- session.toString() + ": appname = " + appName +
+ logger.finest("[TM]sessionCreatedEvent received - session = " +
+ session.toString() + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -140,14 +142,14 @@
@ProbeParam("session") HttpSession session,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
-
- logger.finest("[TM]sessionDestroyedEvent received - session = " +
- session.toString() + ": appname = " + appName +
+
+ logger.finest("[TM]sessionDestroyedEvent received - session = " +
+ session.toString() + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
}
- activeSessionsCurrent.decrement();
+ activeSessionsCurrent.decrement();
}
@ProbeListener("glassfish:web:session:sessionRejectedEvent")
@@ -155,9 +157,9 @@
@ProbeParam("maxThresholdSize") int maxSessions,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
-
- logger.finest("[TM]sessionRejectedEvent received - max sessions = " +
- maxSessions + ": appname = " + appName +
+
+ logger.finest("[TM]sessionRejectedEvent received - max sessions = " +
+ maxSessions + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -172,9 +174,9 @@
@ProbeParam("session") HttpSession session,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
-
- logger.finest("[TM]sessionExpiredEvent received - session = " +
- session.toString() + ": appname = " + appName +
+
+ logger.finest("[TM]sessionExpiredEvent received - session = " +
+ session.toString() + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -187,9 +189,9 @@
@ProbeParam("session") HttpSession session,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
-
- logger.finest("[TM]sessionPersistedStartEvent received - session = " +
- session.toString() + ": appname = " + appName +
+
+ logger.finest("[TM]sessionPersistedStartEvent received - session = " +
+ session.toString() + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -201,9 +203,9 @@
@ProbeParam("session") HttpSession session,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
-
- logger.finest("[TM]sessionPersistedEndEvent received - session = " +
- session.toString() + ": appname = " + appName +
+
+ logger.finest("[TM]sessionPersistedEndEvent received - session = " +
+ session.toString() + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -216,9 +218,9 @@
@ProbeParam("session") HttpSession session,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
-
- logger.finest("[TM]sessionActivatedStartEvent received - session = " +
- session.toString() + ": appname = " + appName +
+
+ logger.finest("[TM]sessionActivatedStartEvent received - session = " +
+ session.toString() + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -230,9 +232,9 @@
@ProbeParam("session") HttpSession session,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
-
- logger.finest("[TM]sessionActivatedEndEvent received - session = " +
- session.toString() + ": appname = " + appName +
+
+ logger.finest("[TM]sessionActivatedEndEvent received - session = " +
+ session.toString() + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -246,9 +248,9 @@
@ProbeParam("session") HttpSession session,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
-
- logger.finest("[TM]sessionPassivatedStartEvent received - session = " +
- session.toString() + ": appname = " + appName +
+
+ logger.finest("[TM]sessionPassivatedStartEvent received - session = " +
+ session.toString() + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -260,24 +262,24 @@
@ProbeParam("session") HttpSession session,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName){
-
- logger.finest("[TM]sessionPassivatedEndEvent received - session = " +
- session.toString() + ": appname = " + appName +
+
+ logger.finest("[TM]sessionPassivatedEndEvent received - session = " +
+ session.toString() + ": appname = " + appName +
": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
}
passivatedSessionsTotal.increment();
}
-
+
public String getModuleName() {
return moduleName;
}
-
+
public String getVSName() {
return vsName;
}
-
+
private void incrementActiveSessionsCurrent() {
activeSessionsCurrent.increment();
if (activeSessionsCurrent.getCount() > activeSessionsHigh.getCount()){
@@ -285,7 +287,7 @@
}
sessionsTotal.increment();
}
-
+
private boolean isValidEvent(String mName, String hostName) {
//Temp fix, get the appname from the context root
if ((moduleName == null) || (vsName == null)) {
Index: web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java
===================================================================
--- web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java (revision 29260)
+++ web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletStatsProvider.java (working copy)
@@ -37,9 +37,10 @@
import java.util.logging.Logger;
import javax.servlet.Servlet;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.*;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
@@ -49,13 +50,14 @@
*
* @author Prashanth Abbagani
*/
+//@AMXMetadata(type="servlet-mon", group="monitoring")
@ManagedObject
@Description("Web Container Servlet Statistics")
public class ServletStatsProvider {
private String moduleName;
private String vsName;
private Logger logger;
-
+
public ServletStatsProvider(String moduleName, String vsName, Logger logger) {
this.logger = logger;
this.moduleName = moduleName;
@@ -83,15 +85,15 @@
public CountStatistic getTotalServletsLoaded() {
return totalServletsLoadedCount;
}
-
+
@ProbeListener("glassfish:web:servlet:servletInitializedEvent")
public void servletInitializedEvent(
@ProbeParam("servlet") Servlet servlet,
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName) {
// handle the servlet loaded probe events
- logger.finest("Servlet Loaded event received - servletName = " +
- servlet.getServletConfig().getServletName() +
+ logger.finest("Servlet Loaded event received - servletName = " +
+ servlet.getServletConfig().getServletName() +
": appName = " + appName + ": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
@@ -101,7 +103,7 @@
if (activeServletsLoadedCount.getCount() > maxServletsLoadedCount.getCount()) {
maxServletsLoadedCount.setCount(activeServletsLoadedCount.getCount());
}
-
+
}
@ProbeListener("glassfish:web:servlet:servletDestroyedEvent")
@@ -110,15 +112,15 @@
@ProbeParam("appName") String appName,
@ProbeParam("hostName") String hostName) {
// handle the servlet loaded probe events
- logger.finest("Servlet Destroyed event received - servletName = " +
- servlet.getServletConfig().getServletName() +
+ logger.finest("Servlet Destroyed event received - servletName = " +
+ servlet.getServletConfig().getServletName() +
": appName = " + appName + ": hostName = " + hostName);
if (!isValidEvent(appName, hostName)) {
return;
}
activeServletsLoadedCount.decrement();
}
-
+
private boolean isValidEvent(String mName, String hostName) {
//Temp fix, get the appname from the context root
if ((moduleName == null) || (vsName == null)) {
@@ -127,18 +129,18 @@
if ((moduleName.equals(mName)) && (vsName.equals(hostName))) {
return true;
}
-
+
return false;
}
public String getModuleName() {
return moduleName;
}
-
+
public String getVSName() {
return vsName;
}
-
+
private void resetStats() {
activeServletsLoadedCount.setCount(0);
maxServletsLoadedCount.setCount(0);
Index: web/admin/pom.xml
===================================================================
--- web/admin/pom.xml (revision 29260)
+++ web/admin/pom.xml (working copy)
@@ -92,11 +92,6 @@
-
- org.glassfish.flashlight
- flashlight-framework
- ${project.version}
-
org.glassfish.admin
monitoring-core
@@ -122,11 +117,6 @@
org.glassfish.common
- glassfish-api
- ${project.version}
-
-
- org.glassfish.common
container-common
${project.parent.version}
@@ -141,8 +131,8 @@
${project.version}
- org.glassfish.provider
- gfprobe-provider-client
+ org.glassfish.external
+ management-api
org.glassfish.gmbal
Property changes on: web\jspcaching-connector
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: web\jstl-connector
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: web\webbeans-integration
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\jmxremote_optional
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\antlr
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\ant
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\ldapbp
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\commons-codec
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\asm-all
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\dbschema
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\apache-commons
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\schema2beans
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: packager\external\sysnet-registration
___________________________________________________________________
Name: svn:ignore
+ target
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java (revision 29260)
+++ webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContainer.java (working copy)
@@ -26,8 +26,8 @@
import org.glassfish.api.container.Container;
import org.glassfish.api.deployment.Deployer;
-import org.glassfish.probe.provider.StatsProviderManager;
-import org.glassfish.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
import org.glassfish.webservices.monitoring.Deployment109StatsProvider;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.component.PostConstruct;
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109StatsProvider.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109StatsProvider.java (revision 29260)
+++ webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109StatsProvider.java (working copy)
@@ -3,8 +3,8 @@
import org.glassfish.gmbal.ManagedObject;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.Description;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
import java.util.Collection;
import java.util.Collections;
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109ProbeProvider.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109ProbeProvider.java (revision 29260)
+++ webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/Deployment109ProbeProvider.java (working copy)
@@ -1,8 +1,8 @@
package org.glassfish.webservices.monitoring;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
/**
* 109 deployment probe. A registered listener get to listen the emited
Index: webservices/jsr109-impl/pom.xml
===================================================================
--- webservices/jsr109-impl/pom.xml (revision 29260)
+++ webservices/jsr109-impl/pom.xml (working copy)
@@ -129,11 +129,6 @@
org.glassfish.common
- glassfish-api
- ${project.version}
-
-
- org.glassfish.common
internal-api
${project.version}
Property changes on: transaction\jts
___________________________________________________________________
Name: svn:ignore
+ target
Index: transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java
===================================================================
--- transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java (revision 29260)
+++ transaction/jta/src/main/java/com/sun/enterprise/transaction/JavaEETransactionManagerSimplified.java (working copy)
@@ -75,8 +75,8 @@
import org.glassfish.api.invocation.InvocationException;
import org.glassfish.api.invocation.ResourceHandler;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
import com.sun.enterprise.config.serverbeans.TransactionService;
import com.sun.enterprise.config.serverbeans.ServerTags;
Index: transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java
===================================================================
--- transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java (revision 29260)
+++ transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceStatsProvider.java (working copy)
@@ -35,9 +35,10 @@
*/
package com.sun.enterprise.transaction.monitoring;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.*;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
@@ -47,6 +48,7 @@
*
* @author Marina Vatkina
*/
+//@AMXMetadata(type="transaction-service-mon", group="monitoring", isSingleton=true)
@ManagedObject
@Description("Transaction Service Statistics")
public class TransactionServiceStatsProvider {
Index: transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceProbeProvider.java
===================================================================
--- transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceProbeProvider.java (revision 29260)
+++ transaction/jta/src/main/java/com/sun/enterprise/transaction/monitoring/TransactionServiceProbeProvider.java (working copy)
@@ -35,7 +35,7 @@
*/
package com.sun.enterprise.transaction.monitoring;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.probe.provider.annotations.*;
import org.glassfish.gmbal.Description;
/**
Index: transaction/jta/pom.xml
===================================================================
--- transaction/jta/pom.xml (revision 29260)
+++ transaction/jta/pom.xml (working copy)
@@ -86,9 +86,13 @@
${project.parent.version}
- org.glassfish.provider
- gfprobe-provider-client
-
+ org.glassfish.external
+ management-api
+
+
+ org.glassfish.gmbal
+ gmbal
+
Property changes on: flashlight\extra-jdk-packages
___________________________________________________________________
Name: svn:ignore
+ target
Index: flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java (revision 29260)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java (working copy)
@@ -43,7 +43,7 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.annotations.Inject;
-import org.glassfish.probe.provider.annotations.*;
+import org.glassfish.external.probe.provider.annotations.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
Index: flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java (revision 29260)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/FlashlightProbeClientMediator.java (working copy)
@@ -43,7 +43,7 @@
import org.glassfish.flashlight.client.*;
import org.glassfish.flashlight.provider.FlashlightProbe;
import org.glassfish.flashlight.provider.ProbeRegistry;
-import org.glassfish.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.component.PostConstruct;
Index: flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java (revision 29260)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerListener.java (working copy)
@@ -1,6 +1,6 @@
package org.glassfish.flashlight.client;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
import java.lang.reflect.Method;
Index: flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java (revision 29260)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/client/ProbeClientInvokerFactory.java (working copy)
@@ -38,7 +38,7 @@
import org.glassfish.flashlight.impl.client.ReflectiveClientInvoker;
import org.glassfish.flashlight.provider.FlashlightProbe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
import org.jvnet.hk2.annotations.Service;
import java.lang.annotation.Annotation;
Index: flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java
===================================================================
--- flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java (revision 29260)
+++ flashlight/framework/src/main/java/org/glassfish/flashlight/client/EjbContainerProvider.java (working copy)
@@ -1,7 +1,7 @@
package org.glassfish.flashlight.client;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
import java.lang.reflect.Method;
Property changes on: flashlight\agent
___________________________________________________________________
Name: svn:ignore
+ target
Index: flashlight/agent/pom.xml
===================================================================
--- flashlight/agent/pom.xml (revision 29260)
+++ flashlight/agent/pom.xml (working copy)
@@ -49,10 +49,14 @@
hk2-jar
GlassFish Flashlight Agent
-
- org.glassfish.provider
- gfprobe-provider-client
-
+
+ org.glassfish.external
+ management-api
+
+
+ org.glassfish.gmbal
+ gmbal
+
Property changes on: flashlight\client
___________________________________________________________________
Name: svn:ignore
+ target
Index: flashlight/client/src/main/java/org/glassfish/flashlight/client/ProbeClient.java
===================================================================
--- flashlight/client/src/main/java/org/glassfish/flashlight/client/ProbeClient.java (revision 29260)
+++ flashlight/client/src/main/java/org/glassfish/flashlight/client/ProbeClient.java (working copy)
@@ -35,8 +35,8 @@
*/
package org.glassfish.flashlight.client;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
/**
* @author Mahesh Kannan
Index: common/glassfish-api/src/main/java/org/glassfish/api/statistics/CountStatistic.java
===================================================================
--- common/glassfish-api/src/main/java/org/glassfish/api/statistics/CountStatistic.java (revision 29260)
+++ common/glassfish-api/src/main/java/org/glassfish/api/statistics/CountStatistic.java (working copy)
@@ -36,17 +36,12 @@
package org.glassfish.api.statistics;
-import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.gmbal.ManagedData;
-
/**
* Specifies standard count measurements.
*/
-@ManagedData
public interface CountStatistic extends Statistic {
/**
* The count since the last reset.
*/
- @ManagedAttribute
long getCount();
}
Index: common/glassfish-api/src/main/java/org/glassfish/api/statistics/RangeStatistic.java
===================================================================
--- common/glassfish-api/src/main/java/org/glassfish/api/statistics/RangeStatistic.java (revision 29260)
+++ common/glassfish-api/src/main/java/org/glassfish/api/statistics/RangeStatistic.java (working copy)
@@ -36,29 +36,22 @@
package org.glassfish.api.statistics;
-import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.gmbal.ManagedData;
-
/**
* Specifies standard measurements of the lowest and highest values an attribute has held as well as its current value.
*/
-@ManagedData
public interface RangeStatistic extends Statistic {
/**
* The highest value this attribute has held since the beginning of the measurement.
*/
- @ManagedAttribute
long getHighWaterMark();
/**
* The lowest value this attribute has held since the beginning of the measurement.
*/
- @ManagedAttribute
long getLowWaterMark();
/**
* The current value of this attribute.
*/
- @ManagedAttribute
long getCurrent();
}
Index: common/glassfish-api/src/main/java/org/glassfish/api/statistics/BoundedRangeStatistic.java
===================================================================
--- common/glassfish-api/src/main/java/org/glassfish/api/statistics/BoundedRangeStatistic.java (revision 29260)
+++ common/glassfish-api/src/main/java/org/glassfish/api/statistics/BoundedRangeStatistic.java (working copy)
@@ -36,12 +36,10 @@
package org.glassfish.api.statistics;
-import org.glassfish.gmbal.ManagedData;
/**
* The BoundedRangeStatistic model aggregates the attributes of RangeStatistic and BoundaryStatistic and provides standard measurements of a range that has fixed limits.
*/
-@ManagedData
public interface BoundedRangeStatistic extends BoundaryStatistic, RangeStatistic {
}
Index: common/glassfish-api/src/main/java/org/glassfish/api/statistics/TimeStatistic.java
===================================================================
--- common/glassfish-api/src/main/java/org/glassfish/api/statistics/TimeStatistic.java (revision 29260)
+++ common/glassfish-api/src/main/java/org/glassfish/api/statistics/TimeStatistic.java (working copy)
@@ -36,35 +36,28 @@
package org.glassfish.api.statistics;
-import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.gmbal.ManagedData;
/**
* Specifies standard timing measurements.
*/
-@ManagedData
public interface TimeStatistic extends Statistic {
/**
* Number of times the operation was invoked since the beginning of this measurement.
*/
- @ManagedAttribute
long getCount();
/**
* The maximum amount of time taken to complete one invocation of this operation since the beginning of this measurement.
*/
- @ManagedAttribute
long getMaxTime();
/**
* The minimum amount of time taken to complete one invocation of this operation since the beginning of this measurement.
*/
- @ManagedAttribute
long getMinTime();
/**
* This is the sum total of time taken to complete every invocation of this operation since the beginning of this measurement. Dividing totalTime by count will give you the average execution time for this operation.
*/
- @ManagedAttribute
long getTotalTime();
}
Index: common/glassfish-api/src/main/java/org/glassfish/api/statistics/Statistic.java
===================================================================
--- common/glassfish-api/src/main/java/org/glassfish/api/statistics/Statistic.java (revision 29260)
+++ common/glassfish-api/src/main/java/org/glassfish/api/statistics/Statistic.java (working copy)
@@ -36,42 +36,33 @@
package org.glassfish.api.statistics;
-import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.gmbal.ManagedData;
-
/**
* The Statistic model and its sub-models specify the data models which are requried to be used to provide the performance data described by the specific attributes in the Stats models.
*/
-@ManagedData
public interface Statistic {
/**
* The name of this Statistic.
*/
- @ManagedAttribute
String getName();
/**
* The unit of measurement for this Statistic.
* Valid values for TimeStatistic measurements are "HOUR", "MINUTE", "SECOND", "MILLISECOND", "MICROSECOND" and "NANOSECOND".
*/
- @ManagedAttribute
String getUnit();
/**
* A human-readable description of the Statistic.
*/
- @ManagedAttribute
String getDescription();
/**
* The time of the first measurement represented as a long, whose value is the number of milliseconds since January 1, 1970, 00:00:00.
*/
- @ManagedAttribute
long getStartTime();
/**
* The time of the last measurement represented as a long, whose value is the number of milliseconds since January 1, 1970, 00:00:00.
*/
- @ManagedAttribute
long getLastSampleTime();
}
Index: common/glassfish-api/src/main/java/org/glassfish/api/statistics/BoundaryStatistic.java
===================================================================
--- common/glassfish-api/src/main/java/org/glassfish/api/statistics/BoundaryStatistic.java (revision 29260)
+++ common/glassfish-api/src/main/java/org/glassfish/api/statistics/BoundaryStatistic.java (working copy)
@@ -36,23 +36,17 @@
package org.glassfish.api.statistics;
-import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.gmbal.ManagedData;
-
/**
* Specifies standard measurements of the upper and lower limits of the value of an attribute.
*/
-@ManagedData
public interface BoundaryStatistic extends Statistic {
/**
* The upper limit of the value of this attribute.
*/
- @ManagedAttribute
long getUpperBound();
/**
* The lower limit of the value of this attribute.The upper limit of the value of this attribute.
*/
- @ManagedAttribute
long getLowerBound();
}
Index: common/glassfish-api/src/main/java/org/glassfish/api/statistics/StringStatistic.java
===================================================================
--- common/glassfish-api/src/main/java/org/glassfish/api/statistics/StringStatistic.java (revision 29260)
+++ common/glassfish-api/src/main/java/org/glassfish/api/statistics/StringStatistic.java (working copy)
@@ -36,9 +36,6 @@
package org.glassfish.api.statistics;
-import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.gmbal.ManagedData;
-
/**
* Custom statistic type created for the Sun ONE Application Server.
* The goal is to be able to represent changing attribute values that are strings
@@ -52,11 +49,9 @@
* The permissible values are upto a particular implementation.
*/
-@ManagedData
public interface StringStatistic extends Statistic {
/**
* Returns the String value of the statistic
*/
- @ManagedAttribute
String getCurrent();
}
Index: common/glassfish-api/osgi.bundle
===================================================================
--- common/glassfish-api/osgi.bundle (revision 29260)
+++ common/glassfish-api/osgi.bundle (working copy)
@@ -21,7 +21,5 @@
org.glassfish.api.naming; \
org.glassfish.api.embedded; \
org.glassfish.api.web; \
- org.glassfish.api.statistics; \
- org.glassfish.api.statistics.impl; \
org.glassfish.api.branding; version=${project.osgi.version}
Index: common/glassfish-api/pom.xml
===================================================================
--- common/glassfish-api/pom.xml (revision 29260)
+++ common/glassfish-api/pom.xml (working copy)
@@ -70,10 +70,6 @@
grizzly-utils
- org.glassfish.gmbal
- gmbal
-
-
junit
junit
4.3.1
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java (working copy)
@@ -12,22 +12,25 @@
import java.util.ArrayList;
import java.util.Collection;
import javax.management.ObjectName;
+import javax.management.MBeanServer;
import org.glassfish.api.amx.MBeanListener;
import org.glassfish.flashlight.datatree.TreeNode;
import org.glassfish.flashlight.datatree.factory.TreeNodeFactory;
import org.glassfish.gmbal.ManagedObjectManager;
import org.glassfish.gmbal.ManagedObjectManagerFactory;
import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManagerDelegate;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManagerDelegate;
import org.glassfish.flashlight.MonitoringRuntimeDataRegistry;
import com.sun.enterprise.config.serverbeans.*;
+import java.lang.management.ManagementFactory;
import org.glassfish.flashlight.client.ProbeClientMediator;
import org.glassfish.flashlight.client.ProbeClientMethodHandle;
import org.jvnet.hk2.annotations.Scoped;
import org.jvnet.hk2.component.Singleton;
import org.glassfish.api.amx.AMXValues;
+import org.glassfish.api.amx.AMXUtil;
/**
*
@@ -43,6 +46,12 @@
private final TreeNode serverNode;
private static final ObjectName MONITORING_ROOT = AMXValues.monitoringRoot();
static final ObjectName MONITORING_SERVER = AMXValues.serverMon( AMXValues.dasName() );
+ private static final String DOMAIN = MONITORING_SERVER.getDomain();
+ private static final String PP = MONITORING_SERVER.getKeyProperty(AMXValues.PARENT_PATH_KEY);
+ private static final String TYPE = MONITORING_SERVER.getKeyProperty(AMXValues.TYPE_KEY);
+ private static final String NAME = MONITORING_SERVER.getKeyProperty(AMXValues.NAME_KEY);
+ private static final String PARENT_PATH = PP + "/" + TYPE + "[" + NAME + "]" ;
+ private static final MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
private boolean AMXReady = false;
private StatsProviderRegistry statsProviderRegistry;
@@ -113,7 +122,7 @@
if (AMXReady) {
ManagedObjectManager mom = registerGmbal(statsProvider, subTreePath);
//Make an entry to my own registry so I can manage the unregister, enable and disable
- statsProviderRegistry.registerStatsProvider(configElement,
+ statsProviderRegistry.registerStatsProvider(configElement,
parentNode.getCompletePathName(), childNodeNames,
handles, statsProvider, subTreePath, mom);
} else {
@@ -135,16 +144,22 @@
}
}
- public void unRegister(Object statsProvider) {
+ public void unregister(Object statsProvider) {
try {
//Unregister from the MonitoringDataTreeRegistry and gmbal
statsProviderRegistry.unregisterStatsProvider(statsProvider);
} catch (Exception ex) {
Logger.getLogger(StatsProviderManagerDelegateImpl.class.getName()).log(Level.SEVERE, null, ex);
}
-
+
}
+ public boolean hasListeners(String probeStr) {
+ boolean hasListeners = false;
+ //TODO implmentation
+ return hasListeners;
+ }
+
//Called when AMX DomainRoot is loaded (when jconsole or gui is started)
//Register statsProviders with gmbal whose configElement is enabled
//Save mom in the spre. Used in unregister with gmbal later for config change to OFF or undeploy
@@ -173,11 +188,13 @@
// 1 mom per statsProvider
mom = ManagedObjectManagerFactory.createFederated(MONITORING_SERVER);
if (mom != null) {
- mom.stripPackagePrefix();
- if (mbeanName != null && !mbeanName.isEmpty()) {
- mom.createRoot(statsProvider, mbeanName);
- } else {
- mom.createRoot(statsProvider);
+ if (!isMBeanRegistered(statsProvider, mbeanName)) {
+ mom.stripPackagePrefix();
+ if (mbeanName != null && !mbeanName.isEmpty()) {
+ mom.createRoot(statsProvider, mbeanName);
+ } else {
+ mom.createRoot(statsProvider);
+ }
}
}
//To register hierarchy in mom specify parent ManagedObject, and the ManagedObject itself
@@ -306,4 +323,37 @@
return enabled;
}
+ public boolean isStatsProviderRegistered(Object statsProvider, String subTreePath) {
+ boolean isStatsProviderRegistered = false;
+ Collection spreList = statsProviderRegistry.getSpreList();
+ for (StatsProviderRegistry.StatsProviderRegistryElement spre : spreList) {
+ if (spre.getStatsProvider().equals(statsProvider) && spre.getMBeanName().equals(statsProvider)) {
+ isStatsProviderRegistered = true;
+ }
+ }
+ return isStatsProviderRegistered;
+ }
+
+ public boolean isMBeanRegistered(Object statsProvider, String subTreePath) {
+ return isMBeanRegistered(getObjectName(statsProvider, subTreePath));
+ }
+
+ public boolean isMBeanRegistered(ObjectName objectName) {
+ return mbeanServer.isRegistered(objectName);
+ }
+
+ public ObjectName getObjectName(Object statsProvider, String subTreePath) {
+ String typeValue = getTypeValue(statsProvider);
+ String nameValue = getNameValue(subTreePath);
+ return AMXUtil.newObjectName(PARENT_PATH, typeValue, nameValue);
+ }
+
+ public String getTypeValue(Object statsProvider) {
+ return statsProvider.getClass().getSimpleName();
+ }
+
+ public String getNameValue(String subTreePath) {
+ return subTreePath;
+ }
+
}
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java (working copy)
@@ -55,7 +55,6 @@
}
public void unregisterStatsProvider(Object statsProvider) throws Exception {
-
StatsProviderRegistryElement spre = statsProviderToRegistryElementMap.get(statsProvider);
if (spre == null)
throw new Exception("Invalid statsProvider, cannot unregister");
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java (working copy)
@@ -9,7 +9,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.jvnet.hk2.component.PostConstruct;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.StatsProviderManager;
import org.glassfish.api.Startup;
import com.sun.enterprise.config.serverbeans.*;
import org.glassfish.flashlight.MonitoringRuntimeDataRegistry;
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMMemoryStatsProvider.java (working copy)
@@ -39,11 +39,13 @@
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
import java.lang.management.MemoryUsage;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
/* jvm.memory */
+//@AMXMetadata(type="memory-mon", group="monitoring", isSingleton=true)
@ManagedObject
@Description( "JVM Memory Statistics" )
public class JVMMemoryStatsProvider {
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMGCStatsProvider.java (working copy)
@@ -40,14 +40,16 @@
import java.lang.management.ManagementFactory;
import java.util.List;
import org.glassfish.gmbal.Description;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
/* jvm.garbage-collectors */
+//@AMXMetadata(type="garbage-collector-mon", group="monitoring")
@ManagedObject
@Description( "JVM Garbage Collectors Statistics" )
public class JVMGCStatsProvider {
-
+
private List gcBeanList = ManagementFactory.getGarbageCollectorMXBeans();
private String gcName = null;
@@ -79,4 +81,5 @@
}
return times;
}
+
}
\ No newline at end of file
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java (working copy)
@@ -16,8 +16,8 @@
//import org.glassfish.api.event.EventListener.Event;
//import org.glassfish.api.event.EventTypes;
//import org.glassfish.api.event.RestrictTo;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
import org.jvnet.hk2.component.PostConstruct;
import org.glassfish.api.Startup;
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMCompilationStatsProvider.java (working copy)
@@ -39,10 +39,13 @@
import java.lang.management.CompilationMXBean;
import java.lang.management.ManagementFactory;
import org.glassfish.gmbal.Description;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
-/* jvm.compilation-system */
+/* jvm.
+ compilation-system */
+//@AMXMetadata(type="compilation-system-mon", group="monitoring", isSingleton=true)
@ManagedObject
@Description( "JVM Compilation Statistics" )
public class JVMCompilationStatsProvider {
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMOSStatsProvider.java (working copy)
@@ -38,11 +38,13 @@
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
/* jvm.operating-system */
+//@AMXMetadata(type="operating-system-mon", group="monitoring", isSingleton=true)
@ManagedObject
@Description( "JVM Operating System Statistics" )
public class JVMOSStatsProvider {
@@ -71,5 +73,5 @@
@Description( "operating system version" )
public String getOSVersion() {
return osBean.getVersion();
- }
+ }
}
\ No newline at end of file
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMRuntimeStatsProvider.java (working copy)
@@ -39,11 +39,13 @@
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.util.List;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
/* jvm.runtime */
+//@AMXMetadata(type="runtime-mon", group="monitoring", isSingleton=true)
@ManagedObject
@Description( "JVM Runtime Statistics" )
public class JVMRuntimeStatsProvider {
Index: admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java
===================================================================
--- admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java (revision 29260)
+++ admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMClassLoadingStatsProvider.java (working copy)
@@ -38,11 +38,13 @@
import java.lang.management.ClassLoadingMXBean;
import java.lang.management.ManagementFactory;
+import org.glassfish.gmbal.AMXMetadata;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
/* jvm.class-loading-system */
+//@AMXMetadata(type="class-loading-system-mon", group="monitoring", isSingleton=true)
@ManagedObject
@Description( "JVM Class Loading Statistics" )
public class JVMClassLoadingStatsProvider {
Index: admin/monitor/pom.xml
===================================================================
--- admin/monitor/pom.xml (revision 29260)
+++ admin/monitor/pom.xml (working copy)
@@ -114,8 +114,8 @@
${project.version}
- org.glassfish.provider
- gfprobe-provider-client
+ org.glassfish.external
+ management-api
org.glassfish.gmbal
Index: admin/cli-optional/pom.xml
===================================================================
--- admin/cli-optional/pom.xml (revision 29260)
+++ admin/cli-optional/pom.xml (working copy)
@@ -112,7 +112,7 @@
- jsr311-api.jar jersey-gf-bundle.jar amx-core-impl.jar amx-core.jar glassfish-api.jar hk2.jar hk2-corejar configjar auto-dependsjar tiger-types-osgijar bean-validator.jar grizzly-utils.jar gmbal.jar glassfish-mbeanserver.jar internal-api.jar config-api.jar common-util.jar javax.servlet.jar grizzly-config.jar osgi-adapterjar jmxremote_optional-repackaged.jar amx-config-impl.jar amx-config.jar amx-ext-impl.jar kernel.jar grizzly-framework.jar grizzly-http.jar grizzly-rcm.jar grizzly-portunif.jar deployment-common.jar asm-all-repackaged.jar pkg-client.jar flashlight-framework.jar flashlight-agent.jar gfprobe-provider-client.jar security.jar dol.jar javax.annotation.jar javax.transaction.jar javax.enterprise.deploy.jar javax.persistence.jar javax.resource.jar annotation-framework.jar javax.security.auth.message.jar javax.security.jacc.jar javax.ejb.jar ejb-internal-api.jar connectors-internal-api.jar transaction-internal-api.jar ldapbp-repackaged.jar grizzly-compat.jar grizzly-comet.jar grizzly-cometd.jar grizzly-messagesbus.jar servlet-api-2.5.jar glassfish-extra-jre-packages.jar api-exporter.jar glassfish.jar admin-cli.jar cli-framework.jar launcher.jar branding.jar deployment-admin.jar deployment-autodeploy.jar glassfish-ee-api.jar osgi-mainjar glassfish-corba-omgapi.jar container-common.jar glassfish-naming.jar orb-connector.jar javax.mail.jar osgi-container.jar grizzly-container.jar monitoring-core.jar stats77.jar deployment-client.jar deployment-javaee-core.jar inmemory.jacc.provider.jar ant.jar jaxb-osgi.jar jaxb-api-osgi.jar registration-api.jar registration-impl.jar sysnet-registration-repackaged.jar commons-codec-repackaged.jar glassfish-registration.jar cli-optional.jar server-mgmt.jar admin-util.jar extra-jdk-packages.jar rest-service.jar gf-client.jar gf-client-module.jar ejb-container.jar appclient.security.jar ejb.security.jar glassfish-corba-csiv2-idl.jar glassfish-corba-orb.jar glassfish-corba-orbgeneric.jar glassfish-corba-newtimer.jar glassfish-corba-codegen.jar glassfish-corba-asm.jar orb-iiop.jar acc-config.jar webservices.security.jar webservices-osgi.jar webservices-api-osgi.jar websecurity.jar web-core.jar apache-commons.jar war-util.jar javax.servlet.jsp.jar web-naming.jar jsr109-impl.jar web-glue.jar web-cli.jar amx-j2ee.jar javax.management.j2ee.jar jsp-impl.jar jsp-api.jar el-api.jar el-impl.jar admin-core.jar web-gui-plugin-common.jar grizzly-http-servlet.jar work-management.jar connectors-inbound-runtime.jar connectors-runtime.jar jts.jar jta.jar jms-core.jar javax.jms.jar org.eclipse.persistence.core.jar org.eclipse.persistence.jpa.jar org.eclipse.persistence.oracle.jar org.eclipse.persistence.antlr.jar org.eclipse.persistence.asm.jar jpa-connector.jar persistence-common.jar appclient-connector.jar appclient-server-core.jar cmp-utility.jar cmp-model.jar dbschema-repackaged.jar cmp-generator-database.jar cmp-ejb-mapping.jar schema2beans-repackaged.jar cmp-enhancer.jar cmp-support-sqlstore.jar antlr-repackaged.jar cmp-support-ejb.jar gf-connectors-connector.jar connectors-admin.jar glassfish-oracle-jdbc-driver-packages.jar jsf-api.jar jsf-impl.jar jstl-connector.jar jstl-impl.jar jstl-api.jar javax.servlet.jsp.jstl.jar jsf-connector.jar jspcaching-connector.jar gf-web-connector.jar web-ajp.jar web-embed-api.jar web-embed-impl.jar jdbc-admin.jar console-plugin-service.jar dataprovider.jar dataprovider.jar jsftemplating.jar console-common.jar console-security-plugin.jar webui-jsf-suntheme.jar webui-jsf.jar commons-fileupload.jar xml-apis.jar json.jar console-updatecenter-plugin.jar console-community-branding-plugin.jar console-web-plugin.jar console-jdbc-plugin.jar gf-ejb-connector.jar console-ejb-lite-plugin.jar deployment-javaee-full.jar amx-j2ee-impl.jar mejb.jar console-jms-plugin.jar jms-admin.jar console-ejb-plugin.jar console-corba-plugin.jar webbeans-integration.jar webbeans-osgi-bundle.jar jsr299-api.jar webbeans-api.jar webbeans-spi.jar jms.jar webbeans-core.jar webbeans-logging.jar javassist.jar dom4j.jar gf-jruby-connector.jar grizzly-jruby-module.jar grizzly-jruby.jar grizzly-scripting-common.jar
+ jsr311-api.jar jersey-gf-bundle.jar amx-core-impl.jar amx-core.jar glassfish-api.jar hk2.jar hk2-corejar configjar auto-dependsjar tiger-types-osgijar bean-validator.jar grizzly-utils.jar gmbal.jar glassfish-mbeanserver.jar internal-api.jar config-api.jar common-util.jar javax.servlet.jar grizzly-config.jar osgi-adapterjar jmxremote_optional-repackaged.jar amx-config-impl.jar amx-config.jar amx-ext-impl.jar kernel.jar grizzly-framework.jar grizzly-http.jar grizzly-rcm.jar grizzly-portunif.jar deployment-common.jar asm-all-repackaged.jar pkg-client.jar flashlight-framework.jar flashlight-agent.jar management-api.jar security.jar dol.jar javax.annotation.jar javax.transaction.jar javax.enterprise.deploy.jar javax.persistence.jar javax.resource.jar annotation-framework.jar javax.security.auth.message.jar javax.security.jacc.jar javax.ejb.jar ejb-internal-api.jar connectors-internal-api.jar transaction-internal-api.jar ldapbp-repackaged.jar grizzly-compat.jar grizzly-comet.jar grizzly-cometd.jar grizzly-messagesbus.jar servlet-api-2.5.jar glassfish-extra-jre-packages.jar api-exporter.jar glassfish.jar admin-cli.jar cli-framework.jar launcher.jar branding.jar deployment-admin.jar deployment-autodeploy.jar glassfish-ee-api.jar osgi-mainjar glassfish-corba-omgapi.jar container-common.jar glassfish-naming.jar orb-connector.jar javax.mail.jar osgi-container.jar grizzly-container.jar monitoring-core.jar stats77.jar deployment-client.jar deployment-javaee-core.jar inmemory.jacc.provider.jar ant.jar jaxb-osgi.jar jaxb-api-osgi.jar registration-api.jar registration-impl.jar sysnet-registration-repackaged.jar commons-codec-repackaged.jar glassfish-registration.jar cli-optional.jar server-mgmt.jar admin-util.jar extra-jdk-packages.jar rest-service.jar gf-client.jar gf-client-module.jar ejb-container.jar appclient.security.jar ejb.security.jar glassfish-corba-csiv2-idl.jar glassfish-corba-orb.jar glassfish-corba-orbgeneric.jar glassfish-corba-newtimer.jar glassfish-corba-codegen.jar glassfish-corba-asm.jar orb-iiop.jar acc-config.jar webservices.security.jar webservices-osgi.jar webservices-api-osgi.jar websecurity.jar web-core.jar apache-commons.jar war-util.jar javax.servlet.jsp.jar web-naming.jar jsr109-impl.jar web-glue.jar web-cli.jar amx-j2ee.jar javax.management.j2ee.jar jsp-impl.jar jsp-api.jar el-api.jar el-impl.jar admin-core.jar web-gui-plugin-common.jar grizzly-http-servlet.jar work-management.jar connectors-inbound-runtime.jar connectors-runtime.jar jts.jar jta.jar jms-core.jar javax.jms.jar org.eclipse.persistence.core.jar org.eclipse.persistence.jpa.jar org.eclipse.persistence.oracle.jar org.eclipse.persistence.antlr.jar org.eclipse.persistence.asm.jar jpa-connector.jar persistence-common.jar appclient-connector.jar appclient-server-core.jar cmp-utility.jar cmp-model.jar dbschema-repackaged.jar cmp-generator-database.jar cmp-ejb-mapping.jar schema2beans-repackaged.jar cmp-enhancer.jar cmp-support-sqlstore.jar antlr-repackaged.jar cmp-support-ejb.jar gf-connectors-connector.jar connectors-admin.jar glassfish-oracle-jdbc-driver-packages.jar jsf-api.jar jsf-impl.jar jstl-connector.jar jstl-impl.jar jstl-api.jar javax.servlet.jsp.jstl.jar jsf-connector.jar jspcaching-connector.jar gf-web-connector.jar web-ajp.jar web-embed-api.jar web-embed-impl.jar jdbc-admin.jar console-plugin-service.jar dataprovider.jar dataprovider.jar jsftemplating.jar console-common.jar console-security-plugin.jar webui-jsf-suntheme.jar webui-jsf.jar commons-fileupload.jar xml-apis.jar json.jar console-updatecenter-plugin.jar console-community-branding-plugin.jar console-web-plugin.jar console-jdbc-plugin.jar gf-ejb-connector.jar console-ejb-lite-plugin.jar deployment-javaee-full.jar amx-j2ee-impl.jar mejb.jar console-jms-plugin.jar jms-admin.jar console-ejb-plugin.jar console-corba-plugin.jar webbeans-integration.jar webbeans-osgi-bundle.jar jsr299-api.jar webbeans-api.jar webbeans-spi.jar jms.jar webbeans-core.jar webbeans-logging.jar javassist.jar dom4j.jar gf-jruby-connector.jar grizzly-jruby-module.jar grizzly-jruby.jar grizzly-scripting-common.jar
Index: admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeXmlProvider.java
===================================================================
--- admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeXmlProvider.java (revision 29260)
+++ admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeXmlProvider.java (working copy)
@@ -53,7 +53,7 @@
import javax.ws.rs.WebApplicationException;
import org.glassfish.flashlight.datatree.TreeNode;
-import org.glassfish.api.statistics.Statistic;
+import org.glassfish.external.statistics.Statistic;
/**
* @author Rajeshwar Patil
Index: admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeHtmlProvider.java
===================================================================
--- admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeHtmlProvider.java (revision 29260)
+++ admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeHtmlProvider.java (working copy)
@@ -45,7 +45,7 @@
import java.util.Map;
//import javax.management.j2ee.statistics.Statistics; //?
-import org.glassfish.api.statistics.Statistic;
+import org.glassfish.external.statistics.Statistic;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
Index: admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeJsonProvider.java
===================================================================
--- admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeJsonProvider.java (revision 29260)
+++ admin/rest/src/main/java/org/glassfish/admin/rest/provider/TreeNodeJsonProvider.java (working copy)
@@ -53,7 +53,7 @@
import javax.ws.rs.WebApplicationException;
import org.glassfish.flashlight.datatree.TreeNode;
-import org.glassfish.api.statistics.Statistic;
+import org.glassfish.external.statistics.Statistic;
/**
* @author Rajeshwar Patil
Index: admin/rest/src/main/java/org/glassfish/admin/rest/provider/ProviderUtil.java
===================================================================
--- admin/rest/src/main/java/org/glassfish/admin/rest/provider/ProviderUtil.java (revision 29260)
+++ admin/rest/src/main/java/org/glassfish/admin/rest/provider/ProviderUtil.java (working copy)
@@ -45,7 +45,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.glassfish.api.statistics.Statistic;
+import org.glassfish.external.statistics.Statistic;
import javax.ws.rs.core.UriInfo;
Index: admin/rest/pom.xml
===================================================================
--- admin/rest/pom.xml (revision 29260)
+++ admin/rest/pom.xml (working copy)
@@ -77,10 +77,9 @@
hk2
- org.glassfish.common
- glassfish-api
- ${project.version}
-
+ org.glassfish.external
+ management-api
+
org.glassfish.common
common-util
Property changes on: jms\jms-core
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jms\admin
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: admingui\jms-plugin
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: admingui\ejb-lite
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: admingui\ejb
___________________________________________________________________
Name: svn:ignore
+ target
Index: ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityStatsProvider.java
===================================================================
--- ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityStatsProvider.java (revision 29260)
+++ ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityStatsProvider.java (working copy)
@@ -5,15 +5,15 @@
package org.glassfish.ejb.security.application;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.TimeStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.TimeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.TimeStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.TimeStatisticImpl;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
/**
*
Index: ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java
===================================================================
--- ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java (revision 29260)
+++ ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EJBSecurityManager.java (working copy)
@@ -84,9 +84,9 @@
import com.sun.enterprise.security.factory.SecurityManagerFactory;
import org.glassfish.ejb.security.factory.EJBSecurityManagerFactory;
import org.glassfish.internal.api.Globals;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
* This class is used by the EJB server to manage security. All
Index: ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityProbeProvider.java
===================================================================
--- ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityProbeProvider.java (revision 29260)
+++ ejb/ejb-container/src/main/java/org/glassfish/ejb/security/application/EjbSecurityProbeProvider.java (working copy)
@@ -5,9 +5,9 @@
package org.glassfish.ejb.security.application;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
*
Property changes on: ejb\javax.ejb
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: jbi\serviceengine\sun-javaee-engine
___________________________________________________________________
Name: svn:ignore
+ target
Index: security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java
===================================================================
--- security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java (revision 29260)
+++ security/webintegration/src/main/java/com/sun/web/security/RealmAdapter.java (working copy)
@@ -84,7 +84,7 @@
import org.glassfish.api.invocation.ComponentInvocation;
import org.glassfish.internal.api.ServerContext;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.StatsProviderManager;
//import com.sun.enterprise.Switch;
import com.sun.enterprise.deployment.Application;
import com.sun.enterprise.deployment.RunAsIdentityDescriptor;
@@ -113,7 +113,7 @@
import com.sun.enterprise.security.auth.login.DigestCredentials;
import com.sun.enterprise.security.auth.digest.api.Key;
import com.sun.enterprise.security.auth.digest.api.DigestParameterGenerator;
-import org.glassfish.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.PluginPoint;
import org.jvnet.hk2.annotations.Inject;
import org.jvnet.hk2.component.Habitat;
import static com.sun.enterprise.security.auth.digest.api.Constants.A1;
Index: security/webintegration/src/main/java/com/sun/web/security/LoginStatsProvider.java
===================================================================
--- security/webintegration/src/main/java/com/sun/web/security/LoginStatsProvider.java (revision 29260)
+++ security/webintegration/src/main/java/com/sun/web/security/LoginStatsProvider.java (working copy)
@@ -5,13 +5,13 @@
package com.sun.web.security;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
/**
*
Index: security/webintegration/src/main/java/com/sun/web/security/LoginProbeProvider.java
===================================================================
--- security/webintegration/src/main/java/com/sun/web/security/LoginProbeProvider.java (revision 29260)
+++ security/webintegration/src/main/java/com/sun/web/security/LoginProbeProvider.java (working copy)
@@ -5,9 +5,9 @@
package com.sun.web.security;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
*
Index: security/webintegration/pom.xml
===================================================================
--- security/webintegration/pom.xml (revision 29260)
+++ security/webintegration/pom.xml (working copy)
@@ -96,10 +96,6 @@
org.glassfish.admin
config-api
${project.version}
-
-
- org.glassfish.common
- glassfish-api
org.glassfish.common
@@ -152,10 +148,12 @@
grizzly-utils
- org.glassfish.provider
- gfprobe-provider-client
-
- 3.0.0-b008
+ org.glassfish.external
+ management-api
+
+
+ org.glassfish.gmbal
+ gmbal
Property changes on: security\inmemory.jacc.provider
___________________________________________________________________
Name: svn:ignore
+ target
Index: security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java (revision 29260)
+++ security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmsProbeProvider.java (working copy)
@@ -4,9 +4,9 @@
*/
package com.sun.enterprise.security.auth.realm;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
/**
*
Index: security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java (revision 29260)
+++ security/core/src/main/java/com/sun/enterprise/security/auth/realm/RealmStatsProvider.java (working copy)
@@ -1,9 +1,9 @@
package com.sun.enterprise.security.auth.realm;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
import org.glassfish.gmbal.*;
Index: security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java (revision 29260)
+++ security/core/src/main/java/com/sun/enterprise/security/SecurityLifecycle.java (working copy)
@@ -63,8 +63,8 @@
import java.util.Enumeration;
import java.util.List;
import org.glassfish.api.Startup.Lifecycle;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
import org.jvnet.hk2.annotations.Inject;
import org.jvnet.hk2.annotations.Scoped;
import org.jvnet.hk2.annotations.Service;
Index: security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java (revision 29260)
+++ security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerStatsProvider.java (working copy)
@@ -5,15 +5,15 @@
package com.sun.enterprise.security;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.TimeStatistic;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.TimeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.TimeStatistic;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.TimeStatisticImpl;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
/**
*
Index: security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java
===================================================================
--- security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java (revision 29260)
+++ security/core/src/main/java/com/sun/enterprise/security/WebSecurityDeployerProbeProvider.java (working copy)
@@ -4,9 +4,9 @@
*/
package com.sun.enterprise.security;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
*
Index: security/core/pom.xml
===================================================================
--- security/core/pom.xml (revision 29260)
+++ security/core/pom.xml (working copy)
@@ -209,13 +209,12 @@
${project.version}
- org.glassfish.provider
- gfprobe-provider-client
+ org.glassfish.external
+ management-api
- org.glassfish.common
- glassfish-api
- ${project.version}
+ org.glassfish.gmbal
+ gmbal
Property changes on: verifier\verifier-jdk-extension-bundle
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: verifier\verifier-impl
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: connectors\connectors-inbound-runtime
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: connectors\work-management
___________________________________________________________________
Name: svn:ignore
+ target
Index: connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java
===================================================================
--- connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java (revision 29260)
+++ connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/CommonWorkManager.java (working copy)
@@ -54,8 +54,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.glassfish.probe.provider.StatsProviderManager;
-import org.glassfish.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
/**
Index: connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java
===================================================================
--- connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java (revision 29260)
+++ connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementProbeProvider.java (working copy)
@@ -36,9 +36,9 @@
package com.sun.enterprise.connectors.work.monitor;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
/**
Index: connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java
===================================================================
--- connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java (revision 29260)
+++ connectors/work-management/src/main/java/com/sun/enterprise/connectors/work/monitor/WorkManagementStatsProvider.java (working copy)
@@ -38,13 +38,13 @@
import org.glassfish.gmbal.ManagedObject;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.StatisticImpl;
-import org.glassfish.api.statistics.impl.RangeStatisticImpl;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.RangeStatistic;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.StatisticImpl;
+import org.glassfish.external.statistics.impl.RangeStatisticImpl;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.RangeStatistic;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
/**
* Provides the monitoring data for Connector Work Manager
Index: connectors/work-management/pom.xml
===================================================================
--- connectors/work-management/pom.xml (revision 29260)
+++ connectors/work-management/pom.xml (working copy)
@@ -75,17 +75,16 @@
- org.glassfish.provider
- gfprobe-provider-client
+ org.glassfish.external
+ management-api
+
+
+
+ org.glassfish.gmbal
+ gmbal
- org.glassfish.admin
- monitoring-core
- ${project.parent.version}
-
-
-
org.glassfish.common
common-util
${project.parent.version}
Index: connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProviderBootstrap.java
===================================================================
--- connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProviderBootstrap.java (revision 29260)
+++ connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProviderBootstrap.java (working copy)
@@ -64,8 +64,8 @@
import org.jvnet.hk2.annotations.Service;
import org.jvnet.hk2.component.PostConstruct;
import org.jvnet.hk2.component.Singleton;
-import org.glassfish.probe.provider.PluginPoint;
-import org.glassfish.probe.provider.StatsProviderManager;
+import org.glassfish.external.probe.provider.PluginPoint;
+import org.glassfish.external.probe.provider.StatsProviderManager;
/**
* Bootstrap operations of telemetry objects are done by this class.
Index: connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProvider.java
===================================================================
--- connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProvider.java (revision 29260)
+++ connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JDBCPoolStatsProvider.java (working copy)
@@ -38,14 +38,14 @@
import com.sun.enterprise.resource.pool.monitor.telemetry.*;
import com.sun.enterprise.resource.pool.PoolLifeCycleListenerRegistry;
import java.util.logging.Logger;
-import org.glassfish.api.statistics.BoundedRangeStatistic;
-import org.glassfish.api.statistics.CountStatistic;
-import org.glassfish.api.statistics.RangeStatistic;
-import org.glassfish.api.statistics.impl.BoundedRangeStatisticImpl;
-import org.glassfish.api.statistics.impl.CountStatisticImpl;
-import org.glassfish.api.statistics.impl.RangeStatisticImpl;
-import org.glassfish.probe.provider.annotations.ProbeListener;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.statistics.BoundedRangeStatistic;
+import org.glassfish.external.statistics.CountStatistic;
+import org.glassfish.external.statistics.RangeStatistic;
+import org.glassfish.external.statistics.impl.BoundedRangeStatisticImpl;
+import org.glassfish.external.statistics.impl.CountStatisticImpl;
+import org.glassfish.external.statistics.impl.RangeStatisticImpl;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
import org.glassfish.gmbal.Description;
import org.glassfish.gmbal.ManagedAttribute;
import org.glassfish.gmbal.ManagedObject;
Index: connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/telemetry/JDBCPoolTelemetry.java
===================================================================
--- connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/telemetry/JDBCPoolTelemetry.java (revision 29260)
+++ connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/telemetry/JDBCPoolTelemetry.java (working copy)
@@ -42,10 +42,10 @@
import java.util.logging.Logger;
import org.glassfish.flashlight.client.ProbeClientMediator;
import org.glassfish.flashlight.client.ProbeClientMethodHandle;
-import org.glassfish.probe.provider.annotations.ProbeListener;
+import org.glassfish.external.probe.provider.annotations.ProbeListener;
import org.glassfish.flashlight.datatree.TreeNode;
import org.glassfish.flashlight.datatree.factory.TreeNodeFactory;
-import org.glassfish.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
import org.glassfish.flashlight.statistics.Average;
import org.glassfish.flashlight.statistics.Counter;
import org.glassfish.flashlight.statistics.factory.AverageFactory;
Index: connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JdbcConnPoolProbeProvider.java
===================================================================
--- connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JdbcConnPoolProbeProvider.java (revision 29260)
+++ connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JdbcConnPoolProbeProvider.java (working copy)
@@ -35,9 +35,9 @@
*/
package com.sun.enterprise.resource.pool.monitor;
-import org.glassfish.probe.provider.annotations.ProbeParam;
-import org.glassfish.probe.provider.annotations.Probe;
-import org.glassfish.probe.provider.annotations.ProbeProvider;
+import org.glassfish.external.probe.provider.annotations.ProbeParam;
+import org.glassfish.external.probe.provider.annotations.Probe;
+import org.glassfish.external.probe.provider.annotations.ProbeProvider;
/**
* Probe provider interface for JDBC connection pool related events to provide
Index: connectors/connectors-runtime/pom.xml
===================================================================
--- connectors/connectors-runtime/pom.xml (revision 29260)
+++ connectors/connectors-runtime/pom.xml (working copy)
@@ -104,11 +104,6 @@
- org.glassfish.common
- glassfish-api
-
-
-
org.glassfish.transaction
transaction-internal-api
${project.parent.version}
@@ -157,10 +152,13 @@
- org.glassfish.provider
- gfprobe-provider-client
- ${gfprobe-provider-client.version}
+ org.glassfish.external
+ management-api
+
+ org.glassfish.gmbal
+ gmbal
+