April 2009 - embjopr-commits - Jboss List Archives

EMBJOPR SVN: r318 - trunk/jsfunit/testdata/ear.

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2009-04-22 11:00:41 -0400 (Wed, 22 Apr 2009) New Revision: 318 Added: trunk/jsfunit/testdata/ear/refs-ejb3-ejblink.ear trunk/jsfunit/testdata/ear/refs.ear Log: archives containing refs to nested ejbs Added: trunk/jsfunit/testdata/ear/refs-ejb3-ejblink.ear =================================================================== (Binary files differ) Property changes on: trunk/jsfunit/testdata/ear/refs-ejb3-ejblink.ear ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsfunit/testdata/ear/refs.ear =================================================================== (Binary files differ) Property changes on: trunk/jsfunit/testdata/ear/refs.ear ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r317 - trunk/core/src/main/webapp/css.

by embjopr-commits＠lists.jboss.org

Author: charles.crouch(a)jboss.com Date: 2009-04-21 12:31:49 -0400 (Tue, 21 Apr 2009) New Revision: 317 Modified: trunk/core/src/main/webapp/css/console-style.css Log: make scroll bar offset match footer height Modified: trunk/core/src/main/webapp/css/console-style.css =================================================================== --- trunk/core/src/main/webapp/css/console-style.css 2009-04-21 16:30:46 UTC (rev 316) +++ trunk/core/src/main/webapp/css/console-style.css 2009-04-21 16:31:49 UTC (rev 317) @@ -78,7 +78,7 @@ { position: absolute; top: 46px; - bottom: 30px; /* Operas 5 + 6 shouldn't see this property */ + bottom: 31px; /* Operas 5 + 6 shouldn't see this property */ left: 0; width: 20em; overflow: auto;

15 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r316 - trunk/core/src/main/webapp/css.

by embjopr-commits＠lists.jboss.org

Author: charles.crouch(a)jboss.com Date: 2009-04-21 12:30:46 -0400 (Tue, 21 Apr 2009) New Revision: 316 Modified: trunk/core/src/main/webapp/css/console-style.css Log: move up the bottom scrollbar for the left nav so its not hidden under the footer Modified: trunk/core/src/main/webapp/css/console-style.css =================================================================== --- trunk/core/src/main/webapp/css/console-style.css 2009-04-21 13:19:01 UTC (rev 315) +++ trunk/core/src/main/webapp/css/console-style.css 2009-04-21 16:30:46 UTC (rev 316) @@ -78,7 +78,7 @@ { position: absolute; top: 46px; - bottom: 20px; /* Operas 5 + 6 shouldn't see this property */ + bottom: 30px; /* Operas 5 + 6 shouldn't see this property */ left: 0; width: 20em; overflow: auto;

15 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r315 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-21 09:19:01 -0400 (Tue, 21 Apr 2009) New Revision: 315 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java Log: Removed debug log line from getLinkInsideForm() Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-04-20 23:25:07 UTC (rev 314) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-04-21 13:19:01 UTC (rev 315) @@ -172,7 +172,6 @@ { HtmlAnchor link = (HtmlAnchor)i.next(); String linkText = link.getTextContent(); - log.debug(" * Link text: "+linkText); if (linkText.contains(linkLabel)) return link; }

15 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r314 - in trunk/core/src/main: webapp/WEB-INF and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-20 19:25:07 -0400 (Mon, 20 Apr 2009) New Revision: 314 Added: trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupFilter.java trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupListener.java Modified: trunk/core/src/main/webapp/WEB-INF/web.xml Log: configure listener/filter that will init Seam lazily (upon first request to the webapp), rather than than at webapp init (during server startup) (https://jira.jboss.org/jira/browse/EMBJOPR-85) Added: trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupFilter.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupFilter.java (rev 0) +++ trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupFilter.java 2009-04-20 23:25:07 UTC (rev 314) @@ -0,0 +1,119 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.jboss.on.embedded; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * A filter which lazily initializes another filter. + * + * The filter requires an initalization parameter with the name + * {@link org.jboss.on.embedded.LazyStartupFilter} + * + * The value is the name of the filter to lazily load. All other + * parameters are passed to the lazily loaded filter. + * + * <pre><code> + * <filter> + * <filter-name>Seam Filter</filter-name> + *  + * <filter-class>org.jboss.on.embedded.LazyStartupFilter</filter-class> + * + * <init-param> + * <param-name>org.jboss.on.embedded.LazyStartupFilter</param-name> + * <param-value>org.jboss.seam.servlet.SeamFilter</param-value> + * </init-param> + * </filter> + * <filter-mapping> + * <filter-name>Seam Filter</filter-name> + * <url-pattern>/*</url-pattern> + * </filter-mapping> + * </code></pre> + * + * @author Jason T. Greene + */ +public class LazyStartupFilter implements Filter +{ + private final Log log = LogFactory.getLog(getClass()); + + private volatile Filter filter; + private volatile boolean initialized = false; + private volatile FilterConfig config; + + public void destroy() + { + try + { + init(); + } + catch (ServletException e) + { + } + + filter.destroy(); + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException + { + init(); + + filter.doFilter(request, response, chain); + } + + private void init() throws ServletException + { + if (!initialized) + { + String parameter = getClass().getName(); + String filterName = config.getInitParameter(parameter); + if (filterName == null) + throw new IllegalArgumentException("Filter was not specified using the " + parameter + " parameter"); + + log.debug("Loading filter" + filterName); + try + { + filter = (Filter) Class.forName(filterName).newInstance(); + } + catch (Exception e) + { + throw new IllegalArgumentException("Could not instantiated filter: " + filterName, e); + } + + filter.init(config); + log.debug("Filter activated: " + filter); + initialized = true; + } + } + + public void init(FilterConfig config) throws ServletException + { + this.config = config; + } + +} Property changes on: trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupFilter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Author Id Revision HeadURL Name: svn:eol-style + LF Added: trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupListener.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupListener.java (rev 0) +++ trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupListener.java 2009-04-20 23:25:07 UTC (rev 314) @@ -0,0 +1,413 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.jboss.on.embedded; + +import java.util.ArrayList; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import javax.servlet.ServletContext; +import javax.servlet.ServletContextAttributeEvent; +import javax.servlet.ServletContextAttributeListener; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.servlet.ServletRequestAttributeEvent; +import javax.servlet.ServletRequestAttributeListener; +import javax.servlet.ServletRequestEvent; +import javax.servlet.ServletRequestListener; +import javax.servlet.http.HttpSessionAttributeListener; +import javax.servlet.http.HttpSessionBindingEvent; +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * LazyStartupListener is a special listener that can lazily start any number + * of hard-coded Servlet listeners. + * + * This works by delaying instantiation and context initialization events until + * any post-init event occurs (session creation, servlet request, etc). + * + * This filter expects a context parameter with the name: + * {@link org.jboss.on.embedded.LazyStartupListener} + * + * The value is a comma separated list of listeners to lazily load: + * + * <pre><code> + *  + * <context-param> + * <param-name>org.jboss.on.embedded.LazyStartupListener</param-name> + * <param-value>org.jboss.seam.servlet.SeamListener</param-value> + * </context-param> + * <listener> + * <listener-class>org.jboss.on.embedded.LazyStartupListener</listener-class> + * </listener> + * </code></pre> + * + * @author Jason T. Greene + * + */ +public class LazyStartupListener implements HttpSessionListener, ServletRequestListener, ServletContextListener, HttpSessionAttributeListener, + ServletRequestAttributeListener, ServletContextAttributeListener +{ + private final Log log = LogFactory.getLog(getClass()); + private final ConcurrentLinkedQueue<ContextEvent> contextEvents = new ConcurrentLinkedQueue<ContextEvent>(); + + /* + * Technically the array list fields don't need to be volatile, since initialized + * is read before they are read and written after they are read. + */ + private volatile ArrayList<HttpSessionListener> sessionListeners; + private volatile ArrayList<HttpSessionAttributeListener> sessionAttributeListeners; + private volatile ArrayList<ServletRequestListener> requestListeners; + private volatile ArrayList<ServletRequestAttributeListener> requestAttributeListeners; + private volatile ArrayList<ServletContextListener> contextListeners; + private volatile ArrayList<ServletContextAttributeListener> contextAttributeListeners; + + private volatile boolean initialized = false; + private volatile ServletContext context; + private volatile String[] names; + + + /** + * This lock guards event replay. Any thread which adds to the context event queue + * MUST obtain a read lock. The thread which replays the queue MUST obtain a write + * lock. + */ + private final ReentrantReadWriteLock replayLock = new ReentrantReadWriteLock(); + + private enum ContextEventType + { + ADD, REMOVE, REPLACE, INIT + }; + + private final class ContextEvent + { + final ContextEventType type; + final ServletContextEvent event; + + private ContextEvent(ContextEventType type, ServletContextEvent event) + { + this.type = type; + this.event = event; + } + } + + private void setupListeners() + { + final ArrayList<HttpSessionListener> sessionListeners = new ArrayList<HttpSessionListener>(); + final ArrayList<HttpSessionAttributeListener> sessionAttributeListeners = new ArrayList<HttpSessionAttributeListener>(); + final ArrayList<ServletRequestListener> requestListeners = new ArrayList<ServletRequestListener>(); + final ArrayList<ServletRequestAttributeListener> requestAttributeListeners = new ArrayList<ServletRequestAttributeListener>(); + final ArrayList<ServletContextListener> contextListeners = new ArrayList<ServletContextListener>(); + final ArrayList<ServletContextAttributeListener> contextAttributeListeners = new ArrayList<ServletContextAttributeListener>(); + + Object[] objs = new Object[names.length]; + for (int i = 0; i < names.length; i++) + { + try + { + objs[i] = Class.forName(names[i]).newInstance(); + } + catch (InstantiationException e) + { + } + catch (IllegalAccessException e) + { + } + catch (ClassNotFoundException e) + { + } + } + + for (Object obj : objs) + { + if (obj instanceof HttpSessionListener) + sessionListeners.add((HttpSessionListener)obj); + if (obj instanceof HttpSessionAttributeListener) + sessionAttributeListeners.add((HttpSessionAttributeListener)obj); + if (obj instanceof ServletRequestListener) + requestListeners.add((ServletRequestListener)obj); + if (obj instanceof ServletRequestAttributeListener) + requestAttributeListeners.add((ServletRequestAttributeListener)obj); + if (obj instanceof ServletContextListener) + contextListeners.add((ServletContextListener)obj); + if (obj instanceof ServletContextAttributeListener) + contextAttributeListeners.add((ServletContextAttributeListener)obj); + + log.debug("Activated listener: "+ obj); + } + + this.sessionListeners = sessionListeners; + this.sessionAttributeListeners = sessionAttributeListeners; + this.requestListeners = requestListeners; + this.requestAttributeListeners = requestAttributeListeners; + this.contextListeners = contextListeners; + this.contextAttributeListeners = contextAttributeListeners; + } + + private void initialize() + { + if (initialized) + return; + + log.debug("Activating listeners"); + setupListeners(); + + try + { + replayLock.writeLock().lock(); + + ConcurrentLinkedQueue<ContextEvent> events = contextEvents; + ContextEvent event = events.poll(); + while (event != null) + { + switch (event.type) + { + case INIT: + for (ServletContextListener listener : contextListeners) + listener.contextInitialized(event.event); + break; + case ADD: + for (ServletContextAttributeListener listener : contextAttributeListeners) + listener.attributeAdded((ServletContextAttributeEvent)event.event); + break; + case REMOVE: + for (ServletContextAttributeListener listener : contextAttributeListeners) + listener.attributeRemoved((ServletContextAttributeEvent)event.event); + break; + case REPLACE: + for (ServletContextAttributeListener listener : contextAttributeListeners) + listener.attributeReplaced((ServletContextAttributeEvent)event.event); + break; + } + + event = events.poll(); + } + + initialized = true; + } + finally + { + replayLock.writeLock().unlock(); + } + + } + + public void sessionCreated(HttpSessionEvent event) + { + initialize(); + + ArrayList<HttpSessionListener> listeners = sessionListeners; + for (HttpSessionListener listener : listeners) + listener.sessionCreated(event); + } + + public void sessionDestroyed(HttpSessionEvent event) + { + initialize(); + + ArrayList<HttpSessionListener> listeners = sessionListeners; + for (HttpSessionListener listener : listeners) + listener.sessionDestroyed(event); + } + + public void requestDestroyed(ServletRequestEvent event) + { + initialize(); + + ArrayList<ServletRequestListener> listeners = requestListeners; + for (ServletRequestListener listener : listeners) + listener.requestDestroyed(event); + + } + + public void requestInitialized(ServletRequestEvent event) + { + initialize(); + + ArrayList<ServletRequestListener> listeners = requestListeners; + for (ServletRequestListener listener : listeners) + listener.requestInitialized(event); + } + + public void contextDestroyed(ServletContextEvent event) + { + initialize(); + + ArrayList<ServletContextListener> listeners = contextListeners; + for (ServletContextListener listener : listeners) + listener.contextDestroyed(event); + } + + public void contextInitialized(ServletContextEvent event) + { + this.context = event.getServletContext(); + + // Comma separated list of listeners + String param = context.getInitParameter(getClass().getName()); + log.debug("Listeners configured for lazy loading: " + param); + this.names = param == null ? new String[0] : param.split(","); + + try + { + replayLock.readLock().lock(); + + if (!initialized) + { + contextEvents.add(new ContextEvent(ContextEventType.INIT, event)); + return; + } + + ArrayList<ServletContextListener> listeners = contextListeners; + for (ServletContextListener listener : listeners) + listener.contextInitialized(event); + } + finally + { + replayLock.readLock().unlock(); + } + } + + public void attributeAdded(HttpSessionBindingEvent event) + { + initialize(); + + ArrayList<HttpSessionAttributeListener> listeners = sessionAttributeListeners; + for (HttpSessionAttributeListener listener : listeners) + listener.attributeAdded(event); + } + + public void attributeRemoved(HttpSessionBindingEvent event) + { + initialize(); + + ArrayList<HttpSessionAttributeListener> listeners = sessionAttributeListeners; + for (HttpSessionAttributeListener listener : listeners) + listener.attributeRemoved(event); + } + + public void attributeReplaced(HttpSessionBindingEvent event) + { + initialize(); + + ArrayList<HttpSessionAttributeListener> listeners = sessionAttributeListeners; + for (HttpSessionAttributeListener listener : listeners) + listener.attributeReplaced(event); + } + + public void attributeAdded(ServletRequestAttributeEvent event) + { + initialize(); + + ArrayList<ServletRequestAttributeListener> listeners = requestAttributeListeners; + for (ServletRequestAttributeListener listener : listeners) + listener.attributeAdded(event); + } + + public void attributeRemoved(ServletRequestAttributeEvent event) + { + initialize(); + + ArrayList<ServletRequestAttributeListener> listeners = requestAttributeListeners; + for (ServletRequestAttributeListener listener : listeners) + listener.attributeRemoved(event); + } + + public void attributeReplaced(ServletRequestAttributeEvent event) + { + initialize(); + + ArrayList<ServletRequestAttributeListener> listeners = requestAttributeListeners; + for (ServletRequestAttributeListener listener : listeners) + listener.attributeReplaced(event); + + } + + public void attributeAdded(ServletContextAttributeEvent event) + { + try + { + replayLock.readLock().lock(); + + if (!initialized) + { + contextEvents.add(new ContextEvent(ContextEventType.ADD, event)); + return; + } + + ArrayList<ServletContextAttributeListener> listeners = contextAttributeListeners; + for (ServletContextAttributeListener listener : listeners) + listener.attributeAdded(event); + } + finally + { + replayLock.readLock().unlock(); + } + + } + + public void attributeRemoved(ServletContextAttributeEvent event) + { + + try + { + replayLock.readLock().lock(); + + if (!initialized) + { + contextEvents.add(new ContextEvent(ContextEventType.REMOVE, event)); + return; + } + + ArrayList<ServletContextAttributeListener> listeners = contextAttributeListeners; + for (ServletContextAttributeListener listener : listeners) + listener.attributeRemoved(event); + } + finally + { + replayLock.readLock().unlock(); + } + } + + public void attributeReplaced(ServletContextAttributeEvent event) + { + + try + { + replayLock.readLock().lock(); + + if (!initialized) + { + contextEvents.add(new ContextEvent(ContextEventType.REPLACE, event)); + return; + } + + ArrayList<ServletContextAttributeListener> listeners = contextAttributeListeners; + for (ServletContextAttributeListener listener : listeners) + listener.attributeRemoved(event); + } + finally + { + replayLock.readLock().unlock(); + } + } +} Property changes on: trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Author Id Revision HeadURL Name: svn:eol-style + LF Modified: trunk/core/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/web.xml 2009-04-20 21:50:03 UTC (rev 313) +++ trunk/core/src/main/webapp/WEB-INF/web.xml 2009-04-20 23:25:07 UTC (rev 314) @@ -36,40 +36,47 @@ <param-value>jboss-console</param-value> </context-param> -  - +  + <context-param> + <param-name>org.jboss.on.embedded.LazyStartupListener</param-name> + <param-value>org.jboss.seam.servlet.SeamListener</param-value> + </context-param> <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + <listener-class>org.jboss.on.embedded.LazyStartupListener</listener-class> </listener>  <filter> <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> +  + <filter-class>org.jboss.on.embedded.LazyStartupFilter</filter-class> + <init-param> + <param-name>org.jboss.on.embedded.LazyStartupFilter</param-name> + <param-value>org.jboss.seam.servlet.SeamFilter</param-value> + </init-param> </filter> <filter-mapping> <filter-name>Seam Filter</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> - + </filter-mapping> +  - + <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> <servlet-name>Faces Servlet</servlet-name> <url-pattern>*.seam</url-pattern> - </servlet-mapping> + </servlet-mapping> <context-param> <param-name>javax.faces.CONFIG_FILES</param-name> <param-value>/WEB-INF/navigation.xml</param-value> </context-param> - + <context-param> <param-name>javax.faces.STATE_SAVING_METHOD</param-name> <param-value>client</param-value> @@ -81,11 +88,10 @@ </context-param>  - <listener> <listener-class>com.sun.faces.config.ConfigureListener</listener-class> </listener> - +

15 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r313 - trunk/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2009-04-20 17:50:03 -0400 (Mon, 20 Apr 2009) New Revision: 313 Modified: trunk/jsfunit/pom.xml Log: fix cargo.jvmargs Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-04-20 20:08:00 UTC (rev 312) +++ trunk/jsfunit/pom.xml 2009-04-20 21:50:03 UTC (rev 313) @@ -334,7 +334,7 @@ <properties> <cargo.java.home>${JAVA_HOME}</cargo.java.home>  - <cargo.jvmargs>-Dcom.sun.management.jmxremote -Xmx:1024m -Dxb.builder.useUnorderedSequence=true -XX:PermSize=128m -XX:MaxPermSize=256m</cargo.jvmargs> + <cargo.jvmargs>-Dcom.sun.management.jmxremote -Xmx1024m -Dxb.builder.useUnorderedSequence=true -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs>   <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration>

15 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r312 - trunk/jbas5/etc.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-20 16:08:00 -0400 (Mon, 20 Apr 2009) New Revision: 312 Modified: trunk/jbas5/etc/generated-rhq-plugin.xml Log: latest and greatest Modified: trunk/jbas5/etc/generated-rhq-plugin.xml =================================================================== --- trunk/jbas5/etc/generated-rhq-plugin.xml 2009-04-20 19:42:01 UTC (rev 311) +++ trunk/jbas5/etc/generated-rhq-plugin.xml 2009-04-20 20:08:00 UTC (rev 312) @@ -17,6 +17,16 @@ <c:map-property required="false" name="result"/> </results> </operation> + <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> @@ -46,7 +56,10 @@ <c:simple-property type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/> <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/> <c:simple-property name="rar-name" description="The resource adapter archive name"/> - <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"/> + <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"> + <c:simple-property required="false" name="domain" description="the security domain"/> + <c:simple-property required="false" name="securityDeploymentType" description="the security deploymen type"/> + </c:map-property> <c:simple-property type="boolean" required="false" name="set-tx-query-timeout" description="Should query timeout be enabled"/> <c:simple-property type="boolean" required="false" name="share-prepared-statements" description="Should prepared statements be shared"/> <c:simple-property required="false" name="stale-connection-checker-class-name" description="The DataSource stale connection checker class name"/> @@ -86,6 +99,16 @@ <c:map-property required="false" name="result"/> </results> </operation> + <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> @@ -119,8 +142,8 @@ <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/> <c:simple-property name="rar-name" description="The resource adapter archive name"/> <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"> - <c:simple-property required="false" readOnly="true" name="securityDeploymentType"/> - <c:simple-property required="false" name="domain"/> + <c:simple-property required="false" name="domain" description="the security domain"/> + <c:simple-property required="false" name="securityDeploymentType" description="the security deploymen type"/> </c:map-property> <c:simple-property type="boolean" required="false" name="set-tx-query-timeout" description="Should query timeout be enabled"/> <c:simple-property type="boolean" required="false" name="share-prepared-statements" description="Should prepared statements be shared"/> @@ -157,6 +180,16 @@ <c:map-property required="false" name="result"/> </results> </operation> + <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> @@ -189,7 +222,10 @@ <c:simple-property type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/> <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/> <c:simple-property name="rar-name" description="The resource adapter archive name"/> - <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"/> + <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"> + <c:simple-property required="false" name="domain" description="the security domain"/> + <c:simple-property required="false" name="securityDeploymentType" description="the security deploymen type"/> + </c:map-property> <c:simple-property type="boolean" required="false" name="set-tx-query-timeout" description="Should query timeout be enabled"/> <c:simple-property type="boolean" required="false" name="share-prepared-statements" description="Should prepared statements be shared"/> <c:simple-property required="false" name="stale-connection-checker-class-name" description="The DataSource stale connection checker class name"/> @@ -225,6 +261,17 @@ <c:map-property required="false" name="result"/> </results> </operation> + <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="xa-transaction" displayType="summary" displayName="Xa Transaction" description="The XA/local transaction behavior flag" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> @@ -249,8 +296,8 @@ <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/> <c:simple-property name="rar-name" description="The resource adapter archive name"/> <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"> - <c:simple-property required="false" readOnly="true" name="securityDeploymentType"/> - <c:simple-property required="false" name="domain"/> + <c:simple-property required="false" name="domain" description="the security domain"/> + <c:simple-property required="false" name="securityDeploymentType" description="the security deploymen type"/> </c:map-property> <c:simple-property required="false" name="statistics-formatter"/> <c:simple-property type="boolean" required="false" name="track-connection-by-tx"/> @@ -279,6 +326,16 @@ <c:map-property required="false" name="result"/> </results> </operation> + <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> @@ -302,7 +359,10 @@ <c:simple-property required="false" name="poolJndiName"/> <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/> <c:simple-property name="rar-name" description="The resource adapter archive name"/> - <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"/> + <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"> + <c:simple-property required="false" name="domain" description="the security domain"/> + <c:simple-property required="false" name="securityDeploymentType" description="the security deploymen type"/> + </c:map-property> <c:simple-property required="false" name="statistics-formatter"/> <c:simple-property type="boolean" required="false" name="track-connection-by-tx"/> <c:simple-property required="false" name="type-mapping"/> @@ -376,6 +436,10 @@ <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/> <operation name="start" displayName="Start" description="Service lifecycle operation"/> <operation name="stop" displayName="Stop" description="Service lifecycle operation"/> + <metric property="consumerCount" measurementType="dynamic" displayType="detail" displayName="Consumer Count" description="The number of consumers on the queue" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="createdProgrammatically" displayType="summary" displayName="Created Programmatically" description="True if this destination was created programmatically" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count" description="The number of messages currently being delivered" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="messageCount" measurementType="dynamic" displayType="detail" displayName="Message Count" description="The number of messages in the queue" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="messageCounter.count" measurementType="dynamic" displayType="detail" displayName="Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="messageCounter.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="messageCounter.counterAsString" displayType="detail" displayName="Counter As String" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> @@ -398,6 +462,7 @@ <metric property="messageStatistics.subscriptionID" displayType="detail" displayName="Subscription ID" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="messageStatistics.topic" measurementType="dynamic" displayType="detail" displayName="Topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count" description="The number of scheduled messages in the queue" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <resource-configuration> <c:simple-property required="false" name="DLQ" description="The DLQ for this queue, overrides the default DLQ on the server peer"/> <c:simple-property name="JNDIName" description="The destination's JNDI name"/> @@ -511,6 +576,14 @@ <operation name="removeAllMessages" displayName="Remove All Messages" description="Remove all messages"/> <operation name="start" displayName="Start" description="Service lifecycle operation"/> <operation name="stop" displayName="Stop" description="Service lifecycle operation"/> + <metric property="allMessageCount" measurementType="dynamic" displayType="detail" displayName="All Message Count" description="The count of all messages in all subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="All Subscriptions Count" description="The count of all subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="createdProgrammatically" displayType="summary" displayName="Created Programmatically" description="True if this destination was created programmatically" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count" description="The count of all messages in all durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count" description="The count of all durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="messageCounterHistoryDayLimit" measurementType="dynamic" displayType="detail" displayName="Message Counter History Day Limit" description="The day limit for the message counter" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count" description="The count of all messages in all non durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count" description="The count of all non durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <resource-configuration> <c:simple-property required="false" name="DLQ" description="The DLQ for this topic, overrides the default DLQ on the server peer"/> <c:simple-property name="JNDIName" description="The destination's JNDI name"/> @@ -530,14 +603,34 @@ </service> <service name="Platform MBean"> <resource-configuration> - <c:list-property required="false" readOnly="true" name="memoryPoolNames"> + <c:simple-property required="false" readOnly="true" name="bootClassPath"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="bootClassPathSupported"/> + <c:simple-property required="false" readOnly="true" name="classPath"/> + <c:list-property required="false" readOnly="true" name="inputArguments"> <c:simple-property required="false" name="element"/> </c:list-property> + <c:simple-property required="false" readOnly="true" name="libraryPath"/> + <c:simple-property required="false" readOnly="true" name="managementSpecVersion"/> <c:simple-property required="false" readOnly="true" name="name"/> - <c:simple-property type="boolean" required="false" readOnly="true" name="valid"/> + <c:simple-property required="false" readOnly="true" name="specName"/> + <c:simple-property required="false" readOnly="true" name="specVendor"/> + <c:simple-property required="false" readOnly="true" name="specVersion"/> + <c:simple-property type="long" required="false" readOnly="true" name="startTime"/> + <c:map-property required="false" readOnly="true" name="systemProperties"/> + <c:simple-property type="long" required="false" readOnly="true" name="uptime"/> + <c:simple-property required="false" readOnly="true" name="vmName"/> + <c:simple-property required="false" readOnly="true" name="vmVendor"/> + <c:simple-property required="false" readOnly="true" name="vmVersion"/> </resource-configuration> </service> <service name="Web MBean"> + <operation name="resetCounters" displayName="Reset Counters" description=""/> + <metric property="bytesReceived" measurementType="dynamic" displayType="detail" displayName="Bytes Received" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="bytesSent" measurementType="dynamic" displayType="detail" displayName="Bytes Sent" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="errorCount" measurementType="dynamic" displayType="detail" displayName="Error Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="maxTime" measurementType="dynamic" displayType="detail" displayName="Max Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="requestCount" measurementType="dynamic" displayType="detail" displayName="Request Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <resource-configuration> <c:simple-property required="false" readOnly="true" name="mbeanNameAsString"/> </resource-configuration> @@ -549,11 +642,6 @@ </c:list-property> </resource-configuration> </service> - <service name="ManagementView MCBean"> - <resource-configuration> - <c:simple-property required="false" name="state" description="The bean controller state"/> - </resource-configuration> - </service> <service name="%Generated% MCBean"> <resource-configuration> <c:list-property required="false" name="properties"> @@ -575,6 +663,11 @@ </c:list-property> </resource-configuration> </service> + <service name="ManagementView MCBean"> + <resource-configuration> + <c:simple-property required="false" name="state" description="The bean controller state"/> + </resource-configuration> + </service> <service name="%Generated% MCBean"> <resource-configuration> <c:list-property required="false" name="properties"> @@ -784,9 +877,100 @@ </resource-configuration> </service> <service name="Security MCBean"> + <operation name="createSecurityDomainContext" displayName="Create Security Domain Context" description="Create the context for the specified security domain"> + <parameters> + <c:simple-property required="false" name="securityDomain" description="The security domain name"/> + </parameters> + <results> + <c:notes>Create the context for the specified security domain</c:notes> + <c:map-property required="false" name="result"/> + </results> + </operation> + <operation name="deregisterJaasSecurityDomainInstance" displayName="Deregister Jaas Security Domain Instance" description="Deregister the specified security domain"> + <parameters> + <c:simple-property required="false" name="securityDomain" description="The name of the security domain being deregistered"/> + </parameters> + </operation> + <operation name="getAuditManager" displayName="Get Audit Manager" description="Get the audit manager for the specified security domain"> + <parameters> + <c:simple-property required="false" name="securityDomain" description="The security domain name"/> + </parameters> + <results> + <c:notes>Get the audit manager for the specified security domain</c:notes> + <c:map-property required="false" name="result"/> + </results> + </operation> + <operation name="getAuthenticationManager" displayName="Get Authentication Manager" description="Get the authentication manager for the specified security domain"> + <parameters> + <c:simple-property required="false" name="securityDomain" description="The security domain name"/> + </parameters> + <results> + <c:notes>Get the authentication manager for the specified security domain</c:notes> + <c:map-property required="false" name="result"/> + </results> + </operation> + <operation name="getAuthorizationManager" displayName="Get Authorization Manager" description="Get the authorization manager for the specified security domain"> + <parameters> + <c:simple-property required="false" name="securityDomain" description="The security domain name"/> + </parameters> + <results> + <c:notes>Get the authorization manager for the specified security domain</c:notes> + <c:map-property required="false" name="result"/> + </results> + </operation> + <operation name="getIdentityTrustManager" displayName="Get Identity Trust Manager" description="Get the identity trust manager for the specified security domain"> + <parameters> + <c:simple-property required="false" name="securityDomain" description="The security domain name"/> + </parameters> + <results> + <c:notes>Get the identity trust manager for the specified security domain</c:notes> + <c:map-property required="false" name="result"/> + </results> + </operation> + <operation name="getMappingManager" displayName="Get Mapping Manager" description="Get the mapping manager for the specified security domain"> + <parameters> + <c:simple-property required="false" name="securityDomain" description="The security domain name"/> + </parameters> + <results> + <c:notes>Get the mapping manager for the specified security domain</c:notes> + <c:map-property required="false" name="result"/> + </results> + </operation> + <operation name="registerJaasSecurityDomainInstance" displayName="Register Jaas Security Domain Instance" description="Register the specified security domain"> + <parameters> + <c:map-property required="false" name="domain" description="The security domain being registered"> + <c:simple-property required="false" name="cipherAlgorithm"/> + <c:simple-property type="boolean" required="false" name="deepCopySubjectOption"/> + <c:simple-property type="integer" required="false" name="iterationCount"/> + <c:simple-property required="false" name="keyStorePass"/> + <c:simple-property required="false" name="keyStoreType"/> + <c:simple-property required="false" name="keyStoreURL"/> + <c:simple-property required="false" name="name"/> + <c:list-property name="notificationInfo"> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="description"/> + <c:simple-property required="false" name="name"/> + <c:list-property name="notifTypes"> +<c:simple-property required="false" name="element"/> + </c:list-property> + </c:map-property> + </c:list-property> + <c:simple-property required="false" name="salt"/> + <c:simple-property required="false" name="securityDomain"/> + <c:simple-property type="integer" required="false" name="state"/> + <c:simple-property required="false" name="stateString"/> + <c:simple-property required="false" name="trustStorePass"/> + <c:simple-property required="false" name="trustStoreType"/> + <c:simple-property required="false" name="trustStoreURL"/> + </c:map-property> + </parameters> + </operation> <resource-configuration> - <c:simple-property required="false" name="baseContext"/> - <c:simple-property required="false" name="factoryName"/> + <c:simple-property required="false" name="auditMgrClass" description="The class that implements the AuditManager interface"/> + <c:simple-property required="false" name="authenticationMgrClass" description="The class that implements the AuthenticationManager interface"/> + <c:simple-property required="false" name="authorizationMgrClass" description="The class that implements the AuthorizationManager interface"/> + <c:simple-property required="false" name="identityTrustMgrClass" description="The class that implements the IdentityTrustManager interface"/> + <c:simple-property required="false" name="mappingMgrClass" description="The class that implements the MappingManager interface"/> <c:simple-property required="false" name="state" description="The bean controller state"/> </resource-configuration> </service> @@ -821,6 +1005,7 @@ <metric property="commonLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="commonLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="commonLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeDir" displayType="summary" displayName="Home Dir" description="the local home directory which the server is running from" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <metric property="homeURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="homeURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="homeURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> @@ -841,6 +1026,8 @@ <metric property="libraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="libraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="libraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="rootDeploymentFilename" displayType="summary" displayName="Root Deployment Filename" description="the filename of the root deployable that will be used to finalize the bootstrap process" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="serverBaseDir" displayType="summary" displayName="Server Base Dir" description="the base directory for calculating server home directories" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <metric property="serverBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="serverBaseURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="serverBaseURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> @@ -851,6 +1038,8 @@ <metric property="serverBaseURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="serverBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="serverBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverDataDir" displayType="summary" displayName="Server Data Dir" description="the directory where local data will be stored" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="serverHomeDir" displayType="summary" displayName="Server Home Dir" description="the server home directory" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <metric property="serverHomeURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="serverHomeURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="serverHomeURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> @@ -871,8 +1060,15 @@ <metric property="serverLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="serverLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="serverLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLogDir" displayType="summary" displayName="Server Log Dir" description="the server log directory" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="serverName" displayType="summary" displayName="Server Name" description="the name of the active profile the sever is using" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="serverNativeDir" displayType="summary" displayName="Server Native Dir" description="the directory for platform native files" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="serverTempDeployDir" displayType="summary" displayName="Server Temp Deploy Dir" description="the temporary deployment dir" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="serverTempDir" displayType="summary" displayName="Server Temp Dir" description="the directory where temporary files will be stored" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="specificationVersion" displayType="summary" displayName="Specification Version" description="the server Specification-Version" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> </service> <service name="ServerInfo MCBean"> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:simple-property required="false" readOnly="true" name="OSArch"/> <c:simple-property required="false" readOnly="true" name="OSName"/>

15 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r311 - trunk/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-20 15:42:01 -0400 (Mon, 20 Apr 2009) New Revision: 311 Modified: trunk/jsfunit/pom.xml Log: Added -Xmx:1024m to Cargo configuration Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-04-20 16:12:09 UTC (rev 310) +++ trunk/jsfunit/pom.xml 2009-04-20 19:42:01 UTC (rev 311) @@ -334,7 +334,7 @@ <properties> <cargo.java.home>${JAVA_HOME}</cargo.java.home>  - <cargo.jvmargs>-Dcom.sun.management.jmxremote -Dxb.builder.useUnorderedSequence=true -XX:PermSize=128m -XX:MaxPermSize=256m</cargo.jvmargs> + <cargo.jvmargs>-Dcom.sun.management.jmxremote -Xmx:1024m -Dxb.builder.useUnorderedSequence=true -XX:PermSize=128m -XX:MaxPermSize=256m</cargo.jvmargs>   <cargo.jboss.configuration>${cargo.jboss.configuration}</cargo.jboss.configuration>

15 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r310 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5 and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-20 12:12:09 -0400 (Mon, 20 Apr 2009) New Revision: 310 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java Log: EAR and WAR tests updated. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-04-20 15:33:19 UTC (rev 309) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-04-20 16:12:09 UTC (rev 310) @@ -352,11 +352,11 @@ String id = input.getId(); String xpath; if(isRadioButton) { - xpath = ".//input[@onchange=\"setInputUnset(document.getElementById('"+ id + xpath = ".//input[@onclick=\"setInputUnset(document.getElementById('"+ id + "'), this.checked);setInputUnset(document.getElementById('" + id.substring(0, id.lastIndexOf(":")) + ":1'), this.checked);\"]"; } else { - xpath = ".//input[@onchange=\"setInputUnset(document.getElementById('" + xpath = ".//input[@onclick=\"setInputUnset(document.getElementById('" + id + "'), this.checked);\"]"; } @@ -495,11 +495,29 @@ /** * Check that the given messages occur on the client side and server side. + * Uses checkClientAndServerMessages( String, String, FacesMessage.Severity ), + * kept for backwards compat. */ public void checkClientAndServerMessages(String expectedClientMsg, String expectedServerMsg, - boolean isErrorMsg) { + boolean isErrorMsg) + { + FacesMessage.Severity expectedSeverity = FacesMessage.SEVERITY_INFO; + + if(isErrorMsg) { + expectedSeverity = FacesMessage.SEVERITY_ERROR; + } + } + + /** + * Check that the given messages with given severity + * occur on the client side and server side. + */ + public void checkClientAndServerMessages(String expectedClientMsg, + String expectedServerMsg, + FacesMessage.Severity expectedSeverity ) { + // Check that the expected message appears on the client side assertTrue("This expected message was not found on the page: " + expectedClientMsg, client.getPageAsText().contains(expectedClientMsg)); @@ -509,11 +527,8 @@ server.getFacesMessages().hasNext()); FacesMessage message = server.getFacesMessages().next(); - if(isErrorMsg) { - assertEquals("Incorrect message severity", FacesMessage.SEVERITY_ERROR, message.getSeverity()); - } else { - assertEquals("Incorrect message severity", FacesMessage.SEVERITY_INFO, message.getSeverity()); - } + + assertEquals("Incorrect message severity", expectedSeverity, message.getSeverity()); assertTrue("Expected message: " + expectedServerMsg + " Actual: "+ message.getDetail(), message.getDetail().contains(expectedServerMsg)); Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-04-20 15:33:19 UTC (rev 309) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/EarTest.java 2009-04-20 16:12:09 UTC (rev 310) @@ -184,6 +184,7 @@ { String headerText = "JBossAS Server"; + String jbossConfig = ejtt.getJBossConfig(); assertTrue("Page doesn't contain the header: "+headerText, client.getPageAsText().contains(headerText)); @@ -194,7 +195,7 @@ // Check whether the server is listed. If not, Exception is thrown. ContentTableRow row = ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("JBoss Application Server") - .getFirstRowContainingLink("JBAS (default)"); + .getFirstRowContainingLink("JBoss AS 5 ("+jbossConfig+")"); // Click the server link //HtmlAnchor link row.getLinkByLabel("JBAS (default)"); Node firstLink = row.getCellByColumnName("Name").getElementsByTagName("a").item(0); @@ -208,7 +209,8 @@ { String pageText = client.getPageAsText(); - String headerText = "JBAS (default)"; + String jbossConfig = ejtt.getJBossConfig(); + String headerText = "JBoss AS 5 ("+jbossConfig+")"; assertTrue("Page doesn't contain the header: "+headerText, pageText.contains(headerText)); @@ -1035,10 +1037,16 @@ HtmlSubmitInput submit = ejtt.tabMenu.getTabContentBox().getElement().getFirstByXPath(xPath); submit.click(); - // Check that the new app is deployed. - ejtt.deployment.waitActivelyForDeployment(DeployableTypes.EAR, DEPLOYABLE_NAME2, 3000, 15); - + // We should get: + // The specified file must have the same name as the existing + // deployed EAR File (EarWithWar-Counter.ear). + String msg = "The specified file must have the same name " + + "as the existing deployed EAR File"; + checkClientAndServerMessages( msg, msg, FacesMessage.SEVERITY_WARN ); + // Check that the old app is deployed. + ejtt.deployment.waitActivelyForDeployment(DeployableTypes.EAR, DEPLOYABLE_NAME, 3000, 15); + } finally { try { Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-04-20 15:33:19 UTC (rev 309) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/WarTest.java 2009-04-20 16:12:09 UTC (rev 310) @@ -156,6 +156,7 @@ { String headerText = "JBossAS Server"; + String jbossConfig = ejtt.getJBossConfig(); assertTrue("Page doesn't contain the header: "+headerText, client.getPageAsText().contains(headerText)); @@ -166,7 +167,7 @@ // Check whether the server is listed. If not, Exception is thrown. ContentTableRow row = ejtt.getTabMenu().getTabContentBox().getTableUnderHeader("JBoss Application Server") - .getFirstRowContainingLink("JBAS (default)"); + .getFirstRowContainingLink("JBoss AS 5 ("+jbossConfig+")"); // Click the server link //HtmlAnchor link row.getLinkByLabel("JBoss App Server:default"); Node firstLink = row.getCellByColumnName("Name").getElementsByTagName("a").item(0); @@ -180,7 +181,8 @@ { String pageText = client.getPageAsText(); - String headerText = "JBAS (default)"; + String jbossConfig = ejtt.getJBossConfig(); + String headerText = "JBoss AS 5 ("+jbossConfig+")"; assertTrue("Page doesn't contain the header: "+headerText, pageText.contains(headerText)); @@ -1006,7 +1008,7 @@ try { undeployWAR(DEPLOYABLE_NAME); } catch( Exception ex ){ - DebugUtils.writeFile("testRestartWar-undeploy.html", client.getPageAsText());/// + DebugUtils.writeFile("target/testRestartWar-undeploy.html", client.getPageAsText());/// log.debug("Cathed an expected exception when trying to undeploy "+DEPLOYABLE_NAME+": "+ex ); } } Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-04-20 15:33:19 UTC (rev 309) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-04-20 16:12:09 UTC (rev 310) @@ -254,7 +254,7 @@ }catch(Exception ex){ log.error("Caught when writing file: "+ex); } - throw new HtmlElementNotFoundException("Nav tree form not found using ID: "+ID_NAV_TREE_FORM); + throw new HtmlElementNotFoundException("Nav tree form not found using ID: "+ID_NAV_TREE_FORM, currentTest); } // A table which has an anchor containing given text.

15 years, 8 months

1
0
0 / 0

EMBJOPR SVN: r309 - trunk/jsfunit/testdata/ear.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-20 11:33:19 -0400 (Mon, 20 Apr 2009) New Revision: 309 Added: trunk/jsfunit/testdata/ear/EarWithWar-Counter-20.ear Log: Added EarWithWar-Counter-20.ear to testdata/ Added: trunk/jsfunit/testdata/ear/EarWithWar-Counter-20.ear =================================================================== (Binary files differ) Property changes on: trunk/jsfunit/testdata/ear/EarWithWar-Counter-20.ear ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits April 2009