Author: ips Date: 2009-05-18 13:23:38 -0400 (Mon, 18 May 2009) New Revision: 439 Added: trunk/core/src/main/java/org/jboss/on/embedded/ResourceTypes.java trunk/core/src/main/java/org/jboss/on/embedded/ui/FacesOutcomes.java trunk/core/src/test/java/org/jboss/on/embedded/util/TestBootstrapAction.java Removed: trunk/core/src/main/java/org/jboss/on/embedded/Constants.java trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceManagerBean.java Modified: trunk/core/pom.xml trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupFilter.java trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupListener.java trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java trunk/core/src/main/java/org/jboss/on/embedded/TextareaMapConverter.java trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementComparator.java trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementDisplay.java trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationHistoryManagerBean.java trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationServerServiceImpl.java trunk/core/src/main/java/org/jboss/on/embedded/converter/OperationDefinitionConverter.java trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManagerFactory.java trunk/core/src/main/java/org/jboss/on/embedded/manager/history/AbstractHistoryManager.java trunk/core/src/main/java/org/jboss/on/embedded/manager/history/HistoryManager.java trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java trunk/core/src/main/java/org/jboss/on/embedded/manager/history/operation/OperationHistoryManager.java trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/DiscoveryException.java trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java trunk/core/src/main/java/org/jboss/on/embedded/ui/ApplicationInfoAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java trunk/core/src/main/java/org/jboss/on/embedded/ui/DatascrollerUIBean.java trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/DiscoveryAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/ExceptionAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java trunk/core/src/main/java/org/jboss/on/embedded/ui/ResourceAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/TableManager.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AbstractResourceConfigurationUIBean.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AddNewOpenMapMemberPropertyToResourceConfigurationUIBean.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ConfigHelperFactory.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/IdChunkFactory.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/TemplateDropDownPopulator.java trunk/core/src/main/java/org/jboss/on/embedded/ui/content/AbstractFileUploadAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/BaseTreeNode.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/DummyTreeNode.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/JONTreeNode.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/NonSingletonResourceTypeTreeNode.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/PlatformResourceTreeNode.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTreeNode.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTypeTreeNode.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SingletonResourceTypeTreeNode.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/TreeNodeWithResource.java trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/TreeNodeWithResourceType.java trunk/core/src/main/java/org/jboss/on/embedded/util/ContentUtility.java trunk/core/src/main/webapp/WEB-INF/components.xml trunk/core/src/main/webapp/WEB-INF/faces-config.xml trunk/core/src/main/webapp/WEB-INF/pages.xml trunk/core/src/main/webapp/WEB-INF/web.xml trunk/core/src/main/webapp/css/console-style.css trunk/core/src/main/webapp/css/form-style.css trunk/core/src/main/webapp/error.xhtml trunk/core/src/main/webapp/errorLayout.xhtml trunk/core/src/main/webapp/include/footer.xhtml trunk/core/src/main/webapp/include/header.xhtml trunk/core/src/main/webapp/include/resourceDataScroller.xhtml trunk/core/src/main/webapp/include/tabMenu.xhtml trunk/core/src/main/webapp/index.xhtml trunk/core/src/main/webapp/js/embedded.js trunk/core/src/main/webapp/js/formValues.js trunk/core/src/main/webapp/layout.xhtml trunk/core/src/main/webapp/login.xhtml trunk/core/src/main/webapp/secure/addMap.xhtml trunk/core/src/main/webapp/secure/addSimple.xhtml trunk/core/src/main/webapp/secure/categorySummary.xhtml trunk/core/src/main/webapp/secure/operationParameters.xhtml trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml trunk/core/src/main/webapp/secure/viewResultsMap.xhtml trunk/core/src/test/java/org/jboss/on/embedded/manager/operationhistory/OperationHistoryManagerBeanTest.java trunk/core/src/test/java/org/jboss/on/embedded/manager/pc/test/PluginContainerResourceManagerTest.java trunk/core/src/test/java/org/jboss/on/embedded/manager/test/TemplatePopulatorTest.java trunk/core/src/test/java/org/jboss/on/embedded/test/MeasurementUtilTest.java trunk/core/src/test/java/org/jboss/on/embedded/test/TextareaMapConverterTest.java trunk/core/src/test/java/org/jboss/on/embedded/ui/test/SingleResourceOperationTest.java trunk/core/src/test/java/org/jboss/on/embedded/ui/test/TreeNodeTest.java trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedPluginContainerHelper.java trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedSeamHelper.java trunk/core/src/test/java/org/jboss/on/embedded/util/NavigationRequests.java trunk/core/src/test/resources/WEB-INF/web.xml trunk/core/src/test/resources/conf/bootstrap-beans.xml trunk/core/src/test/resources/conf/jboss-service.xml trunk/core/src/test/resources/conf/jbossjta-properties.xml trunk/core/src/test/resources/conf/login-config.xml trunk/jbas5/etc/generated-rhq-plugin.xml trunk/jbas5/etc/overlay/server/default/conf/jboss-log4j.xml trunk/jbas5/etc/overlay/server/default/deploy/MyLocalTxCF-ds.xml trunk/jbas5/etc/overlay/server/default/deploy/MyNoTxCF-ds.xml trunk/jbas5/etc/overlay/server/default/deploy/MyOracleLocalTxDS-ds.xml trunk/jbas5/etc/overlay/server/default/deploy/MyOracleNoTxDS-ds.xml trunk/jbas5/etc/overlay/server/default/deploy/MyOracleXADS-ds.xml trunk/jbas5/etc/overlay/server/default/deploy/MyQueue-service.xml trunk/jbas5/etc/overlay/server/default/deploy/MyQueueWithSecurityConfig-service.xml trunk/jbas5/etc/overlay/server/default/deploy/MyTopic-service.xml trunk/jbas5/etc/overlay/server/default/deploy/MyXATxCF-ds.xml trunk/jbas5/etc/overlay/server/default/deploy/messaging/destinations-service.xml trunk/jbas5/pom.xml trunk/jbas5/src/main/webapp/META-INF/jboss-structure.xml trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml Log: reformatted source and fixed up copyright headers; removed an unused class and renamed/moved a couple classes Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/pom.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -17,151 +17,154 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> <version>1.2.0-SNAPSHOT</version> - </parent> - - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-core</artifactId> - <version>1.2.0-SNAPSHOT</version> - <packaging>war</packaging> - <name>Embedded Jopr Core</name> - <description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description> - + </parent> + + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-core</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>Embedded Jopr Core</name> + <description>a web application that provides administration and monitoring of the app server instance to which it is + deployed + </description> + <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/core/&... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/... - </scm> - - <properties> - <war.dir>${basedir}/target/${project.build.finalName}</war.dir> - <product.name>${project.name}</product.name> - <product.version>${project.version}</product.version> - </properties> - - <dependencies> - <!-- == RHQ Core Dependencies ================ --> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-client-api</artifactId> - <version>${rhq.version}</version> - </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-domain</artifactId> - <version>${rhq.version}</version> - </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-gui</artifactId> - <version>${rhq.version}</version> - </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-plugin-container</artifactId> - <version>${rhq.version}</version> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/core/&... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/... + </scm> + + <properties> + <war.dir>${basedir}/target/${project.build.finalName}</war.dir> + <product.name>${project.name}</product.name> + <product.version>${project.version}</product.version> + </properties> + + <dependencies> + <!-- == RHQ Core Dependencies ================ --> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-client-api</artifactId> + <version>${rhq.version}</version> + </dependency> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-domain</artifactId> + <version>${rhq.version}</version> + </dependency> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-gui</artifactId> + <version>${rhq.version}</version> + </dependency> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-plugin-container</artifactId> + <version>${rhq.version}</version> <exclusions> <exclusion> <groupId>org.hyperic</groupId> <artifactId>sigar</artifactId> </exclusion> </exclusions> - </dependency> - <dependency> - <groupId>${rhq.groupId}</groupId> - <artifactId>rhq-core-util</artifactId> - <version>${rhq.version}</version> - </dependency> + </dependency> + <dependency> + <groupId>${rhq.groupId}</groupId> + <artifactId>rhq-core-util</artifactId> + <version>${rhq.version}</version> + </dependency> - <!-- == Seam Related Dependencies ================ --> - <dependency> - <groupId>${seam.groupId}</groupId> - <artifactId>jboss-seam</artifactId> - <version>${seam.version}</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>${seam.groupId}</groupId> - <artifactId>jboss-seam-ui</artifactId> - <version>${seam.version}</version> - </dependency> - <!-- third party dependencies needed when running tests with Seam --> - <dependency> - <groupId>${seam.embedded.groupId}</groupId> - <artifactId>jboss-embedded-all</artifactId> - <version>${seam.embedded.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${seam.embedded.groupId}</groupId> - <artifactId>thirdparty-all</artifactId> - <version>${seam.embedded.version}</version> - <scope>test</scope> - </dependency> - <!-- needed because the version of javassist pulled in by Seam (3.3.GA) - isn't compatible with the current version of jboss embedded (beta3) --> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.5.0.GA</version> - <scope>test</scope> - </dependency> - <!-- - these next two jars need to be a compile time dependency in order - to include the annotations used by the domain classes, but are not needed at runtime. - Without these in the classpath you get exceptions like this from javac: - com.sun.tools.javac.code.Symbol$CompletionFailure: file org\hibernate\annotations\Cascade.class not found - - IIRC this is fixed in jdk6. --> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.3.0.ga</version> - <scope>provided</scope> - </dependency> - <!-- don't know why this is required if you dont have it you get: - file org\hibernate\validator\InvalidValue.class not found - facesMessages.add(new FacesMessage(FacesMessage.SEVERITY_ERROR, errorMessage, null)); - --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>3.0.0.ga</version> - <scope>provided</scope> - <!-- (not required at runtime) --> - </dependency> - <!-- TODO: remove this before we release --> - <dependency> - <groupId>${seam.groupId}</groupId> - <artifactId>jboss-seam-debug</artifactId> - <version>${seam.version}</version> - <!-- should be pulling this in directly ourselves, not relying - jboss-seam-debug to provide it --> - <exclusions> - <exclusion> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </exclusion> - </exclusions> + <!-- == Seam Related Dependencies ================ --> + <dependency> + <groupId>${seam.groupId}</groupId> + <artifactId>jboss-seam</artifactId> + <version>${seam.version}</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>${seam.groupId}</groupId> + <artifactId>jboss-seam-ui</artifactId> + <version>${seam.version}</version> + </dependency> + <!-- third party dependencies needed when running tests with Seam --> + <dependency> + <groupId>${seam.embedded.groupId}</groupId> + <artifactId>jboss-embedded-all</artifactId> + <version>${seam.embedded.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${seam.embedded.groupId}</groupId> + <artifactId>thirdparty-all</artifactId> + <version>${seam.embedded.version}</version> + <scope>test</scope> + </dependency> + <!-- needed because the version of javassist pulled in by Seam (3.3.GA) + isn't compatible with the current version of jboss embedded (beta3) --> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.5.0.GA</version> + <scope>test</scope> + </dependency> + <!-- + these next two jars need to be a compile time dependency in order + to include the annotations used by the domain classes, but are not needed at runtime. + Without these in the classpath you get exceptions like this from javac: + com.sun.tools.javac.code.Symbol$CompletionFailure: file org\hibernate\annotations\Cascade.class not found + + IIRC this is fixed in jdk6. --> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.3.0.ga</version> + <scope>provided</scope> + </dependency> + <!-- don't know why this is required if you dont have it you get: + file org\hibernate\validator\InvalidValue.class not found + facesMessages.add(new FacesMessage(FacesMessage.SEVERITY_ERROR, errorMessage, null)); + --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>3.0.0.ga</version> + <scope>provided</scope> + <!-- (not required at runtime) --> + </dependency> + <!-- TODO: remove this before we release --> + <dependency> + <groupId>${seam.groupId}</groupId> + <artifactId>jboss-seam-debug</artifactId> + <version>${seam.version}</version> + <!-- should be pulling this in directly ourselves, not relying + jboss-seam-debug to provide it --> + <exclusions> + <exclusion> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + </exclusion> + </exclusions> <scope>runtime</scope> - </dependency> - + </dependency> + <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> @@ -169,72 +172,72 @@ <scope>provided</scope> </dependency> - <!-- Provided in 5.0 --> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>${facelets.version}</version> + <!-- Provided in 5.0 --> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>${facelets.version}</version> <scope>runtime</scope> - </dependency> - + </dependency> + <!-- ===== RichFaces ===== --> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>${richfaces.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${richfaces.version}</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>${richfaces.version}</version> - </dependency> - - <!-- == 3rd Party Provided Dependencies ================ --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - <!-- by JBossAS --> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - <!-- by JBossAS --> - </dependency> - <!-- Provided in 5.0 --> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${jaxb-api.version}</version> - <scope>provided</scope> - </dependency> - <!-- Provided in 5.0 --> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb-impl.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - - <plugin> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${richfaces.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>${richfaces.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>${richfaces.version}</version> + </dependency> + + <!-- == 3rd Party Provided Dependencies ================ --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + <!-- by JBossAS --> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + <!-- by JBossAS --> + </dependency> + <!-- Provided in 5.0 --> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-api.version}</version> + <scope>provided</scope> + </dependency> + <!-- Provided in 5.0 --> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb-impl.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> <artifactId>maven-dependency-plugin</artifactId> <version>2.0</version> <executions> @@ -263,49 +266,49 @@ </execution> </executions> </plugin> - - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <useCache>false</useCache> - <webResources> - <resource> - <filtering>true</filtering> - <directory> - ${basedir}/src/main/webapp - </directory> - </resource> - <resource> - <directory> - ${basedir}/src/main/webappBinary - </directory> - </resource> - </webResources> - <archive> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <useCache>false</useCache> + <webResources> + <resource> + <filtering>true</filtering> + <directory> + ${basedir}/src/main/webapp + </directory> + </resource> + <resource> + <directory> + ${basedir}/src/main/webappBinary + </directory> + </resource> + </webResources> + <archive> <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> </manifest> <manifestEntries> - <!-- TODO: This isn't working, because the build number plugin hasn't run yet - at the time the buildNumber prop below is resolved. --> - <Build-Number>${buildNumber}</Build-Number> + <!-- TODO: This isn't working, because the build number plugin hasn't run yet + at the time the buildNumber prop below is resolved. --> + <Build-Number>${buildNumber}</Build-Number> </manifestEntries> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Djava.library.path=target/itest/lib</argLine> - <trimStackTrace>false</trimStackTrace> - </configuration> - </plugin> - - </plugins> - </build> - + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Djava.library.path=target/itest/lib</argLine> + <trimStackTrace>false</trimStackTrace> + </configuration> + </plugin> + + </plugins> + </build> + <repositories> <!-- If the JBoss repo is down, uncomment this to pull down the JSF jars. --> <!-- @@ -317,84 +320,93 @@ </repository> --> </repositories> - - <profiles> - <profile> - <id>dev</id> - <properties> - <jbas4.warDir>${jbas4.configDir}/deploy/${jbas4.finalName}.war</jbas4.warDir> - <jbas5.warDir>${jbas5.configDir}/deploy/${jbas5.finalName}.war</jbas5.warDir> - </properties> + <profiles> + <profile> + <id>dev</id> - <build> - <plugins> + <properties> + <jbas4.warDir>${jbas4.configDir}/deploy/${jbas4.finalName}.war</jbas4.warDir> + <jbas5.warDir>${jbas5.configDir}/deploy/${jbas5.finalName}.war</jbas5.warDir> + </properties> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> - <executions> + <build> + <plugins> - <execution> - <id>deploy-to-jbas4</id> - <phase>compile</phase> - <configuration> - <tasks> - <echo>*** Copying updated files from target${file.separator}classes to &lt;jbas4.warDir&gt;${file.separator}WEB-INF${file.separator}classes...</echo> - <copy todir="${jbas4.warDir}/WEB-INF/classes"> - <fileset dir="target/classes" /> - </copy> - - <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} and src${file.separator}main${file.separator}webappBinary${file.separator} to &lt;jbas4.warDir&gt;...</echo> - <copy todir="${jbas4.warDir}"> - <fileset dir="${basedir}/src/main/webapp" /> - <fileset dir="${basedir}/src/main/webappBinary" /> - </copy> - <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. --> - - <echo>*** Touching &lt;jbas4.warDir&gt;/WEB-INF/web.xml to force redeploy...</echo> - <touch file="${jbas4.warDir}/WEB-INF/web.xml" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>deploy-to-jbas5</id> - <phase>compile</phase> - <configuration> - <tasks> - <echo>*** Copying updated files from target${file.separator}classes to &lt;jbas5.warDir&gt;${file.separator}WEB-INF${file.separator}classes...</echo> - <copy todir="${jbas5.warDir}/WEB-INF/classes"> - <fileset dir="target/classes" /> - </copy> - - <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} and src${file.separator}main${file.separator}webappBinary${file.separator} to &lt;jbas5.warDir&gt;...</echo> - <copy todir="${jbas5.warDir}"> - <fileset dir="${basedir}/src/main/webapp" /> - <fileset dir="${basedir}/src/main/webappBinary" /> - </copy> - <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. --> - - <!-- - <echo>*** Touching &lt;jbas5.warDir&gt;/WEB-INF/web.xml to force redeploy...</echo> - <touch file="${jbas5.warDir}/WEB-INF/web.xml" /> - --> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - </executions> - </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> - </plugins> - </build> - </profile> - </profiles> - + <execution> + <id>deploy-to-jbas4</id> + <phase>compile</phase> + <configuration> + <tasks> + <echo>*** Copying updated files from target${file.separator}classes to &lt;jbas4.warDir&gt;${file.separator}WEB-INF${file.separator}classes...</echo> + <copy todir="${jbas4.warDir}/WEB-INF/classes"> + <fileset dir="target/classes"/> + </copy> + + <echo>*** Copying updated files from + src${file.separator}main${file.separator}webapp${file.separator} and + src${file.separator}main${file.separator}webappBinary${file.separator} to + &lt;jbas4.warDir&gt;... + </echo> + <copy todir="${jbas4.warDir}"> + <fileset dir="${basedir}/src/main/webapp"/> + <fileset dir="${basedir}/src/main/webappBinary"/> + </copy> + <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. --> + + <echo>*** Touching &lt;jbas4.warDir&gt;/WEB-INF/web.xml to force redeploy... + </echo> + <touch file="${jbas4.warDir}/WEB-INF/web.xml"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>deploy-to-jbas5</id> + <phase>compile</phase> + <configuration> + <tasks> + <echo>*** Copying updated files from target${file.separator}classes to &lt;jbas5.warDir&gt;${file.separator}WEB-INF${file.separator}classes...</echo> + <copy todir="${jbas5.warDir}/WEB-INF/classes"> + <fileset dir="target/classes"/> + </copy> + + <echo>*** Copying updated files from + src${file.separator}main${file.separator}webapp${file.separator} and + src${file.separator}main${file.separator}webappBinary${file.separator} to + &lt;jbas5.warDir&gt;... + </echo> + <copy todir="${jbas5.warDir}"> + <fileset dir="${basedir}/src/main/webapp"/> + <fileset dir="${basedir}/src/main/webappBinary"/> + </copy> + <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. --> + + <!-- + <echo>*** Touching &lt;jbas5.warDir&gt;/WEB-INF/web.xml to force redeploy...</echo> + <touch file="${jbas5.warDir}/WEB-INF/web.xml" /> + --> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + + </plugins> + </build> + </profile> + </profiles> + </project> Deleted: trunk/core/src/main/java/org/jboss/on/embedded/Constants.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/Constants.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/Constants.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,109 +0,0 @@ -/* - * Embedded Jopr Project - * Copyright (C) 2006-2009 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 Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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; - -/** - * Constants that are used as the Action Outputs for all the JSF Actions - * - * @author <a href="mailto:jsant@jboss.com">Jessica Sant</a> - */ -public class Constants -{ - /** - * action outcome indicating success - */ - public static final String OUTCOME_SUCCESS = "success"; - /** - * action outcome indicating failure - */ - public static final String OUTCOME_FAILURE = "failure"; - /** - * action outcome indicating the user canceled the action - */ - public static final String OUTCOME_CANCEL = "cancel"; - /** - * action outcome indicating there was an error - */ - public static final String OUTCOME_ERROR = "error"; - /** - * action outcome indicating that the ROOT summary page should be displayed - */ - public static final String OUTCOME_ROOT = "root"; - /** - * action outcome indicating that a category summary table should be displayed - */ - public static final String OUTCOME_CATEGORY_TABLE = "table"; - /** - * action outcome indicating that the navigation should simply be repeated - */ - public static final String OUTCOME_REPEAT_NAV = "repeatNav"; - /** - * action outcome indicating that a resource type summary table should be displayed - */ - public static final String OUTCOME_RESOURCE_TYPE_SUMMARY = "resourceSummary"; - /** - * action outcome indicating that a summary of this single resource instance should be displayed - */ - public static final String OUTCOME_RESOURCE_INSTANCE = "resourceInstance"; - /** - * action outcome indicating that the summary page for the Platform resource instance should be displayed - */ - public static final String OUTCOME_PLATFORM = "platform"; - /** - * navigation key used to store all the datasources in the nav - */ - public static final String RESOURCE_CATEGORY_DATASOURCE = "datasource"; - /** - * navigation key used to store all the JMS items in the nav - */ - public static final String RESOURCE_CATEGORY_JMS = "jms"; - /** - * used to retrieve all the no-tx datasource ResourceTypes from the ResourceManager - */ - public static final String RESOURCE_TYPE_NO_TX_DATASOURCE = "no-tx-datasource"; - /** - * used to retrieve all the local datasource ResourceTypes from the ResourceManager - */ - public static final String RESOURCE_TYPE_LOCAL_DATASOURCE = "local-datasource"; - /** - * used to retrieve all the xa datasource ResourceTypes from the ResourceManager - */ - public static final String RESOURCE_TYPE_XA_DATASOURCE = "xa-datasource"; - /** - * used to retrieve all the jms topic ResourceTypes from the ResourceManager - */ - public static final String RESOURCE_TYPE_JMS_TOPIC = "jms-topic"; - /** - * used to retrieve all the jms queue ResourceTypes from the ResourceManager - */ - public static final String RESOURCE_TYPE_JMS_QUEUE = "jms-queue"; - public static final String RESOURCE_TYPE_VM_MEMORY = "VM Memory System"; - public static final String RESOURCE_TYPE_VM_COMPILATION = "VM Compilation System"; - public static final String RESOURCE_TYPE_VM_CLASS_LOADING = "VM Class Loading System"; - public static final String RESOURCE_TYPE_VM_JBOSS = "JBoss AS JVM"; - public static final String PLATFORM_OS = "Windows"; - public static final String RESOURCE_TYPE_NETWORK_ADAPTER = "Network Adapter"; - public static final String RESOURCE_TYPE_CPU = "CPU"; - - public static final String TAB_CONFIGURATION = "configuration"; - public static final String TAB_METRIC = "metric"; - public static final String TAB_OPERATION = "operation"; - public static final String TAB_CONTENT = "content"; -} Modified: trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,42 +1,42 @@ /* - * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Embedded Jopr Project + * Copyright (C) 2006-2009 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. + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * * This 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU Lesser 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.Set; -import org.jetbrains.annotations.Nullable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.rhq.core.pc.inventory.InventoryEventListener; -import org.rhq.core.pc.PluginContainer; +import org.jetbrains.annotations.Nullable; +import org.rhq.core.clientapi.agent.PluginContainerException; +import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceCreationDataType; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.resource.ResourceCreationDataType; -import org.rhq.core.domain.content.PackageType; -import org.rhq.core.clientapi.agent.PluginContainerException; +import org.rhq.core.pc.PluginContainer; +import org.rhq.core.pc.inventory.InventoryEventListener; -import org.jboss.seam.core.Events; -import org.jboss.seam.annotations.Scope; +import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.core.Events; import org.jboss.on.embedded.manager.ResourceManager; @@ -57,7 +57,7 @@ { if (this.navTreeInitialized) Events.instance().raiseEvent(ResourceManager.RESOURCE_CREATED_EVENT, resource.getResourceType(), - resource.getParentResource()); + resource.getParentResource()); ResourceType resourceType = resource.getResourceType(); if (isContentBacked(resourceType)) { @@ -67,7 +67,7 @@ try { PluginContainer.getInstance().getContentManager().executeResourcePackageDiscoveryImmediately( - resource.getId(), creationPackageType.getName()); + resource.getId(), creationPackageType.getName()); } catch (PluginContainerException e) { @@ -92,7 +92,8 @@ } @Observer(ResourceManager.NAV_TREE_INITIALIZED) - public void navTreeInitialized() { + public void navTreeInitialized() + { this.navTreeInitialized = true; } @@ -100,7 +101,7 @@ { return resourceType.isCreatable() && resourceType.getCreationDataType() == ResourceCreationDataType.CONTENT; } - + @Nullable private static PackageType getCreationPackageType(ResourceType resourceType) { Modified: trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupFilter.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupFilter.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupFilter.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,19 +1,20 @@ /* - * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Embedded Jopr Project + * Copyright (C) 2006-2009 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. + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * * This 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU Lesser 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; @@ -32,19 +33,17 @@ /** * A filter which lazily initializes another filter. - * - * <p>The filter requires an initalization parameter with the name - * {@link org.jboss.on.embedded.LazyStartupFilter} - * - * <p>The value is the name of the filter to lazily load. All other - * parameters are passed to the lazily loaded filter. - * + * <p/> + * <p>The filter requires an initalization parameter with the name {@link org.jboss.on.embedded.LazyStartupFilter} + * <p/> + * <p>The value is the name of the filter to lazily load. All other parameters are passed to the lazily loaded filter. + * <p/> * <pre><code> * &lt;filter> * &lt;filter-name>Seam Filter&lt;/filter-name&gt; * &lt;!-- Lazily start up the Seam Filter --&gt; * &lt;filter-class&gt;org.jboss.on.embedded.LazyStartupFilter&lt;/filter-class&gt; - * + * <p/> * &lt;init-param&gt; * &lt;param-name&gt;org.jboss.on.embedded.LazyStartupFilter&lt;/param-name&gt; * &lt;param-value&gt;org.jboss.seam.servlet.SeamFilter&lt;/param-value&gt; @@ -58,70 +57,58 @@ * * @author Jason T. Greene */ -public class LazyStartupFilter implements Filter -{ - private final Log log = LogFactory.getLog(getClass()); +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; + private volatile Filter filter; + private volatile boolean initialized = false; + private volatile FilterConfig config; - public void destroy() - { - if (! initialized) - { - filter = null; - config = null; - return; - } + public void destroy() { + if (!initialized) { + filter = null; + config = null; + return; + } - try - { - init(); - } - catch (ServletException e) - { - log.error("Filter through an exception during init: ", e); - } + try { + init(); + } catch (ServletException e) { + log.error("Filter through an exception during init: ", e); + } - filter.destroy(); - } + filter.destroy(); + } - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException - { - init(); + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { + init(); - filter.doFilter(request, response, chain); - } + 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"); + 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) - { - log.error("Could not instantiated filter: " + filterName, e); - } + log.debug("Loading filter" + filterName); + try { + filter = (Filter) Class.forName(filterName).newInstance(); + } catch (Exception e) { + log.error("Could not instantiated filter: " + filterName, e); + } - filter.init(config); - log.debug("Filter activated: " + filter); - initialized = true; - } - } + filter.init(config); + log.debug("Filter activated: " + filter); + initialized = true; + } + } - public void init(FilterConfig config) throws ServletException - { - this.config = config; - } + public void init(FilterConfig config) throws ServletException { + this.config = config; + } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupListener.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupListener.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/LazyStartupListener.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,19 +1,20 @@ /* - * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Embedded Jopr Project + * Copyright (C) 2006-2009 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. + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * * This 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU Lesser 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; @@ -40,17 +41,15 @@ import org.apache.commons.logging.LogFactory; /** - * LazyStartupListener is a special listener that can lazily start any number - * of hard-coded Servlet listeners. - * - * <p>This works by delaying instantiation and context initialization events until - * any post-init event occurs (session creation, servlet request, etc). - * - * <p>This filter expects a context parameter with the name: - * {@link org.jboss.on.embedded.LazyStartupListener} - * + * LazyStartupListener is a special listener that can lazily start any number of hard-coded Servlet listeners. + * <p/> + * <p>This works by delaying instantiation and context initialization events until any post-init event occurs (session + * creation, servlet request, etc). + * <p/> + * <p>This filter expects a context parameter with the name: {@link org.jboss.on.embedded.LazyStartupListener} + * <p/> * <p>The value is a comma separated list of listeners to lazily load: - * + * <p/> * <pre><code> * &lt;!-- Seam (lazy loaded)--&gt; * &lt;context-param&gt; @@ -63,353 +62,353 @@ * </code></pre> * * @author Jason T. Greene - * */ public class LazyStartupListener implements HttpSessionListener, ServletRequestListener, ServletContextListener, HttpSessionAttributeListener, - ServletRequestAttributeListener, ServletContextAttributeListener + ServletRequestAttributeListener, ServletContextAttributeListener { - private final Log log = LogFactory.getLog(getClass()); - private final ConcurrentLinkedQueue<ContextEvent> contextEvents = new ConcurrentLinkedQueue<ContextEvent>(); + 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 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; + 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(); + /** + * 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 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 final class ContextEvent + { + final ContextEventType type; + final ServletContextEvent 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>(); + private ContextEvent(ContextEventType type, ServletContextEvent event) + { + this.type = type; + this.event = event; + } + } - Object[] objs = new Object[names.length]; - for (int i = 0; i < names.length; i++) - { - try - { - objs[i] = Class.forName(names[i]).newInstance(); - } - catch (Exception e) - { - log.error("Could not find/load listener: "+ names[i], e); - } + 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 (Exception e) + { + log.error("Could not find/load listener: " + names[i], 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); - } + 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); - this.sessionListeners = sessionListeners; - this.sessionAttributeListeners = sessionAttributeListeners; - this.requestListeners = requestListeners; - this.requestAttributeListeners = requestAttributeListeners; - this.contextListeners = contextListeners; - this.contextAttributeListeners = contextAttributeListeners; - } + log.debug("Activated listener: " + obj); + } - private void initialize() - { - if (initialized) - return; + this.sessionListeners = sessionListeners; + this.sessionAttributeListeners = sessionAttributeListeners; + this.requestListeners = requestListeners; + this.requestAttributeListeners = requestAttributeListeners; + this.contextListeners = contextListeners; + this.contextAttributeListeners = contextAttributeListeners; + } - log.debug("Activating listeners"); - setupListeners(); + private void initialize() + { + if (initialized) + return; - try - { - replayLock.writeLock().lock(); + log.debug("Activating listeners"); + setupListeners(); - ConcurrentLinkedQueue<ContextEvent> events = contextEvents; - ContextEvent event = events.poll(); - while (event != null) - { - switch (event.type) + try + { + replayLock.writeLock().lock(); + + ConcurrentLinkedQueue<ContextEvent> events = contextEvents; + ContextEvent event = events.poll(); + while (event != null) { - 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; + 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(); } - event = events.poll(); - } + initialized = true; + } + finally + { + replayLock.writeLock().unlock(); + } - initialized = true; - } - finally - { - replayLock.writeLock().unlock(); - } + } - } + public void sessionCreated(HttpSessionEvent event) + { + initialize(); - public void sessionCreated(HttpSessionEvent event) - { - initialize(); + ArrayList<HttpSessionListener> listeners = sessionListeners; + for (HttpSessionListener listener : listeners) + listener.sessionCreated(event); + } - ArrayList<HttpSessionListener> listeners = sessionListeners; - for (HttpSessionListener listener : listeners) - listener.sessionCreated(event); - } + public void sessionDestroyed(HttpSessionEvent event) + { + initialize(); - public void sessionDestroyed(HttpSessionEvent event) - { - initialize(); + ArrayList<HttpSessionListener> listeners = sessionListeners; + for (HttpSessionListener listener : listeners) + listener.sessionDestroyed(event); + } - ArrayList<HttpSessionListener> listeners = sessionListeners; - for (HttpSessionListener listener : listeners) - listener.sessionDestroyed(event); - } + public void requestDestroyed(ServletRequestEvent event) + { + initialize(); - public void requestDestroyed(ServletRequestEvent event) - { - initialize(); + ArrayList<ServletRequestListener> listeners = requestListeners; + for (ServletRequestListener listener : listeners) + listener.requestDestroyed(event); - ArrayList<ServletRequestListener> listeners = requestListeners; - for (ServletRequestListener listener : listeners) - listener.requestDestroyed(event); + } - } + public void requestInitialized(ServletRequestEvent event) + { + initialize(); - public void requestInitialized(ServletRequestEvent event) - { - initialize(); + ArrayList<ServletRequestListener> listeners = requestListeners; + for (ServletRequestListener listener : listeners) + listener.requestInitialized(event); + } - ArrayList<ServletRequestListener> listeners = requestListeners; - for (ServletRequestListener listener : listeners) - listener.requestInitialized(event); - } + public void contextDestroyed(ServletContextEvent event) + { + if (!initialized) + { + contextEvents.clear(); + return; + } - public void contextDestroyed(ServletContextEvent event) - { - if (! initialized) - { - contextEvents.clear(); - return; - } + initialize(); - initialize(); + ArrayList<ServletContextListener> listeners = contextListeners; + for (ServletContextListener listener : listeners) + listener.contextDestroyed(event); + } - ArrayList<ServletContextListener> listeners = contextListeners; - for (ServletContextListener listener : listeners) - listener.contextDestroyed(event); - } + public void contextInitialized(ServletContextEvent event) + { + this.context = event.getServletContext(); - 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(","); - // 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(); - try - { - replayLock.readLock().lock(); + if (!initialized) + { + contextEvents.add(new ContextEvent(ContextEventType.INIT, event)); + return; + } - 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(); + } + } - ArrayList<ServletContextListener> listeners = contextListeners; - for (ServletContextListener listener : listeners) - listener.contextInitialized(event); - } - finally - { - replayLock.readLock().unlock(); - } - } + public void attributeAdded(HttpSessionBindingEvent event) + { + initialize(); - public void attributeAdded(HttpSessionBindingEvent event) - { - initialize(); + ArrayList<HttpSessionAttributeListener> listeners = sessionAttributeListeners; + for (HttpSessionAttributeListener listener : listeners) + listener.attributeAdded(event); + } - ArrayList<HttpSessionAttributeListener> listeners = sessionAttributeListeners; - for (HttpSessionAttributeListener listener : listeners) - listener.attributeAdded(event); - } + public void attributeRemoved(HttpSessionBindingEvent event) + { + initialize(); - public void attributeRemoved(HttpSessionBindingEvent event) - { - initialize(); + ArrayList<HttpSessionAttributeListener> listeners = sessionAttributeListeners; + for (HttpSessionAttributeListener listener : listeners) + listener.attributeRemoved(event); + } - ArrayList<HttpSessionAttributeListener> listeners = sessionAttributeListeners; - for (HttpSessionAttributeListener listener : listeners) - listener.attributeRemoved(event); - } + public void attributeReplaced(HttpSessionBindingEvent event) + { + initialize(); - public void attributeReplaced(HttpSessionBindingEvent event) - { - initialize(); + ArrayList<HttpSessionAttributeListener> listeners = sessionAttributeListeners; + for (HttpSessionAttributeListener listener : listeners) + listener.attributeReplaced(event); + } - ArrayList<HttpSessionAttributeListener> listeners = sessionAttributeListeners; - for (HttpSessionAttributeListener listener : listeners) - listener.attributeReplaced(event); - } + public void attributeAdded(ServletRequestAttributeEvent event) + { + initialize(); - public void attributeAdded(ServletRequestAttributeEvent event) - { - initialize(); + ArrayList<ServletRequestAttributeListener> listeners = requestAttributeListeners; + for (ServletRequestAttributeListener listener : listeners) + listener.attributeAdded(event); + } - ArrayList<ServletRequestAttributeListener> listeners = requestAttributeListeners; - for (ServletRequestAttributeListener listener : listeners) - listener.attributeAdded(event); - } + public void attributeRemoved(ServletRequestAttributeEvent event) + { + initialize(); - public void attributeRemoved(ServletRequestAttributeEvent event) - { - initialize(); + ArrayList<ServletRequestAttributeListener> listeners = requestAttributeListeners; + for (ServletRequestAttributeListener listener : listeners) + listener.attributeRemoved(event); + } - ArrayList<ServletRequestAttributeListener> listeners = requestAttributeListeners; - for (ServletRequestAttributeListener listener : listeners) - listener.attributeRemoved(event); - } + public void attributeReplaced(ServletRequestAttributeEvent event) + { + initialize(); - public void attributeReplaced(ServletRequestAttributeEvent event) - { - initialize(); + ArrayList<ServletRequestAttributeListener> listeners = requestAttributeListeners; + for (ServletRequestAttributeListener listener : listeners) + listener.attributeReplaced(event); - ArrayList<ServletRequestAttributeListener> listeners = requestAttributeListeners; - for (ServletRequestAttributeListener listener : listeners) - listener.attributeReplaced(event); + } - } + public void attributeAdded(ServletContextAttributeEvent event) + { + try + { + replayLock.readLock().lock(); - public void attributeAdded(ServletContextAttributeEvent event) - { - try - { - replayLock.readLock().lock(); + if (!initialized) + { + contextEvents.add(new ContextEvent(ContextEventType.ADD, event)); + return; + } - 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(); + } - ArrayList<ServletContextAttributeListener> listeners = contextAttributeListeners; - for (ServletContextAttributeListener listener : listeners) - listener.attributeAdded(event); - } - finally - { - replayLock.readLock().unlock(); - } + } - } + public void attributeRemoved(ServletContextAttributeEvent event) + { - public void attributeRemoved(ServletContextAttributeEvent event) - { + try + { + replayLock.readLock().lock(); - try - { - replayLock.readLock().lock(); + if (!initialized) + { + contextEvents.add(new ContextEvent(ContextEventType.REMOVE, event)); + return; + } - 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(); + } + } - ArrayList<ServletContextAttributeListener> listeners = contextAttributeListeners; - for (ServletContextAttributeListener listener : listeners) - listener.attributeRemoved(event); - } - finally - { - replayLock.readLock().unlock(); - } - } + public void attributeReplaced(ServletContextAttributeEvent event) + { - public void attributeReplaced(ServletContextAttributeEvent event) - { + try + { + replayLock.readLock().lock(); - try - { - replayLock.readLock().lock(); + if (!initialized) + { + contextEvents.add(new ContextEvent(ContextEventType.REPLACE, event)); + return; + } - 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(); - } - } + ArrayList<ServletContextAttributeListener> listeners = contextAttributeListeners; + for (ServletContextAttributeListener listener : listeners) + listener.attributeRemoved(event); + } + finally + { + replayLock.readLock().unlock(); + } + } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/LoggingInventoryEventListener.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,25 +1,26 @@ /* - * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Embedded Jopr Project + * Copyright (C) 2006-2009 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. + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * * This 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU Lesser 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.HashSet; import java.util.Set; -import java.util.HashSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,28 +36,29 @@ public void resourcesAdded(Set<Resource> resources) { - log.trace("The following Resources have been added: " + toString(resources)); + log.trace("The following Resources have been added: " + toString(resources)); } public void resourcesRemoved(Set<Resource> resources) { - log.debug("The following Resources have been removed: " + toString(resources)); - return; + log.debug("The following Resources have been removed: " + toString(resources)); + return; } public void resourceActivated(Resource resource) { Set resources = new HashSet(); resources.add(resource); - log.trace("The following Resource has been activated: " + toString(resources)); - return; + log.trace("The following Resource has been activated: " + toString(resources)); + return; } - private static String toString(Set<Resource> resources) { - StringBuilder stringBuilder = new StringBuilder(); + private static String toString(Set<Resource> resources) + { + StringBuilder stringBuilder = new StringBuilder(); for (Resource resource : resources) stringBuilder.append("Resource[").append(resource.getId()).append("]: ").append(resource.getName()).append(", "); stringBuilder.delete(stringBuilder.length() - 2, stringBuilder.length()); return stringBuilder.toString(); - } + } } Added: trunk/core/src/main/java/org/jboss/on/embedded/ResourceTypes.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ResourceTypes.java (rev 0) +++ trunk/core/src/main/java/org/jboss/on/embedded/ResourceTypes.java 2009-05-18 17:23:38 UTC (rev 439) @@ -0,0 +1,50 @@ +/* + * Embedded Jopr Project + * Copyright (C) 2006-2009 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 Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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; + +/** + * Constants for Resource type names. + * + * TODO: Move to src/main/test/, since only tests use these. + */ +public class ResourceTypes +{ + /** + * used to retrieve all the no-tx datasource ResourceTypes from the ResourceManager + */ + public static final String RESOURCE_TYPE_NO_TX_DATASOURCE = "no-tx-datasource"; + /** + * used to retrieve all the local datasource ResourceTypes from the ResourceManager + */ + public static final String RESOURCE_TYPE_LOCAL_DATASOURCE = "local-datasource"; + /** + * used to retrieve all the xa datasource ResourceTypes from the ResourceManager + */ + public static final String RESOURCE_TYPE_XA_DATASOURCE = "xa-datasource"; + /** + * used to retrieve all the jms topic ResourceTypes from the ResourceManager + */ + public static final String RESOURCE_TYPE_JMS_TOPIC = "jms-topic"; + public static final String RESOURCE_TYPE_VM_MEMORY = "VM Memory System"; + + private ResourceTypes() + { + } +} Property changes on: trunk/core/src/main/java/org/jboss/on/embedded/ResourceTypes.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/java/org/jboss/on/embedded/TextareaMapConverter.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/TextareaMapConverter.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/TextareaMapConverter.java 2009-05-18 17:23:38 UTC (rev 439) @@ -31,8 +31,10 @@ import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertySimple; -public class TextareaMapConverter implements Converter -{ +/** + * TODO + */ +public class TextareaMapConverter implements Converter { private static final String ATTRIBUTE_VALUE_SEPARATOR = "="; // from http://www.w3.org/TR/REC-html40/interact/forms.html#h-17.13.4 @@ -43,10 +45,9 @@ // if we split on \n we need to trim the value to get rid of the \r which IE puts in private static final String LINE_SEPARATOR = "\n"; - /** - * Adapted from com.jboss.jbossnetwork.ui.action.resource.common.manage.APLHelper.gatherMapParameter TODO add i18n of - * messages + * Adapted from com.jboss.jbossnetwork.ui.action.resource.common.manage.APLHelper.gatherMapParameter TODO add i18n + * of messages */ public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String valueAsString) { @@ -110,12 +111,12 @@ String valueAsString = null; if (valueAsMap != null && valueAsMap instanceof Map) { - Map<String, Property> map = (Map<String, Property>) valueAsMap; + Map<String, Property> map = (Map<String, Property>)valueAsMap; StringBuffer mapAsStringBuffer = new StringBuffer(); for (String attributeName : map.keySet()) { - PropertySimple attributeValue = (PropertySimple) map.get(attributeName); + PropertySimple attributeValue = (PropertySimple)map.get(attributeName); mapAsStringBuffer.append(attributeName) .append(ATTRIBUTE_VALUE_SEPARATOR) Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementComparator.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementComparator.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementComparator.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,17 +19,15 @@ */ package org.jboss.on.embedded.bean; -import org.rhq.core.domain.measurement.MeasurementData; -import org.rhq.core.domain.measurement.MeasurementDefinition; - import java.util.Comparator; import java.util.Map; +import org.rhq.core.domain.measurement.MeasurementData; +import org.rhq.core.domain.measurement.MeasurementDefinition; + /** - * @author Mark Spritzler - * TODO evaluate whether this class is needed - * why cant we use the order defined by measurementDefinitionMap which should be ordered - * as the measurements are specified in the plugin descriptor + * @author Mark Spritzler TODO evaluate whether this class is needed why cant we use the order defined by + * measurementDefinitionMap which should be ordered as the measurements are specified in the plugin descriptor */ public class MeasurementComparator implements Comparator<MeasurementData> { Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementDisplay.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementDisplay.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementDisplay.java 2009-05-18 17:23:38 UTC (rev 439) @@ -30,8 +30,7 @@ * * @author Jessica Sant */ -public class MeasurementDisplay implements Serializable -{ +public class MeasurementDisplay implements Serializable { /** * the data to be displayed */ @@ -47,29 +46,24 @@ */ private MeasurementValueAndUnits valueAndUnits; - public MeasurementDisplay(MeasurementData measurementData, MeasurementDefinition measurementDefinition) - { + public MeasurementDisplay(MeasurementData measurementData, MeasurementDefinition measurementDefinition) { this.measurementData = measurementData; this.measurementDefinition = measurementDefinition; } - public MeasurementData getMeasurementData() - { + public MeasurementData getMeasurementData() { return measurementData; } - public MeasurementDefinition getMeasurementDefinition() - { + public MeasurementDefinition getMeasurementDefinition() { return measurementDefinition; } - public MeasurementValueAndUnits getMeasurementValueAndUnits() - { + public MeasurementValueAndUnits getMeasurementValueAndUnits() { return valueAndUnits; } - public void setMeasurementValueAndUnits(MeasurementValueAndUnits valueAndUnits) - { + public void setMeasurementValueAndUnits(MeasurementValueAndUnits valueAndUnits) { this.valueAndUnits = valueAndUnits; } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,19 +1,20 @@ /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Embedded Jopr Project + * Copyright (C) 2006-2009 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. + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * * This 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU Lesser 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.bean; Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2009-05-18 17:23:38 UTC (rev 439) @@ -21,14 +21,14 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.HashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; - +import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService; import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.DisplayType; import org.rhq.core.domain.measurement.MeasurementData; @@ -39,7 +39,6 @@ import org.rhq.core.domain.measurement.util.MeasurementConversionException; import org.rhq.core.domain.measurement.util.MeasurementConverter; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService; import org.rhq.core.pc.PluginContainer; /** @@ -71,7 +70,8 @@ this.resourceType = this.resource.getResource().getResourceType(); this.measurementDefinitionMap = new HashMap(); Set<MeasurementDefinition> metricDefinitions = this.resourceType.getMetricDefinitions(); - for (MeasurementDefinition measurementDefinition : metricDefinitions) { + for (MeasurementDefinition measurementDefinition : metricDefinitions) + { if (!measurementDefinition.isPerMinute()) // Filter out per-minute metrics, since we don't support them in embedded for the time being. // This is also important, since we key off the metric names, and a per-minute metric has the @@ -83,8 +83,10 @@ /** * Loads the metric values for the current Resource, optionally filtered by display type and/or data type. * - * @param displayType the display type (summary or detail) that the returned metrics should have. Null if any display type should be returned. - * @param dataType the data type (measurement or trait) that the returned metrics should have. Null if any data type should be returned. + * @param displayType the display type (summary or detail) that the returned metrics should have. Null if any + * display type should be returned. + * @param dataType the data type (measurement or trait) that the returned metrics should have. Null if any data + * type should be returned. * @return a set of all metrics that have the given display type and data type */ public @@ -117,7 +119,7 @@ MeasurementAgentService measurementAgentService = PluginContainer.getInstance().getMeasurementAgentService(); int resourceId = this.resource.getResource().getId(); String[] measurementNamesArray = requestedMetricDefs.keySet().toArray(new String[requestedMetricDefs.size()]); - Set<MeasurementData> measurementDataSet = measurementAgentService.getRealTimeMeasurementValue(resourceId, dataType, measurementNamesArray); + Set<MeasurementData> measurementDataSet = measurementAgentService.getRealTimeMeasurementValue(resourceId, dataType, measurementNamesArray); // @TODO when displayOrder is implemented this should use displayOrder, but right now the displayOrder // for all MeasurementData is set to "0" which will cause only the last object of the set to be // put into the TreeSet due to the semantics of TreeSet which does not implement the Set interface correctly. @@ -131,8 +133,8 @@ } /** - * returns a list of all categories used on this page. - * This method also loads the measuremntDataList and the measurementDataMap (a map of + * returns a list of all categories used on this page. This method also loads the measuremntDataList and the + * measurementDataMap (a map of * * @param measurementDefinitionMap * @param measurementDataList @@ -184,13 +186,13 @@ { try { - double dataValue = (Double) measurementDisplay.getMeasurementData().getValue(); + double dataValue = (Double)measurementDisplay.getMeasurementData().getValue(); MeasurementUnits units = measurementDisplay.getMeasurementDefinition().getUnits(); MeasurementNumericValueAndUnits dataValueAndUnits; if (units == MeasurementUnits.NONE) - dataValueAndUnits = new MeasurementIntegerValueAndUnits(dataValue, units); + dataValueAndUnits = new MeasurementIntegerValueAndUnits(dataValue, units); else - dataValueAndUnits = MeasurementConverter.fit(dataValue, units); + dataValueAndUnits = MeasurementConverter.fit(dataValue, units); measurementDisplay.setMeasurementValueAndUnits(dataValueAndUnits); } catch (MeasurementConversionException mce) @@ -210,7 +212,7 @@ // if its a string -- just save the string into the Formatted value display else if (measurementDisplay.getMeasurementData().getValue() instanceof String) { - String dataValue = (String) measurementDisplay.getMeasurementData().getValue(); + String dataValue = (String)measurementDisplay.getMeasurementData().getValue(); measurementDisplay.setMeasurementValueAndUnits(new MeasurementStringValueAndUnits(dataValue, MeasurementUnits.NONE)); } @@ -218,7 +220,8 @@ return measurementDisplay; } - public Map<String, MeasurementDefinition> getMeasurementDefinitionMap() { + public Map<String, MeasurementDefinition> getMeasurementDefinitionMap() + { return measurementDefinitionMap; } Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,19 +19,18 @@ */ package org.jboss.on.embedded.bean; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.measurement.Availability; - import java.io.Serializable; +import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.resource.Resource; + /** - * Bean used to hold all of the data necessary to render a table of resources. Quick accessors are provided to - * the nested attributes to minimize the chaining that needs to take place in the XHTML pages. + * Bean used to hold all of the data necessary to render a table of resources. Quick accessors are provided to the + * nested attributes to minimize the chaining that needs to take place in the XHTML pages. * * @author Jason Dobies */ -public class ResourceListItem implements Serializable -{ +public class ResourceListItem implements Serializable { // Attributes -------------------------------------------- private Resource resource; @@ -39,38 +38,30 @@ // Constructors -------------------------------------------- - public ResourceListItem(Resource resource, Availability availability) - { + public ResourceListItem(Resource resource, Availability availability) { this.resource = resource; this.availability = availability; } // Public -------------------------------------------- - public Resource getResource() - { + public Resource getResource() { return resource; } - public String getAvailability() - { - if (availability == null || availability.getAvailabilityType() == null) - { + public String getAvailability() { + if (availability == null || availability.getAvailabilityType() == null) { return "UNKNOWN"; - } - else - { + } else { return availability.getAvailabilityType().toString(); } } - public String getName() - { + public String getName() { return resource.getName(); } - public String getType() - { + public String getType() { return resource.getResourceType().getName(); } } Deleted: trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceManagerBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceManagerBean.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceManagerBean.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,69 +0,0 @@ -/* - * Embedded Jopr Project - * Copyright (C) 2006-2009 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 Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser 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.bean; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.rhq.core.domain.measurement.Availability; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.jboss.on.embedded.Constants; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -/** - * Interacts with the ResourceManager - * - * @author Jessica Sant - */ -public class ResourceManagerBean -{ - private final Log LOG = LogFactory.getLog(ResourceManagerBean.class); - - private ResourceManager manager; - - public ResourceManagerBean() - { - manager = ResourceManagerFactory.resourceManager(); - - loadResourceCategoryTypeMap(); - } - - // TODO we shouldnt be using this anywhere any more - /** - * loads the ResourceCategory - ResourceType map. Key: resource Category, Value: list of ResourceTypes that go with this category - */ - private void loadResourceCategoryTypeMap() - { - List<String> datasourceCategoryList = new ArrayList<String>(); - datasourceCategoryList.add(Constants.RESOURCE_TYPE_LOCAL_DATASOURCE); - datasourceCategoryList.add(Constants.RESOURCE_TYPE_NO_TX_DATASOURCE); - datasourceCategoryList.add(Constants.RESOURCE_TYPE_XA_DATASOURCE); - - List<String> jmsCategoryList = new ArrayList<String>(); - jmsCategoryList.add(Constants.RESOURCE_TYPE_JMS_QUEUE); - jmsCategoryList.add(Constants.RESOURCE_TYPE_JMS_TOPIC); - } -} Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,24 +17,27 @@ * 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.bean.history.content; -import org.jboss.on.embedded.manager.history.AbstractHistoryManager; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; -import org.jboss.on.embedded.manager.history.content.ContentHistoryManager; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import java.util.Collection; + import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; -import java.util.Collection; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.manager.ResourceManagerFactory; +import org.jboss.on.embedded.manager.history.AbstractHistoryManager; +import org.jboss.on.embedded.manager.history.content.ContentHistoryManager; + @Name("contentHistoryManager") @Scope(ScopeType.APPLICATION) -public class ContentHistoryManagerBean extends AbstractHistoryManager<ContentDiscoveryReport> +public class ContentHistoryManagerBean extends AbstractHistoryManager<ContentDiscoveryReport> implements ContentHistoryManager { public ContentDiscoveryReport addContentHistory(ContentDiscoveryReport report) Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,14 +17,15 @@ * 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.bean.history.content; +import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.BufferedInputStream; import java.util.Set; import org.apache.commons.logging.Log; @@ -125,7 +126,8 @@ historyBean.addContentHistory(report); } - private long downloadPackageBits(PackageDetailsKey packageDetailsKey, OutputStream outputStream) { + private long downloadPackageBits(PackageDetailsKey packageDetailsKey, OutputStream outputStream) + { log.debug("Downloading package bits for " + packageDetailsKey + "..."); long bitSize; String fileName = packageDetailsKey.getName(); Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationHistoryManagerBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationHistoryManagerBean.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationHistoryManagerBean.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,13 +17,12 @@ * 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.bean.history.operation; -import org.jboss.on.embedded.manager.history.AbstractHistoryManager; -import org.jboss.on.embedded.manager.history.operation.OperationHistoryManager; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.core.domain.operation.OperationHistory; @@ -31,9 +30,13 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.on.embedded.manager.history.AbstractHistoryManager; +import org.jboss.on.embedded.manager.history.operation.OperationHistoryManager; + /** * @author Mark Spritzler */ @@ -82,7 +85,7 @@ } return operationDefinition; } - + protected String getJobId(OperationHistory history) { return history.getJobId().toString(); Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationServerServiceImpl.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationServerServiceImpl.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/history/operation/OperationServerServiceImpl.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,78 +17,67 @@ * 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.bean.history.operation; import java.util.Date; +import org.rhq.core.clientapi.server.operation.OperationServerService; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.operation.OperationHistory; import org.rhq.core.domain.operation.OperationRequestStatus; import org.rhq.core.domain.operation.ResourceOperationHistory; +import org.rhq.core.util.exception.ExceptionPackage; import org.jboss.on.embedded.manager.history.operation.OperationHistoryManager; -import org.rhq.core.clientapi.server.operation.OperationServerService; -import org.rhq.core.util.exception.ExceptionPackage; /** * @author Mark Spritzler */ -public class OperationServerServiceImpl implements OperationServerService -{ +public class OperationServerServiceImpl implements OperationServerService { private OperationHistoryManager historyBean; - public OperationHistoryManager getHistoryBean() - { + public OperationHistoryManager getHistoryBean() { return historyBean; } - public void setHistoryBean(OperationHistoryManager historyBean) - { + public void setHistoryBean(OperationHistoryManager historyBean) { this.historyBean = historyBean; } - public void operationSucceeded(String jobId, Configuration results, long invocationTime, long completionTime) - { + public void operationSucceeded(String jobId, Configuration results, long invocationTime, long completionTime) { OperationHistory history = this.historyBean.getHistory(jobId); - history.setStatus(OperationRequestStatus.SUCCESS); - if (history instanceof ResourceOperationHistory) - { + history.setStatus(OperationRequestStatus.SUCCESS); + if (history instanceof ResourceOperationHistory) { if (results != null) results.setId(history.getId()); - ((ResourceOperationHistory)history).setResults(results); + ((ResourceOperationHistory) history).setResults(results); } } public void operationFailed(String jobId, Configuration results, ExceptionPackage error, long invocationTime, - long completionTime) - { + long completionTime) { OperationHistory operationHistory = this.historyBean.getHistory(jobId); operationHistory.setStatus(OperationRequestStatus.FAILURE); - if (operationHistory instanceof ResourceOperationHistory) - { + if (operationHistory instanceof ResourceOperationHistory) { if (results != null) results.setId(operationHistory.getId()); - ((ResourceOperationHistory)operationHistory).setResults(results); + ((ResourceOperationHistory) operationHistory).setResults(results); } - if (error != null) - { + if (error != null) { if (error.getExceptionName().equals(UnsupportedOperationException.class.getName())) operationHistory.setErrorMessage("The '" + operationHistory.getOperationDefinition().getName() - + "' operation is not supported by Embedded Jopr: " + error.getMessage()); + + "' operation is not supported by Embedded Jopr: " + error.getMessage()); else operationHistory.setErrorMessage(error.getStackTraceString()); - } - else - { + } else { operationHistory.setErrorMessage("Failed for an unknown reason at " + new Date(completionTime)); } } - public void operationTimedOut(String jobId, long invocationTime, long timeoutTime) - { + public void operationTimedOut(String jobId, long invocationTime, long timeoutTime) { OperationHistory history = this.historyBean.getHistory(jobId); - if (history.getStatus() == OperationRequestStatus.INPROGRESS) - { + if (history.getStatus() == OperationRequestStatus.INPROGRESS) { history.setStatus(OperationRequestStatus.FAILURE); history.setErrorMessage("Timed Out"); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/converter/OperationDefinitionConverter.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/converter/OperationDefinitionConverter.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/converter/OperationDefinitionConverter.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,39 +19,35 @@ */ package org.jboss.on.embedded.converter; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; + import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.core.domain.resource.ResourceType; -import javax.faces.convert.Converter; -import javax.faces.context.FacesContext; -import javax.faces.component.UIComponent; - - /** * @author Mark Spritzler */ -public class OperationDefinitionConverter implements Converter -{ +public class OperationDefinitionConverter implements Converter { private static final String ATTRIBUTE_VALUE_SEPARATOR = ":"; private static final int OPERATION_NAME_ELEMENT = 0; private static final int RESOURCE_TYPE_NAME_ELEMENT = 1; private static final int PLUGIN_ELEMENT = 2; - public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String string) - { + public Object getAsObject(FacesContext facesContext, UIComponent uiComponent, String string) { String[] values = string.split(ATTRIBUTE_VALUE_SEPARATOR); // TODO: Pass a resource category to constructor. - ResourceType resourceType = new ResourceType(values[RESOURCE_TYPE_NAME_ELEMENT], values[PLUGIN_ELEMENT], null, null); + ResourceType resourceType = new ResourceType(values[RESOURCE_TYPE_NAME_ELEMENT], values[PLUGIN_ELEMENT], null, + null); return new OperationDefinition(resourceType, values[OPERATION_NAME_ELEMENT]); //return string; } - public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object object) - { + public String getAsString(FacesContext facesContext, UIComponent uiComponent, Object object) { String operation = ""; - if (object instanceof OperationDefinition) - { + if (object instanceof OperationDefinition) { OperationDefinition operationDefinition = (OperationDefinition) object; ResourceType resourceType = operationDefinition.getResourceType(); operation = operationDefinition.getName() + ":" + resourceType.getName() + ":" + resourceType.getPlugin(); Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java 2009-05-18 17:23:38 UTC (rev 439) @@ -24,16 +24,15 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; - +import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse; +import org.rhq.core.clientapi.agent.inventory.DeleteResourceResponse; +import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.content.transfer.ResourcePackageDetails; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.content.transfer.ResourcePackageDetails; -import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; -import org.rhq.core.clientapi.agent.inventory.DeleteResourceResponse; -import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse; /** * API used to retrieve backend data for the embedded console. @@ -60,19 +59,21 @@ * Non-blocking method which will try to refresh the inventory with the latest services which have been deployed */ void discoverServicesAsync(); - + /** * Blocking method which will try to refresh the inventory with the latest services which have been deployed */ void discoverServicesSync(); - + /** - * Returns the resource type instance for the indicated resource type. The instance itself contains a good deal of - * metadata and is used in many calls to this API. + * Returns the <code>ResourceType</code> with the specified name, or, if no ResourceType exists with that name, + * <code>null</code> is returned. * * @param resourceTypeName name of the resource type. - * @return <code>ResourceType</code> instance if one exists for the specified name; <code>null</code> otherwise. + * @return the <code>ResourceType</code> with the specified name, or, if no ResourceType exists with that name, + * <code>null</code> is returned */ + @Nullable ResourceType getResourceType(String resourceTypeName); /** @@ -83,12 +84,11 @@ Set<ResourceType> getAllResourceTypes(); /** - * Returns all resources of the given type, that are descendants of the given resource. - * If no resources exists, this will return an empty Set. The Set of resources will be - * sorted by name. + * Returns all resources of the given type, that are descendants of the given resource. If no resources exists, this + * will return an empty Set. The Set of resources will be sorted by name. * * @param resourceType type of resource. - * @param resource parent resource. + * @param resource parent resource. * @return set of <code>Resource</code> instances; empty list if none match the resource type. */ @NotNull @@ -120,7 +120,7 @@ * * @param resourceName name of the resource being created * @param resourceType type of resource being created. - * @param ancestorResource the closest ancestor resource to the one being created, usually parent + * @param ancestorResource the closest ancestor resource to the one being created, usually parent * @param pluginConfiguration optional values that can be used use when creating the newly created resource. * @param resourceConfiguration values to use when configuring the newly created resource. * @return returns the CreateResourceRequest, allows the caller to check for errors and status. @@ -130,11 +130,11 @@ /** * Creates a new resource. * - * @param resourceName name of the resource being created - * @param resourceType type of resource being created. - * @param parentResource the parent resource of the one being created - * @param pluginConfiguration optional values that can be used use when creating the newly created resource. - * @param packageDetails PackagedDetails for a content backed resource. + * @param resourceName name of the resource being created + * @param resourceType type of resource being created. + * @param parentResource the parent resource of the one being created + * @param pluginConfiguration optional values that can be used use when creating the newly created resource. + * @param packageDetails PackagedDetails for a content backed resource. * @return returns the CreateResourceRequest, allows the caller to check for errors and status. */ CreateResourceResponse createResource(String resourceName, ResourceType resourceType, Resource parentResource, Configuration pluginConfiguration, ResourcePackageDetails packageDetails); @@ -167,15 +167,16 @@ /** * Invokes an operation on a Resource. * - * @param resource resource to invoke the operation on. - * @param operation operation that is going to be invoked + * @param resource resource to invoke the operation on. + * @param operation operation that is going to be invoked * @param parameters - * @param jobId id to give the operation so that it can be found later to update the status in + * @param jobId id to give the operation so that it can be found later to update the status in */ void invokeOperation(Resource resource, OperationDefinition operation, Configuration parameters, String jobId); /** * Returns the underlying platform which the Resource Manager is running on + * * @return Resource platform Resource */ Resource getPlatform(); Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManagerFactory.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManagerFactory.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManagerFactory.java 2009-05-18 17:23:38 UTC (rev 439) @@ -26,9 +26,8 @@ * * @author Jason Dobies */ -public class ResourceManagerFactory -{ - // Constants -------------------------------------------- +public class ResourceManagerFactory { + // ResourceTypes -------------------------------------------- /** * ResourceManager instance to be used. @@ -40,8 +39,7 @@ /** * Returns an instance of <code>ResourceManager</code>. */ - public static ResourceManager resourceManager() - { + public static ResourceManager resourceManager() { return RESOURCE_MANAGER; } Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/history/AbstractHistoryManager.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/manager/history/AbstractHistoryManager.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/manager/history/AbstractHistoryManager.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,16 +17,17 @@ * 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.manager.history; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; + public abstract class AbstractHistoryManager<T> implements HistoryManager<T> { @@ -40,7 +41,7 @@ new HashMap<String, T>(); protected abstract String getJobId(T History); - + protected void addToMaps(T history, Resource resource, ResourceType resourceType) { // When we are able to create Requests then we will have a jobId, until then code not needed Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/history/HistoryManager.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/manager/history/HistoryManager.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/manager/history/HistoryManager.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,13 +17,14 @@ * 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.manager.history; +import java.util.Collection; + import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; -import java.util.Collection; - public interface HistoryManager<T> { public T getHistory(String historyId); Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,8 +19,11 @@ */ package org.jboss.on.embedded.manager.history.content; +import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; + import org.jboss.on.embedded.manager.history.HistoryManager; -import org.rhq.core.domain.content.transfer.ContentDiscoveryReport;public interface ContentHistoryManager extends HistoryManager<ContentDiscoveryReport> + +public interface ContentHistoryManager extends HistoryManager<ContentDiscoveryReport> { public ContentDiscoveryReport addContentHistory(ContentDiscoveryReport report); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/history/operation/OperationHistoryManager.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/manager/history/operation/OperationHistoryManager.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/manager/history/operation/OperationHistoryManager.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,12 +19,13 @@ */ package org.jboss.on.embedded.manager.history.operation; -import org.jboss.on.embedded.manager.history.HistoryManager; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.operation.OperationHistory; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; +import org.jboss.on.embedded.manager.history.HistoryManager; + /** * @author Mark Spritzler */ Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/DiscoveryException.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/DiscoveryException.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/DiscoveryException.java 2009-05-18 17:23:38 UTC (rev 439) @@ -22,27 +22,21 @@ /** * @author Jason Dobies */ -public class DiscoveryException - extends Exception -{ +public class DiscoveryException extends Exception { - public DiscoveryException() - { + public DiscoveryException() { super(); } - public DiscoveryException(String message) - { + public DiscoveryException(String message) { super(message); } - public DiscoveryException(String message, Throwable cause) - { + public DiscoveryException(String message, Throwable cause) { super(message, cause); } - public DiscoveryException(Throwable cause) - { + public DiscoveryException(Throwable cause) { super(cause); } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2009-05-18 17:23:38 UTC (rev 439) @@ -26,8 +26,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.seam.core.Events; import org.jetbrains.annotations.NotNull; import org.rhq.core.clientapi.agent.PluginContainerException; import org.rhq.core.clientapi.agent.configuration.ConfigurationAgentService; @@ -53,12 +51,16 @@ import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pc.PluginContainer; +import org.jboss.seam.core.Events; + +import org.jboss.on.embedded.manager.ResourceManager; + /** * @author Jason Dobies */ public class PluginContainerResourceManager implements ResourceManager { - // Constants -------------------------------------------- + // ResourceTypes -------------------------------------------- private static final Log LOG = LogFactory.getLog(PluginContainerResourceManager.class); @@ -71,7 +73,7 @@ private static final String CREATE_RESOURCE_ERROR = "Error while creating service of type ["; private static final String UPDATE_RESOURCE_ERROR = "Error while updating service: "; private static final String INVOKE_OPERATION_ERROR = "Error invoking operation on resource ["; - + // Public -------------------------------------------- public void discoverResources() @@ -96,11 +98,11 @@ return; } } - + public void discoverServicesAsync() { try - { + { getInventoryService().executeServiceScanDeferred(); } catch (Exception e) @@ -113,7 +115,7 @@ public void discoverServicesSync() { try - { + { getInventoryService().executeServiceScanImmediately(); } catch (Exception e) @@ -122,8 +124,8 @@ throw new RuntimeException(DISCOVERY_ERROR, e); } } - - + + // ResourceManager Implementation -------------------------------------------- // @TODO need to check this. In tests this causes NPE, something might have changed and we might need a different way to do this @@ -146,10 +148,10 @@ { return getPluginContainer().getPluginManager().getMetadataManager().getAllTypes(); } - + @NotNull public Set<Resource> getResources(ResourceType resourceType, Resource rootResource) - { + { // Use a TreeSet to ensure the Set is sorted via Resource.compareTo() (i.e. by name). Set<Resource> childResources = new TreeSet<Resource>(); @@ -288,7 +290,7 @@ response = getResourceFactoryService().executeCreateResourceImmediately(request); if (response.getStatus() == CreateResourceStatus.SUCCESS) { - discoverServicesSync(); + discoverServicesSync(); } } catch (PluginContainerException e) Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/ApplicationInfoAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/ApplicationInfoAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/ApplicationInfoAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,19 +1,20 @@ /* - * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Embedded Jopr Project + * Copyright (C) 2006-2009 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. + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * * This 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU Lesser 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.ui; @@ -24,12 +25,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.ScopeType; /** * @author Ian Springer @@ -45,7 +45,7 @@ public String getBaseUrl() { FacesContext context = FacesContext.getCurrentInstance(); - HttpServletRequest request = (HttpServletRequest) context.getExternalContext().getRequest(); + HttpServletRequest request = (HttpServletRequest)context.getExternalContext().getRequest(); int indexAfterContextRoot = request.getRequestURL().indexOf(request.getServletPath()); String baseUrl = request.getRequestURL().substring(0, indexAfterContextRoot) + "/"; log.debug("Base URL: " + baseUrl); Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,45 +19,46 @@ */ package org.jboss.on.embedded.ui; +import java.io.File; +import java.io.FileInputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collection; +import java.util.Set; +import java.util.jar.Attributes; +import java.util.jar.Manifest; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.servlet.ServletContext; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.on.embedded.bean.history.content.ContentServerServiceImpl; -import org.jboss.on.embedded.bean.history.content.ContentHistoryManagerBean; -import org.jboss.on.embedded.bean.history.operation.OperationServerServiceImpl; -import org.jboss.on.embedded.manager.history.operation.OperationHistoryManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; -import org.jboss.on.embedded.EmbeddedInventoryEventListener; -import org.jboss.on.embedded.LoggingInventoryEventListener; +import org.jetbrains.annotations.Nullable; +import org.rhq.core.pc.PluginContainer; +import org.rhq.core.pc.PluginContainerConfiguration; +import org.rhq.core.pc.ServerServices; +import org.rhq.core.pc.plugin.PluginEnvironment; +import org.rhq.core.pc.plugin.SimplePluginFinder; import org.jboss.seam.ScopeType; -import org.jboss.seam.security.Identity; +import org.jboss.seam.annotations.Destroy; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.Observer; import org.jboss.seam.contexts.ServletLifecycle; -import org.jetbrains.annotations.Nullable; -import org.rhq.core.pc.PluginContainer; -import org.rhq.core.pc.PluginContainerConfiguration; -import org.rhq.core.pc.ServerServices; -import org.rhq.core.pc.plugin.PluginEnvironment; -import org.rhq.core.pc.plugin.SimplePluginFinder; +import org.jboss.seam.security.Identity; -import javax.servlet.ServletContext; +import org.jboss.on.embedded.EmbeddedInventoryEventListener; +import org.jboss.on.embedded.LoggingInventoryEventListener; +import org.jboss.on.embedded.bean.history.content.ContentHistoryManagerBean; +import org.jboss.on.embedded.bean.history.content.ContentServerServiceImpl; +import org.jboss.on.embedded.bean.history.operation.OperationServerServiceImpl; +import org.jboss.on.embedded.manager.ResourceManagerFactory; +import org.jboss.on.embedded.manager.history.operation.OperationHistoryManager; -import java.io.File; -import java.io.FileInputStream; -import java.net.URL; -import java.net.MalformedURLException; -import java.util.Collection; -import java.util.Set; -import java.util.jar.Manifest; -import java.util.jar.Attributes; -import java.util.logging.Logger; -import java.util.logging.Level; - /** * A Seam component that is in charge of initializing and shutting down the Admin Console. * @@ -93,7 +94,8 @@ @Observer(Identity.EVENT_LOGIN_SUCCESSFUL) public void init() { - if (!this.initialized) { + if (!this.initialized) + { try { String version = getVersion(); @@ -119,7 +121,8 @@ @Destroy public void shutdown() { - if (this.initialized) { + if (this.initialized) + { try { LOG.info("Shutting down Administration Console..."); @@ -156,38 +159,48 @@ } @Nullable - private String getVersion() { + private String getVersion() + { String version = null; - try { + try + { version = this.getClass().getPackage().getImplementationVersion(); - if (version == null) { + if (version == null) + { ServletContext servletContext = ServletLifecycle.getServletContext(); String manifestPath = servletContext.getRealPath("/META-INF/MANIFEST.MF"); Manifest manifest = new Manifest(new FileInputStream(manifestPath)); version = (String)manifest.getMainAttributes().get(Attributes.Name.IMPLEMENTATION_VERSION); - if (version == null) { + if (version == null) + { throw new IllegalStateException(Attributes.Name.IMPLEMENTATION_VERSION + " attribute is not set in WAR's manifest."); } } } - catch (Exception e) { + catch (Exception e) + { LOG.error("Could not determine Administration Console version.", e); } return version; } - private static void reconfigureJdkLogging() { - try { + private static void reconfigureJdkLogging() + { + try + { LOG.trace("Reconfiguring JDK logging..."); setJdkLoggerLevel(FACES_API_LOGGER_NAME, Level.WARNING); setJdkLoggerLevel(FACES_RI_LOGGER_NAME, Level.WARNING); setJdkLoggerLevel(FACELETS_LOGGER_NAME, Level.WARNING); - } catch (Exception e) { + } + catch (Exception e) + { LOG.warn("Failed to reconfigure JDK logging.", e); } } - private PluginContainerConfiguration createPluginContainerConfiguration() throws MalformedURLException { + private PluginContainerConfiguration createPluginContainerConfiguration() throws MalformedURLException + { PluginContainerConfiguration config = new PluginContainerConfiguration(); config.setPluginFinder(createPluginFinder()); setPluginContainerDataDirectory(config); @@ -210,7 +223,8 @@ return config; } - private static SimplePluginFinder createPluginFinder() throws MalformedURLException { + private static SimplePluginFinder createPluginFinder() throws MalformedURLException + { ServletContext servletContext = ServletLifecycle.getServletContext(); SimplePluginFinder pluginFinder = new SimplePluginFinder(); Set<String> pluginStringSet = servletContext.getResourcePaths("/plugins/"); @@ -225,18 +239,21 @@ return pluginFinder; } - private static void configureMockScenarioLoader() { + private static void configureMockScenarioLoader() + { LOG.trace("Configuring Mock Scenario Loader..."); System.setProperty("on.mock.jboss.scenario", "scenario2.xml"); } - private static void logLoadedPlugins(PluginContainer pluginContainer) { + private static void logLoadedPlugins(PluginContainer pluginContainer) + { Collection<PluginEnvironment> pluginEnvironments = pluginContainer.getPluginManager().getPlugins(); for (PluginEnvironment pluginEnvironment : pluginEnvironments) - LOG.debug("Loaded RHQ plugin [" + pluginEnvironment.getPluginName() + "]."); + LOG.debug("Loaded RHQ plugin [" + pluginEnvironment.getPluginName() + "]."); } - private static void setJdkLoggerLevel(String name, Level level) { + private static void setJdkLoggerLevel(String name, Level level) + { Logger facesApiLogger = Logger.getLogger(name); facesApiLogger.setLevel(level); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java 2009-05-18 17:23:38 UTC (rev 439) @@ -53,8 +53,8 @@ private NavigationAction navigationAction; /** - * Retrieves the ResourceListItem for the Resource specified - * by the current navigation path. This path must resolve to an id + * Retrieves the ResourceListItem for the Resource specified by the current navigation path. This path must resolve + * to an id * * @return a resource list item representing the resource */ @@ -86,24 +86,29 @@ // e.g. navigationAction.getSelectedNode().getResource() String path = navigationAction.getCurrentPath(); int resourceId; - try { + try + { // Temporary fix for tab error in Control and Metrics for Root Element - if (path.equals("/")) { + if (path.equals("/")) + { resourceId = 0; LOG.info("Application just started, so the Resource path is showing as '/'"); } - else { + else + { resourceId = Integer.valueOf(path); } } - catch (NumberFormatException e) { + catch (NumberFormatException e) + { throw new RuntimeException("Could not parse path [" + path + "] into a numeric Resource id."); } // we've got an id so lets go and retrieve the corresponding resource ResourceManager resourceManager = ResourceManagerFactory.resourceManager(); Resource resource = resourceManager.getResource(resourceId); - if (resource == null) { + if (resource == null) + { throw new IllegalStateException("Resource with id " + resourceId + " not found."); } return resource; Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/DatascrollerUIBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/DatascrollerUIBean.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/DatascrollerUIBean.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,36 +1,53 @@ /* - * JBoss, a division of Red Hat. - * Copyright 2009, Red Hat Middleware, LLC. All rights reserved. + * Embedded Jopr Project + * Copyright (C) 2006-2009 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 Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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.ui; +import java.io.Serializable; + import org.richfaces.component.UIDatascroller; + import org.jboss.seam.annotations.Name; -import java.io.Serializable; /** - * DatascrollerUIBean is used to store the data needed to - * reset a datascroller. - * + * DatascrollerUIBean is used to store the data needed to reset a datascroller. + * * @author Farah Juma */ @Name("datascrollerUI") public class DatascrollerUIBean implements Serializable { private UIDatascroller datascroller; - - public UIDatascroller getDatascroller() { - return datascroller; + + public UIDatascroller getDatascroller() + { + return datascroller; } - - public void setDatascroller(UIDatascroller datascroller) { - this.datascroller = datascroller; + + public void setDatascroller(UIDatascroller datascroller) + { + this.datascroller = datascroller; } /** - * Reset the datascroller to the first page. - * resetDatascroller() is called when the user changes the number - * of items displayed in a data table. + * Reset the datascroller to the first page. resetDatascroller() is called when the user changes the number of items + * displayed in a data table. */ public void resetDatascroller() { Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -21,8 +21,8 @@ import java.io.PrintWriter; +import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.util.InventoryPrinter; -import org.rhq.core.pc.PluginContainer; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; @@ -31,49 +31,61 @@ /** * A Seam component that contains actions used for debugging purposes. - * + * * @author Ian Springer */ @Name("debugAction") -public class DebugAction { +public class DebugAction +{ private static final String JBMANCON_DEBUG_SYSPROP = "jbmancon.debug"; @Out private boolean debug; - public void init() { - this.debug = Boolean.getBoolean(JBMANCON_DEBUG_SYSPROP); + public void init() + { + this.debug = Boolean.getBoolean(JBMANCON_DEBUG_SYSPROP); } - - public void dumpInventory() { + + public void dumpInventory() + { System.out.println("*********************************** INVENTORY DUMP **************************************"); InventoryPrinter.outputInventory(new PrintWriter(System.out), false); System.out.println("*****************************************************************************************"); } - public void runServerScan() { + public void runServerScan() + { System.out.println("******************************* RUNNING SERVER SCAN... **********************************"); PluginContainer.getInstance().getInventoryManager().executeServerScanImmediately(); } - public void runServiceScan() { + public void runServiceScan() + { System.out.println("******************************* RUNNING SERVICE SCAN... **********************************"); ResourceManagerFactory.resourceManager().discoverServicesAsync(); } - public void testErrorPage() { - try { + public void testErrorPage() + { + try + { throw new RuntimeException("Yikes!"); } - catch (RuntimeException re) { - try { + catch (RuntimeException re) + { + try + { throw new IllegalStateException("Ugh!", re); } - catch (IllegalStateException ise) { - try { + catch (IllegalStateException ise) + { + try + { throw new RuntimeException("Damn!", ise); } - catch (NullPointerException npe) { + catch (NullPointerException npe) + { throw new IllegalArgumentException("Drat!", npe); } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/DiscoveryAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/DiscoveryAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/DiscoveryAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -21,59 +21,66 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.on.embedded.manager.ResourceManagerFactory; import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.In; +import org.jboss.on.embedded.manager.ResourceManagerFactory; + /** - * A managed bean that periodically asynchronously executes service discovery scans. - * The {@link #checkAutodiscovery()} action will get triggered every time the user - * hits any page (configured in pages.xml), but it will only kick off a scan if the - * last scan was more than one minute ago. + * A managed bean that periodically asynchronously executes service discovery scans. The {@link #checkAutodiscovery()} + * action will get triggered every time the user hits any page (configured in pages.xml), but it will only kick off a + * scan if the last scan was more than one minute ago. * * @author Charles Crouch */ @Scope(ScopeType.APPLICATION) @Name("discoveryAction") -public class DiscoveryAction { - private final Log log = LogFactory.getLog(this.getClass()); +public class DiscoveryAction +{ + private final Log log = LogFactory.getLog(this.getClass()); // the minimum length of time (in milliseconds) between consecutive discoveries - private static final int DEFAULT_MINIMUM_SCAN_INTERVAL = 60000; // 1 minute + private static final int DEFAULT_MINIMUM_SCAN_INTERVAL = 60000; // 1 minute @In private BootstrapAction bootstrapAction; - private volatile long lastDiscoveryTime; + private volatile long lastDiscoveryTime; private int scanPeriod = DEFAULT_MINIMUM_SCAN_INTERVAL; - public int getScanPeriod() { - return this.scanPeriod; - } + public int getScanPeriod() + { + return this.scanPeriod; + } - public void setScanPeriod(int scanPeriod) { - this.scanPeriod = scanPeriod; - } - - public void checkAutodiscovery() { - if (this.bootstrapAction.isInitialized() && (System.currentTimeMillis() - lastDiscoveryTime) > DEFAULT_MINIMUM_SCAN_INTERVAL) { - // Try the timestamp check in a synchronized block. - tryAutodiscovery(); - } - } + public void setScanPeriod(int scanPeriod) + { + this.scanPeriod = scanPeriod; + } - synchronized private void tryAutodiscovery() { - log.trace("Checking if service discovery scan is needed..."); - if ((System.currentTimeMillis() - lastDiscoveryTime) > DEFAULT_MINIMUM_SCAN_INTERVAL) { - // Put the timestamp updating above the call to discoverServicesAsync(), so we don't continuously - // retry on failure, and so we don't block subsequent requests waiting to get into tryAutodiscovery(). - lastDiscoveryTime = System.currentTimeMillis(); - log.trace("Performing service discovery scan..."); - ResourceManagerFactory.resourceManager().discoverServicesAsync(); - } - } + public void checkAutodiscovery() + { + if (this.bootstrapAction.isInitialized() && (System.currentTimeMillis() - lastDiscoveryTime) > DEFAULT_MINIMUM_SCAN_INTERVAL) + { + // Try the timestamp check in a synchronized block. + tryAutodiscovery(); + } + } + + synchronized private void tryAutodiscovery() + { + log.trace("Checking if service discovery scan is needed..."); + if ((System.currentTimeMillis() - lastDiscoveryTime) > DEFAULT_MINIMUM_SCAN_INTERVAL) + { + // Put the timestamp updating above the call to discoverServicesAsync(), so we don't continuously + // retry on failure, and so we don't block subsequent requests waiting to get into tryAutodiscovery(). + lastDiscoveryTime = System.currentTimeMillis(); + log.trace("Performing service discovery scan..."); + ResourceManagerFactory.resourceManager().discoverServicesAsync(); + } + } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/ExceptionAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/ExceptionAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/ExceptionAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -23,9 +23,9 @@ import java.util.List; import org.jboss.seam.ScopeType; -import org.jboss.seam.util.Exceptions; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; +import org.jboss.seam.util.Exceptions; /** * @author Ian Springer Added: trunk/core/src/main/java/org/jboss/on/embedded/ui/FacesOutcomes.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/FacesOutcomes.java (rev 0) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/FacesOutcomes.java 2009-05-18 17:23:38 UTC (rev 439) @@ -0,0 +1,73 @@ +/* + * Embedded Jopr Project + * Copyright (C) 2006-2009 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 Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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.ui; + +/** + * Constants that are used as the Action Outputs for all the JSF Actions + * + * @author Jessica Sant + */ +public class FacesOutcomes +{ + /** + * action outcome indicating success + */ + public static final String SUCCESS = "success"; + /** + * action outcome indicating failure + */ + public static final String FAILURE = "failure"; + /** + * action outcome indicating the user canceled the action + */ + public static final String CANCEL = "cancel"; + /** + * action outcome indicating there was an error + */ + public static final String ERROR = "error"; + /** + * action outcome indicating that the ROOT summary page should be displayed + */ + public static final String ROOT = "root"; + /** + * action outcome indicating that a category summary table should be displayed + */ + public static final String CATEGORY_TABLE = "table"; + /** + * action outcome indicating that the navigation should simply be repeated + */ + public static final String REPEAT_NAV = "repeatNav"; + /** + * action outcome indicating that a resource type summary table should be displayed + */ + public static final String RESOURCE_TYPE_SUMMARY = "resourceSummary"; + /** + * action outcome indicating that a summary of this single resource instance should be displayed + */ + public static final String RESOURCE_INSTANCE = "resourceInstance"; + /** + * action outcome indicating that the summary page for the Platform resource instance should be displayed + */ + public static final String PLATFORM = "platform"; + + private FacesOutcomes() + { + } +} Property changes on: trunk/core/src/main/java/org/jboss/on/embedded/ui/FacesOutcomes.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/java/org/jboss/on/embedded/ui/MetricAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/MetricAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,23 +19,24 @@ */ package org.jboss.on.embedded.ui; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.resource.ResourceType; -import org.jboss.on.embedded.Constants; -import org.jboss.on.embedded.bean.MeasurementDisplay; -import org.jboss.on.embedded.bean.MeasurementUtils; -import org.jboss.on.embedded.bean.ResourceListItem; + import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.faces.FacesMessages; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.on.embedded.bean.MeasurementDisplay; +import org.jboss.on.embedded.bean.MeasurementUtils; +import org.jboss.on.embedded.bean.ResourceListItem; /** * Retrieves all the data for the Metric tab @@ -131,6 +132,6 @@ } } - return Constants.OUTCOME_SUCCESS; + return FacesOutcomes.SUCCESS; } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,11 +19,11 @@ */ package org.jboss.on.embedded.ui; +import java.io.Serializable; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.io.Serializable; import javax.faces.component.UIComponent; @@ -33,9 +33,9 @@ import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceCreationDataType; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.resource.ResourceCategory; import org.richfaces.component.UITree; import org.jboss.seam.ScopeType; @@ -43,7 +43,7 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.on.embedded.Constants; +import org.jboss.on.embedded.ResourceTypes; import org.jboss.on.embedded.manager.ResourceManager; import org.jboss.on.embedded.manager.ResourceManagerFactory; import org.jboss.on.embedded.ui.nav.BaseTreeNode; @@ -54,7 +54,7 @@ import org.jboss.on.embedded.ui.nav.TreeNodeWithResource; /** - * NavigationAction creates the navigation objects. + * NavigationAction creates the navigation objects. * * @author Jessica Sant * @author Charles Crouch @@ -67,6 +67,13 @@ @Scope(ScopeType.SESSION) public class NavigationAction implements Serializable { + static interface Tabs { + String CONFIGURATION = "configuration"; + String METRIC = "metric"; + String OPERATION = "operation"; + String CONTENT = "content"; + } + private Set<JONTreeNode> expandedYet = new HashSet<JONTreeNode>(); private int openDepth = 0; @@ -75,7 +82,7 @@ { return this.openDepth; } - + public void setOpenDepth(int n) { this.openDepth = n; @@ -101,16 +108,16 @@ } - @In(value = "rootNode", create=true) + @In(value = "rootNode", create = true) private JONTreeNode rootNode; - + // Its only SummaryAction.getResourceTypePath which needs this to be public - // This returns a DummyTreeNode so its generally not going to be useful to other clients + // This returns a DummyTreeNode so its generally not going to be useful to other clients public JONTreeNode getRootNode() { - return rootNode; + return rootNode; } - + // @Out(value = "navTree", required = false, scope = ScopeType.EVENT) // public HtmlTree getNavTree() // { @@ -263,15 +270,15 @@ JONTreeNode currentNode = getSelectedNode(); if (currentNode instanceof TreeNodeWithResource) { - Resource resource = ((TreeNodeWithResource) currentNode).getResource(); + Resource resource = ((TreeNodeWithResource)currentNode).getResource(); if (hasConfiguration(resource)) - enabledTabs.add(Constants.TAB_CONFIGURATION); + enabledTabs.add(Tabs.CONFIGURATION); if (hasMetrics(resource)) - enabledTabs.add(Constants.TAB_METRIC); + enabledTabs.add(Tabs.METRIC); if (resource.getResourceType().getCategory() != ResourceCategory.PLATFORM && hasOperations(resource)) - enabledTabs.add(Constants.TAB_OPERATION); + enabledTabs.add(Tabs.OPERATION); if (isContentBacked(resource)) - enabledTabs.add(Constants.TAB_CONTENT); + enabledTabs.add(Tabs.CONTENT); } return enabledTabs; } @@ -313,7 +320,7 @@ JONTreeNode currentNode = getSelectedNode(); if (currentNode instanceof TreeNodeWithResource) { - Resource resource = ((TreeNodeWithResource) currentNode).getResource(); + Resource resource = ((TreeNodeWithResource)currentNode).getResource(); return getAvailableStatus(resource); } return status; @@ -356,7 +363,8 @@ log.trace("Finding node for path [" + getCurrentPath() + "]..."); JONTreeNode selectedNode = getRootNode().findNode(getCurrentPath()); ResourceManager resourceManager = ResourceManagerFactory.resourceManager(); - if (selectedNode == null) { + if (selectedNode == null) + { log.debug("Unable to find node with path [" + this.currentPath + "]; defaulting to platform node..."); // TODO (ccrouch): I'm seeing this on login now. Comment out for now. // String errorMsg = "Unable to find node with path [" + this.currentPath + "]; defaulting to platform node..."; @@ -395,16 +403,17 @@ { return getResourcePath(resource.getId()); } - + // TODO consider have this return TreeNodeWithResourceType public ResourceTypeTreeNode findNodeByResourceTypeAndParent(ResourceType resourceType, JONTreeNode parentResourceNode) { - return ((BaseTreeNode) parentResourceNode).findNodeByType(resourceType); + return ((BaseTreeNode)parentResourceNode).findNodeByType(resourceType); } - public Boolean openNodeAdvisor(UITree tree) { - JONTreeNode data = (JONTreeNode) (tree.getTreeNode().getData()); - if (!expandedYet.contains(data) && isWithinNStepsOfPlatform(this.openDepth-1, data)) + public Boolean openNodeAdvisor(UITree tree) + { + JONTreeNode data = (JONTreeNode)(tree.getTreeNode().getData()); + if (!expandedYet.contains(data) && isWithinNStepsOfPlatform(this.openDepth - 1, data)) { expandedYet.add(data); return Boolean.TRUE; @@ -415,24 +424,26 @@ } } - private Boolean isWithinNStepsOfPlatform(int n, JONTreeNode node) { + private Boolean isWithinNStepsOfPlatform(int n, JONTreeNode node) + { if ((n < 0) || node == null) { return Boolean.FALSE; } - else + else { - return (node instanceof PlatformResourceTreeNode) || isWithinNStepsOfPlatform(n-1, node.getParent()); + return (node instanceof PlatformResourceTreeNode) || isWithinNStepsOfPlatform(n - 1, node.getParent()); } } - + // unfortunately can't tell whether this is an open or close event // so we have to re-do the childMap in all cases - public void changeExpandListener(org.richfaces.event.NodeExpandedEvent event) { - UIComponent comp = event.getComponent(); - UITree tree = (UITree) comp; - JONTreeNode jonTreeNode = (JONTreeNode) (tree.getTreeNode().getData()); - jonTreeNode.reInitializeChildrenMap(); + public void changeExpandListener(org.richfaces.event.NodeExpandedEvent event) + { + UIComponent comp = event.getComponent(); + UITree tree = (UITree)comp; + JONTreeNode jonTreeNode = (JONTreeNode)(tree.getTreeNode().getData()); + jonTreeNode.reInitializeChildrenMap(); } // /** Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java 2009-05-18 17:23:38 UTC (rev 439) @@ -21,13 +21,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; -import org.jboss.on.embedded.ui.nav.BaseTreeNode; -import org.jboss.on.embedded.ui.nav.DummyTreeNode; -import org.jboss.on.embedded.ui.nav.JONTreeNode; -import org.jboss.on.embedded.ui.nav.PlatformResourceTreeNode; -import org.jboss.on.embedded.ui.nav.ResourceTypeTreeNode; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.In; @@ -35,13 +31,18 @@ import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Out; import org.jboss.seam.core.Events; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.manager.ResourceManagerFactory; +import org.jboss.on.embedded.ui.nav.BaseTreeNode; +import org.jboss.on.embedded.ui.nav.DummyTreeNode; +import org.jboss.on.embedded.ui.nav.JONTreeNode; +import org.jboss.on.embedded.ui.nav.PlatformResourceTreeNode; +import org.jboss.on.embedded.ui.nav.ResourceTypeTreeNode; + /** - * NavigationContent class encapsulates the JONTreeNode object which - * contains the objects rendered in the navigation tree. - * Contains the methods which will update this structure as resources are added/deleted + * NavigationContent class encapsulates the JONTreeNode object which contains the objects rendered in the navigation + * tree. Contains the methods which will update this structure as resources are added/deleted * * @author Charles Crouch */ @@ -51,19 +52,20 @@ private final Log log = LogFactory.getLog(this.getClass()); // used by resourceNavigation.xhtml to render the nav - @In(value = "rootNode", create=true) - @Out(value = "rootNode", scope = ScopeType.APPLICATION) + @In(value = "rootNode", create = true) + @Out(value = "rootNode", scope = ScopeType.APPLICATION) private JONTreeNode rootNode; - - @Factory(value = "rootNode") - public JONTreeNode createJONTreeNode() { - log.trace("createJONTreeNode factory method being called."); - DummyTreeNode dummy = new DummyTreeNode(); - PlatformResourceTreeNode platform = new PlatformResourceTreeNode(ResourceManagerFactory.resourceManager().getPlatform()); + + @Factory(value = "rootNode") + public JONTreeNode createJONTreeNode() + { + log.trace("createJONTreeNode factory method being called."); + DummyTreeNode dummy = new DummyTreeNode(); + PlatformResourceTreeNode platform = new PlatformResourceTreeNode(ResourceManagerFactory.resourceManager().getPlatform()); dummy.addChild(platform); Events.instance().raiseEvent(ResourceManager.NAV_TREE_INITIALIZED); return dummy; - } + } @Observer(ResourceManager.RESOURCE_CREATED_EVENT) public void updateNavWithNewResource(ResourceType typeOfNewResource, Resource parentResource) @@ -72,22 +74,25 @@ + "] - updating nav tree..."); JONTreeNode parentResourceNode = findNode(getResourcePath(parentResource)); JONTreeNode resourceTypeNode = findNodeByResourceTypeAndParent(typeOfNewResource, parentResourceNode); - if (resourceTypeNode == null) { - // the resource type node doesn't exist yet, so lets refresh its parent to give it a chance - // to be generated. This would be the case for non-singleton resource types which started off - // with no children and can't have resource added directly to them, e.g. Embedded EJB deployments. - parentResourceNode.reInitializeChildrenMap(); - } else { - resourceTypeNode.reInitializeChildrenMap(); + if (resourceTypeNode == null) + { + // the resource type node doesn't exist yet, so lets refresh its parent to give it a chance + // to be generated. This would be the case for non-singleton resource types which started off + // with no children and can't have resource added directly to them, e.g. Embedded EJB deployments. + parentResourceNode.reInitializeChildrenMap(); } - + else + { + resourceTypeNode.reInitializeChildrenMap(); + } + } @Observer(ResourceManager.RESOURCE_DELETED_EVENT) public void updateNavWithDeletedResource(Resource deletedResource) { log.trace("Resource [" + deletedResource + "] deleted - updating nav tree..."); - JONTreeNode node = findNode(getResourcePath(deletedResource)); + JONTreeNode node = findNode(getResourcePath(deletedResource)); if (node == null) { log.warn("Unable to find node for deleted resource [" + deletedResource + "]."); @@ -96,34 +101,34 @@ JONTreeNode parentNode = node.getParent(); parentNode.reInitializeChildrenMap(); } - + @Observer(ResourceManager.RESOURCE_UPDATED_EVENT) public void updateNavWithUpdatedResource(Resource updatedResource) { - // doesn't do anything right now, but in the future this could - // regenerate the nav similar to how updateNavWithDeletedResource - // does it. This would catch any resource renames that happened - // as part of the update + // doesn't do anything right now, but in the future this could + // regenerate the nav similar to how updateNavWithDeletedResource + // does it. This would catch any resource renames that happened + // as part of the update } - + // the following methods are all copied from NavigationAction - + private JONTreeNode findNode(String path) { return rootNode.findNode(path); } - + // TODO consider having this return TreeNodeWithResourceType private ResourceTypeTreeNode findNodeByResourceTypeAndParent(ResourceType resourceType, JONTreeNode parentResourceNode) { - return ((BaseTreeNode) parentResourceNode).findNodeByType(resourceType); + return ((BaseTreeNode)parentResourceNode).findNodeByType(resourceType); } private String getResourcePath(Resource resource) { return getResourcePath(resource.getId()); } - + private String getResourcePath(Integer resourceId) { // this just happens to be the current implementation for generating the path @@ -132,5 +137,5 @@ // TODO this could call a static method on ResourceTreeNode to keep this // implementation better encapsulated return String.valueOf(resourceId); - } + } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/ResourceAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/ResourceAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/ResourceAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,16 +19,17 @@ */ package org.jboss.on.embedded.ui; +import javax.faces.application.FacesMessage; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.faces.FacesMessages; -import javax.faces.application.FacesMessage; - /** * ResourceAction handles all the interaction between the UI and the backend ResourceManager * @@ -59,9 +60,9 @@ private boolean ascending = true; /** - * Used to determine if the there are any globalMessages present. - * This is used to determine if the messages box should be rendered (this is the panelGroup surrounding the <h:messages/> tag). - * I'd love to figure out how to do this in the XHTML page itself, but until then... this method will work + * Used to determine if the there are any globalMessages present. This is used to determine if the messages box + * should be rendered (this is the panelGroup surrounding the <h:messages/> tag). I'd love to figure out how to do + * this in the XHTML page itself, but until then... this method will work * * @return "true" if there are messages present, "false" otherwise */ @@ -76,9 +77,9 @@ } /** - * returns true IFF the current faces messages has only input-specific non-INFO severity messages - * in other words -- it will return false if there are any global messages, and it will return false if any of the - * input-specific messages are of severity INFO + * returns true IFF the current faces messages has only input-specific non-INFO severity messages in other words -- + * it will return false if there are any global messages, and it will return false if any of the input-specific + * messages are of severity INFO * * @return true or false */ Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -24,24 +24,21 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.NotNull; +import org.rhq.core.clientapi.agent.inventory.DeleteResourceResponse; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; import org.jboss.seam.ScopeType; -import org.jboss.seam.core.Events; import org.jboss.seam.annotations.Create; import org.jboss.seam.annotations.Destroy; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.web.RequestParameter; import org.jboss.seam.faces.FacesMessages; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.clientapi.agent.inventory.DeleteResourceResponse; - -import org.jboss.on.embedded.Constants; import org.jboss.on.embedded.manager.ResourceManager; import org.jboss.on.embedded.manager.ResourceManagerFactory; @@ -110,7 +107,7 @@ if (resourceToBeDeleted == null) { facesMessages.add(FacesMessage.SEVERITY_ERROR, "Resource with id [" + resourceId + "] not found."); - return Constants.OUTCOME_FAILURE; + return FacesOutcomes.FAILURE; } return removeResourceAction(resourceToBeDeleted); } @@ -119,23 +116,25 @@ * calls the appropriate manager to remove this resource * * @param resource the resource to be removed - * @return a string representing the outcome of this action (Constants.OUTCOME_SUCCESS, Constants.OUTCOME_FAILURE, etc) + * @return a string representing the outcome of this action (Constants.OUTCOME_SUCCESS, Constants.OUTCOME_FAILURE, + * etc) */ public String removeResourceAction(@NotNull Resource resource) { log.debug("Removing Resource " + resource + "..."); DeleteResourceResponse deleteResourceResponse = resourceManager.removeResource(resource); - switch (deleteResourceResponse.getStatus()) { + switch (deleteResourceResponse.getStatus()) + { case SUCCESS: facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.remove.success", - resource.getResourceType().getName(), resource.getName()); - return Constants.OUTCOME_SUCCESS; + resource.getResourceType().getName(), resource.getName()); + return FacesOutcomes.SUCCESS; default: String details = (deleteResourceResponse.getErrorMessage() != null) ? deleteResourceResponse.getErrorMessage() : "Check server log for more details."; facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_ERROR, "resource.status.remove.failure", resource.getResourceType().getName(), resource.getName(), details); - return Constants.OUTCOME_FAILURE; + return FacesOutcomes.FAILURE; } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,21 +19,23 @@ */ package org.jboss.on.embedded.ui; -import org.jboss.on.embedded.manager.history.content.ContentHistoryManager; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; + +import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; +import org.rhq.core.domain.content.transfer.ResourcePackageDetails; +import org.rhq.core.domain.resource.Resource; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; -import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; -import org.rhq.core.domain.content.transfer.ResourcePackageDetails; -import org.rhq.core.domain.resource.Resource; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import java.util.ArrayList; -import java.io.Serializable; +import org.jboss.on.embedded.manager.history.content.ContentHistoryManager; @Name("contentDisplayAction") @Scope(ScopeType.SESSION) @@ -54,7 +56,8 @@ @In(create = true) private CommonActionUtil commonActionUtil; - public void getContent() { + public void getContent() + { resource = commonActionUtil.getCurrentResource(); Collection<ContentDiscoveryReport> historyForResource = contentManager.getHistoryForResource(resource); if (historyForResource != null && historyForResource.size() > 0) @@ -64,7 +67,7 @@ contentHistory = currentReport; } Set<ResourcePackageDetails> contentDetailsSet = contentHistory.getDeployedPackages(); - contentDetails = new ArrayList<ResourcePackageDetails>(contentDetailsSet); + contentDetails = new ArrayList<ResourcePackageDetails>(contentDetailsSet); } } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,39 +19,41 @@ */ package org.jboss.on.embedded.ui; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; -import org.jboss.on.embedded.manager.history.operation.OperationHistoryManager; -import org.jboss.seam.ScopeType; -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; -import org.rhq.core.domain.operation.OperationDefinition; -import org.rhq.core.domain.operation.OperationHistory; -import org.rhq.core.domain.operation.ResourceOperationHistory; -import org.rhq.core.domain.operation.OperationRequestStatus; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; - +import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; -import java.util.Map; -import java.util.HashMap; -import java.io.Serializable; import javax.faces.application.FacesMessage; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; +import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.domain.operation.OperationHistory; +import org.rhq.core.domain.operation.OperationRequestStatus; +import org.rhq.core.domain.operation.ResourceOperationHistory; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Begin; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.web.RequestParameter; +import org.jboss.seam.faces.FacesMessages; + +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.manager.ResourceManagerFactory; +import org.jboss.on.embedded.manager.history.operation.OperationHistoryManager; + /** * @author Mark Spritzler * @author Ian Springer @@ -111,22 +113,27 @@ ResourceType resourceType = getResourceType(); OperationDefinition operationDef = getOperationDefinition(resourceType, this.selectedOperationName); ConfigurationDefinition paramDef = operationDef.getParametersConfigurationDefinition(); - if (paramDef != null && !paramDef.getPropertyDefinitions().isEmpty() && this.selectedOperationParameters == null) { + if (paramDef != null && !paramDef.getPropertyDefinitions().isEmpty() && this.selectedOperationParameters == null) + { initSelectedOperationInfo(); return "missingParams"; - } else { - OperationHistory newOperationHistory = this.historyManager.addOperationHistory(operationDef.getName(), + } + else + { + OperationHistory newOperationHistory = this.historyManager.addOperationHistory(operationDef.getName(), this.selectedOperationParameters, this.currentResource, resourceType); // Null this out as soon as we're done with it, so it won't carry over to the next request. this.selectedOperationParameters = null; ResourceManager resourceManager = ResourceManagerFactory.resourceManager(); String jobId = newOperationHistory.getJobId().toString(); - try { + try + { resourceManager.invokeOperation(this.currentResource, operationDef, newOperationHistory.getParameters(), jobId); this.facesMessages.add("The #0 operation has been invoked. See the operation history below for the results once the operation has completed.", operationDef.getName()); } - catch (RuntimeException e) { + catch (RuntimeException e) + { newOperationHistory.setStatus(OperationRequestStatus.FAILURE); newOperationHistory.setErrorMessageFromThrowable(e); this.facesMessages.add(FacesMessage.SEVERITY_FATAL, "Failed to invoke operation: #0", e); @@ -146,6 +153,7 @@ /** * Makes the last row not have the dotted line. + * * @param operation Which operation is currently being displayed in that row * @return styleclass String based on whether is is the last operation in the operations collection. */ @@ -171,16 +179,18 @@ */ public String getHistoriesTableRowStyleClass(OperationHistory history) { - @SuppressWarnings({"UnnecessaryLocalVariable"}) + @SuppressWarnings({"UnnecessaryLocalVariable"}) String styleClass = (history.equals(this.selectedHistory)) ? "selectedRow" : ""; return styleClass; } - public ResourceOperationHistory getOperationHistory(int opHistoryId) { + public ResourceOperationHistory getOperationHistory(int opHistoryId) + { return this.operationHistoryMap.get(opHistoryId); } - private ResourceType getResourceType() { + private ResourceType getResourceType() + { currentResource = commonActionUtil.getCurrentResource(); //noinspection UnnecessaryLocalVariable ResourceType resourceType = currentResource.getResourceType(); @@ -200,7 +210,8 @@ if (opHistories != null) { this.operationHistories = new ArrayList<ResourceOperationHistory>(); - for (OperationHistory opHistory : opHistories) { + for (OperationHistory opHistory : opHistories) + { ResourceOperationHistory resourceOpHistory = (ResourceOperationHistory)opHistory; this.operationHistories.add(resourceOpHistory); this.operationHistoryMap.put(resourceOpHistory.getId(), resourceOpHistory); @@ -251,8 +262,9 @@ this.selectedOperationParameters = new Configuration(); } } - - private static OperationDefinition getOperationDefinition(ResourceType resourceType, String operationName) { + + private static OperationDefinition getOperationDefinition(ResourceType resourceType, String operationName) + { Set<OperationDefinition> operationDefs = resourceType.getOperationDefinitions(); for (OperationDefinition operationDef : operationDefs) { Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,41 +19,41 @@ */ package org.jboss.on.embedded.ui; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.faces.application.FacesMessage; +import javax.faces.context.FacesContext; +import javax.faces.event.ValueChangeEvent; + +import org.jetbrains.annotations.NotNull; import org.rhq.core.domain.measurement.Availability; +import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.DisplayType; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDefinition; -import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; -import org.jboss.on.embedded.Constants; -import org.jboss.on.embedded.ui.nav.NonSingletonResourceTypeTreeNode; -import org.jboss.on.embedded.ui.nav.BaseTreeNode; -import org.jboss.on.embedded.ui.nav.JONTreeNode; -import org.jboss.on.embedded.ui.nav.SubCategoryTreeNode; -import org.jboss.on.embedded.bean.MeasurementDisplay; -import org.jboss.on.embedded.bean.MeasurementUtils; -import org.jboss.on.embedded.bean.ResourceListItem; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; + import org.jboss.seam.ScopeType; -import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; +import org.jboss.seam.faces.FacesMessages; -import org.jetbrains.annotations.NotNull; +import org.jboss.on.embedded.bean.MeasurementDisplay; +import org.jboss.on.embedded.bean.MeasurementUtils; +import org.jboss.on.embedded.bean.ResourceListItem; +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.manager.ResourceManagerFactory; +import org.jboss.on.embedded.ui.nav.BaseTreeNode; +import org.jboss.on.embedded.ui.nav.JONTreeNode; +import org.jboss.on.embedded.ui.nav.NonSingletonResourceTypeTreeNode; +import org.jboss.on.embedded.ui.nav.SubCategoryTreeNode; -import javax.faces.event.ValueChangeEvent; -import javax.faces.context.FacesContext; -import javax.faces.application.FacesMessage; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.Map; - /** * blah * @@ -114,8 +114,7 @@ private String resourceTypeFilter; /** - * determines which summary page should be displayed, based on the current - * navigation node + * determines which summary page should be displayed, based on the current navigation node * * @return an outcome indicating which summary page to display. */ @@ -124,21 +123,27 @@ // TODO could consider renaming this getCurrentNavigationNode() JONTreeNode selectedNode = navigationAction.getSelectedNode(); return selectedNode.getSummaryActionOutcome(this).getOutcome(); - } - - public interface SummaryActionOutcome { - public String getOutcome(); } - - public class ResourceOutcome implements SummaryActionOutcome { - private Resource resource; - public ResourceOutcome(Resource resource) { - this.resource = resource; - } - - public String getOutcome() { + + public interface SummaryActionOutcome + { + public String getOutcome(); + } + + public class ResourceOutcome implements SummaryActionOutcome + { + private Resource resource; + + public ResourceOutcome(Resource resource) + { + this.resource = resource; + } + + public String getOutcome() + { ResourceManager resourceManager = ResourceManagerFactory.resourceManager(); - if (resourceManager.getResource(this.resource.getId()) == null) { + if (resourceManager.getResource(this.resource.getId()) == null) + { SummaryAction.this.facesMessages.add(FacesMessage.SEVERITY_WARN, "#0 '#1' no longer exists.", this.resource.getResourceType().getName(), this.resource.getName()); @@ -147,55 +152,62 @@ SummaryAction.this.navigationAction.setCurrentPath(parentNode.getPath()); // And refresh the parent node's children to remove the stale Resource node. parentNode.reInitializeChildrenMap(); - return Constants.OUTCOME_ERROR; + return FacesOutcomes.ERROR; } - setResourceAndSummaryInfo(this.resource); - return Constants.OUTCOME_RESOURCE_INSTANCE; - } + setResourceAndSummaryInfo(this.resource); + return FacesOutcomes.RESOURCE_INSTANCE; + } } - - public class NonSingletonResourceTypeOutcome implements SummaryActionOutcome { - private ResourceType resourceType; - private Resource parentResource; - - public NonSingletonResourceTypeOutcome(ResourceType resType, Resource parentResource) { - this.resourceType = resType; - this.parentResource = parentResource; - } - - public String getOutcome() { - SummaryAction.this.resourceType = this.resourceType; - SummaryAction.this.resources = getResourceListByType(this.resourceType, parentResource); - - return Constants.OUTCOME_RESOURCE_TYPE_SUMMARY; + + public class NonSingletonResourceTypeOutcome implements SummaryActionOutcome + { + private ResourceType resourceType; + private Resource parentResource; + + public NonSingletonResourceTypeOutcome(ResourceType resType, Resource parentResource) + { + this.resourceType = resType; + this.parentResource = parentResource; + } + + public String getOutcome() + { + SummaryAction.this.resourceType = this.resourceType; + SummaryAction.this.resources = getResourceListByType(this.resourceType, parentResource); + + return FacesOutcomes.RESOURCE_TYPE_SUMMARY; // ResourceTreeNode uses resource id as its 'path' variable // so the xhtml can use that as well when rendering the link for a single item, i.e. // <f:param name="path" // value="#{navigationAction.getResourcePath(resourceItem.resource.id)}"/> - } + } } - - public class SubCategoryOutcome implements SummaryActionOutcome { - private SubCategoryTreeNode selectedNode; - public SubCategoryOutcome(SubCategoryTreeNode node) { - this.selectedNode = node; - } + public class SubCategoryOutcome implements SummaryActionOutcome + { + private SubCategoryTreeNode selectedNode; - public String getOutcome() { - String outcome = Constants.OUTCOME_REPEAT_NAV; - if (!this.selectedNode.isLeaf()) { - outcome = Constants.OUTCOME_CATEGORY_TABLE; - outcome = addResourcesToList(outcome, this.selectedNode); - } + public SubCategoryOutcome(SubCategoryTreeNode node) + { + this.selectedNode = node; + } - // whatever happens make sure we set the categoryNode - SummaryAction.this.category = this.selectedNode; + public String getOutcome() + { + String outcome = FacesOutcomes.REPEAT_NAV; + if (!this.selectedNode.isLeaf()) + { + outcome = FacesOutcomes.CATEGORY_TABLE; + outcome = addResourcesToList(outcome, this.selectedNode); + } - return outcome; - } - } + // whatever happens make sure we set the categoryNode + SummaryAction.this.category = this.selectedNode; + return outcome; + } + } + private String addResourcesToList(String outcome, SubCategoryTreeNode selectedNode) { resources = new ArrayList<ResourceListItem>(); @@ -203,7 +215,7 @@ { if (childNode instanceof NonSingletonResourceTypeTreeNode) { - NonSingletonResourceTypeTreeNode nonSingletonNode = (NonSingletonResourceTypeTreeNode) childNode; + NonSingletonResourceTypeTreeNode nonSingletonNode = (NonSingletonResourceTypeTreeNode)childNode; ResourceType resourceType = nonSingletonNode.getResourceType(); if (resourceTypeFilter == null || resourceTypeFilter.equals("All Types") || resourceTypeFilter.equals(resourceType.getName())) { @@ -214,7 +226,7 @@ { // if we ever find a child which is not a NonSingletonResourceTypeTreeNode // then we should just repeat the nav - outcome = Constants.OUTCOME_REPEAT_NAV; + outcome = FacesOutcomes.REPEAT_NAV; resources.clear(); break; } @@ -230,9 +242,9 @@ public String getResourceTypePath(String resourceTypeName) { // TODO double check if this is still a problem - //need to put breakpoint here to work out why categorySummary paging is not working properly + //need to put breakpoint here to work out why categorySummary paging is not working properly //i.e. it renders the first page and the second page but not the third page - JONTreeNode treeNode = ((BaseTreeNode) navigationAction.getRootNode()).findNodeByTypeName(resourceTypeName); + JONTreeNode treeNode = ((BaseTreeNode)navigationAction.getRootNode()).findNodeByTypeName(resourceTypeName); return treeNode.getPath(); } @@ -277,17 +289,17 @@ */ private List<ResourceListItem> getResourceListByType(ResourceType resourceType, Resource parentResource) { - ResourceManager manager = ResourceManagerFactory.resourceManager(); - Set<Resource> resources = manager.getResources(resourceType, parentResource); - List<ResourceListItem> items = new ArrayList<ResourceListItem>(); - for (Resource r : resources) - { - Availability availability = manager.getAvailability(r); - ResourceListItem item = new ResourceListItem(r, availability); - items.add(item); - } - - return items; + ResourceManager manager = ResourceManagerFactory.resourceManager(); + Set<Resource> resources = manager.getResources(resourceType, parentResource); + List<ResourceListItem> items = new ArrayList<ResourceListItem>(); + for (Resource r : resources) + { + Availability availability = manager.getAvailability(r); + ResourceListItem item = new ResourceListItem(r, availability); + items.add(item); + } + + return items; } public SubCategoryTreeNode getSubCategoryNode() @@ -311,7 +323,7 @@ Object newValue = event.getNewValue(); if (newValue instanceof String) { - resourceTypeFilter = (String) newValue; + resourceTypeFilter = (String)newValue; resourceTypeFilter = resourceTypeFilter.substring(resourceTypeFilter.lastIndexOf("/") + 1, @@ -320,7 +332,7 @@ JONTreeNode selectedNode = navigationAction.getSelectedNode(); if (selectedNode instanceof SubCategoryTreeNode) { - SubCategoryTreeNode subCatTreeNode = (SubCategoryTreeNode) selectedNode; + SubCategoryTreeNode subCatTreeNode = (SubCategoryTreeNode)selectedNode; addResourcesToList("", subCatTreeNode); this.category = subCatTreeNode; } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/TableManager.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/TableManager.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/TableManager.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,16 +19,18 @@ */ package org.jboss.on.embedded.ui; +import java.io.Serializable; + +import javax.faces.model.SelectItem; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import java.io.Serializable; -import javax.faces.model.SelectItem; /** - * TableManager is used to store all of the data needed to allow the user to - * configure the number of items per page displayed in a data table. - * + * TableManager is used to store all of the data needed to allow the user to configure the number of items per page + * displayed in a data table. + * * @author Farah Juma */ @Name("tableManager") @@ -36,25 +38,29 @@ public class TableManager implements Serializable { private static final int MIN_PAGE_SIZE = 10; - + private int numRows = MIN_PAGE_SIZE; - - private SelectItem[] pageSizes = new SelectItem[] { new SelectItem("10", "10"), - new SelectItem("20", "20"), new SelectItem("50", "50") }; - - public int getNumRows() { - return this.numRows; + + private SelectItem[] pageSizes = new SelectItem[]{new SelectItem("10", "10"), + new SelectItem("20", "20"), new SelectItem("50", "50")}; + + public int getNumRows() + { + return this.numRows; } - - public void setNumRows(int numRows) { - this.numRows=numRows; + + public void setNumRows(int numRows) + { + this.numRows = numRows; } - - public int getMinimumPageSize() { + + public int getMinimumPageSize() + { return MIN_PAGE_SIZE; } - - public SelectItem[] getPageSizes() { + + public SelectItem[] getPageSizes() + { return pageSizes; - } + } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AbstractResourceConfigurationUIBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AbstractResourceConfigurationUIBean.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AbstractResourceConfigurationUIBean.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,21 +19,22 @@ */ package org.jboss.on.embedded.ui.configuration.resource; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.gui.RequestParameterNameConstants; import org.rhq.core.gui.util.FacesContextUtility; -import org.rhq.core.gui.RequestParameterNameConstants; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; /** * This is a JSF managed bean for the resource configuration view and edit pages. The contents of the page are * dynamically generated based on the ConfigurationDefinition (metadata) and Configuration (data) for a specified * resource. * <p/> - * REQUEST PARAMETERS: <li>id - a {@link org.rhq.core.domain.resource.Resource} id</li> <li>listName - the name of a list property within the - * Configuration (only required if the mapPanel property is being accessed)</li> <li>listIndex - the index of a map - * property within the above list property (only required if the mapPanel property is being accessed)</li> + * REQUEST PARAMETERS: <li>id - a {@link org.rhq.core.domain.resource.Resource} id</li> <li>listName - the name of a + * list property within the Configuration (only required if the mapPanel property is being accessed)</li> <li>listIndex + * - the index of a map property within the above list property (only required if the mapPanel property is being + * accessed)</li> * * @author Ian Springer */ Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AddNewOpenMapMemberPropertyToResourceConfigurationUIBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AddNewOpenMapMemberPropertyToResourceConfigurationUIBean.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AddNewOpenMapMemberPropertyToResourceConfigurationUIBean.java 2009-05-18 17:23:38 UTC (rev 439) @@ -25,10 +25,11 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.gui.RequestParameterNameConstants; import org.rhq.core.gui.util.FacesContextUtility; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.In; -import org.jboss.seam.ScopeType; import org.jboss.seam.faces.FacesMessages; /** Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ConfigHelperFactory.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ConfigHelperFactory.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ConfigHelperFactory.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,11 +19,12 @@ */ package org.jboss.on.embedded.ui.configuration.resource; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.ScopeType; import org.rhq.core.gui.configuration.ConfigHelperUIBean; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.annotations.Name; + /** * @author Charles Crouch */ Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/IdChunkFactory.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/IdChunkFactory.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/IdChunkFactory.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,10 +19,11 @@ */ package org.jboss.on.embedded.ui.configuration.resource; +import org.rhq.core.gui.util.IdChunkGeneratorUIBean; + +import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.Name; -import org.jboss.seam.ScopeType; -import org.rhq.core.gui.util.IdChunkGeneratorUIBean; /** * @author Mark Spritzler Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,21 +19,23 @@ */ package org.jboss.on.embedded.ui.configuration.resource; +import java.io.Serializable; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; + +import javax.faces.application.FacesMessage; + +import org.jetbrains.annotations.NotNull; +import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse; +import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; -import org.jboss.on.embedded.Constants; -import org.jboss.on.embedded.bean.ResourceListItem; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; -import org.jboss.on.embedded.ui.CommonActionUtil; import org.rhq.core.gui.configuration.ConfigHelperUIBean; import org.rhq.core.gui.util.IdChunkGeneratorUIBean; -import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse; -import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; -import org.jetbrains.annotations.NotNull; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; @@ -44,16 +46,15 @@ import org.jboss.seam.core.Conversation; import org.jboss.seam.faces.FacesMessages; -import javax.faces.application.FacesMessage; +import org.jboss.on.embedded.bean.ResourceListItem; +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.manager.ResourceManagerFactory; +import org.jboss.on.embedded.ui.CommonActionUtil; +import org.jboss.on.embedded.ui.FacesOutcomes; -import java.util.Map; -import java.util.Set; -import java.util.ResourceBundle; -import java.io.Serializable; - /** - * Managed Bean to handle Resource Configuration pages. Both Create and Edit Resource configurations - * are handled by this class. + * Managed Bean to handle Resource Configuration pages. Both Create and Edit Resource configurations are handled by this + * class. * * @author Mark Spritzler */ @@ -78,7 +79,7 @@ @In(value = "ancestorResource", required = false) private Resource ancestorResource; - + @Out(value = "resource", required = false) private ResourceListItem listItem; @@ -87,11 +88,10 @@ private ResourceBundle messages = ResourceBundle.getBundle("messages"); /** - * If the user is creating a new resource, they will come from createResourcePage1.xhtml - * They would have chosen a Template and clicked continue, which would have outjected a value - * for "serviceType" and then inject it here. Since only create will inject a serviceType - * this method also sets the actionType for this instance to CREATE, so that save will know to call - * create instead of update + * If the user is creating a new resource, they will come from createResourcePage1.xhtml They would have chosen a + * Template and clicked continue, which would have outjected a value for "serviceType" and then inject it here. + * Since only create will inject a serviceType this method also sets the actionType for this instance to CREATE, so + * that save will know to call create instead of update * * @param serviceType Resource Type of the Resource that we are trying to create */ @@ -110,7 +110,7 @@ public void setTemplateConfiguration(Configuration template) { if (template != null) - setConfiguration(template); + setConfiguration(template); } //Instance Variables used by this class but not bijected @@ -129,9 +129,9 @@ } /** - * Method that is called from the tabMenu.xhtml when the user clicks the Configuration tab - * This method will start the edit resource conversation and also sets the actionType to be UPDATE - * so that the save will know that it is editing and therefore need to call update instead of create. + * Method that is called from the tabMenu.xhtml when the user clicks the Configuration tab This method will start + * the edit resource conversation and also sets the actionType to be UPDATE so that the save will know that it is + * editing and therefore need to call update instead of create. */ @Begin public void resourceConfiguration() @@ -152,14 +152,14 @@ } /** - * This method is called when the user clicks the Save button on the configuration page. - * It also ends the conversation. + * This method is called when the user clicks the Save button on the configuration page. It also ends the + * conversation. * * @return String Results of the save success or failure. */ public String saveConfiguration() { - String result = Constants.OUTCOME_FAILURE; + String result = FacesOutcomes.FAILURE; switch (actionType) { case CREATE: @@ -173,9 +173,9 @@ break; } } - + if (result.equals("success")) - Conversation.instance().end(false); + Conversation.instance().end(false); return result; } @@ -187,12 +187,13 @@ ConfigurationUpdateResponse pluginResponse = configurationManager.updateResource(this.listItem.getResource(), resourceConfig); - switch (pluginResponse.getStatus()) { + switch (pluginResponse.getStatus()) + { case SUCCESS: { facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.update.success", this.listItem.getResource().getResourceType().getName(), this.listItem.getResource().getName()); - result = Constants.OUTCOME_SUCCESS; + result = FacesOutcomes.SUCCESS; break; } default: @@ -200,7 +201,7 @@ String baseMessage = this.messages.getString("resource.status.update.failure"); addActionFailureMessageToFacesMessages(baseMessage, pluginResponse.getErrorMessage(), pluginResponse.getConfiguration()); - result = Constants.OUTCOME_FAILURE; + result = FacesOutcomes.FAILURE; } } @@ -229,7 +230,7 @@ { facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.create.success", serviceType.getName()); - result = Constants.OUTCOME_SUCCESS; + result = FacesOutcomes.SUCCESS; break; } default: @@ -237,7 +238,7 @@ String baseMessage = this.messages.getString("resource.status.create.failure"); addActionFailureMessageToFacesMessages(baseMessage, pluginResponse.getErrorMessage(), pluginResponse.getResourceConfiguration()); - result = Constants.OUTCOME_FAILURE; + result = FacesOutcomes.FAILURE; break; } } @@ -269,7 +270,8 @@ private void addActionFailureMessageToFacesMessages(@NotNull String baseMessage, String errorDetails, Configuration resourceConfiguration) { - if (errorDetails == null || errorDetails.trim().equals("")) { + if (errorDetails == null || errorDetails.trim().equals("")) + { if (containsPropertyErrors(resourceConfiguration)) errorDetails = this.messages.getString("resource.status.invalidProps"); else Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/TemplateDropDownPopulator.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/TemplateDropDownPopulator.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/TemplateDropDownPopulator.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,28 +19,30 @@ */ package org.jboss.on.embedded.ui.configuration.resource; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Begin; +import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.web.RequestParameter; -import org.jboss.seam.ScopeType; + +import org.jboss.on.embedded.bean.ConfigTemplateSelectUtil; +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.manager.ResourceManagerFactory; import org.jboss.on.embedded.ui.NavigationAction; import org.jboss.on.embedded.ui.nav.JONTreeNode; import org.jboss.on.embedded.ui.nav.SubCategoryTreeNode; import org.jboss.on.embedded.ui.nav.TreeNodeWithResourceType; -import org.jboss.on.embedded.bean.ConfigTemplateSelectUtil; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility; -import java.util.LinkedHashMap; -import java.util.Map; - /** * @author Mark Spritzler */ @@ -60,13 +62,13 @@ @Out(value = "templateConfiguration", required = false, scope = ScopeType.CONVERSATION) private Configuration template; - + @Out(value = "ancestorResource", required = false, scope = ScopeType.CONVERSATION) private Resource ancestorResource; /** - * Takes the injected selectedTemplate value and uses it to look up the - * corresponding configuration which it then outjects + * Takes the injected selectedTemplate value and uses it to look up the corresponding configuration which it then + * outjects */ public void populateFromTemplate() { @@ -79,7 +81,7 @@ // to use as parent when creating this new resource. JONTreeNode currentNode = navigationAction.getSelectedNode(); ancestorResource = currentNode.getClosestResource(); - + serviceType = configurationManager.getResourceType(selectedResourceTypeName); Map<String, ConfigurationTemplate> templates = serviceType.getResourceConfigurationDefinition().getTemplates(); Configuration originalTemplate = templates.get(selectedTemplateName).getConfiguration(); @@ -117,12 +119,12 @@ JONTreeNode treeNode = navigationAction.findNode(selectedSubCategoryPath); if (treeNode instanceof SubCategoryTreeNode) { - SubCategoryTreeNode subCategoryNode = (SubCategoryTreeNode) treeNode; + SubCategoryTreeNode subCategoryNode = (SubCategoryTreeNode)treeNode; for (JONTreeNode childNode : subCategoryNode.getChildNodes()) { if (childNode instanceof TreeNodeWithResourceType) { - TreeNodeWithResourceType nodeWithResourceType = (TreeNodeWithResourceType) childNode; + TreeNodeWithResourceType nodeWithResourceType = (TreeNodeWithResourceType)childNode; ResourceType resourceType = nodeWithResourceType.getResourceType(); Map<String, ConfigurationTemplate> templates = resourceType.getResourceConfigurationDefinition().getTemplates(); ConfigTemplateSelectUtil.populateSelectItemsMap(templateMap, templates.keySet(), resourceType.getName()); Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/AbstractFileUploadAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/AbstractFileUploadAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/AbstractFileUploadAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,26 +1,27 @@ /* - * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Embedded Jopr Project + * Copyright (C) 2006-2009 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. + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * * This 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU Lesser 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.ui.content; import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; -import java.io.FileOutputStream; import javax.faces.application.FacesMessage; @@ -30,13 +31,14 @@ import org.jboss.seam.annotations.In; import org.jboss.seam.faces.FacesMessages; +import org.jboss.on.embedded.ui.BootstrapAction; import org.jboss.on.embedded.ui.NavigationAction; -import org.jboss.on.embedded.ui.BootstrapAction; /** * @author Ian Springer */ -public abstract class AbstractFileUploadAction { +public abstract class AbstractFileUploadAction +{ protected static final String SUCCESS_OUTCOME = "success"; protected static final String FAILURE_OUTCOME = "failure"; @@ -66,16 +68,18 @@ File tempFile; File tempDir = this.bootstrapAction.getTempDir(); File uploadsDir = new File(tempDir, "uploads"); - try { + try + { uploadsDir.mkdirs(); - tempFile = new File(uploadsDir, this.fileName); + tempFile = new File(uploadsDir, this.fileName); log.debug("Writing uploaded file to '" + tempFile + "'..."); FileOutputStream fos = new FileOutputStream(tempFile); fos.write(this.file); log.debug("Wrote " + this.file.length + " bytes to '" + tempFile + "'."); fos.close(); } - catch (IOException e) { + catch (IOException e) + { facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_ERROR, "content.resourceInstance.create.unableToCreateTempFile"); log.error("Unable to save uploaded file to temp directory " + tempDir + ".", e); Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -27,14 +27,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; - import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse; import org.rhq.core.clientapi.server.plugin.content.ContentSourcePackageDetailsKey; import org.rhq.core.domain.configuration.Configuration; @@ -45,6 +37,13 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Begin; +import org.jboss.seam.annotations.End; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.annotations.Scope; + import org.jboss.on.embedded.manager.ResourceManager; import org.jboss.on.embedded.manager.ResourceManagerFactory; import org.jboss.on.embedded.ui.nav.JONTreeNode; @@ -53,7 +52,7 @@ /** * A Seam action for creating a content-backed Resource (e.g. a WAR or an EAR). - * + * * @author Ian Springer */ @Name("createContentBackedResourceAction") @@ -97,7 +96,7 @@ return SUCCESS_OUTCOME; } - @End(ifOutcome={"success"}) + @End(ifOutcome = {"success"}) public String createContentBackedResource() { if (getFileName() == null) @@ -141,7 +140,7 @@ return SUCCESS_OUTCOME; default: String cause = (createResourceResponse.getErrorMessage() != null) ? - createResourceResponse.getErrorMessage() : "unknown"; + createResourceResponse.getErrorMessage() : "unknown"; facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_ERROR, "content.resourceInstance.create.failure", getFileName(), cause); return FAILURE_OUTCOME; Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -29,28 +29,27 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; - import org.rhq.core.clientapi.agent.PluginContainerException; import org.rhq.core.clientapi.server.plugin.content.ContentSourcePackageDetailsKey; import org.rhq.core.domain.content.PackageDetailsKey; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; +import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse; import org.rhq.core.domain.content.transfer.DeployPackagesRequest; +import org.rhq.core.domain.content.transfer.DeployPackagesResponse; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; -import org.rhq.core.domain.content.transfer.DeployPackagesResponse; -import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.content.ContentManager; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Begin; +import org.jboss.seam.annotations.End; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.annotations.Scope; + import org.jboss.on.embedded.ui.nav.JONTreeNode; import org.jboss.on.embedded.ui.nav.ResourceTreeNode; import org.jboss.on.embedded.util.ContentUtility; @@ -96,32 +95,37 @@ return FAILURE_OUTCOME; } - try { + try + { this.packageDetails = getBackingPackage(); } - catch (Exception e) { + catch (Exception e) + { facesMessages.add(FacesMessage.SEVERITY_ERROR, e.getLocalizedMessage()); return FAILURE_OUTCOME; } - + return SUCCESS_OUTCOME; } - @End(ifOutcome={"success"}) - public String updateBackingContent() { + @End(ifOutcome = {"success"}) + public String updateBackingContent() + { // NOTE: This check is necessary, because the "required" attribute of the Seam FileUpload component doesn't // work. - if (getFileName() == null) { + if (getFileName() == null) + { log.error("No file was specified in request to update backing file for " + this.resource + "."); facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_ERROR, "content.resourceInstance.update.noFileSelected"); return FAILURE_OUTCOME; } - if (!getFileName().equals(this.packageDetails.getFileName())) { + if (!getFileName().equals(this.packageDetails.getFileName())) + { log.error("Specified file '" + getFileName() + "' does not have same filename as existing file '" + this.packageDetails.getFileName() + "' for " + this.resource + "."); facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_WARN, - "content.resourceInstance.update.wrongFileName", this.packageType.getDisplayName(), + "content.resourceInstance.update.wrongFileName", this.packageType.getDisplayName(), this.packageDetails.getFileName()); return FAILURE_OUTCOME; } @@ -150,11 +154,13 @@ ContentManager contentManager = PluginContainer.getInstance().getContentManager(); DeployIndividualPackageResponse deployPackageResponse; - try { + try + { DeployPackagesResponse deployPackagesResponse = contentManager.deployPackagesImmediately(deployPackagesRequest); deployPackageResponse = deployPackagesResponse.getPackageResponses().iterator().next(); } - catch (Exception e) { + catch (Exception e) + { facesMessages.add(FacesMessage.SEVERITY_FATAL, e.getLocalizedMessage()); return FAILURE_OUTCOME; } @@ -163,7 +169,7 @@ { case SUCCESS: facesMessages.add(FacesMessage.SEVERITY_INFO, "{0} {1} updated.", this.packageType.getDisplayName(), - this.packageDetails.getFileName()); + this.packageDetails.getFileName()); return SUCCESS_OUTCOME; default: String cause = (deployPackageResponse.getErrorMessage() != null) ? @@ -174,9 +180,11 @@ } } - private ResourcePackageDetails getBackingPackage() throws Exception { + private ResourcePackageDetails getBackingPackage() throws Exception + { ContentDiscoveryReport report; - try { + try + { report = PluginContainer.getInstance().getContentManager().executeResourcePackageDiscoveryImmediately( this.resource.getId(), this.packageType.getName()); if (report.getDeployedPackages().isEmpty()) @@ -186,7 +194,8 @@ throw new IllegalStateException("More than one " + this.packageType.getName() + " package found for " + this.resource + "."); } - catch (PluginContainerException e) { + catch (PluginContainerException e) + { throw new Exception("Failed to discover underlying " + this.packageType.getName() + " package for " + this.resourceType.getName() + " Resource.", e); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/BaseTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/BaseTreeNode.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/BaseTreeNode.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,6 +17,7 @@ * 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.ui.nav; import java.util.ArrayList; @@ -29,10 +30,6 @@ import java.util.TreeSet; import java.util.concurrent.atomic.AtomicInteger; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; -import org.jboss.on.embedded.ui.SummaryAction; -import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.rhq.core.domain.resource.Resource; @@ -40,10 +37,15 @@ import org.rhq.core.domain.resource.ResourceType; import org.richfaces.model.TreeNode; +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.manager.ResourceManagerFactory; +import org.jboss.on.embedded.ui.SummaryAction; +import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; + /** - * Base class of all nodes in our nav tree, provides helper methods to subclasses - * for adding the appropriate child nodes - * + * Base class of all nodes in our nav tree, provides helper methods to subclasses for adding the appropriate child + * nodes + * * @author ccrouch */ public abstract class BaseTreeNode implements JONTreeNode @@ -79,7 +81,7 @@ } protected abstract void initChildrenMap(); - + public abstract SummaryActionOutcome getSummaryActionOutcome(SummaryAction action); public void reInitializeChildrenMap() @@ -109,9 +111,8 @@ } /** - * This method is pretty much useless to other clients - * besides the richfaces tree renderer which requires - * an Iterator over a Map.Entry in order to work + * This method is pretty much useless to other clients besides the richfaces tree renderer which requires an + * Iterator over a Map.Entry in order to work */ public Iterator<Map.Entry<Object, JONTreeNode>> getChildren() { @@ -125,45 +126,42 @@ { return getChildrenMap().values(); } - + /** - * This method is here just to workaround the fact that - * UIRepeat doesn't support Collections. - * See https://jira.jboss.org/jira/browse/JBSEAM-1253 for more details - * This doesn't need to be on the JONTreeNode interface since the method - * will be accessed via reflection on the object rather than through the - * interface + * This method is here just to workaround the fact that UIRepeat doesn't support Collections. See + * https://jira.jboss.org/jira/browse/JBSEAM-1253 for more details This doesn't need to be on the JONTreeNode + * interface since the method will be accessed via reflection on the object rather than through the interface */ public List<JONTreeNode> getChildNodesAsList() { - return new ArrayList<JONTreeNode>(getChildNodes()); + return new ArrayList<JONTreeNode>(getChildNodes()); } public JONTreeNode getChild(Object key) { return getChildrenMap().get(key); } - + /** - * This method should be preferred over addChild(Object key, TreeNode child) - * as this takes care of using the child's own key - * + * This method should be preferred over addChild(Object key, TreeNode child) as this takes care of using the child's + * own key + * * @param child the child to be added */ public void addChild(BaseTreeNode child) { - addChild(child.getKey(), child); + addChild(child.getKey(), child); } - + private String getKey() { - return key; + return key; } - + public void addChild(Object key, TreeNode child) { child.setParent(this); - getChildrenMap().put(key, (JONTreeNode) child); + getChildrenMap().put(key, (JONTreeNode)child); } public void removeChild(Object key) @@ -182,16 +180,17 @@ public void setParent(TreeNode treeNode) { - parent = (JONTreeNode) treeNode; + parent = (JONTreeNode)treeNode; } // this is just a helper method, could be a static method somewhere else private static final AtomicInteger nodeKey = new AtomicInteger(); + public static String getUniqueKey() { - return String.valueOf(nodeKey.incrementAndGet()); + return String.valueOf(nodeKey.incrementAndGet()); } - + // utility method utilized by some sub classes, these could be made static // and have you pass in the parent instance you want to add the child to // @@ -200,7 +199,7 @@ // if the resourceType is tagged with a subcategory it is ignored protected void addChildResourceTypeNode(@NotNull ResourceType resourceType, @NotNull Resource parentResource) { - addChildResourceTypeNode(resourceType, parentResource, true); + addChildResourceTypeNode(resourceType, parentResource, true); } // checks the resource type and if appropriate adds a @@ -208,23 +207,23 @@ // if the resourceType is tagged with a subcategory it is not automatically ignored protected void addChildResourceTypeNodeWithSubCategory(@NotNull ResourceType resourceType, @NotNull Resource parentResource) { - addChildResourceTypeNode(resourceType, parentResource, false); + addChildResourceTypeNode(resourceType, parentResource, false); } - + private void addChildResourceTypeNode(@NotNull ResourceType resourceType, @NotNull Resource parentResource, boolean ignoreSubCategorizedResources) { if (resourceType == null) { throw new IllegalArgumentException("ResourceType cannot be null"); } - + if (ignoreSubCategorizedResources && resourceType.getSubCategory() != null) { // don't include children that are tagged as being part of a subcategory // otherwise they will appear twice return; } - + // get all child resources of this parentResource which map the specified resourceType Set<Resource> resources = getResourceManager().getResources(resourceType, parentResource); @@ -249,8 +248,8 @@ // TODO the only thing we would miss here are resources that are added outside of the console // e.g. copy direct to /deploy, this could be worked through though by calling // reInitializeChildrenMap() after we'd run discovery. - else if (!resourceType.isSingleton() && - (!resources.isEmpty() || resourceType.isCreatable())) + else if (!resourceType.isSingleton() && + (!resources.isEmpty() || resourceType.isCreatable())) { addChild(new NonSingletonResourceTypeTreeNode(getUniqueKey(), resourceType, parentResource)); } @@ -268,7 +267,7 @@ // iterate over child resource types of this type adding child nodes Set<ResourceType> childResourceTypes = resourceType.getChildResourceTypes(); for (ResourceType childResourceType : childResourceTypes) - { + { addChildResourceTypeNode(childResourceType, parentResource); } @@ -294,8 +293,7 @@ } /** - * Finds a JONTreeNode based on its path. Looks at this node - * and its children recursively as necessary + * Finds a JONTreeNode based on its path. Looks at this node and its children recursively as necessary */ public @Nullable @@ -309,9 +307,8 @@ } /** - * Finds a ResourceTypeTreeNode based on its underlying - * resource type name. - * Looks at this node and its children recursively as necessary + * Finds a ResourceTypeTreeNode based on its underlying resource type name. Looks at this node and its children + * recursively as necessary */ // TODO move these to navigation action, as well as the NodeFinder impls // In order for this to work it must be executed against an appropriate @@ -338,7 +335,7 @@ { if (resourceType != null) { - return (ResourceTypeTreeNode) findNode(this, new ResourceTypeNodeMatcher(resourceType)); + return (ResourceTypeTreeNode)findNode(this, new ResourceTypeNodeMatcher(resourceType)); } return null; } @@ -394,7 +391,7 @@ if (node instanceof TreeNodeWithResourceType) { - TreeNodeWithResourceType nodeWithResourceType = (TreeNodeWithResourceType) node; + TreeNodeWithResourceType nodeWithResourceType = (TreeNodeWithResourceType)node; result = resourceTypeName.equals(nodeWithResourceType.getResourceType().getName()); } @@ -421,7 +418,7 @@ if (node instanceof TreeNodeWithResourceType) { - TreeNodeWithResourceType nodeWithResourceType = (TreeNodeWithResourceType) node; + TreeNodeWithResourceType nodeWithResourceType = (TreeNodeWithResourceType)node; result = resourceType.equals(nodeWithResourceType.getResourceType()); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/DummyTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/DummyTreeNode.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/DummyTreeNode.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,44 +17,40 @@ * 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.ui.nav; +import org.rhq.core.domain.resource.Resource; + import org.jboss.on.embedded.ui.SummaryAction; import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; -import org.rhq.core.domain.resource.Resource; -public class DummyTreeNode extends BaseTreeNode -{ - public DummyTreeNode() - { +public class DummyTreeNode extends BaseTreeNode { + public DummyTreeNode() { super(getUniqueKey()); } - protected void initChildrenMap() - { + protected void initChildrenMap() { // no-op } - public String getPath() - { + public String getPath() { return "no-path"; } - public String getName() - { + public String getName() { return "no-name"; } - public String getDescription() - { + public String getDescription() { return "no-description"; } - public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) { - throw new UnsupportedOperationException("Should not be calling getSummaryActionOutcome() on DummyTreeNode."); - } - - public Resource getClosestResource() { - throw new UnsupportedOperationException("Should not be calling getClosestAncestorResource() on DummyTreeNode."); + public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) { + throw new UnsupportedOperationException("Should not be calling getSummaryActionOutcome() on DummyTreeNode."); } + + public Resource getClosestResource() { + throw new UnsupportedOperationException("Should not be calling getClosestAncestorResource() on DummyTreeNode."); + } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/JONTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/JONTreeNode.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/JONTreeNode.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,18 +17,20 @@ * 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.ui.nav; -import org.jboss.on.embedded.ui.SummaryAction; -import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; +import java.util.Collection; + import org.rhq.core.domain.resource.Resource; import org.richfaces.model.TreeNode; -import java.util.Collection; +import org.jboss.on.embedded.ui.SummaryAction; +import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; /** - * Interface which adds methods on top of TreeNode - * Aim is to avoid using direct references to the richfaces TreeNode class + * Interface which adds methods on top of TreeNode Aim is to avoid using direct references to the richfaces TreeNode + * class */ public interface JONTreeNode extends TreeNode { @@ -49,20 +51,18 @@ void reInitializeChildrenMap(); - /** - * Returns one of SummaryAction's inner classes to indicate what sort - * of summary page should be displayed when the user clicks on - * a particular type of node - */ + /** + * Returns one of SummaryAction's inner classes to indicate what sort of summary page should be displayed when the + * user clicks on a particular type of node + */ SummaryActionOutcome getSummaryActionOutcome(SummaryAction action); - /** - * Returns the closest resource associated to this node, - * i.e. the resource associated directly with the node, or the + /** + * Returns the closest resource associated to this node, i.e. the resource associated directly with the node, or the * resource associated with its parent node */ Resource getClosestResource(); - + // TODO this should be moved off of here JONTreeNode findNode(String path); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/NonSingletonResourceTypeTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/NonSingletonResourceTypeTreeNode.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/NonSingletonResourceTypeTreeNode.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,24 +17,24 @@ * 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.ui.nav; -import org.jboss.on.embedded.ui.SummaryAction; -import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; +import java.util.Set; + import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; -import java.util.Set; +import org.jboss.on.embedded.ui.SummaryAction; +import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; /** - * Class representing a node in the nav tree which holds a resource type - * which is not a singleton. - * - * Supports having zero or more of each of the following as child nodes - * a) ResourceTreeNode, for resources associated with this resource type - * + * Class representing a node in the nav tree which holds a resource type which is not a singleton. + * <p/> + * Supports having zero or more of each of the following as child nodes a) ResourceTreeNode, for resources associated + * with this resource type + * * @author ccrouch - * */ public class NonSingletonResourceTypeTreeNode extends ResourceTypeTreeNode { @@ -50,7 +50,7 @@ for (Resource resource : resources) { addChild(new ResourceTreeNode(getUniqueKey(), resource)); - } + } } @Override @@ -71,16 +71,18 @@ return pluralize(getResourceType().getName()); } - public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) { - return action.new NonSingletonResourceTypeOutcome(getResourceType(), getParentResource()); - } + public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) + { + return action.new NonSingletonResourceTypeOutcome(getResourceType(), getParentResource()); + } - private static String pluralize(String noun) { + private static String pluralize(String noun) + { if (noun.endsWith("y")) return noun.substring(0, noun.length() - 1) + "ies"; else if (noun.endsWith("s")) return noun; else return noun + "s"; - } + } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/PlatformResourceTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/PlatformResourceTreeNode.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/PlatformResourceTreeNode.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,43 +17,40 @@ * 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.ui.nav; -import org.rhq.core.domain.resource.Resource; - import java.util.Set; +import org.rhq.core.domain.resource.Resource; + /** * Class representing a node in the nav tree which holds a platform - * - * Supports having zero or more of each of the following as child nodes - * a) ResourceTypeNode, to capture child resources of this platform that aren't defined - * in its plugin descriptor e.g. JBAS servers - * b) other child nodes as specified by ResourceTreeNode, e.g. to pick up platform services - * - * @author ccrouch + * <p/> + * Supports having zero or more of each of the following as child nodes a) ResourceTypeNode, to capture child resources + * of this platform that aren't defined in its plugin descriptor e.g. JBAS servers b) other child nodes as specified by + * ResourceTreeNode, e.g. to pick up platform services * + * @author ccrouch */ -public class PlatformResourceTreeNode extends ResourceTreeNode -{ - public PlatformResourceTreeNode(Resource resource) - { +public class PlatformResourceTreeNode extends ResourceTreeNode { + public PlatformResourceTreeNode(Resource resource) { super(getUniqueKey(), resource); } protected void initChildrenMap() { // Server resources, e.g. JBAS, hang directly off the platform without - // an intervening resource type. In order to present these in a "nice way" - // in the nav, we add nodes for the resource types of each of the child - // resources underneath the platform, rather than just the resources themselves. + // an intervening resource type. In order to present these in a "nice way" + // in the nav, we add nodes for the resource types of each of the child + // resources underneath the platform, rather than just the resources themselves. // The resources in turn will show up under their corresponding resource type nodes Set<Resource> childResources = getResource().getChildResources(); for (Resource childResource : childResources) { addChildResourceTypeNode(childResource.getResourceType(), getResource()); } - + // do the standard initialization for a ResourceTreeNode super.initChildrenMap(); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTreeNode.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTreeNode.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,22 +17,22 @@ * 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.ui.nav; +import org.jetbrains.annotations.NotNull; +import org.rhq.core.domain.resource.Resource; + import org.jboss.on.embedded.ui.SummaryAction; import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; -import org.rhq.core.domain.resource.Resource; -import org.jetbrains.annotations.NotNull; /** - * Class representing a node in the nav tree which holds any non-platform - * resource. - * - * Supports having zero or more of each of the following as child nodes - * a) ResourceTypeTreeNode, for child types of this resource's type - * b) SubCategoryTreeNode, for sub categories defined on this resource's type - * - * @author ccrouch + * Class representing a node in the nav tree which holds any non-platform resource. + * <p/> + * Supports having zero or more of each of the following as child nodes a) ResourceTypeTreeNode, for child types of this + * resource's type b) SubCategoryTreeNode, for sub categories defined on this resource's type + * + * @author ccrouch */ public class ResourceTreeNode extends BaseTreeNode implements TreeNodeWithResource { @@ -54,14 +54,15 @@ addChildResourceTypeOrSubCategoryNodes(getResource().getResourceType(), getResource()); } - public Resource getClosestResource() { - return resource; + public Resource getClosestResource() + { + return resource; } - + public String getPath() { - // TODO can't change this without changing the corresponding methods on NavigationAction - // e.g. getResourcePath(Integer resourceId), and the places that call that, e.g. resourceTypeSummary.xhtml + // TODO can't change this without changing the corresponding methods on NavigationAction + // e.g. getResourcePath(Integer resourceId), and the places that call that, e.g. resourceTypeSummary.xhtml return String.valueOf(getResource().getId()); } @@ -80,9 +81,10 @@ return this.resource; } - public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) { - return action.new ResourceOutcome(this.resource); - } + public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) + { + return action.new ResourceOutcome(this.resource); + } @Override public String toString() Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTypeTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTypeTreeNode.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTypeTreeNode.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,6 +17,7 @@ * 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.ui.nav; import org.rhq.core.domain.resource.Resource; @@ -24,56 +25,50 @@ /** * Abstract class representing a node in the nav tree which holds a resource type. - * + * <p/> * Which child nodes are supported is determined by the subclasses - * - * @author ccrouch * + * @author ccrouch */ -public abstract class ResourceTypeTreeNode extends BaseTreeNode implements TreeNodeWithResourceType -{ +public abstract class ResourceTypeTreeNode extends BaseTreeNode implements TreeNodeWithResourceType { private ResourceType resourceType; - + // The closest ancestor resource to this resource type. // This is used to make sure that when we retrieve resources matching the given resourceType // that we only return those that are children of the given parentResource private Resource parentResource; - public ResourceTypeTreeNode(String key, ResourceType type, Resource parentResource) - { + public ResourceTypeTreeNode(String key, ResourceType type, Resource parentResource) { super(key); - if (type == null) - { - throw new IllegalArgumentException("ResourceTypeTreeNode requires a ResourceType. Null was passed into the constructor"); + if (type == null) { + throw new IllegalArgumentException( + "ResourceTypeTreeNode requires a ResourceType. Null was passed into the constructor"); } - if (parentResource == null) - { - throw new IllegalArgumentException("ResourceTypeTreeNode requires a Resource. Null was passed into the constructor"); + if (parentResource == null) { + throw new IllegalArgumentException( + "ResourceTypeTreeNode requires a Resource. Null was passed into the constructor"); } setResourceType(type); this.parentResource = parentResource; } - public Resource getClosestResource() { - return parentResource; + public Resource getClosestResource() { + return parentResource; } - - public void setResourceType(ResourceType resourceType) - { + + public void setResourceType(ResourceType resourceType) { this.resourceType = resourceType; } - public ResourceType getResourceType() - { + public ResourceType getResourceType() { return this.resourceType; } - public String getDescription() - { + public String getDescription() { return getResourceType().getDescription(); } - public Resource getParentResource() { - return parentResource; - } + public Resource getParentResource() { + return parentResource; + } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SingletonResourceTypeTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SingletonResourceTypeTreeNode.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SingletonResourceTypeTreeNode.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,6 +17,7 @@ * 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.ui.nav; import org.rhq.core.domain.resource.Resource; @@ -26,34 +27,32 @@ import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; /** - * Class representing a node in the nav tree which holds a resource type - * which is a singleton. - * - * Supports having zero or more of each of the following as child nodes - * a) ResourceTypeTreeNode, for child types of this resource's type - * b) SubCategoryTreeNode, for sub categories defined on this resource's type - * + * Class representing a node in the nav tree which holds a resource type which is a singleton. + * <p/> + * Supports having zero or more of each of the following as child nodes a) ResourceTypeTreeNode, for child types of this + * resource's type b) SubCategoryTreeNode, for sub categories defined on this resource's type + * * @author ccrouch - * */ public class SingletonResourceTypeTreeNode extends ResourceTypeTreeNode implements TreeNodeWithResource { private Resource singletonInstance; - + public SingletonResourceTypeTreeNode(String key, ResourceType type, Resource singletonInstance, Resource parentResource) { super(key, type, parentResource); this.singletonInstance = singletonInstance; } - + protected void initChildrenMap() { addChildResourceTypeOrSubCategoryNodes(getResourceType(), getResource()); } - - public Resource getClosestResource() { - return singletonInstance; + + public Resource getClosestResource() + { + return singletonInstance; } public Resource getResource() @@ -76,8 +75,9 @@ { return singletonInstance.getName(); } - - public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) { - return action.new ResourceOutcome(this.singletonInstance); - } + + public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) + { + return action.new ResourceOutcome(this.singletonInstance); + } } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SubCategoryTreeNode.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,33 +17,34 @@ * 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.ui.nav; -import org.jboss.on.embedded.ui.SummaryAction; -import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; +import java.util.Collection; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceSubCategory; import org.rhq.core.domain.resource.ResourceType; -import java.util.Collection; -import java.util.List; -import java.util.TreeSet; -import java.util.Set; +import org.jboss.on.embedded.ui.SummaryAction; +import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome; /** * Class representing a node in the nav tree which holds a sub category. - * - * Supports having zero or more of each of the following as child nodes - * a) ResourceTypeTreeNode, for types tagged with this sub category - * b) SubCategoryTreeNode, for sub categories defined as children of this one - * - * @author ccrouch + * <p/> + * Supports having zero or more of each of the following as child nodes a) ResourceTypeTreeNode, for types tagged with + * this sub category b) SubCategoryTreeNode, for sub categories defined as children of this one + * + * @author ccrouch */ public class SubCategoryTreeNode extends BaseTreeNode { private ResourceSubCategory subCategory; private Resource parentResource; - + public SubCategoryTreeNode(String key, ResourceSubCategory subCategory, Resource parentResource) { super(key); @@ -59,9 +60,9 @@ { // iterate over any resource types which have been tagged with this // sub category and add appropriate child nodes - Collection<ResourceType> taggedResourceTypes = getSubCategory().findTaggedResourceTypes(); + Collection<ResourceType> taggedResourceTypes = getSubCategory().findTaggedResourceTypes(); for (ResourceType taggedResourceType : taggedResourceTypes) - { + { addChildResourceTypeNodeWithSubCategory(taggedResourceType, parentResource); } @@ -73,9 +74,10 @@ addChild(new SubCategoryTreeNode(getUniqueKey(), subCategory, parentResource)); } } - - public Resource getClosestResource() { - return parentResource; + + public Resource getClosestResource() + { + return parentResource; } public String getPath() @@ -99,9 +101,10 @@ return this.subCategory; } - public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) { - return action.new SubCategoryOutcome(this); - } + public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) + { + return action.new SubCategoryOutcome(this); + } @Override public String toString() Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/TreeNodeWithResource.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/TreeNodeWithResource.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/TreeNodeWithResource.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,12 +17,12 @@ * 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.ui.nav; import org.rhq.core.domain.resource.Resource; // TODO consider making this extend JONTreeNode so instances would be fully usable -public interface TreeNodeWithResource -{ +public interface TreeNodeWithResource { public Resource getResource(); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/TreeNodeWithResourceType.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/TreeNodeWithResourceType.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/TreeNodeWithResourceType.java 2009-05-18 17:23:38 UTC (rev 439) @@ -17,12 +17,12 @@ * 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.ui.nav; import org.rhq.core.domain.resource.ResourceType; // TODO consider making this extend JONTreeNode so instances would be fully usable -public interface TreeNodeWithResourceType -{ +public interface TreeNodeWithResourceType { public ResourceType getResourceType(); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/util/ContentUtility.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/util/ContentUtility.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/java/org/jboss/on/embedded/util/ContentUtility.java 2009-05-18 17:23:38 UTC (rev 439) @@ -1,34 +1,34 @@ /* - * RHQ Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Embedded Jopr Project + * Copyright (C) 2006-2009 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. + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. * * This 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. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU Lesser 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.util; import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.Nullable; - import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.content.PackageType; +import org.rhq.core.domain.resource.ResourceCreationDataType; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.resource.ResourceCreationDataType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * @author Ian Springer @@ -64,7 +64,8 @@ } @Nullable - public static Configuration getDefaultDeploymentConfiguration(PackageType packageType){ + public static Configuration getDefaultDeploymentConfiguration(PackageType packageType) + { ConfigurationDefinition configurationDefinition = packageType.getDeploymentConfigurationDefinition(); Configuration configuration = null; if (configurationDefinition != null) Modified: trunk/core/src/main/webapp/WEB-INF/components.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/components.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/WEB-INF/components.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -26,14 +26,15 @@ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd"> <component name="org.jboss.seam.core.init"> - <property name="debug">false</property> <!-- enable only when needed --> - <property name="transactionManagementEnabled">false</property> + <property name="debug">false</property> + <!-- enable only when needed --> + <property name="transactionManagementEnabled">false</property> </component> <component name="navigationAction"> <property name="openDepth">4</property> </component> - + <component name="discoveryAction"> <property name="scanPeriod">60000</property> </component> Modified: trunk/core/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/faces-config.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/WEB-INF/faces-config.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -43,7 +43,7 @@ <application> <!-- initial viewhandler: --> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> <!-- Customize JSF validation messages --> <message-bundle>messages</message-bundle> Modified: trunk/core/src/main/webapp/WEB-INF/pages.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/pages.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/WEB-INF/pages.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -28,7 +28,7 @@ <!--no-conversation-view-id="/main.xhtml"--> <!--login-view-id="/home.xhtml"--> - <!-- Fix for JBMANCON-353 --> + <!-- Fix for JBMANCON-353 --> <page view-id="/login.xhtml"> <navigation> <rule if="#{s:hasRole('JBossAdmin')}"> @@ -74,20 +74,20 @@ <page view-id="/secure/resourceTypeSummary.xhtml"> <navigation from-action="#{createContentBackedResourceAction.init()}"> - <rule if-outcome="success"> - <redirect view-id="/secure/resourceContentCreate.xhtml"/> - </rule> - </navigation> + <rule if-outcome="success"> + <redirect view-id="/secure/resourceContentCreate.xhtml"/> + </rule> + </navigation> </page> <page view-id="/secure/resourceContentCreate.xhtml"> <navigation> <rule if-outcome="success"> - <redirect view-id="/secure/summary.xhtml"/> - </rule> - <rule if-outcome="failure"> - <render view-id="/secure/resourceContentCreate.xhtml"/> - </rule> + <redirect view-id="/secure/summary.xhtml"/> + </rule> + <rule if-outcome="failure"> + <render view-id="/secure/resourceContentCreate.xhtml"/> + </rule> </navigation> </page> @@ -189,8 +189,8 @@ <!-- This is done to ensure that the login screen after logging out has a Conversation. --> <navigation from-action="#{identity.logout}"> <redirect view-id="/index.xhtml"/> - </navigation> - + </navigation> + <navigation from-action="#{resourceCRUDAction.removeResourceAction()}"> <redirect view-id="/secure/summary.xhtml"/> </navigation> Modified: trunk/core/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/web.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/WEB-INF/web.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -52,8 +52,8 @@ <!-- Lazily start up the Seam Filter --> <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> + <param-name>org.jboss.on.embedded.LazyStartupFilter</param-name> + <param-value>org.jboss.seam.servlet.SeamFilter</param-value> </init-param> </filter> <filter-mapping> Modified: trunk/core/src/main/webapp/css/console-style.css =================================================================== --- trunk/core/src/main/webapp/css/console-style.css 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/css/console-style.css 2009-05-18 17:23:38 UTC (rev 439) @@ -46,10 +46,10 @@ */ height: 49px; color: #dddddd; - position: absolute; - top: 0; - left: 0; - width: 100%; + position: absolute; + top: 0; + left: 0; + width: 100%; } #pageheader a { @@ -64,48 +64,45 @@ line-height: 160%; } -#content - { - margin-top: 46px; - margin-left: 20em; - margin-right: 0; - margin-bottom: 20px; - padding: 1em; - background: #FFFFFF; - } +#content { + margin-top: 46px; + margin-left: 20em; + margin-right: 0; + margin-bottom: 20px; + padding: 1em; + background: #FFFFFF; +} -#sidebar-left - { - position: absolute; - top: 46px; - bottom: 31px; /* Operas 5 + 6 shouldn't see this property */ - left: 0; - width: 20em; - overflow: auto; - background: #eff2f4; - border-right: 1px solid #dee6ee; +#sidebar-left { + position: absolute; + top: 46px; + bottom: 31px; /* Operas 5 + 6 shouldn't see this property */ + left: 0; + width: 20em; + overflow: auto; + background: #eff2f4; + border-right: 1px solid #dee6ee; - } +} -#footer - { - position: absolute; /* Operas 5 + 6, need this to be relative */ - bottom: 0; - left: 0; - width: 100%; - height: 31px; - color:#dbe7ee; - font-size:9px; - text-align: center; - background: #35485d; +#footer { + position: absolute; /* Operas 5 + 6, need this to be relative */ + bottom: 0; + left: 0; + width: 100%; + height: 31px; + color: #dbe7ee; + font-size: 9px; + text-align: center; + background: #35485d; } /*\*/ -body>#pageheader, body>#sidebar-left, body>#footer - { - position: fixed; +body>#pageheader, body>#sidebar-left, body>#footer { + position: fixed; } + /* Exclude Mac IE5 from fixed - exclude for Opera 5 + 6 if needed */ /* ]]> */ @@ -196,24 +193,23 @@ /* ------------------------ Error page styles -------------------------- */ #errorbox { - margin-top: 80px; - margin-left: 100px; - margin-right:100px; - background: #ffffff; - padding: 30px 60px 30px 150px; - border: 1px solid #5f6a6f; - background-image:url(../images/errorpage_icon.gif); - background-repeat:no-repeat; - background-position: 30px 40px; + margin-top: 80px; + margin-left: 100px; + margin-right: 100px; + background: #ffffff; + padding: 30px 60px 30px 150px; + border: 1px solid #5f6a6f; + background-image: url(../images/errorpage_icon.gif); + background-repeat: no-repeat; + background-position: 30px 40px; - } #errorbox #codebox { - height: 250px; - overflow:auto; - background-color:#eff2f4; - padding: 10px; + height: 250px; + overflow: auto; + background-color: #eff2f4; + padding: 10px; } /* ------------------------ Login styles -------------------------- */ @@ -245,7 +241,6 @@ .content2 a:hover { } - /* ----------------------------- float styles --------------------------- */ .floatright { @@ -283,7 +278,7 @@ #tabmenu { font: bold 1em "Lucida Grand", Arial, sans-serif; width: 100%; - background: url( ../images/TabBkgUnderline.gif ) repeat-x bottom; + background: url(../images/TabBkgUnderline.gif) repeat-x bottom; } #tabmenu ul { @@ -296,7 +291,7 @@ #tabmenu li { float: left; display: inline; - background: url( ../images/TabBkgLeft.gif ) no-repeat top left; + background: url(../images/TabBkgLeft.gif) no-repeat top left; margin: 0px; padding: 0px 0px 0px 2px; @@ -307,7 +302,7 @@ margin: 0px; padding: 5px 15px 4px; color: #3d5b75; - background: url( ../images/TabBkgActive.gif ) no-repeat top right; + background: url(../images/TabBkgActive.gif) no-repeat top right; text-decoration: none; border-bottom: 1px solid #5f6a6f; } @@ -317,7 +312,7 @@ margin: 0px; padding: 5px 15px 4px; color: #233346; - background: url( ../images/TabBkgHighlight.gif ) no-repeat top right; + background: url(../images/TabBkgHighlight.gif) no-repeat top right; text-decoration: none; border-bottom: 1px solid #ffffff; } @@ -327,7 +322,7 @@ margin: 0px; padding: 5px 15px 4px; color: #a3a4a4; - background: url( ../images/TabBkgDisabled.gif ) no-repeat top right; + background: url(../images/TabBkgDisabled.gif) no-repeat top right; text-decoration: none; border-bottom: 1px solid #5f6a6f; } @@ -359,7 +354,7 @@ border: 1px solid #d0a131; background-color: #fceecf; vertical-align: middle; - display: block; + display: block; } .messagingBox ul { @@ -372,7 +367,7 @@ } .messagingSuccess { - background-image: url( ../images/ico_message_success.gif ); + background-image: url(../images/ico_message_success.gif); background-repeat: no-repeat; background-position: left center; color: #3b6b1b; @@ -381,7 +376,7 @@ } .messagingFail { - background-image: url( ../images/ico_message_fail.gif ); + background-image: url(../images/ico_message_fail.gif); background-repeat: no-repeat; background-position: left center; color: #cc0000; @@ -498,7 +493,7 @@ } .operationFailure { - color: #CC0000; + color: #CC0000; margin-right: 4px; } @@ -527,8 +522,8 @@ .detailPanel { border-top-width: 0; border-bottom-width: 0; - background-image:url(../images/detailpanel_bkg.gif); - background-repeat:repeat-x; + background-image: url(../images/detailpanel_bkg.gif); + background-repeat: repeat-x; padding: 0px 10px; margin: 0px; position: center; @@ -539,11 +534,12 @@ } .detailPanel .properties-table .OddRow { - background-color:white;} + background-color: white; +} .detailPanel .properties-table-header-cell { background-color: #eef1f3; - background-image:none; + background-image: none; border-top: 1px solid #d9e0e3; border-right: 1px solid #d9e0e3; border-bottom: 1px solid #d9e0e3; @@ -630,7 +626,7 @@ } .sectionalLinks ol { - list-style-image: url( ../images/iconLinkArrowBlue.gif ); + list-style-image: url(../images/iconLinkArrowBlue.gif); list-style-type: circle; } @@ -680,7 +676,7 @@ .rich-table-headercell { background-color: #d9e0e3; - background-image: url( ../images/TablePrimary_Norm.gif ); + background-image: url(../images/TablePrimary_Norm.gif); background-position: top; background-repeat: repeat-x; font-size: 10px; @@ -706,7 +702,7 @@ border-left: none; padding-left: 8px; padding-right: 30px; - white-space:nowrap; + white-space: nowrap; } .rich-table-row { @@ -756,7 +752,7 @@ .link-unavailable { padding-left: 18px; color: #6b4c4c; - background-image: url( ../images/iconLeafDisa.gif ); + background-image: url(../images/iconLeafDisa.gif); background-repeat: no-repeat; background-position: 0px 0px; padding-bottom: 2px; @@ -764,7 +760,7 @@ .link-available { padding-left: 18px; - background-image: url( ../images/iconLeafNorm.gif ); + background-image: url(../images/iconLeafNorm.gif); background-repeat: no-repeat; background-position: 0px 0px; padding-bottom: 2px; @@ -776,7 +772,7 @@ border-right: none; border-bottom: 1px solid #d9e0e3; width: 100%; - white-space:normal; + white-space: normal; } /* ------Style for the action header used above the dataTable */ Modified: trunk/core/src/main/webapp/css/form-style.css =================================================================== --- trunk/core/src/main/webapp/css/form-style.css 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/css/form-style.css 2009-05-18 17:23:38 UTC (rev 439) @@ -22,14 +22,14 @@ /* --------------------- link arrows for the expand all / collapse all feature --------------- */ .ExpandAllLink { - background-image: url( ../images/ico_trigger_grey_expand.gif ); + background-image: url(../images/ico_trigger_grey_expand.gif); background-repeat: no-repeat; background-position: 3px 3px; padding-left: 12px; } .CollapseAllLink { - background-image: url( ../images/ico_trigger_grey_collapse.gif ); + background-image: url(../images/ico_trigger_grey_collapse.gif); background-repeat: no-repeat; background-position: 3px 3px; padding-left: 12px; @@ -233,7 +233,7 @@ .properties-table-header-cell { background-color: #d9e0e3; - background-image: url( ../images/TablePrimary_Norm.gif ); + background-image: url(../images/TablePrimary_Norm.gif); background-position: top; background-repeat: repeat-x; font-size: 10px; @@ -249,7 +249,7 @@ .nested-properties-table-header-cell { background-color: #d9e0e3; - background-image: url( ../images/TableSecondary_Norm.gif ); + background-image: url(../images/TableSecondary_Norm.gif); background-position: top; background-repeat: repeat-x; font-size: 10px; @@ -470,7 +470,7 @@ .property-map-summary-data-header-cell { background-color: #d9e0e3; - background-image: url( ../images/TableSecondary_Norm.gif ); + background-image: url(../images/TableSecondary_Norm.gif); background-position: top; background-repeat: repeat-x; font-size: 10px; @@ -520,7 +520,7 @@ } .error-msg { - background-image: url( ../images/ico_message_inlineerror.gif ); + background-image: url(../images/ico_message_inlineerror.gif); background-repeat: no-repeat; padding-left: 18px; font-weight: bold; Modified: trunk/core/src/main/webapp/error.xhtml =================================================================== --- trunk/core/src/main/webapp/error.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/error.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -28,23 +28,28 @@ <f:view> <ui:composition template="/errorLayout.xhtml"> <!-- body --> - <ui:define name="body"> + <ui:define name="body"> <div id="errorbox"> <h1>#{messages['exception.heading']}</h1> + <p>#{messages['exception.paragraph1']}</p> + <p>#{messages['exception.paragraph2a']} <a href="index.html">#{messages['exception.paragraph2b']}</a> - #{messages['exception.paragraph2c']}</p> + #{messages['exception.paragraph2c']}</p> + <h3 style="padding-top: 12px; border-bottom: 1px solid #e6eaef;">Error details:</h3> + <div id="codebox"> <a4j:repeat value="#{exceptionAction.causes}" var="cause" rowKeyVar="rowKey"> - <div style="margin-bottom: 15px"> - <b><h:outputLabel rendered="#{rowKey ne 0}">Caused by: </h:outputLabel>#{cause}</b><br/> - <div style="margin-left: 20px"> - <ui:repeat value="#{cause.stackTrace}" var="stackElement"> - at #{stackElement}<br/> - </ui:repeat> - </div> - </div> + <div style="margin-bottom: 15px"> + <b><h:outputLabel rendered="#{rowKey ne 0}">Caused by: </h:outputLabel>#{cause}</b><br/> + + <div style="margin-left: 20px"> + <ui:repeat value="#{cause.stackTrace}" var="stackElement"> + at #{stackElement}<br/> + </ui:repeat> + </div> + </div> </a4j:repeat> </div> </div> Modified: trunk/core/src/main/webapp/errorLayout.xhtml =================================================================== --- trunk/core/src/main/webapp/errorLayout.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/errorLayout.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -26,34 +26,34 @@ xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:remove> - <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and - other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. - We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since - including an xml prolog causes IE6 to go into the undesirable "quirks mode". - (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> + <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and + other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. + We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since + including an xml prolog causes IE6 to go into the undesirable "quirks mode". + (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> </ui:remove> <f:view contentType="text/html; charset=UTF-8"> - <head> - <base href="#{baseUrl}" /> - <title> - <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> - </title> + <head> + <base href="#{baseUrl}"/> + <title> + <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> + </title> - <link href="css/console-style.css" rel="stylesheet" type="text/css"/> - <link href="css/form-style.css" rel="stylesheet" type="text/css"/> + <link href="css/console-style.css" rel="stylesheet" type="text/css"/> + <link href="css/form-style.css" rel="stylesheet" type="text/css"/> - <link rel="icon" type="image/png" href="images/favicon.png"/> - <link rel="apple-touch-icon" href="images/favicon.png"/> + <link rel="icon" type="image/png" href="images/favicon.png"/> + <link rel="apple-touch-icon" href="images/favicon.png"/> - <script type="text/javascript" src="js/embedded.js"></script> - </head> - <body > - <div class="container"> - <ui:include src="include/header.xhtml"/> - <ui:insert name="body">body goes here</ui:insert> - </div> - </body> + <script type="text/javascript" src="js/embedded.js"></script> + </head> + <body> + <div class="container"> + <ui:include src="include/header.xhtml"/> + <ui:insert name="body">body goes here</ui:insert> + </div> + </body> </f:view> </html> \ No newline at end of file Modified: trunk/core/src/main/webapp/include/footer.xhtml =================================================================== --- trunk/core/src/main/webapp/include/footer.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/include/footer.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -38,7 +38,7 @@ rendered="#{not empty messages['product.buildNumber']}"/> <br/> <h:outputText escape="false" value="#{messages['product.copyright']}"/> - </div> + </div> </ui:composition> </body> </html> \ No newline at end of file Modified: trunk/core/src/main/webapp/include/header.xhtml =================================================================== --- trunk/core/src/main/webapp/include/header.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/include/header.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -47,20 +47,20 @@ #{messages['security.NotLoggedIn']}&nbsp; [<s:link action="/login.xhtml">#{messages['security.login']}</s:link>] </h:outputText> - <ui:remove> - <!-- Disable the Help link until we actually have some online help to link to. --> - | - [<a href="#">#{messages['help.link']}</a>] - </ui:remove> + <ui:remove> + <!-- Disable the Help link until we actually have some online help to link to. --> + | + [<a href="#">#{messages['help.link']}</a>] + </ui:remove> <h:outputText rendered="#{debug}"> | - [<s:link action="#{debugAction.dumpInventory()}">Dump Inventory</s:link>] + [<s:link action="#{debugAction.dumpInventory()}">Dump Inventory</s:link>] | - [<s:link action="#{debugAction.runServerScan()}">Run Server Scan</s:link>] + [<s:link action="#{debugAction.runServerScan()}">Run Server Scan</s:link>] | - [<s:link action="#{debugAction.runServiceScan()}">Run Service Scan</s:link>] + [<s:link action="#{debugAction.runServiceScan()}">Run Service Scan</s:link>] | - [<s:link action="#{debugAction.testErrorPage()}">Test Error Page</s:link>] + [<s:link action="#{debugAction.testErrorPage()}">Test Error Page</s:link>] </h:outputText> </div> </div> Modified: trunk/core/src/main/webapp/include/resourceDataScroller.xhtml =================================================================== --- trunk/core/src/main/webapp/include/resourceDataScroller.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/include/resourceDataScroller.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -32,16 +32,16 @@ <body> <f:view> - Usage: The following parameters must be set in the calling page - + Usage: The following parameters must be set in the calling page + paginationDataModel - Data model of the underlying table being controlled (used for total size) - paginationDataTableName - Name of the data table to be controlled + paginationDataTableName - Name of the data table to be controlled <ui:composition> - - <ui:param name="paginationDataScrollerName" value="#{paginationDataTableName}Scroller"/> - + + <ui:param name="paginationDataScrollerName" value="#{paginationDataTableName}Scroller"/> + <rich:spacer height="10px"/> - <rich:datascroller id="#{paginationDataScrollerName}" for="#{paginationDataTableName}" + <rich:datascroller id="#{paginationDataScrollerName}" for="#{paginationDataTableName}" align="right" renderIfSinglePage="false" fastStep="2" stepControls="show" fastControls="hide" boundaryControls="show" binding="#{datascrollerUI.datascroller}"> @@ -110,21 +110,23 @@ </f:facet> </rich:datascroller> <h:panelGroup layout="block" style=" margin-top: -4px; float: right; font-size:11px;"> - <h:outputText id="paginationTotalItems" value="Total: #{paginationDataModel.size}" style="margin-right: 1em;"/> - + <h:outputText id="paginationTotalItems" value="Total: #{paginationDataModel.size}" + style="margin-right: 1em;"/> + <!-- Allow the user to configure the number of items per page - displayed in a data table. --> - <h:outputText value="Items Per Page:" style="margin-right: .2em;" + displayed in a data table. --> + <h:outputText value="Items Per Page:" style="margin-right: .2em;" rendered="#{paginationDataModel.size > tableManager.minimumPageSize}"/> - <h:selectOneListbox style="margin-right: 1em; width: 3.5em; height: 1.8em; position: relative; top: -0.05em; left: 0.1em;" - id="currentPageSize" size="1" - value="#{tableManager.numRows}" - rendered="#{paginationDataModel.size > tableManager.minimumPageSize}"> - <a4j:support event="onchange" + <h:selectOneListbox + style="margin-right: 1em; width: 3.5em; height: 1.8em; position: relative; top: -0.05em; left: 0.1em;" + id="currentPageSize" size="1" + value="#{tableManager.numRows}" + rendered="#{paginationDataModel.size > tableManager.minimumPageSize}"> + <a4j:support event="onchange" reRender="#{paginationDataTableName}, #{paginationDataScrollerName}" action="#{datascrollerUI.resetDatascroller}"/> <f:selectItems value="#{tableManager.pageSizes}"/> - </h:selectOneListbox> + </h:selectOneListbox> </h:panelGroup> </ui:composition> </f:view> Modified: trunk/core/src/main/webapp/include/tabMenu.xhtml =================================================================== --- trunk/core/src/main/webapp/include/tabMenu.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/include/tabMenu.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -38,146 +38,150 @@ <body> <ui:composition> -<!-- don't need to specify the 'path' param on these links because Seam will take care + <!-- don't need to specify the 'path' param on these links because Seam will take care of adding it because its specified as a page param in pages.xml --> -<div id="tabmenu"> -<ul> - <!-- ======================= SUMMARY TAB ======================== --> - <h:panelGroup layout="block"> - <!-- ACTIVE panel (currently being viewed) --> - <h:panelGroup layout="block" rendered="#{activeTab eq 'summary'}"> - <li> - <span id="summaryTab" class="active">#{messages['tab.menu.summary']}</span> - </li> - </h:panelGroup> - <!-- ENABLED panel (can be viewed) --> - <h:panelGroup layout="block" rendered="#{activeTab ne 'summary'}"> - <li> - <s:link id="summaryTab" styleClass="" view="/secure/summary.xhtml" propagation="end"> - #{messages['tab.menu.summary']} - </s:link> - </li> - </h:panelGroup> - </h:panelGroup> + <div id="tabmenu"> + <ul> + <!-- ======================= SUMMARY TAB ======================== --> + <h:panelGroup layout="block"> + <!-- ACTIVE panel (currently being viewed) --> + <h:panelGroup layout="block" rendered="#{activeTab eq 'summary'}"> + <li> + <span id="summaryTab" class="active">#{messages['tab.menu.summary']}</span> + </li> + </h:panelGroup> + <!-- ENABLED panel (can be viewed) --> + <h:panelGroup layout="block" rendered="#{activeTab ne 'summary'}"> + <li> + <s:link id="summaryTab" styleClass="" view="/secure/summary.xhtml" propagation="end"> + #{messages['tab.menu.summary']} + </s:link> + </li> + </h:panelGroup> + </h:panelGroup> - <!-- ======================= CONFIGURATION TAB ======================== --> - <h:panelGroup layout="block"> - <!-- ACTIVE panel (currently being viewed) --> - <h:panelGroup layout="block" rendered="#{activeTab eq 'configuration'}"> - <li> - <span id="configurationTab" class="active">#{messages['tab.menu.configuration']}</span> - </li> - </h:panelGroup> - <!-- ENABLED panel (can be viewed) --> - <h:panelGroup layout="block" - rendered="#{activeTab ne 'configuration' and navigationAction.enabledTabs.contains('configuration')}"> - <li> - <s:link id="configurationTab" styleClass="" action="#{resourceConfigurationUIBean.resourceConfiguration()}" propagation="end"> - #{messages['tab.menu.configuration']} - </s:link> - </li> - </h:panelGroup> - <!-- DISABLED panel (can not be viewed) --> - <h:panelGroup layout="block" rendered="#{!navigationAction.enabledTabs.contains('configuration')}"> - <li> - <span id="configurationTab" class="disabled">#{messages['tab.menu.configuration']}</span> - </li> - </h:panelGroup> - </h:panelGroup> + <!-- ======================= CONFIGURATION TAB ======================== --> + <h:panelGroup layout="block"> + <!-- ACTIVE panel (currently being viewed) --> + <h:panelGroup layout="block" rendered="#{activeTab eq 'configuration'}"> + <li> + <span id="configurationTab" class="active">#{messages['tab.menu.configuration']}</span> + </li> + </h:panelGroup> + <!-- ENABLED panel (can be viewed) --> + <h:panelGroup layout="block" + rendered="#{activeTab ne 'configuration' and navigationAction.enabledTabs.contains('configuration')}"> + <li> + <s:link id="configurationTab" styleClass="" + action="#{resourceConfigurationUIBean.resourceConfiguration()}" propagation="end"> + #{messages['tab.menu.configuration']} + </s:link> + </li> + </h:panelGroup> + <!-- DISABLED panel (can not be viewed) --> + <h:panelGroup layout="block" rendered="#{!navigationAction.enabledTabs.contains('configuration')}"> + <li> + <span id="configurationTab" class="disabled">#{messages['tab.menu.configuration']}</span> + </li> + </h:panelGroup> + </h:panelGroup> - <!-- ======================= METRICS TAB ======================== --> - <h:panelGroup layout="block"> - <!-- ACTIVE panel (currently being viewed) --> - <h:panelGroup layout="block" rendered="#{activeTab eq 'metric'}"> - <li> - <span id="metricsTab" class="active">#{messages['tab.menu.metrics']}</span> - </li> - </h:panelGroup> - <!-- ENABLED panel (can be viewed) --> - <h:panelGroup layout="block" - rendered="#{activeTab ne 'metric' and navigationAction.enabledTabs.contains('metric')}"> - <li> - <s:link id="metricsTab" styleClass="" view="/secure/resourceInstanceMetrics.xhtml" propagation="end"> - #{messages['tab.menu.metrics']} - </s:link> - </li> - </h:panelGroup> - <!-- DISABLED panel (can not be viewed) --> - <h:panelGroup layout="block" rendered="#{!navigationAction.enabledTabs.contains('metric')}"> - <li> - <span id="metricsTab" class="disabled">#{messages['tab.menu.metrics']}</span> - </li> - </h:panelGroup> - </h:panelGroup> + <!-- ======================= METRICS TAB ======================== --> + <h:panelGroup layout="block"> + <!-- ACTIVE panel (currently being viewed) --> + <h:panelGroup layout="block" rendered="#{activeTab eq 'metric'}"> + <li> + <span id="metricsTab" class="active">#{messages['tab.menu.metrics']}</span> + </li> + </h:panelGroup> + <!-- ENABLED panel (can be viewed) --> + <h:panelGroup layout="block" + rendered="#{activeTab ne 'metric' and navigationAction.enabledTabs.contains('metric')}"> + <li> + <s:link id="metricsTab" styleClass="" view="/secure/resourceInstanceMetrics.xhtml" + propagation="end"> + #{messages['tab.menu.metrics']} + </s:link> + </li> + </h:panelGroup> + <!-- DISABLED panel (can not be viewed) --> + <h:panelGroup layout="block" rendered="#{!navigationAction.enabledTabs.contains('metric')}"> + <li> + <span id="metricsTab" class="disabled">#{messages['tab.menu.metrics']}</span> + </li> + </h:panelGroup> + </h:panelGroup> - <!-- ======================= CONTROL TAB ======================== --> - <h:panelGroup layout="block"> - <!-- ACTIVE panel (currently being viewed) --> - <h:panelGroup layout="block" rendered="#{activeTab eq 'operation'}"> - <li> - <span id="controlTab" class="active">#{messages['tab.menu.control']}</span> - </li> - </h:panelGroup> - <!-- ENABLED panel (can be viewed) --> - <h:panelGroup layout="block" - rendered="#{activeTab ne 'operation' and navigationAction.enabledTabs.contains('operation')}"> - <li> - <s:link id="controlTab" styleClass="" view="/secure/resourceInstanceOperation.xhtml" propagation="end"> - #{messages['tab.menu.control']} - </s:link> - </li> - </h:panelGroup> - <!-- DISABLED panel (can not be viewed) --> - <h:panelGroup layout="block" rendered="#{!navigationAction.enabledTabs.contains('operation')}"> - <li> - <span id="controlTab" class="disabled">#{messages['tab.menu.control']}</span> - </li> - </h:panelGroup> - </h:panelGroup> + <!-- ======================= CONTROL TAB ======================== --> + <h:panelGroup layout="block"> + <!-- ACTIVE panel (currently being viewed) --> + <h:panelGroup layout="block" rendered="#{activeTab eq 'operation'}"> + <li> + <span id="controlTab" class="active">#{messages['tab.menu.control']}</span> + </li> + </h:panelGroup> + <!-- ENABLED panel (can be viewed) --> + <h:panelGroup layout="block" + rendered="#{activeTab ne 'operation' and navigationAction.enabledTabs.contains('operation')}"> + <li> + <s:link id="controlTab" styleClass="" view="/secure/resourceInstanceOperation.xhtml" + propagation="end"> + #{messages['tab.menu.control']} + </s:link> + </li> + </h:panelGroup> + <!-- DISABLED panel (can not be viewed) --> + <h:panelGroup layout="block" rendered="#{!navigationAction.enabledTabs.contains('operation')}"> + <li> + <span id="controlTab" class="disabled">#{messages['tab.menu.control']}</span> + </li> + </h:panelGroup> + </h:panelGroup> - <!-- ======================= CONTENT TAB ======================== --> - <h:panelGroup layout="block"> - <!-- ACTIVE panel (currently being viewed) --> - <h:panelGroup layout="block" rendered="#{activeTab eq 'content'}"> - <li> - <span id="contentTab" class="active">#{messages['tab.menu.content']}</span> - </li> - </h:panelGroup> - <!-- ENABLED panel (can be viewed) --> - <h:panelGroup layout="block" - rendered="#{activeTab ne 'content' and navigationAction.enabledTabs.contains('content')}"> - <li> - <s:link id="contentTab" styleClass="" view="/secure/resourceInstanceContent.xhtml" propagation="end"> - #{messages['tab.menu.content']} - </s:link> - </li> - </h:panelGroup> - <!-- DISABLED panel (can not be viewed) --> - <h:panelGroup layout="block" rendered="#{!navigationAction.enabledTabs.contains('content')}"> - <li> - <span id="contentTab" class="disabled">#{messages['tab.menu.content']}</span> - </li> - </h:panelGroup> - </h:panelGroup> + <!-- ======================= CONTENT TAB ======================== --> + <h:panelGroup layout="block"> + <!-- ACTIVE panel (currently being viewed) --> + <h:panelGroup layout="block" rendered="#{activeTab eq 'content'}"> + <li> + <span id="contentTab" class="active">#{messages['tab.menu.content']}</span> + </li> + </h:panelGroup> + <!-- ENABLED panel (can be viewed) --> + <h:panelGroup layout="block" + rendered="#{activeTab ne 'content' and navigationAction.enabledTabs.contains('content')}"> + <li> + <s:link id="contentTab" styleClass="" view="/secure/resourceInstanceContent.xhtml" + propagation="end"> + #{messages['tab.menu.content']} + </s:link> + </li> + </h:panelGroup> + <!-- DISABLED panel (can not be viewed) --> + <h:panelGroup layout="block" rendered="#{!navigationAction.enabledTabs.contains('content')}"> + <li> + <span id="contentTab" class="disabled">#{messages['tab.menu.content']}</span> + </li> + </h:panelGroup> + </h:panelGroup> -</ul> -<div class="statusindicator"> - <h:panelGroup rendered="#{navigationAction.availableStatus ne 'SUMMARY'}"> - <strong>Status:</strong> - <h:panelGroup rendered="#{navigationAction.availableStatus eq 'UP'}"> - <h:graphicImage value="images/iconStatusAvailable.gif"/>Available - </h:panelGroup> - <h:panelGroup rendered="#{navigationAction.availableStatus eq 'DOWN'}"> - <h:graphicImage value="images/iconStatusUnavailable.gif"/>Unavailable - </h:panelGroup> - <h:panelGroup rendered="#{navigationAction.availableStatus eq 'UNKNOWN'}"> - <h:graphicImage value="images/iconStatusUnknown.gif"/>Unknown - </h:panelGroup> - </h:panelGroup> -</div> + </ul> + <div class="statusindicator"> + <h:panelGroup rendered="#{navigationAction.availableStatus ne 'SUMMARY'}"> + <strong>Status:</strong> + <h:panelGroup rendered="#{navigationAction.availableStatus eq 'UP'}"> + <h:graphicImage value="images/iconStatusAvailable.gif"/>Available + </h:panelGroup> + <h:panelGroup rendered="#{navigationAction.availableStatus eq 'DOWN'}"> + <h:graphicImage value="images/iconStatusUnavailable.gif"/>Unavailable + </h:panelGroup> + <h:panelGroup rendered="#{navigationAction.availableStatus eq 'UNKNOWN'}"> + <h:graphicImage value="images/iconStatusUnknown.gif"/>Unknown + </h:panelGroup> + </h:panelGroup> + </div> -<div style="clear:both;"></div> -</div> + <div style="clear:both;"></div> + </div> </ui:composition> </body> Modified: trunk/core/src/main/webapp/index.xhtml =================================================================== --- trunk/core/src/main/webapp/index.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/index.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -19,18 +19,18 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> - + <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:remove> - <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and - other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. - We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since - including an xml prolog causes IE6 to go into the undesirable "quirks mode". - (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> + <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and + other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. + We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since + including an xml prolog causes IE6 to go into the undesirable "quirks mode". + (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> </ui:remove> <f:view contentType="text/html; charset=UTF-8"> Modified: trunk/core/src/main/webapp/js/embedded.js =================================================================== --- trunk/core/src/main/webapp/js/embedded.js 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/js/embedded.js 2009-05-18 17:23:38 UTC (rev 439) @@ -42,18 +42,18 @@ */ function setInputUnset(input, unset) { - clearInputValue(input); - setInputDisabled(input, unset, true); - input.unset = unset; // our own special property that tells us whether an input is unset - if (!unset) - { - // Set focus on the input, but only if it is a text-entry field - it doesn't make sense for radios, checkboxes, - // etc. - if (input.type == 'text' || input.type == 'password' || input.type == 'textarea' || input.type == 'file') - { - input.focus(); - } - } + clearInputValue(input); + setInputDisabled(input, unset, true); + input.unset = unset; // our own special property that tells us whether an input is unset + if (!unset) + { + // Set focus on the input, but only if it is a text-entry field - it doesn't make sense for radios, checkboxes, + // etc. + if (input.type == 'text' || input.type == 'password' || input.type == 'textarea' || input.type == 'file') + { + input.focus(); + } + } } /** @@ -63,26 +63,26 @@ */ function writeProtectInput(input) { - if (input.length != null && (input[0].type == 'radio' || input[0].type == 'select-multiple')) - { - // Recursively call ourself for each of the array items, which are the actual radio buttons or menu items. - for (var i = 0; i < input.length; i++) - { - writeProtectInput(input[i]); - } - } - else - { - input.readonly = true; - // NOTE: For non-text inputs (radios, checkboxes, etc), the "readonly" attribute is ignored by browsers, so we - // resort to the "disabled" attribute for these types of inputs. For the text inputs, it is important to - // *not* set the "disabled" attribute, because then the browser does not allow them to receive focus, which - // prevents tooltips from working (see http://jira.jboss.com/jira/browse/JBNADM-1608). - if (input.type != 'text' && input.type != 'password' && input.type != 'textarea' && input.type != 'file') - { - setInputDisabled(input, true, true); - } - } + if (input.length != null && (input[0].type == 'radio' || input[0].type == 'select-multiple')) + { + // Recursively call ourself for each of the array items, which are the actual radio buttons or menu items. + for (var i = 0; i < input.length; i++) + { + writeProtectInput(input[i]); + } + } + else + { + input.readonly = true; + // NOTE: For non-text inputs (radios, checkboxes, etc), the "readonly" attribute is ignored by browsers, so we + // resort to the "disabled" attribute for these types of inputs. For the text inputs, it is important to + // *not* set the "disabled" attribute, because then the browser does not allow them to receive focus, which + // prevents tooltips from working (see http://jira.jboss.com/jira/browse/JBNADM-1608). + if (input.type != 'text' && input.type != 'password' && input.type != 'textarea' && input.type != 'file') + { + setInputDisabled(input, true, true); + } + } } /** @@ -93,17 +93,17 @@ */ function setInputTitle(input) { - if (input != null && input.type == 'text') - { - if (input.value != null && input.value.length > input.size) - { - input.title = input.value; - } - else - { - input.title = null; - } - } + if (input != null && input.type == 'text') + { + if (input.value != null && input.value.length > input.size) + { + input.title = input.value; + } + else + { + input.title = null; + } + } } /** @@ -113,37 +113,37 @@ */ function clearInputValue(input) { - if (input.length != null) - { - if (input[0].type == 'radio') - { - // Recursively call ourself for each of the array items, which are the actual radio buttons. - for (var i = 0; i < input.length; i++) - { - clearInputValue(input[i]); - } - } - else if (input[0].type == 'select-one' || input[0].type == 'select-multiple') - { - // Recursively call ourself on the selected item. - clearInputValue(input[input.selectedIndex]); - } - } - else - { - switch (input.type) - { - case 'checkbox': - case 'radio': - input.checked = false; break; - case 'select-one': - case 'select-multiple': - input.selected = false; break; - default: - // NOTE: We set the value to an empty string rather than null, because IE converts null to the string 'null'. - input.value = ''; - } - } + if (input.length != null) + { + if (input[0].type == 'radio') + { + // Recursively call ourself for each of the array items, which are the actual radio buttons. + for (var i = 0; i < input.length; i++) + { + clearInputValue(input[i]); + } + } + else if (input[0].type == 'select-one' || input[0].type == 'select-multiple') + { + // Recursively call ourself on the selected item. + clearInputValue(input[input.selectedIndex]); + } + } + else + { + switch (input.type) + { + case 'checkbox': + case 'radio': + input.checked = false; break; + case 'select-one': + case 'select-multiple': + input.selected = false; break; + default: + // NOTE: We set the value to an empty string rather than null, because IE converts null to the string 'null'. + input.value = ''; + } + } } /** @@ -156,22 +156,22 @@ */ function setInputDisabled(input, disabled, updateStyle) { - if (input.length != null && (input[0].type == 'radio' || input[0].type == 'select-multiple')) - { - // Recursively call ourself for each of the array items, which are the actual radio buttons or menu items. - for (var i = 0; i < input.length; i++) - { - setInputDisabled(input[i], disabled, updateStyle); - } - } - else - { - input.disabled = disabled; - if (updateStyle) - { - updateInputStyle(input); - } - } + if (input.length != null && (input[0].type == 'radio' || input[0].type == 'select-multiple')) + { + // Recursively call ourself for each of the array items, which are the actual radio buttons or menu items. + for (var i = 0; i < input.length; i++) + { + setInputDisabled(input[i], disabled, updateStyle); + } + } + else + { + input.disabled = disabled; + if (updateStyle) + { + updateInputStyle(input); + } + } } /** @@ -181,27 +181,27 @@ */ function unsetInputs(inputs) { - for (var i = 0; i < inputs.length; i++) - { - setInputUnset(inputs[i], true); - } + for (var i = 0; i < inputs.length; i++) + { + setInputUnset(inputs[i], true); + } } function setInputsOverride(inputs, shouldOverride) { - for (var i = 0; i < inputs.length; i++) - { - setInputOverride(inputs[i], shouldOverride); - } + for (var i = 0; i < inputs.length; i++) + { + setInputOverride(inputs[i], shouldOverride); + } } function setInputOverride(input, shouldOverride) { - input.override = shouldOverride; - if (shouldOverride) - { - input.check(); - } + input.override = shouldOverride; + if (shouldOverride) + { + input.check(); + } } /** @@ -211,10 +211,10 @@ */ function writeProtectInputs(inputs) { - for (var i = 0; i < inputs.length; i++) - { - writeProtectInput(inputs[i]); - } + for (var i = 0; i < inputs.length; i++) + { + writeProtectInput(inputs[i]); + } } /** @@ -222,26 +222,26 @@ */ function prepareInputsForSubmission(form) { - var inputs = Form.getInputs(form); - for (var i = 0; i < inputs.length; i++) - { - var input = inputs[i]; - if (input.disabled) - { - // NOTE: It is vital to enable any disabled inputs, since the browser will exclude disabled inputs from the - // POST request. - setInputDisabled(input, false, false); - // Some browsers (e.g. Firefox) will automatically un-gray-out the input, when the disabled property is - // set to false, so we need to gray it out again, so it still appears to be disabled. - grayOutInput(input); - if (input.unset) - { - // NOTE: Set the input's value to a special string that will allow the server-side to distinguish between a - // null (i.e. unset) value and an empty string value. - input.value = NULL_INPUT_VALUE; - } - } - } + var inputs = Form.getInputs(form); + for (var i = 0; i < inputs.length; i++) + { + var input = inputs[i]; + if (input.disabled) + { + // NOTE: It is vital to enable any disabled inputs, since the browser will exclude disabled inputs from the + // POST request. + setInputDisabled(input, false, false); + // Some browsers (e.g. Firefox) will automatically un-gray-out the input, when the disabled property is + // set to false, so we need to gray it out again, so it still appears to be disabled. + grayOutInput(input); + if (input.unset) + { + // NOTE: Set the input's value to a special string that will allow the server-side to distinguish between a + // null (i.e. unset) value and an empty string value. + input.value = NULL_INPUT_VALUE; + } + } + } } /** @@ -249,16 +249,16 @@ */ function updateInputStyle(input) { - if (input.disabled) - { - grayOutInput(input); - } - else - { - input.style.background = '#FFFFFF'; - input.style.color = '#000000'; - input.style.border = '1px solid #A7A6AA'; - } + if (input.disabled) + { + grayOutInput(input); + } + else + { + input.style.background = '#FFFFFF'; + input.style.color = '#000000'; + input.style.border = '1px solid #A7A6AA'; + } } /** @@ -266,10 +266,10 @@ */ function grayOutInput(input) { - // Use the default Firefox colors, which are much more intuitive than the default IE colors. - input.style.background = '#D6D5D9'; - input.style.color = '#000000'; - input.style.border = '1px solid #A7A6AA'; + // Use the default Firefox colors, which are much more intuitive than the default IE colors. + input.style.background = '#D6D5D9'; + input.style.color = '#000000'; + input.style.border = '1px solid #A7A6AA'; } /** @@ -278,26 +278,29 @@ */ function displayMessageModal(title, message) { - var win = new Window({className:WINDOW_THEME, width:350, height:400, zIndex: 100, resizable:true, showEffect:Effect.BlindDown, hideEffect:Effect.SwitchOff, draggable:true, wiredDrag:true}); - win.getContent().innerHTML = "<div style='padding:10px'>" + message + "</div>"; - win.setTitle(title); - win.showCenter(true); // true == modal + var win = new Window({className:WINDOW_THEME, width:350, height:400, zIndex: 100, resizable:true, showEffect:Effect.BlindDown, hideEffect:Effect.SwitchOff, draggable:true, wiredDrag:true}); + win.getContent().innerHTML = "<div style='padding:10px'>" + message + "</div>"; + win.setTitle(title); + win.showCenter(true); // true == modal } /** * This method is called in the onload of the body of * the main template to disable all conditional buttons */ -function disableConditionalButtons() { - var buttons = document.getElementsByTagName("input"); - var i; - var button; - for (i=0; i<buttons.length; i++) { - button = buttons.item(i); - if (button.getAttribute("target") != null) { - button.disabled = true; - } - } +function disableConditionalButtons() +{ + var buttons = document.getElementsByTagName("input"); + var i; + var button; + for (i = 0; i < buttons.length; i++) + { + button = buttons.item(i); + if (button.getAttribute("target") != null) + { + button.disabled = true; + } + } } /** @@ -305,22 +308,28 @@ * or select or deselect all of the objects with the name selectName * @param selectName name of the dom instances that should be checked / unchecked */ -function selectAll(thisObj, selectName) { - var selects = document.getElementsByName(selectName); - var i; - var select; - for (i=0; i<selects.length; i++) { - select = selects.item(i); - if (select.disabled) { - continue; - } - if (thisObj.checked) { - select.checked = true; - } else { - select.checked = false; - } - } - updateButtons(selectName); +function selectAll(thisObj, selectName) +{ + var selects = document.getElementsByName(selectName); + var i; + var select; + for (i = 0; i < selects.length; i++) + { + select = selects.item(i); + if (select.disabled) + { + continue; + } + if (thisObj.checked) + { + select.checked = true; + } + else + { + select.checked = false; + } + } + updateButtons(selectName); } /** @@ -332,31 +341,43 @@ * whether or not the conditional buttons on the page should be enabled / disabled */ // TODO: Make this robust enough to properly maintain CSS style when the button is disabled (ips, 08/31/07). -function updateButtons(targetName) { - var count = countSelected(targetName); - var buttons = document.getElementsByTagName("input"); - var i; - var button; - for (i=0; i<buttons.length; i++) { - button = buttons.item(i); - if (button.getAttribute("target") != null && button.getAttribute("target") == targetName) { - var low = button.getAttribute("low"); - var high = button.getAttribute("high"); - if (high != null) { - if (low <= count && count <= high) { - button.disabled = false; - } else { - button.disabled = true; +function updateButtons(targetName) +{ + var count = countSelected(targetName); + var buttons = document.getElementsByTagName("input"); + var i; + var button; + for (i = 0; i < buttons.length; i++) + { + button = buttons.item(i); + if (button.getAttribute("target") != null && button.getAttribute("target") == targetName) + { + var low = button.getAttribute("low"); + var high = button.getAttribute("high"); + if (high != null) + { + if (low <= count && count <= high) + { + button.disabled = false; + } + else + { + button.disabled = true; + } } - } else { - if (low <= count) { - button.disabled = false; - } else { - button.disabled = true; + else + { + if (low <= count) + { + button.disabled = false; + } + else + { + button.disabled = true; + } } - } - } - } + } + } } /** @@ -364,48 +385,51 @@ * * @param selectName name of the dom instances that should be counted for selections */ -function countSelected(selectName) { - var total = 0; - var selectElts = document.getElementsByName(selectName); - var i; - for (i=0; i<selectElts.length; i++) { - if (selectElts.item(i).checked) { - total = total + 1; - } - } - return (total); +function countSelected(selectName) +{ + var total = 0; + var selectElts = document.getElementsByName(selectName); + var i; + for (i = 0; i < selectElts.length; i++) + { + if (selectElts.item(i).checked) + { + total = total + 1; + } + } + return (total); } function setFoot() { - var conH; - var winH; - var footerH = 28; - var browserH = 88; - if (isIE) - { - conH = document.body.scrollHeight; - winH = document.body.clientHeight; - } - else - { - conH = document.height; - winH = window.innerHeight; - } - var myHeight = winH - conH - footerH + browserH; - if (myHeight > 60) - { - var footerSpacer = document.getElementById("footerSpacer"); - footerSpacer.setAttribute('height', myHeight); - } + var conH; + var winH; + var footerH = 28; + var browserH = 88; + if (isIE) + { + conH = document.body.scrollHeight; + winH = document.body.clientHeight; + } + else + { + conH = document.height; + winH = window.innerHeight; + } + var myHeight = winH - conH - footerH + browserH; + if (myHeight > 60) + { + var footerSpacer = document.getElementById("footerSpacer"); + footerSpacer.setAttribute('height', myHeight); + } } function openAbout(windowTitle) { - var content = $('about').innerHTML; - // NOTE: The PWC docs say the 'closable' option defaults to true, but this does not appear to be the case. - var windowOptions = {className:WINDOW_THEME, title:windowTitle, width:296, height:164, closable:true, minimizable:false, maximizable:false, resize:false, draggable:false, effectOptions:{duration: 0.25}}; - Dialog.alert(content, windowOptions); + var content = $('about').innerHTML; + // NOTE: The PWC docs say the 'closable' option defaults to true, but this does not appear to be the case. + var windowOptions = {className:WINDOW_THEME, title:windowTitle, width:296, height:164, closable:true, minimizable:false, maximizable:false, resize:false, draggable:false, effectOptions:{duration: 0.25}}; + Dialog.alert(content, windowOptions); } /** @@ -416,40 +440,40 @@ */ function clickAnchor(anchorId) { - var anchor = document.getElementById(anchorId); - if (document.createEvent) - { - var event = document.createEvent('MouseEvents'); - event.initEvent('click', true, false); - anchor.dispatchEvent(event); - } - else if (document.createEventObject) - { - anchor.fireEvent('onclick'); - } + var anchor = document.getElementById(anchorId); + if (document.createEvent) + { + var event = document.createEvent('MouseEvents'); + event.initEvent('click', true, false); + anchor.dispatchEvent(event); + } + else if (document.createEventObject) + { + anchor.fireEvent('onclick'); + } } function hidediv(elementId) { - document.getElementById(elementId).style.visibility = 'hidden'; - document.getElementById(elementId).style.display = 'none'; + document.getElementById(elementId).style.visibility = 'hidden'; + document.getElementById(elementId).style.display = 'none'; } function showdiv(elementId) { - document.getElementById(elementId).style.visibility = 'visible'; - document.getElementById(elementId).style.display = 'block'; + document.getElementById(elementId).style.visibility = 'visible'; + document.getElementById(elementId).style.display = 'block'; } function clickRadio(radioName, valueToClick) { - var radioSet = document.getElementsByName(radioName); - var i; - for (i=0; i<radioSet.length; i++) - { - if (radioSet.item(i).value == valueToClick) - { - radioSet.item(i).click(); - } - } + var radioSet = document.getElementsByName(radioName); + var i; + for (i = 0; i < radioSet.length; i++) + { + if (radioSet.item(i).value == valueToClick) + { + radioSet.item(i).click(); + } + } } Modified: trunk/core/src/main/webapp/js/formValues.js =================================================================== --- trunk/core/src/main/webapp/js/formValues.js 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/js/formValues.js 2009-05-18 17:23:38 UTC (rev 439) @@ -1,10 +1,10 @@ /* -Script by RoBorg -RoBorg(a)geniusbug.com -http://javascript.geniusbug.com | http://www.roborg.co.uk -Please do not remove or edit this message -Please link to this website if you use this script! -*/ + Script by RoBorg + RoBorg(a)geniusbug.com + http://javascript.geniusbug.com | http://www.roborg.co.uk + Please do not remove or edit this message + Please link to this website if you use this script! + */ function getElementValue(formElement) { if (formElement.length != null) var type = formElement[0].type; Modified: trunk/core/src/main/webapp/layout.xhtml =================================================================== --- trunk/core/src/main/webapp/layout.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/layout.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -18,109 +18,109 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> - + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:remove> - <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and - other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. - We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since - including an xml prolog causes IE6 to go into the undesirable "quirks mode". - (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> + <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and + other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. + We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since + including an xml prolog causes IE6 to go into the undesirable "quirks mode". + (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> </ui:remove> <f:view contentType="text/html; charset=UTF-8"> - <head> - <base href="#{baseUrl}"/> - <title> - <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> - </title> + <head> + <base href="#{baseUrl}"/> + <title> + <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> + </title> - <link href="css/console-style.css" rel="stylesheet" type="text/css"/> - <link href="css/form-style.css" rel="stylesheet" type="text/css"/> + <link href="css/console-style.css" rel="stylesheet" type="text/css"/> + <link href="css/form-style.css" rel="stylesheet" type="text/css"/> - <link rel="icon" type="image/png" href="images/favicon.png"/> - <link rel="apple-touch-icon" href="images/favicon.png"/> + <link rel="icon" type="image/png" href="images/favicon.png"/> + <link rel="apple-touch-icon" href="images/favicon.png"/> - <script type="text/javascript" src="js/embedded.js"></script> - - <!--[if lt IE 7]> -<style type="text/css" media="screen"> -/* let the IE expressions commence */ -/* old ghost in the box for IEs 5.01 + 5.5 */ -body - { - overflow-y: hidden; - margin: 0; - padding: 0; - } -#content - { - height: expression( document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5) ) + 'px') ; - overflow: auto; - } -/* backslashes feed the new ghost in the box to IE6 */ -h\tml - { - overflow: hidden; - } -h\tml body - { - height: 100%; - overflow: auto; - } -h\tml #content - { - height: 100%; - overflow: visible; - } -#pageheader, #footer - { - width: expression(document.body.clientWidth + 'px'); - } -#sidebar-left - { - height: expression(document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5)) + 'px'); - } -</style> -<![endif]--> - - </head> - <body> - <div id="content"> - <!--TODO: add if statement to determine if this warning should be displayed--> - <!-- Restart of server indicator --> - <!--<div id="RestartWarning">--> - <!--<h:graphicImage value="images/icoServerRestartWarning.gif"/>--> - <!--<span>Restart of server is required</span>--> - <!--( <a href="#">hide</a> | <a href="#">Learn more</a> )--> - <!--</div>--> - <!--breadcrumb--> - <div id="bread"> - <ui:repeat var="node" value="#{navigationAction.getBreadCrumbs()}"> - <ul> - <li> - <h:outputText value=" : "/> - <s:link view="/secure/summary.xhtml" propagation="end"> - <f:param name="path" value="#{node.path}"/> - #{node.name} </s:link> - </li> - </ul> - </ui:repeat> + <script type="text/javascript" src="js/embedded.js"></script> + + <!--[if lt IE 7]> + <style type="text/css" media="screen"> + /* let the IE expressions commence */ + /* old ghost in the box for IEs 5.01 + 5.5 */ + body + { + overflow-y: hidden; + margin: 0; + padding: 0; + } + #content + { + height: expression( document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5) ) + 'px') ; + overflow: auto; + } + /* backslashes feed the new ghost in the box to IE6 */ + h\tml + { + overflow: hidden; + } + h\tml body + { + height: 100%; + overflow: auto; + } + h\tml #content + { + height: 100%; + overflow: visible; + } + #pageheader, #footer + { + width: expression(document.body.clientWidth + 'px'); + } + #sidebar-left + { + height: expression(document.body.clientHeight - (parseInt(document.body.currentStyle.fontSize) * 1.3333333 * (8 + 5)) + 'px'); + } + </style> + <![endif]--> + + </head> + <body> + <div id="content"> + <!--TODO: add if statement to determine if this warning should be displayed--> + <!-- Restart of server indicator --> + <!--<div id="RestartWarning">--> + <!--<h:graphicImage value="images/icoServerRestartWarning.gif"/>--> + <!--<span>Restart of server is required</span>--> + <!--( <a href="#">hide</a> | <a href="#">Learn more</a> )--> + <!--</div>--> + <!--breadcrumb--> + <div id="bread"> + <ui:repeat var="node" value="#{navigationAction.getBreadCrumbs()}"> + <ul> + <li> + <h:outputText value=" : "/> + <s:link view="/secure/summary.xhtml" propagation="end"> + <f:param name="path" value="#{node.path}"/> + #{node.name} </s:link> + </li> + </ul> + </ui:repeat> + </div> + <!-- page titling --> + <h1> + <ui:insert name="pagetitle"/> + </h1> + <!--tab menu is optional--> + <ui:insert name="tabmenu"></ui:insert> + <ui:insert name="body">body goes here</ui:insert> </div> - <!-- page titling --> - <h1> - <ui:insert name="pagetitle"/> - </h1> - <!--tab menu is optional--> - <ui:insert name="tabmenu"></ui:insert> - <ui:insert name="body">body goes here</ui:insert> - </div> - <ui:include src="include/resourceNavigation.xhtml"/> - <ui:include src="include/header.xhtml"/> - <ui:include src="include/footer.xhtml"/> - </body> + <ui:include src="include/resourceNavigation.xhtml"/> + <ui:include src="include/header.xhtml"/> + <ui:include src="include/footer.xhtml"/> + </body> </f:view> </html> Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/login.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -19,18 +19,18 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> - + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:remove> - <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and - other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. - We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since - including an xml prolog causes IE6 to go into the undesirable "quirks mode". - (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> + <!-- Set the content type to "text/html" to ensure "application/xhtml+xml", which would put Firefox and + other Gecko-based browsers into XML mode (which requires pages to be well-formed XML), is not used. + We also specify the charset/encoding here, since we cannot specify it via the xml prolog, since + including an xml prolog causes IE6 to go into the undesirable "quirks mode". + (see https://jira.jboss.org/jira/browse/EMBJOPR-19) --> </ui:remove> <f:view contentType="text/html; charset=UTF-8"> <head> @@ -40,7 +40,7 @@ <link href="css/console-style.css" rel="stylesheet" type="text/css"/> <link rel="icon" type="image/png" href="images/favicon.png"/> - <link rel="apple-touch-icon" href="images/favicon.png"/> + <link rel="apple-touch-icon" href="images/favicon.png"/> </head> <body onload="document.getElementById('login_form:name').focus();"> <div align="center" class="container"> @@ -57,7 +57,9 @@ <h:form id="login_form"> <div> <h2>Welcome to the JBoss Administration Console.</h2> + <h2>Please login to proceed.</h2> + <p/> <h:outputLabel for="name" value="#{messages['security.username']}"/><br/> <h:inputText id="name" value="#{identity.username}" size="20"/></div> Modified: trunk/core/src/main/webapp/secure/addMap.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/addMap.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/addMap.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -43,7 +43,7 @@ Any values added here will not be persisted until you hit the Save button on the Resource's main Edit Configuration page. </div> - + <h:form id="editResourceConfigurationForm" onsubmit="prepareInputsForSubmission(this)"> <onc:config configurationDefinition="#{resourceConfigurationUIBean.configurationDefinition}" Modified: trunk/core/src/main/webapp/secure/addSimple.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/addSimple.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/addSimple.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -49,7 +49,7 @@ Any values added here will not be persisted until you hit the Save button on the Resource's main Edit Configuration page. </div> - + <h:form id="addNewOpenMapMemberPropertyForm"> <input type="hidden" name="mapName" value="#{param.mapName}"/> Modified: trunk/core/src/main/webapp/secure/categorySummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/categorySummary.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/categorySummary.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -31,112 +31,114 @@ <body> <f:view> -<ui:composition template="/layout.xhtml"> + <ui:composition template="/layout.xhtml"> -<ui:define name="pagetitle">#{category.subCategory.name}</ui:define> -<ui:define name="tabmenu"> - <ui:include src="/include/tabMenu.xhtml"> - <ui:param name="activeTab" value="summary"/> - </ui:include> -</ui:define> + <ui:define name="pagetitle">#{category.subCategory.name}</ui:define> + <ui:define name="tabmenu"> + <ui:include src="/include/tabMenu.xhtml"> + <ui:param name="activeTab" value="summary"/> + </ui:include> + </ui:define> -<ui:define name="body"> + <ui:define name="body"> - <div class="tabmenubox"> + <div class="tabmenubox"> - <ui:include src="../include/displayGlobalMessages.xhtml"/> + <ui:include src="../include/displayGlobalMessages.xhtml"/> - <div class="instructionalText"> - #{category.subCategory.description} - </div> - <div class="actionHeader"> - <div class="floatright"> - <!-- JBMANCON-437 temporarily disable - <h:form rendered="# { category.subCategory.creatable}" style="text-align: right;"> - <s:button action="# { templateDropDownPopulator.getTemplateDropDownEntriesBySubCategory()}" - value="# { messages['summary.resourceType.addNew']}" styleClass="buttonmed"> - <f:param name="selectedSubCategoryPath" value="# { category.path}"/> - </s:button> - </h:form> - <h:outputLabel rendered="# { !category.subCategory.creatable}" - value="# { messages['resourcetype.no.action']}"/> - --> - <h:outputLabel value="#{messages['resourcetype.no.action']}"/> - </div> - <h:form> - <h:outputLabel style="padding-right:6px;">View by Type:</h:outputLabel> - <h:selectOneMenu onchange="submit()" immediate="true" - valueChangeListener="#{summaryAction.resourceTypeSelected}"> - <f:selectItems value="#{commonActionUtil.asSelectItemList()}"></f:selectItems> - </h:selectOneMenu> - </h:form> - </div> - <h:form id="categorySummaryForm"> - <rich:dataTable - id="dataTable" - rows="#{tableManager.numRows}" - value="#{resources}" - var="resourceItem" - styleClass="controlTable" - rowClasses="oddRow,evenRow" - columnClasses="rich-table-cell, rich-table-cell, rich-table-cell, rich-table-cell-action"> + <div class="instructionalText"> + #{category.subCategory.description} + </div> + <div class="actionHeader"> + <div class="floatright"> + <!-- JBMANCON-437 temporarily disable + <h:form rendered="# { category.subCategory.creatable}" style="text-align: right;"> + <s:button action="# { templateDropDownPopulator.getTemplateDropDownEntriesBySubCategory()}" + value="# { messages['summary.resourceType.addNew']}" styleClass="buttonmed"> + <f:param name="selectedSubCategoryPath" value="# { category.path}"/> + </s:button> + </h:form> + <h:outputLabel rendered="# { !category.subCategory.creatable}" + value="# { messages['resourcetype.no.action']}"/> + --> + <h:outputLabel value="#{messages['resourcetype.no.action']}"/> + </div> + <h:form> + <h:outputLabel style="padding-right:6px;">View by Type:</h:outputLabel> + <h:selectOneMenu onchange="submit()" immediate="true" + valueChangeListener="#{summaryAction.resourceTypeSelected}"> + <f:selectItems value="#{commonActionUtil.asSelectItemList()}"></f:selectItems> + </h:selectOneMenu> + </h:form> + </div> + <h:form id="categorySummaryForm"> + <rich:dataTable + id="dataTable" + rows="#{tableManager.numRows}" + value="#{resources}" + var="resourceItem" + styleClass="controlTable" + rowClasses="oddRow,evenRow" + columnClasses="rich-table-cell, rich-table-cell, rich-table-cell, rich-table-cell-action"> - <f:facet name="header"> - <rich:columnGroup> + <f:facet name="header"> + <rich:columnGroup> + <rich:column> + <h:outputText value="Name"/> + </rich:column> + <rich:column> + <h:outputText value="Type"/> + </rich:column> + <rich:column> + <h:outputText value="Status"/> + </rich:column> + <rich:column> + <h:outputText value="Actions"/> + </rich:column> + </rich:columnGroup> + </f:facet> + <rich:column> - <h:outputText value="Name"/> + <!-- TODO: style should be either link-avilable or link-unavailable --> + <s:link + value="#{resourceItem.name}" + view="/secure/summary.xhtml" + styleClass="link-available"> + <f:param name="path" + value="#{navigationAction.getResourcePath(resourceItem.resource.id)}"/> + </s:link> </rich:column> <rich:column> - <h:outputText value="Type"/> + <s:link view="/secure/summary.xhtml">#{resourceItem.type} + <!-- get the child node corresponding to the type of this item, then get its path --> + <f:param name="path" value="#{summaryAction.getResourceTypePath(resourceItem.type)}"/> + </s:link> </rich:column> <rich:column> - <h:outputText value="Status"/> + <h:outputText value="#{resourceItem.availability}"/> </rich:column> <rich:column> - <h:outputText value="Actions"/> + <ui:param name="confirmDeleteMessage" + value="#{messages['summary.category.confirmDelete']}"/> + <s:button id="removeButton" + action="#{resourceCRUDAction.removeResourceAction()}" value="Delete" + onclick="if (!confirm('#{confirmDeleteMessage}')) return false;" + styleClass="buttonsmall" + rendered="#{resourceItem.resource.resourceType.deletable}"> + <f:param name="resourceId" value="#{resourceItem.resource.id}"/> + </s:button> </rich:column> - </rich:columnGroup> - </f:facet> + <f:facet name="footer"><h:graphicImage value="images/spacer.gif"/> + </f:facet> + </rich:dataTable> - <rich:column> - <!-- TODO: style should be either link-avilable or link-unavailable --> - <s:link - value="#{resourceItem.name}" - view="/secure/summary.xhtml" - styleClass="link-available"> - <f:param name="path" value="#{navigationAction.getResourcePath(resourceItem.resource.id)}"/> - </s:link> - </rich:column> - <rich:column> - <s:link view="/secure/summary.xhtml">#{resourceItem.type} - <!-- get the child node corresponding to the type of this item, then get its path --> - <f:param name="path" value="#{summaryAction.getResourceTypePath(resourceItem.type)}"/> - </s:link> - </rich:column> - <rich:column> - <h:outputText value="#{resourceItem.availability}"/> - </rich:column> - <rich:column> - <ui:param name="confirmDeleteMessage" value="#{messages['summary.category.confirmDelete']}"/> - <s:button id="removeButton" - action="#{resourceCRUDAction.removeResourceAction()}" value="Delete" - onclick="if (!confirm('#{confirmDeleteMessage}')) return false;" - styleClass="buttonsmall" - rendered="#{resourceItem.resource.resourceType.deletable}"> - <f:param name="resourceId" value="#{resourceItem.resource.id}"/> - </s:button> - </rich:column> - <f:facet name="footer"><h:graphicImage value="images/spacer.gif"/> - </f:facet> - </rich:dataTable> - - <ui:param name="paginationDataModel" value="#{resources}"/> - <ui:param name="paginationDataTableName" value="dataTable"/> - <ui:include src="../include/resourceDataScroller.xhtml"/> - </h:form> - </div> -</ui:define> -</ui:composition> + <ui:param name="paginationDataModel" value="#{resources}"/> + <ui:param name="paginationDataTableName" value="dataTable"/> + <ui:include src="../include/resourceDataScroller.xhtml"/> + </h:form> + </div> + </ui:define> + </ui:composition> </f:view> </body> </html> Modified: trunk/core/src/main/webapp/secure/operationParameters.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/operationParameters.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/operationParameters.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -27,7 +27,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:s="http://jboss.com/products/seam/taglib" xmlns:onc="http://jboss.org/on/component"> THIS TEXT WILL BE REMOVED. @@ -52,15 +52,15 @@ <input type="hidden" name="selectedOperationName" value="#{selectedOperation.name}"/> <onc:config configurationDefinition="#{selectedOperation.parametersConfigurationDefinition}" - configuration="#{selectedOperationParameters}" - nullConfigurationDefinitionMessage="null config def!" - nullConfigurationMessage="null config!" - nullConfigurationStyle="InfoBlock"/> + configuration="#{selectedOperationParameters}" + nullConfigurationDefinitionMessage="null config def!" + nullConfigurationMessage="null config!" + nullConfigurationStyle="InfoBlock"/> <ui:remove><!--Don't use s:button, as it will not submit the form!--></ui:remove> <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell"> - <h:commandButton id="okButton" + <h:commandButton id="okButton" value="#{messages['button.ok']}" action="#{operationAction.invokeOperation()}" styleClass="buttonmed"/> Modified: trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -35,6 +35,7 @@ <ui:define name="body"> <div class="notabmenubox"> <ui:include src="../include/displayGlobalMessages.xhtml"/> + <div class="instructionalText"> #{messages['content.resourceInstance.create']} </div> Modified: trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -50,14 +50,14 @@ </ui:include> </h:panelGrid> <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell"> - <h:commandButton id="addButton" + <h:commandButton id="addButton" value="#{messages['resource.add.button.continue']}" action="#{templateDropDownPopulator.populateFromTemplate()}" styleClass="buttonmed"/> - <s:button value="#{messages['resource.add.button.cancel']}" - view="/secure/summary.xhtml" - styleClass="buttonmed" - propagation="end"/> + <s:button value="#{messages['resource.add.button.cancel']}" + view="/secure/summary.xhtml" + styleClass="buttonmed" + propagation="end"/> </h:panelGrid> </h:form> </div> Modified: trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -42,7 +42,8 @@ <div class="tabmenubox"> <h:panelGroup styleClass="messagingBox" rendered="#{resourceAction.hasGlobalMessages || resourceAction.hasOnlyNonInfoNonGlobalMessages}"> - <h:outputText styleClass="messagingFail" value="#{messages['resource.status.update.validationErrors']}" + <h:outputText styleClass="messagingFail" + value="#{messages['resource.status.update.validationErrors']}" rendered="#{resourceAction.hasOnlyNonInfoNonGlobalMessages}"/> <h:messages globalOnly="true" errorClass="messagingFail" Modified: trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/resourceInstanceContent.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -52,7 +52,7 @@ styleClass="instructionalText"> <b>File Size: </b> <h:outputText value=" "/> - <h:outputText value="#{packageDetails.fileSize}"><f:convertNumber/></h:outputText> bytes + <h:outputText value="#{packageDetails.fileSize}"><f:convertNumber/></h:outputText> bytes </h:panelGroup> <hr/> <div class="instructionalText"> Modified: trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -49,13 +49,13 @@ </div> <ui:debug/> - + <h2>#{messages['metrics.resourceInstance.traitValues']}</h2> <rich:dataTable value="#{traitDisplayList}" - id="metricsTraitsTable" - var="trait" - columnClasses="standard-traitscolumn" width="100%"> + id="metricsTraitsTable" + var="trait" + columnClasses="standard-traitscolumn" width="100%"> <rich:column rendered="#{trait['a'] ne null}" width="33%"> <b>#{measurementDefinitionMap[trait['a'].measurementData.name].displayName}:</b> #{trait['a'].measurementValueAndUnits} @@ -100,9 +100,10 @@ </f:facet> </rich:dataTable> - <h:form rendered="#{(measurementCategoryList ne null and measurementCategoryList.size gt 0) or (traitDisplayList ne null and traitDisplayList.size gt 0)}" style="text-align: left;"> + <h:form rendered="#{(measurementCategoryList ne null and measurementCategoryList.size gt 0) or (traitDisplayList ne null and traitDisplayList.size gt 0)}" + style="text-align: left;"> <s:button style="margin-top: 6px;" action="#{metricAction.view()}" - value="#{messages['metrics.resourceInstance.refresh']}" styleClass="buttonmed"> + value="#{messages['metrics.resourceInstance.refresh']}" styleClass="buttonmed"> </s:button> </h:form> </div> Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -44,190 +44,205 @@ </ui:define> <ui:define name="body"> -<div class="tabmenubox"> -<ui:include src="../include/displayGlobalMessages.xhtml"/> + <div class="tabmenubox"> + <ui:include src="../include/displayGlobalMessages.xhtml"/> -<h:outputText value="#{messages['control.resourceInstance.error.noOperations']}" - rendered="#{empty operations}"/> + <h:outputText value="#{messages['control.resourceInstance.error.noOperations']}" + rendered="#{empty operations}"/> -<h:form id="operationsForm" - rendered="#{!empty operations}"> - <div class="instructionalText"> - #{messages['control.resourceInstance.select']} - </div> + <h:form id="operationsForm" + rendered="#{!empty operations}"> + <div class="instructionalText"> + #{messages['control.resourceInstance.select']} + </div> - <div class="controlTriggerPanel"> - <rich:dataTable - styleClass="internalTable" - width="100%" - id="dataTable" - rowClasses="" - var="operation" - value="#{operations}"> + <div class="controlTriggerPanel"> + <rich:dataTable + styleClass="internalTable" + width="100%" + id="dataTable" + rowClasses="" + var="operation" + value="#{operations}"> - <rich:columnGroup styleClass="#{operationAction.getOperationRowStyleClass(operation)}"> - <rich:column styleClass="buttonColumn"> + <rich:columnGroup styleClass="#{operationAction.getOperationRowStyleClass(operation)}"> + <rich:column styleClass="buttonColumn"> - <f:facet name="footer"><h:outputText>footer1</h:outputText></f:facet> - <s:button value="#{operation.displayName}" action="#{operationAction.invokeOperation()}" - styleClass="buttonmed" style="margin-right:40px;"> - <f:param name="selectedOperationName" value="#{operation.name}"/> - </s:button> - </rich:column> - <rich:column styleClass="descripColumn"> - <f:facet name="header"><h:outputText>header2</h:outputText></f:facet> - <f:facet name="footer"><h:outputText>footer2</h:outputText></f:facet> - <h:outputText value="#{operation.description}"/> - </rich:column> - </rich:columnGroup> - </rich:dataTable> - </div> -</h:form> + <f:facet name="footer"><h:outputText>footer1</h:outputText></f:facet> + <s:button value="#{operation.displayName}" + action="#{operationAction.invokeOperation()}" + styleClass="buttonmed" style="margin-right:40px;"> + <f:param name="selectedOperationName" value="#{operation.name}"/> + </s:button> + </rich:column> + <rich:column styleClass="descripColumn"> + <f:facet name="header"><h:outputText>header2</h:outputText></f:facet> + <f:facet name="footer"><h:outputText>footer2</h:outputText></f:facet> + <h:outputText value="#{operation.description}"/> + </rich:column> + </rich:columnGroup> + </rich:dataTable> + </div> + </h:form> -<rich:panel id="historiesPanel" rendered="#{!empty operationHistories}" style="margin-top: 12px;"> + <rich:panel id="historiesPanel" rendered="#{!empty operationHistories}" style="margin-top: 12px;"> - <f:facet name="header"> - #{messages['control.resourceInstance.operationHistory']} - </f:facet> + <f:facet name="header"> + #{messages['control.resourceInstance.operationHistory']} + </f:facet> - <h:outputText value="#{messages['control.resourceInstance.error.noPrevious']}" rendered="#{empty operationHistories}"/> + <h:outputText value="#{messages['control.resourceInstance.error.noPrevious']}" + rendered="#{empty operationHistories}"/> - <h:form id="historiesForm" rendered="#{!empty operationHistories}"> - <a4j:poll id="poller" reRender="poller, historiesForm, historyDetailsPanel" interval="10000" limitToList="true"/> - - <rich:dataTable - styleClass="properties-table" - id="dataTable" - rows="#{tableManager.numRows}" - rowClasses="DarkRow" - var="operationHistory" - value="#{operationHistories}"> + <h:form id="historiesForm" rendered="#{!empty operationHistories}"> + <a4j:poll id="poller" reRender="poller, historiesForm, historyDetailsPanel" interval="10000" + limitToList="true"/> - <f:facet name="header"> - <rich:columnGroup> - <rich:column styleClass="properties-table-header-cell"> - <h:outputText value="#{messages['control.resourceInstance.previous.executedAt']}"/> - </rich:column> - <rich:column styleClass="properties-table-header-cell"> - <h:outputText value="#{messages['control.resourceInstance.previous.operation']}"/> - </rich:column> - <rich:column styleClass="properties-table-header-cell"> - <h:outputText value="#{messages['control.resourceInstance.previous.status']}"/> - </rich:column> - <rich:column styleClass="properties-table-header-cell"> - <h:outputText value="Actions"/> - </rich:column> - </rich:columnGroup> - </f:facet> + <rich:dataTable + styleClass="properties-table" + id="dataTable" + rows="#{tableManager.numRows}" + rowClasses="DarkRow" + var="operationHistory" + value="#{operationHistories}"> - <rich:columnGroup styleClass="#{operationAction.getHistoriesTableRowStyleClass(operationHistory)}"> + <f:facet name="header"> + <rich:columnGroup> + <rich:column styleClass="properties-table-header-cell"> + <h:outputText + value="#{messages['control.resourceInstance.previous.executedAt']}"/> + </rich:column> + <rich:column styleClass="properties-table-header-cell"> + <h:outputText + value="#{messages['control.resourceInstance.previous.operation']}"/> + </rich:column> + <rich:column styleClass="properties-table-header-cell"> + <h:outputText value="#{messages['control.resourceInstance.previous.status']}"/> + </rich:column> + <rich:column styleClass="properties-table-header-cell"> + <h:outputText value="Actions"/> + </rich:column> + </rich:columnGroup> + </f:facet> - <rich:column styleClass="operationTimeColumn"> - <h:outputText value="#{operationHistory.createdTime}"> - <s:convertDateTime type="both" pattern="MMMMM d, yyyy '-' h:mm a"/> - </h:outputText> - </rich:column> + <rich:columnGroup + styleClass="#{operationAction.getHistoriesTableRowStyleClass(operationHistory)}"> - <rich:column styleClass="operationNameColumn"> - <h:outputText value="#{operationHistory.operationDefinition.displayName}"/> - </rich:column> + <rich:column styleClass="operationTimeColumn"> + <h:outputText value="#{operationHistory.createdTime}"> + <s:convertDateTime type="both" pattern="MMMMM d, yyyy '-' h:mm a"/> + </h:outputText> + </rich:column> - <rich:column styleClass="operationStatusColumn"> - <h:panelGroup> - <h:outputText value="#{messages['control.resourceInstance.previous.success']}" - rendered="#{operationHistory.status eq 'SUCCESS'}" styleClass="operationSuccess"/> - <h:outputText value="#{messages['control.resourceInstance.previous.inProgress']}" - rendered="#{operationHistory.status eq 'INPROGRESS'}" styleClass="operationInProgress"/> - <h:outputText value="#{messages['control.resourceInstance.previous.failure']}" - rendered="#{operationHistory.status eq 'FAILURE'}" styleClass="operationFailure"/> - <h:outputLabel value=" "/> - </h:panelGroup> - </rich:column> + <rich:column styleClass="operationNameColumn"> + <h:outputText value="#{operationHistory.operationDefinition.displayName}"/> + </rich:column> - <rich:column styleClass="actionsColumn"> - <a4j:commandButton value="Show Details Below..." - action="#{operationAction.selectOperationHistory(operationHistory.id)}" - reRender="historiesPanel, historyDetailsPanel" - styleClass="buttonsmall"/> - </rich:column> + <rich:column styleClass="operationStatusColumn"> + <h:panelGroup> + <h:outputText value="#{messages['control.resourceInstance.previous.success']}" + rendered="#{operationHistory.status eq 'SUCCESS'}" + styleClass="operationSuccess"/> + <h:outputText + value="#{messages['control.resourceInstance.previous.inProgress']}" + rendered="#{operationHistory.status eq 'INPROGRESS'}" + styleClass="operationInProgress"/> + <h:outputText value="#{messages['control.resourceInstance.previous.failure']}" + rendered="#{operationHistory.status eq 'FAILURE'}" + styleClass="operationFailure"/> + <h:outputLabel value=" "/> + </h:panelGroup> + </rich:column> - </rich:columnGroup> - </rich:dataTable> + <rich:column styleClass="actionsColumn"> + <a4j:commandButton value="Show Details Below..." + action="#{operationAction.selectOperationHistory(operationHistory.id)}" + reRender="historiesPanel, historyDetailsPanel" + styleClass="buttonsmall"/> + </rich:column> - <ui:include src="../include/resourceDataScroller.xhtml"> - <ui:param name="paginationDataModel" value="#{operationHistories}"/> - <ui:param name="paginationDataTableName" value="dataTable"/> - </ui:include> + </rich:columnGroup> + </rich:dataTable> - </h:form> -</rich:panel> + <ui:include src="../include/resourceDataScroller.xhtml"> + <ui:param name="paginationDataModel" value="#{operationHistories}"/> + <ui:param name="paginationDataTableName" value="dataTable"/> + </ui:include> -<rich:panel id="historyDetailsPanel" rendered="#{!empty operationHistories}" style="margin-top: 12px;"> + </h:form> + </rich:panel> - <f:facet name="header"> - <h:outputText value="Selected Operation History Item"/> - </f:facet> + <rich:panel id="historyDetailsPanel" rendered="#{!empty operationHistories}" style="margin-top: 12px;"> - <h:panelGroup layout="block" rendered="#{empty selectedHistory}" - style="margin-top: 6px; margin-bottom: 6px"> - No operation history is selected. Please select one above. - </h:panelGroup> + <f:facet name="header"> + <h:outputText value="Selected Operation History Item"/> + </f:facet> - <!-- TODO: Enclose params and results in separate forms, so that drilling down on a list of maps is possible. --> + <h:panelGroup layout="block" rendered="#{empty selectedHistory}" + style="margin-top: 6px; margin-bottom: 6px"> + No operation history is selected. Please select one above. + </h:panelGroup> - <h:panelGroup layout="block" rendered="#{!empty selectedHistory}" - style="margin-top: 6px; margin-bottom: 6px"> - <!-- Parameters --> - <h3>#{messages['control.resourceInstance.previous.parameters']}</h3> - <h:panelGroup rendered="#{selectedHistory.parameters ne null}"> - <onc:config configurationDefinition="#{selectedHistory.operationDefinition.parametersConfigurationDefinition}" - configuration="#{selectedHistory.parameters}" - readOnly="true" - nullConfigurationDefinitionMessage="null config def!" - nullConfigurationMessage="null config!" - nullConfigurationStyle="InfoBlock"/> - </h:panelGroup> - <h:panelGroup id="noParameters" rendered="#{selectedHistory.parameters eq null or empty selectedHistory.parameters.map}"> - <i>This operation does not take any parameters.</i> - </h:panelGroup> + <!-- TODO: Enclose params and results in separate forms, so that drilling down on a list of maps is possible. --> - <!-- Results --> - <h:panelGroup layout="block" rendered="#{selectedHistory.status eq 'INPROGRESS' or selectedHistory.status eq 'SUCCESS'}"> - <h3>#{messages['control.resourceInstance.previous.results']}</h3> - <h:panelGroup layout="block" - rendered="#{selectedHistory.status eq 'INPROGRESS'}"> - <i>The operation has not completed yet.</i> - </h:panelGroup> - <h:panelGroup id="operationResults" layout="block" - rendered="#{selectedHistory.status eq 'SUCCESS' and selectedHistory.results ne null and selectedHistory.operationDefinition.resultsConfigurationDefinition ne null}"> - <onc:config configurationDefinition="#{selectedHistory.operationDefinition.resultsConfigurationDefinition}" - configuration="#{selectedHistory.results}" + <h:panelGroup layout="block" rendered="#{!empty selectedHistory}" + style="margin-top: 6px; margin-bottom: 6px"> + <!-- Parameters --> + <h3>#{messages['control.resourceInstance.previous.parameters']}</h3> + <h:panelGroup rendered="#{selectedHistory.parameters ne null}"> + <onc:config + configurationDefinition="#{selectedHistory.operationDefinition.parametersConfigurationDefinition}" + configuration="#{selectedHistory.parameters}" readOnly="true" nullConfigurationDefinitionMessage="null config def!" nullConfigurationMessage="null config!" nullConfigurationStyle="InfoBlock"/> - </h:panelGroup> - <h:panelGroup id="noResults" layout="block" - rendered="#{selectedHistory.status eq 'SUCCESS' and (selectedHistory.results eq null or empty selectedHistory.results.map)}"> - <i>The operation did not return any results.</i> - </h:panelGroup> - </h:panelGroup> + </h:panelGroup> + <h:panelGroup id="noParameters" + rendered="#{selectedHistory.parameters eq null or empty selectedHistory.parameters.map}"> + <i>This operation does not take any parameters.</i> + </h:panelGroup> - <!-- Error --> - <h:panelGroup id="errorMessage" layout="block" rendered="#{selectedHistory.status eq 'FAILURE'}"> - <h3>#{messages['control.resourceInstance.previous.error']}</h3> - <h:inputTextarea value="#{selectedHistory.errorMessage}" readonly="true" - rendered="#{selectedHistory.errorMessage ne null}" - style="width: 100%;" rows="7"/> - <h:panelGroup layout="block" rendered="#{selectedHistory.errorMessage eq null}"> - <i>The operation failed for an unknown reason.</i> + <!-- Results --> + <h:panelGroup layout="block" + rendered="#{selectedHistory.status eq 'INPROGRESS' or selectedHistory.status eq 'SUCCESS'}"> + <h3>#{messages['control.resourceInstance.previous.results']}</h3> + <h:panelGroup layout="block" + rendered="#{selectedHistory.status eq 'INPROGRESS'}"> + <i>The operation has not completed yet.</i> + </h:panelGroup> + <h:panelGroup id="operationResults" layout="block" + rendered="#{selectedHistory.status eq 'SUCCESS' and selectedHistory.results ne null and selectedHistory.operationDefinition.resultsConfigurationDefinition ne null}"> + <onc:config + configurationDefinition="#{selectedHistory.operationDefinition.resultsConfigurationDefinition}" + configuration="#{selectedHistory.results}" + readOnly="true" + nullConfigurationDefinitionMessage="null config def!" + nullConfigurationMessage="null config!" + nullConfigurationStyle="InfoBlock"/> + </h:panelGroup> + <h:panelGroup id="noResults" layout="block" + rendered="#{selectedHistory.status eq 'SUCCESS' and (selectedHistory.results eq null or empty selectedHistory.results.map)}"> + <i>The operation did not return any results.</i> + </h:panelGroup> + </h:panelGroup> + + <!-- Error --> + <h:panelGroup id="errorMessage" layout="block" + rendered="#{selectedHistory.status eq 'FAILURE'}"> + <h3>#{messages['control.resourceInstance.previous.error']}</h3> + <h:inputTextarea value="#{selectedHistory.errorMessage}" readonly="true" + rendered="#{selectedHistory.errorMessage ne null}" + style="width: 100%;" rows="7"/> + <h:panelGroup layout="block" rendered="#{selectedHistory.errorMessage eq null}"> + <i>The operation failed for an unknown reason.</i> + </h:panelGroup> + </h:panelGroup> </h:panelGroup> - </h:panelGroup> - </h:panelGroup> -</rich:panel> + </rich:panel> -</div> + </div> </ui:define> </ui:composition> Modified: trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/resourceInstanceSummary.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -47,16 +47,19 @@ <h2>#{messages['summary.resourceInstance.configuration']}</h2> <table border="0"> <tr> - <td><span style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.name']}</strong></span>#{resource.resource.name} + <td><span + style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.name']}</strong></span>#{resource.resource.name} </td> </tr> <tr> - <td><span style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.version']}</strong></span><h:outputText + <td><span + style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.version']}</strong></span><h:outputText rendered="#{not empty resource.resource.version}">#{resource.resource.version}</h:outputText> <h:outputText rendered="#{empty resource.resource.version}">--</h:outputText></td> </tr> <tr> - <td><span style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.description']}</strong></span><h:outputText + <td><span + style="padding-right:3px;"><strong>#{messages['summary.resourceInstance.configuration.description']}</strong></span><h:outputText rendered="#{not empty resource.resource.description}">#{resource.resource.description}</h:outputText> <h:outputText rendered="#{empty resource.resource.description}">--</h:outputText></td> </tr> Modified: trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -62,7 +62,7 @@ <s:button rendered="#{resourceType.creationDataType eq 'CONTENT'}" id="addNewContent" action="#{createContentBackedResourceAction.init()}" - value="#{messages['summary.resourceType.addNew']}" styleClass="buttonmed"/> + value="#{messages['summary.resourceType.addNew']}" styleClass="buttonmed"/> </h:form> <h:outputLabel rendered="#{!resourceType.creatable}" value="#{messages['resourcetype.no.action']}"/> @@ -105,7 +105,8 @@ <h:outputText id="availability" value="#{resourceItem.availability}"/> </rich:column> <rich:column> - <ui:param name="confirmDeleteMessage" value="#{messages['summary.resourceType.confirmDelete']}"/> + <ui:param name="confirmDeleteMessage" + value="#{messages['summary.resourceType.confirmDelete']}"/> <s:button id="removeButton" action="#{resourceCRUDAction.removeResourceAction()}" value="Delete" onclick="if (!confirm('#{confirmDeleteMessage}')) return false;" Modified: trunk/core/src/main/webapp/secure/viewResultsMap.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/viewResultsMap.xhtml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/main/webapp/secure/viewResultsMap.xhtml 2009-05-18 17:23:38 UTC (rev 439) @@ -51,18 +51,19 @@ <h:form id="resourceConfigurationForm" onsubmit="prepareInputsForSubmission(this)"> - <onc:config configurationDefinition="#{operationAction.getOperationHistory(param.configId).operationDefinition.resultsConfigurationDefinition}" - configuration="#{operationAction.getOperationHistory(param.configId).results}" - listName="#{param.listName}" - listIndex="#{param.listIndex}" - readOnly="true"/> + <onc:config + configurationDefinition="#{operationAction.getOperationHistory(param.configId).operationDefinition.resultsConfigurationDefinition}" + configuration="#{operationAction.getOperationHistory(param.configId).results}" + listName="#{param.listName}" + listIndex="#{param.listIndex}" + readOnly="true"/> <h:panelGrid columns="1" styleClass="buttons-table" columnClasses="button-cell"> <h:panelGroup layout="block"> - <div title="#{messages['control.resourceInstance.previous.map.buttonLabel.ok']}" - onclick="history.back()" class="buttonmed"> + <div title="#{messages['control.resourceInstance.previous.map.buttonLabel.ok']}" + onclick="history.back()" class="buttonmed"> #{messages['control.resourceInstance.previous.map.button.ok']} - </div> + </div> </h:panelGroup> </h:panelGrid> Modified: trunk/core/src/test/java/org/jboss/on/embedded/manager/operationhistory/OperationHistoryManagerBeanTest.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/manager/operationhistory/OperationHistoryManagerBeanTest.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/manager/operationhistory/OperationHistoryManagerBeanTest.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,26 +19,25 @@ */ package org.jboss.on.embedded.manager.operationhistory; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.operation.HistoryJobId; import org.rhq.core.domain.operation.OperationHistory; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; +import org.testng.annotations.BeforeClass; + import org.jboss.on.embedded.bean.history.operation.OperationHistoryManagerBean; import org.jboss.on.embedded.manager.ResourceManager; import org.jboss.on.embedded.util.EmbeddedPluginContainerHelper; -import org.testng.annotations.BeforeClass; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * OperationHistoryManagerBean Tester. * - * @author mspritzler - * @created May 11, 2007 - * @since 1.0 + * @author Mark Spritzler */ public class OperationHistoryManagerBeanTest extends EmbeddedPluginContainerHelper { Modified: trunk/core/src/test/java/org/jboss/on/embedded/manager/pc/test/PluginContainerResourceManagerTest.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/manager/pc/test/PluginContainerResourceManagerTest.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/manager/pc/test/PluginContainerResourceManagerTest.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,28 +19,28 @@ */ package org.jboss.on.embedded.manager.pc.test; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Set; + +import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; -import org.jboss.on.embedded.Constants; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.pc.PluginContainerResourceManager; -import org.jboss.on.embedded.util.EmbeddedPluginContainerHelper; -import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService; +import org.rhq.core.gui.util.PropertyIdGeneratorUtility; import org.rhq.core.pc.PluginContainer; -import org.rhq.core.gui.util.PropertyIdGeneratorUtility; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; +import org.jboss.on.embedded.ResourceTypes; +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.util.EmbeddedPluginContainerHelper; /** * @author Jason Dobies @@ -69,27 +69,27 @@ public void getResources() { Resource platform = manager.getPlatform(); - + assert platform != null : "Platform is null"; ResourceType resourceType = platform.getResourceType(); assert resourceType != null : "Resource type was returned as null"; assert platform.getResourceType().getCategory() == ResourceCategory.PLATFORM : "resource is not a platform!?"; - + Set<Resource> children = platform.getChildResources(); assert children != null : "Child resources were null"; - assert children.size() == 1 : "# of children doesn't equal 1, its [" + children.size() +"]"; - + assert children.size() == 1 : "# of children doesn't equal 1, its [" + children.size() + "]"; + } - + //@Test //@TODO this doesn't work in the PluginContainerResourceManager public void testGetResourceType() { - ResourceType resourceType = manager.getResourceType(Constants.RESOURCE_TYPE_NO_TX_DATASOURCE); + ResourceType resourceType = manager.getResourceType(ResourceTypes.RESOURCE_TYPE_NO_TX_DATASOURCE); assert resourceType != null : "Resource type was returned as null"; - assert resourceType.getName().equals(Constants.RESOURCE_TYPE_NO_TX_DATASOURCE); + assert resourceType.getName().equals(ResourceTypes.RESOURCE_TYPE_NO_TX_DATASOURCE); } //@Test @@ -103,7 +103,7 @@ //@TODO manager.getResourceType() does not work. public void testGetResources() { - ResourceType resourceType = manager.getResourceType(Constants.RESOURCE_TYPE_JMS_TOPIC); + ResourceType resourceType = manager.getResourceType(ResourceTypes.RESOURCE_TYPE_JMS_TOPIC); Set<Resource> resources = manager.getResources(resourceType, manager.getPlatform()); assert resourceType != null : "null ResourceType returned"; @@ -113,14 +113,14 @@ /** - * Test to make sure that resources that belong to an embedded server and not the root server are accessible - * by the getResources(String ResourceType) method + * Test to make sure that resources that belong to an embedded server and not the root server are accessible by the + * getResources(String ResourceType) method */ //@Test(dependsOnMethods ="testGetResourceType") //@TODO manager.getResourceType() does not work. public void testGetChildResourceByResourceType() { - ResourceType resourceType = manager.getResourceType(Constants.RESOURCE_TYPE_VM_MEMORY); + ResourceType resourceType = manager.getResourceType(ResourceTypes.RESOURCE_TYPE_VM_MEMORY); Set<Resource> resources = manager.getResources(resourceType, manager.getPlatform()); assert resourceType != null : "null ResourceType returned"; @@ -130,14 +130,14 @@ /** - * Test to make sure that resources that belong to an embedded server and not the root server are accessible - * by the getResource(int id) method + * Test to make sure that resources that belong to an embedded server and not the root server are accessible by the + * getResource(int id) method */ //@Test(dependsOnMethods = "testGetResourceType") //@TODO manager.getResourceType() does not work. public void testGetChildResourceByResourceId() { - ResourceType resourceType = manager.getResourceType(Constants.RESOURCE_TYPE_VM_MEMORY); + ResourceType resourceType = manager.getResourceType(ResourceTypes.RESOURCE_TYPE_VM_MEMORY); Set<Resource> resources = manager.getResources(resourceType, manager.getPlatform()); // get one of the returned resources @@ -160,10 +160,10 @@ //@TODO manager.getResourceType() does not work. public void testGetResourceConfigurationDefinition() { - ResourceType resourceType = manager.getResourceType(Constants.RESOURCE_TYPE_NO_TX_DATASOURCE); + ResourceType resourceType = manager.getResourceType(ResourceTypes.RESOURCE_TYPE_NO_TX_DATASOURCE); ConfigurationDefinition definition = resourceType.getResourceConfigurationDefinition(); - assert definition != null : "Definition not loaded for " + Constants.RESOURCE_TYPE_NO_TX_DATASOURCE; + assert definition != null : "Definition not loaded for " + ResourceTypes.RESOURCE_TYPE_NO_TX_DATASOURCE; assert definition.getPropertyDefinitionSimple("jndiName") != null : "Could not find sample property jndi-name"; } @@ -174,21 +174,21 @@ //@Test public void testGetNonZeroResourceId() { - Resource jonds = getResourceInstance(Constants.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); + Resource jonds = getResourceInstance(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); assert jonds != null : "RHQDS could not be found in services"; assert jonds.getId() != 0 : "Resource ID was 0"; } /** - * related to JBNADM-1330 - getRealTimeMeasurementValue would return on one MeasurementData item, - * even if mutliple metrics were collected + * related to JBNADM-1330 - getRealTimeMeasurementValue would return on one MeasurementData item, even if mutliple + * metrics were collected */ //@Test //@TODO manager.getResourceType() does not work public void testGetMultipleMeasurements() { - String resourceTypeName = Constants.RESOURCE_TYPE_XA_DATASOURCE; + String resourceTypeName = ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE; String resourceInstanceName = "RHQDS"; Resource jonds = getResourceInstance(resourceTypeName, resourceInstanceName); @@ -217,7 +217,7 @@ //@Test public void testGetResourceConfiguration() { - Resource jonds = getResourceInstance(Constants.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); + Resource jonds = getResourceInstance(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); assert jonds != null : "RHQDS could not be found in services"; @@ -233,7 +233,7 @@ // no tests in core-gui so test here public void testPropertyIdGeneratorUtility() { - Resource jonds = getResourceInstance(Constants.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); + Resource jonds = getResourceInstance(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); assert jonds != null : "RHQDS could not be found in services"; @@ -252,10 +252,10 @@ //@Test public void testRenameDatasourceJndi() { - //ResourceType resourceType = manager.getResourceType(Constants.RESOURCE_TYPE_XA_DATASOURCE); + //ResourceType resourceType = manager.getResourceType(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE); // Find the datasource to be modified and ensure it's there - Resource datasource = getResourceInstance(Constants.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); + Resource datasource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); assert datasource != null : "Test datasource could not be retrieved"; @@ -291,8 +291,8 @@ //Resource jonDs = getResourceInstance( resourceType, "RHQDS" ); //Resource newDs = getResourceInstance( resourceType, "NewDS" ); - Resource jonDs = getResourceInstance(Constants.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); - Resource newDs = getResourceInstance(Constants.RESOURCE_TYPE_XA_DATASOURCE, "NewDS"); + Resource jonDs = getResourceInstance(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE, "RHQDS"); + Resource newDs = getResourceInstance(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE, "NewDS"); assert newDs != null : "NewDS was not discovered as a datasource"; assert jonDs == null : "RHQDS was still discovered as a datasource"; @@ -303,7 +303,7 @@ //@TODO getResourceType is currently not working correct public void testDeleteRenamedDatasource() { - ResourceType resourceType = manager.getResourceType(Constants.RESOURCE_TYPE_LOCAL_DATASOURCE); + ResourceType resourceType = manager.getResourceType(ResourceTypes.RESOURCE_TYPE_LOCAL_DATASOURCE); // Find the datasource to be modified and ensure it's there Set<Resource> resources = manager.getResources(resourceType, manager.getPlatform()); Modified: trunk/core/src/test/java/org/jboss/on/embedded/manager/test/TemplatePopulatorTest.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/manager/test/TemplatePopulatorTest.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/manager/test/TemplatePopulatorTest.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,17 +19,17 @@ */ package org.jboss.on.embedded.manager.test; -import org.testng.annotations.Test; +import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertyList; +import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.PropertyMap; -import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.configuration.definition.PropertyDefinitionList; +import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap; import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; import org.rhq.core.domain.configuration.definition.PropertySimpleType; -import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap; -import org.rhq.core.domain.configuration.definition.PropertyDefinitionList; -import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility; +import org.testng.annotations.Test; /** * @author Jason Dobies Modified: trunk/core/src/test/java/org/jboss/on/embedded/test/MeasurementUtilTest.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/test/MeasurementUtilTest.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/test/MeasurementUtilTest.java 2009-05-18 17:23:38 UTC (rev 439) @@ -32,7 +32,8 @@ import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.resource.Resource; -import org.jboss.on.embedded.Constants; + +import org.jboss.on.embedded.ResourceTypes; import org.jboss.on.embedded.bean.MeasurementDisplay; import org.jboss.on.embedded.bean.MeasurementUtils; import org.jboss.on.embedded.bean.ResourceListItem; @@ -43,20 +44,19 @@ * * @author Jessica Sant */ -public class MeasurementUtilTest extends EmbeddedPluginContainerHelper -{ +public class MeasurementUtilTest extends EmbeddedPluginContainerHelper { -// @Override -// protected String getScenario() -// { -// return "scenario1.xml"; -// } + // @Override + // protected String getScenario() + // { + // return "scenario1.xml"; + // } //@Test public void testLoadMeasurementDataAll() throws Exception { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); assert resource != null : "FakeMetricsTopic was not found and it should have been."; ResourceListItem resourceListItem = new ResourceListItem(resource, new Availability(resource, new Date(), AvailabilityType.UP)); @@ -71,27 +71,27 @@ { if (md.getName().equals("FakeByteMetricSummary")) { - assert md.getValue().equals((double) 123456789) : "incorrect value for FakeByteMetricSummary " + md.getValue(); + assert md.getValue().equals((double)123456789) : "incorrect value for FakeByteMetricSummary " + md.getValue(); } else if (md.getName().equals("FakeBitMetricSummary")) { - assert md.getValue().equals((double) 987654321) : "incorrect value for FakeBitMetricSummary " + md.getValue(); + assert md.getValue().equals((double)987654321) : "incorrect value for FakeBitMetricSummary " + md.getValue(); } else if (md.getName().equals("FakeTimeMetricSummary")) { - assert md.getValue().equals((double) 1234567) : "incorrect value for FakeTimeMetricSummary " + md.getValue(); + assert md.getValue().equals((double)1234567) : "incorrect value for FakeTimeMetricSummary " + md.getValue(); } else if (md.getName().equals("FakeByteMetricDetail")) { - assert md.getValue().equals((double) 98765) : "incorrect value for FakeByteMetricDetail " + md.getValue(); + assert md.getValue().equals((double)98765) : "incorrect value for FakeByteMetricDetail " + md.getValue(); } else if (md.getName().equals("FakeBitMetricDetail")) { - assert md.getValue().equals((double) 12345) : "incorrect value for FakeBitMetricDetail " + md.getValue(); + assert md.getValue().equals((double)12345) : "incorrect value for FakeBitMetricDetail " + md.getValue(); } else if (md.getName().equals("FakeTimeMetricDetail")) { - assert md.getValue().equals((double) 9876) : "incorrect value for FakeTimeMetricDetail " + md.getValue(); + assert md.getValue().equals((double)9876) : "incorrect value for FakeTimeMetricDetail " + md.getValue(); } else { @@ -103,7 +103,7 @@ //@Test public void testLoadMeasurementDataSummary() throws Exception { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); assert resource != null : "FakeMetricsTopic was not found and it should have been."; ResourceListItem resourceListItem = new ResourceListItem(resource, new Availability(resource, new Date(), AvailabilityType.UP)); @@ -118,15 +118,15 @@ { if (md.getName().equals("FakeByteMetricSummary")) { - assert md.getValue().equals((double) 123456789) : "incorrect value for FakeByteMetricSummary " + md.getValue(); + assert md.getValue().equals((double)123456789) : "incorrect value for FakeByteMetricSummary " + md.getValue(); } else if (md.getName().equals("FakeBitMetricSummary")) { - assert md.getValue().equals((double) 987654321) : "incorrect value for FakeBitMetricSummary " + md.getValue(); + assert md.getValue().equals((double)987654321) : "incorrect value for FakeBitMetricSummary " + md.getValue(); } else if (md.getName().equals("FakeTimeMetricSummary")) { - assert md.getValue().equals((double) 1234567) : "incorrect value for FakeTimeMetricSummary " + md.getValue(); + assert md.getValue().equals((double)1234567) : "incorrect value for FakeTimeMetricSummary " + md.getValue(); } else { @@ -138,7 +138,7 @@ //@Test( dependsOnMethods = "testLoadMeasurementDataSummary" ) public void testLoadCategory() throws Exception { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); assert resource != null : "FakeMetricsTopic was not found and it should have been."; ResourceListItem resourceListItem = new ResourceListItem(resource, new Availability(resource, new Date(), AvailabilityType.UP)); @@ -161,7 +161,7 @@ //@Test( dependsOnMethods = "testLoadMeasurementDataAll" ) public void testFormattedMetrics() throws Exception { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); assert resource != null : "FakeMetricsTopic was not found and it should have been."; ResourceListItem resourceListItem = new ResourceListItem(resource, new Availability(resource, new Date(), AvailabilityType.UP)); @@ -219,7 +219,7 @@ //@Test public void testMeasurementTraitAll() { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); assert resource != null : "FakeMetricsTopic was not found and it should have been."; ResourceListItem resourceListItem = new ResourceListItem(resource, new Availability(resource, new Date(), AvailabilityType.UP)); @@ -250,7 +250,7 @@ //@Test public void testMeasurementTraitSummary() { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); assert resource != null : "FakeMetricsTopic was not found and it should have been."; ResourceListItem resourceListItem = new ResourceListItem(resource, new Availability(resource, new Date(), AvailabilityType.UP)); @@ -277,7 +277,7 @@ //@Test public void testMeasurementTraitDetail() { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_JMS_TOPIC, "FakeMetricsTopic"); assert resource != null : "FakeMetricsTopic was not found and it should have been."; ResourceListItem resourceListItem = new ResourceListItem(resource, new Availability(resource, new Date(), AvailabilityType.UP)); Modified: trunk/core/src/test/java/org/jboss/on/embedded/test/TextareaMapConverterTest.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/test/TextareaMapConverterTest.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/test/TextareaMapConverterTest.java 2009-05-18 17:23:38 UTC (rev 439) @@ -20,14 +20,14 @@ package org.jboss.on.embedded.test; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; +import org.rhq.core.domain.configuration.Property; +import org.rhq.core.domain.configuration.PropertySimple; import org.testng.annotations.Test; import org.jboss.on.embedded.TextareaMapConverter; -import org.rhq.core.domain.configuration.Property; -import org.rhq.core.domain.configuration.PropertySimple; /** * @author Jason Dobies @@ -74,26 +74,26 @@ private void assertConversionToObject(String stringValue) { Object uncastedObject = converter.getAsObject(null, null, stringValue); - Map<String, Property> map = (Map<String, Property>) uncastedObject; + Map<String, Property> map = (Map<String, Property>)uncastedObject; PropertySimple simple; - simple = (PropertySimple) map.get("property1"); + simple = (PropertySimple)map.get("property1"); assert simple != null : "Property1 not extracted"; assert simple.getStringValue().equals("value1") : "Property1 had an incorrect value"; - simple = (PropertySimple) map.get("property2"); + simple = (PropertySimple)map.get("property2"); assert simple != null : "Property2 not extracted"; assert simple.getStringValue().equals("value2") : "Property2 had an incorrect value"; - simple = (PropertySimple) map.get("property3"); + simple = (PropertySimple)map.get("property3"); assert simple != null : "Property3 not extracted"; assert simple.getStringValue().equals("") : "Property3 had an incorrect value"; - simple = (PropertySimple) map.get("property4"); + simple = (PropertySimple)map.get("property4"); assert simple == null : "Property4 should not have been extracted"; - simple = (PropertySimple) map.get("property6"); + simple = (PropertySimple)map.get("property6"); assert simple != null : "Property6 not extracted"; assert simple.getStringValue().equals("6+7=13") : "Property6 had an incorrect value"; } Modified: trunk/core/src/test/java/org/jboss/on/embedded/ui/test/SingleResourceOperationTest.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/ui/test/SingleResourceOperationTest.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/ui/test/SingleResourceOperationTest.java 2009-05-18 17:23:38 UTC (rev 439) @@ -24,10 +24,11 @@ import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.core.domain.operation.OperationHistory; import org.rhq.core.domain.resource.Resource; -import org.jboss.on.embedded.Constants; -import org.jboss.on.embedded.util.EmbeddedSeamHelper; import org.testng.annotations.Test; +import org.jboss.on.embedded.ResourceTypes; +import org.jboss.on.embedded.util.EmbeddedSeamHelper; + /** * @author Mark Spritzler */ @@ -44,7 +45,7 @@ @Test public void testGetOperations() throws Exception { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_XA_DATASOURCE, "datasourceThree"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE, "datasourceThree"); assert resource != null : "DataSource Three was not found and it should have been."; // It would have been nice to do: @@ -68,20 +69,20 @@ protected void renderResponse() throws Exception { - operations = (List<OperationDefinition>) getInstance("operations"); + operations = (List<OperationDefinition>)getInstance("operations"); assert operations != null : "Should return non-null operations"; assert operations.size() > 0 : "Should return non-empty operations"; } }.run(); } - + // tests don't pass with dependsOnMethods present, JBSEAM-2519 // even without dependsOnMethods this test is failing with // java.lang.IllegalStateException: Could not commit transaction //@Test //(dependsOnMethods={"testGetOperations"}) public void testInvokeOperation() throws Exception { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_XA_DATASOURCE, "datasourceThree"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE, "datasourceThree"); assert resource != null : "DataSource Three was not found and it should have been."; new FacesRequest() @@ -106,14 +107,14 @@ protected void invokeApplication() throws Exception { // to match whats in pages.xml this has (), not sure if its necessary here - invokeMethod("#{operationAction.invokeOperation()}"); + invokeMethod("#{operationAction.invokeOperation()}"); } @Override protected void renderResponse() throws Exception { - List<OperationHistory> operationHistory = (List<OperationHistory>) getInstance("operationHistory"); + List<OperationHistory> operationHistory = (List<OperationHistory>)getInstance("operationHistory"); assert operationHistory.size() > 0 : "There should be something in OperationHistory"; } }.run(); @@ -123,7 +124,7 @@ //@Test//(dependsOnMethods = {"testInvokeOperation"}) public void testGetHistory() throws Exception { - final Resource resource = getResourceInstance(Constants.RESOURCE_TYPE_XA_DATASOURCE, "datasourceThree"); + final Resource resource = getResourceInstance(ResourceTypes.RESOURCE_TYPE_XA_DATASOURCE, "datasourceThree"); assert resource != null : "DataSource Three was not found and it should have been."; new FacesRequest() @@ -145,7 +146,7 @@ @Override protected void renderResponse() throws Exception { - List<OperationHistory> operationHistory = (List<OperationHistory>) getInstance("operationHistory"); + List<OperationHistory> operationHistory = (List<OperationHistory>)getInstance("operationHistory"); assert operationHistory.size() > 0 : "There should be something in OperationHistory"; } }.run(); Modified: trunk/core/src/test/java/org/jboss/on/embedded/ui/test/TreeNodeTest.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/ui/test/TreeNodeTest.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/ui/test/TreeNodeTest.java 2009-05-18 17:23:38 UTC (rev 439) @@ -26,16 +26,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.on.embedded.Constants; +import org.rhq.core.domain.resource.ResourceType; +import org.testng.annotations.Test; + +import org.jboss.seam.Component; + +import org.jboss.on.embedded.ResourceTypes; import org.jboss.on.embedded.ui.NavigationAction; import org.jboss.on.embedded.ui.SummaryAction; -import org.jboss.on.embedded.ui.nav.DummyTreeNode; import org.jboss.on.embedded.ui.nav.JONTreeNode; import org.jboss.on.embedded.ui.nav.ResourceTypeTreeNode; import org.jboss.on.embedded.util.EmbeddedSeamHelper; -import org.jboss.seam.Component; -import org.rhq.core.domain.resource.ResourceType; -import org.testng.annotations.Test; public class TreeNodeTest extends EmbeddedSeamHelper { @@ -46,15 +47,20 @@ { return "scenario2.xml"; } - + @Test // just make sure we can at least visit each node in the tree - public void testVisitEachNode() throws Exception { - new ComponentTest() { - @Override protected void testComponents() throws Exception { - visitNodes("noOp"); - }}.run(); - } + public void testVisitEachNode() throws Exception + { + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + visitNodes("noOp"); + } + }.run(); + } public void noOp(JONTreeNode node, int level) { @@ -71,24 +77,32 @@ // make sure we have the expected number public void testCountNodes() throws Exception { - new ComponentTest() { - @Override protected void testComponents() throws Exception { - numberOfNodes = 0; - visitNodes("countNode"); - - assert numberOfNodes == 28 : "Incorrect number of nodes identified, was [" - + numberOfNodes + "] should have been 28."; - }}.run(); + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + numberOfNodes = 0; + visitNodes("countNode"); + + assert numberOfNodes == 28 : "Incorrect number of nodes identified, was [" + + numberOfNodes + "] should have been 28."; + } + }.run(); } - + @Test(dependsOnMethods = {"testVisitEachNode"}) // just draw the tree to system.out public void logNodes() throws Exception { - new ComponentTest() { - @Override protected void testComponents() throws Exception { - visitNodes("logNode"); - }}.run(); + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + visitNodes("logNode"); + } + }.run(); } public void logNode(JONTreeNode node, int level) @@ -106,32 +120,40 @@ // executes SummaryAction.getOutcome for each node public void testGetOutcome() throws Exception { - new ComponentTest() { - @Override protected void testComponents() throws Exception { - visitNodes("getOutcomeForNode"); - }}.run(); + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + visitNodes("getOutcomeForNode"); + } + }.run(); } public void getOutcomeForNode(JONTreeNode node, int level) { - NavigationAction navAction = getNavigationAction(); + NavigationAction navAction = getNavigationAction(); navAction.setCurrentPath(node.getPath()); SummaryAction action = new SummaryAction(); action.setNavigationAction(navAction); String outcome = action.view(); - log.debug("Name=[" + node.getName() + ", Path=[" + node.getPath() + "], outcome=[" + outcome + "]."); + log.debug("Name=[" + node.getName() + ", Path=[" + node.getPath() + "], outcome=[" + outcome + "]."); } @Test(dependsOnMethods = {"testVisitEachNode"}) // executes NavigationAction.getBreadcrumb for each node public void testGetBreadcrumb() throws Exception { - new ComponentTest() { - @Override protected void testComponents() throws Exception { - visitNodes("getBreadcrumbForNode"); - }}.run(); + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + visitNodes("getBreadcrumbForNode"); + } + }.run(); } public void getBreadcrumbForNode(JONTreeNode node, int level) @@ -149,10 +171,14 @@ // tries to find each node from the root using the nodes path public void testFindNodeByPath() throws Exception { - new ComponentTest() { - @Override protected void testComponents() throws Exception { - visitNodes("findNode"); - }}.run(); + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + visitNodes("findNode"); + } + }.run(); } public void findNode(JONTreeNode node, int level) @@ -171,18 +197,22 @@ // should test with LocalTXDS and AppServer public void testfindNodeByResourceType() throws Exception { - new ComponentTest() { - @Override protected void testComponents() throws Exception { - ResourceType localDS = getManager().getResourceType(Constants.RESOURCE_TYPE_LOCAL_DATASOURCE); - assert localDS != null; - - NavigationAction navAction = getNavigationAction(); - ResourceTypeTreeNode retrievedNode = navAction.findNodeByResourceTypeAndParent(localDS, getPlatformNode()); - - assert retrievedNode != null; - assert localDS.equals(retrievedNode.getResourceType()); - assert retrievedNode.getChildNodes().size() == 6; - }}.run(); + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + ResourceType localDS = getManager().getResourceType(ResourceTypes.RESOURCE_TYPE_LOCAL_DATASOURCE); + assert localDS != null; + + NavigationAction navAction = getNavigationAction(); + ResourceTypeTreeNode retrievedNode = navAction.findNodeByResourceTypeAndParent(localDS, getPlatformNode()); + + assert retrievedNode != null; + assert localDS.equals(retrievedNode.getResourceType()); + assert retrievedNode.getChildNodes().size() == 6; + } + }.run(); } // Utility methods @@ -216,19 +246,19 @@ visitNodes(method, childNode, level); } } - + private NavigationAction getNavigationAction() { - return (NavigationAction) Component.getInstance("navigationAction", true); + return (NavigationAction)Component.getInstance("navigationAction", true); } - + private JONTreeNode getPlatformNode() { NavigationAction navAction = getNavigationAction(); navAction.setCurrentPath("bad_path"); // if the path doesn't match anything the root node is returned JONTreeNode root = navAction.getSelectedNode(); - + return root; } } Modified: trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedPluginContainerHelper.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedPluginContainerHelper.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedPluginContainerHelper.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,25 +19,25 @@ */ package org.jboss.on.embedded.util; +import java.io.File; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; -import org.jboss.on.embedded.manager.ResourceManager; -import org.jboss.on.embedded.manager.ResourceManagerFactory; import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; import org.rhq.core.pc.plugin.FileSystemPluginFinder; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import java.io.File; -import java.util.Set; +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.manager.ResourceManagerFactory; /** - * Base class for tests which need to initialize the plugin container - * Subclasses can override getScenario() to return the name of a particular - * scenario they want the mock plugin loaded with + * Base class for tests which need to initialize the plugin container Subclasses can override getScenario() to return + * the name of a particular scenario they want the mock plugin loaded with */ public class EmbeddedPluginContainerHelper { Modified: trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedSeamHelper.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedSeamHelper.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedSeamHelper.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,15 +19,16 @@ */ package org.jboss.on.embedded.util; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.rhq.core.domain.resource.Resource; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; + import org.jboss.seam.mock.SeamTest; + import org.jboss.on.embedded.manager.ResourceManager; -import org.rhq.core.domain.resource.Resource; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.AfterClass; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * @author mspritzler */ @@ -54,19 +55,19 @@ public void setupClass() throws Exception { // this is required to get vfs URLs (used by JBoss embeddded) recognized - // while executing the test - //org.jboss.net.protocol.URLStreamHandlerFactory factory = new org.jboss.net.protocol.URLStreamHandlerFactory(); - //URL.setURLStreamHandlerFactory(factory); + // while executing the test + //org.jboss.net.protocol.URLStreamHandlerFactory factory = new org.jboss.net.protocol.URLStreamHandlerFactory(); + //URL.setURLStreamHandlerFactory(factory); - // set up which scenario gets loaded - pluginContainerHelper.initializeScenario(); + // set up which scenario gets loaded + pluginContainerHelper.initializeScenario(); - // do all the SeamTest set up - super.setupClass(); + // do all the SeamTest set up + super.setupClass(); } // TODO once JBMANCON-183 is resolved this shouldn't be needed, we'll just - // rely on what BootstrapAction does + // rely on what TestBootstrapAction does @AfterClass public void shutdownPluginContainer() { Modified: trunk/core/src/test/java/org/jboss/on/embedded/util/NavigationRequests.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/util/NavigationRequests.java 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/java/org/jboss/on/embedded/util/NavigationRequests.java 2009-05-18 17:23:38 UTC (rev 439) @@ -19,10 +19,12 @@ */ package org.jboss.on.embedded.util; -import org.jboss.seam.mock.SeamTest; -import org.jboss.on.embedded.Constants; import org.rhq.core.domain.resource.Resource; +import org.jboss.seam.mock.SeamTest; + +import org.jboss.on.embedded.ui.FacesOutcomes; + public class NavigationRequests { @@ -74,7 +76,7 @@ { //Invoke the left nav link assert invokeMethod("#{resourceCRUDAction.viewResourceAction(resourceItem.resource)}") - .equals(Constants.OUTCOME_SUCCESS); + .equals(FacesOutcomes.SUCCESS); } @Override Added: trunk/core/src/test/java/org/jboss/on/embedded/util/TestBootstrapAction.java =================================================================== --- trunk/core/src/test/java/org/jboss/on/embedded/util/TestBootstrapAction.java (rev 0) +++ trunk/core/src/test/java/org/jboss/on/embedded/util/TestBootstrapAction.java 2009-05-18 17:23:38 UTC (rev 439) @@ -0,0 +1,114 @@ +/* + * Embedded Jopr Project + * Copyright (C) 2006-2009 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 Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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.util; + +import java.io.File; +import java.util.Collection; + +import javax.servlet.ServletException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.rhq.core.pc.PluginContainer; +import org.rhq.core.pc.PluginContainerConfiguration; +import org.rhq.core.pc.ServerServices; +import org.rhq.core.pc.plugin.FileSystemPluginFinder; +import org.rhq.core.pc.plugin.PluginEnvironment; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.Startup; + +import org.jboss.on.embedded.bean.history.operation.OperationServerServiceImpl; +import org.jboss.on.embedded.manager.ResourceManager; +import org.jboss.on.embedded.manager.ResourceManagerFactory; +import org.jboss.on.embedded.manager.history.operation.OperationHistoryManager; + +/** + * Seam version of BootstrapServlet + */ +@Name("bootstrapAction") +(a)Scope(ScopeType.APPLICATION) +@Startup +@Install(precedence = (Install.MOCK)) +// TODO this should be renamed TestBootstrapAction +// TODO this should just be able to extend the regular TestBootstrapAction and override +// a getPluginContainerConfiguration method to deal with getting references to the plugins differently +// have to check if we need to override anything else +public class TestBootstrapAction +{ + private static final Log LOG = LogFactory.getLog(TestBootstrapAction.class); + + @In(value = "historyManager", create = true) + private OperationHistoryManager historyManager; + + @Create + public void init() throws ServletException + { + try + { + bootstrap(); + } + catch (Exception e) + { + LOG.error("Error bootstrapping Embedded Console", e); + } + } + + private void bootstrap() + throws Exception + { + File pluginDir = new File("target/itest/plugins"); + + PluginContainerConfiguration config = new PluginContainerConfiguration(); + config.setPluginFinder(new FileSystemPluginFinder(pluginDir)); + config.setPluginDirectory(pluginDir); + + ServerServices services = new ServerServices(); + OperationServerServiceImpl callbackListener = new OperationServerServiceImpl(); + callbackListener.setHistoryBean(historyManager); + + services.setOperationServerService(callbackListener); + config.setServerServices(services); + + PluginContainer container = PluginContainer.getInstance(); + container.setConfiguration(config); + + LOG.info("Initializing Plugin Container"); + + container.initialize(); + + Collection<PluginEnvironment> plugins = container.getPluginManager().getPlugins(); + for (PluginEnvironment pluginEnvironment : plugins) + { + LOG.info("Loaded Plugin: " + pluginEnvironment.getPluginName()); + } + + LOG.info("Discovering Services"); + ResourceManager resourceManager = ResourceManagerFactory.resourceManager(); + resourceManager.discoverResources(); + + LOG.info("==============================================="); + } +} Property changes on: trunk/core/src/test/java/org/jboss/on/embedded/util/TestBootstrapAction.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Author Id Revision HeadURL Name: svn:eol-style + LF Modified: trunk/core/src/test/resources/WEB-INF/web.xml =================================================================== --- trunk/core/src/test/resources/WEB-INF/web.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/resources/WEB-INF/web.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -112,7 +112,7 @@ <servlet-mapping> <servlet-name>Faces Servlet</servlet-name> <url-pattern>*.seam</url-pattern> - </servlet-mapping> + </servlet-mapping> <!--<security-constraint>--> <!--<web-resource-collection>--> Modified: trunk/core/src/test/resources/conf/bootstrap-beans.xml =================================================================== --- trunk/core/src/test/resources/conf/bootstrap-beans.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/resources/conf/bootstrap-beans.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -25,205 +25,226 @@ --> <deployment xmlns="urn:jboss:bean-deployer:2.0"> - <bean name="SystemProperties" class="org.jboss.embedded.util.SystemProperties"> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>jboss.bind.address</key> + <bean name="SystemProperties" class="org.jboss.embedded.util.SystemProperties"> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>jboss.bind.address</key> <value>0.0.0.0</value> - </entry> - <entry> - <key>com.arjuna.ats.arjuna.common.propertiesFile</key> - <value>${jboss.home.dir}/conf/jbossjta-properties.xml</value> - </entry> - <entry> - <key>com.arjuna.ats.arjuna.objectstore.objectStoreDir</key> - <value>${jboss.server.data.dir}/ObjectStore</value> - </entry> - </map> - </property> - </bean> + </entry> + <entry> + <key>com.arjuna.ats.arjuna.common.propertiesFile</key> + <value>${jboss.home.dir}/conf/jbossjta-properties.xml</value> + </entry> + <entry> + <key>com.arjuna.ats.arjuna.objectstore.objectStoreDir</key> + <value>${jboss.server.data.dir}/ObjectStore</value> + </entry> + </map> + </property> + </bean> - <!-- The legacy JMX kernel --> - <bean name="JMXKernel" class="org.jboss.embedded.adapters.JMXKernel"> - <property name="kernel"> - <inject bean="jboss.kernel:service=Kernel"/> - </property> - <property name="serverConfig"> - <inject bean="ServerConfig"/> - </property> - </bean> + <!-- The legacy JMX kernel --> + <bean name="JMXKernel" class="org.jboss.embedded.adapters.JMXKernel"> + <property name="kernel"> + <inject bean="jboss.kernel:service=Kernel"/> + </property> + <property name="serverConfig"> + <inject bean="ServerConfig"/> + </property> + </bean> - <!-- The MainDeployer --> - <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl"> - <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property> - <property name="deployers"><inject bean="Deployers"/></property> - </bean> + <!-- The MainDeployer --> + <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl"> + <property name="structuralDeployers"> + <inject bean="StructuralDeployers"/> + </property> + <property name="deployers"> + <inject bean="Deployers"/> + </property> + </bean> - <!-- The holder for deployers that determine structure --> - <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> - <property name="structureBuilder"> - <!-- The consolidator of the structure information --> - <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/> - </property> - <!-- Accept any implementor of structure deployer --> - <incallback method="addDeployer"/> - <uncallback method="removeDeployer"/> - </bean> - - <!-- The holder for deployers that do real deployment --> - <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl"> - <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor> - <!-- Accept any implementor of deployer --> - <incallback method="addDeployer"/> - <uncallback method="removeDeployer"/> - </bean> + <!-- The holder for deployers that determine structure --> + <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> + <property name="structureBuilder"> + <!-- The consolidator of the structure information --> + <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/> + </property> + <!-- Accept any implementor of structure deployer --> + <incallback method="addDeployer"/> + <uncallback method="removeDeployer"/> + </bean> - <!-- A declared structure descriptor deployer --> - <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"></bean> + <!-- The holder for deployers that do real deployment --> + <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl"> + <constructor> + <parameter> + <inject bean="jboss.kernel:service=KernelController"/> + </parameter> + </constructor> + <!-- Accept any implementor of deployer --> + <incallback method="addDeployer"/> + <uncallback method="removeDeployer"/> + </bean> + <!-- A declared structure descriptor deployer --> + <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"></bean> + <!-- JAR Structure --> <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure"> - <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop --> - <constructor> - <parameter> - <set elementClass="java.lang.String"> - <value>.zip</value> - <value>.ear</value> - <value>.jar</value> - <value>.rar</value> - <value>.war</value> - <value>.sar</value> - <value>.har</value> - <value>.aop</value> - <value>.deployer</value> - <value>.beans</value> - </set> - </parameter> - </constructor> - <property name="candidateStructureVisitorFactory"> - <!-- Any file that is not an ordinary directory is a candidate --> - <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory"> - <!-- A filter to exclude some obvious non-subdeployments --> - <property name="filter"> - <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter"> - <constructor><parameter> - <list elementClass="java.lang.String"> - <!-- Exclude class files as subdeployments --> - <value>.class</value> - </list> - </parameter></constructor> - </bean> - </property> - </bean> - </property> + <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop --> + <constructor> + <parameter> + <set elementClass="java.lang.String"> + <value>.zip</value> + <value>.ear</value> + <value>.jar</value> + <value>.rar</value> + <value>.war</value> + <value>.sar</value> + <value>.har</value> + <value>.aop</value> + <value>.deployer</value> + <value>.beans</value> + </set> + </parameter> + </constructor> + <property name="candidateStructureVisitorFactory"> + <!-- Any file that is not an ordinary directory is a candidate --> + <bean name="JARStructureCandidates" + class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory"> + <!-- A filter to exclude some obvious non-subdeployments --> + <property name="filter"> + <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter"> + <constructor> + <parameter> + <list elementClass="java.lang.String"> + <!-- Exclude class files as subdeployments --> + <value>.class</value> + </list> + </parameter> + </constructor> + </bean> + </property> + </bean> + </property> </bean> <!-- File Structure --> <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure"> - <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml --> - <constructor> - <parameter> - <set elementClass="java.lang.String"> - <value>-service.xml</value> - <value>-beans.xml</value> - <value>-ds.xml</value> - <value>-aop.xml</value> - </set> - </parameter> - </constructor> + <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml --> + <constructor> + <parameter> + <set elementClass="java.lang.String"> + <value>-service.xml</value> + <value>-beans.xml</value> + <value>-ds.xml</value> + <value>-aop.xml</value> + </set> + </parameter> + </constructor> </bean> - <!-- POJO Deployment --> - <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"> - <property name="type">beans</property> - </bean> - <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"> - <property name="type">beans</property> - </bean> - <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer"> - <constructor><parameter><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor> - <property name="type">beans</property> - </bean> + <!-- POJO Deployment --> + <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"> + <property name="type">beans</property> + </bean> + <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"> + <property name="type">beans</property> + </bean> + <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer"> + <constructor> + <parameter> + <inject bean="jboss.kernel:service=Kernel"/> + </parameter> + </constructor> + <property name="type">beans</property> + </bean> - <!-- JMX Deployment --> - <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"> - <property name="type">sar</property> - </bean> - <bean name="ServiceClassLoaderDeployer" class="org.jboss.embedded.ClassLoaderDeployer"/> - <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"> - <property name="type">sar</property> - </bean> - <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer"> - <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor> - <property name="type">sar</property> - </bean> + <!-- JMX Deployment --> + <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"> + <property name="type">sar</property> + </bean> + <bean name="ServiceClassLoaderDeployer" class="org.jboss.embedded.ClassLoaderDeployer"/> + <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"> + <property name="type">sar</property> + </bean> + <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer"> + <constructor> + <parameter> + <inject bean="JMXKernel" property="serviceController"/> + </parameter> + </constructor> + <property name="type">sar</property> + </bean> - <!-- A filter for excluding files from the scanner --> - <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter"> - <!-- Files starting with theses strings are ignored --> - <property name="prefixes">#,%,\,,.,_$</property> - <!-- Files ending with theses strings are ignored --> - <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property> - <!-- Files matching with theses strings are ignored --> - <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property> - </bean> + <!-- A filter for excluding files from the scanner --> + <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter"> + <!-- Files starting with theses strings are ignored --> + <property name="prefixes">#,%,\,,.,_$</property> + <!-- Files ending with theses strings are ignored --> + <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property> + <!-- Files matching with theses strings are ignored --> + <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property> + </bean> - <!-- - JNDI Initialization of basic beans (NO REMOTING) - --> - <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/> - <bean name="java:comp" class="org.jboss.naming.JavaCompInitializer"/> + <!-- + JNDI Initialization of basic beans (NO REMOTING) + --> + <bean name="Naming" class="org.jnp.server.SingletonNamingServer"/> + <bean name="java:comp" class="org.jboss.naming.JavaCompInitializer"/> - <!-- register Naming bean with dispatcher just in case we want to have a remote JNDI connection --> - <bean name="JndiRegistration" class="org.jboss.aspects.remoting.DispatcherRegistration"> - <property name="oid">JNDI</property> - <property name="target"><inject bean="Naming"/></property> - </bean> + <!-- register Naming bean with dispatcher just in case we want to have a remote JNDI connection --> + <bean name="JndiRegistration" class="org.jboss.aspects.remoting.DispatcherRegistration"> + <property name="oid">JNDI</property> + <property name="target"> + <inject bean="Naming"/> + </property> + </bean> - <!-- - Bootstrap old JMX-based core services - setup deployers - setup deploy/ directory - --> - <bean name="ResourcesToDeploy" class="org.jboss.embedded.DeploymentScanner"> - <property name="filter"> - <inject bean="DeploymentFilter"/> - </property> - <property name="mainDeployer"> - <inject bean="MainDeployer"/> - </property> - <property name="kernel"> - <inject bean="jboss.kernel:service=Kernel"/> - </property> - <property name="resources"> - <list elementClass="java.lang.String"> - <value>${jboss.embedded.bootstrap.resource.path}conf/jboss-service.xml</value> - </list> - </property> - </bean> + <!-- + Bootstrap old JMX-based core services + setup deployers + setup deploy/ directory + --> + <bean name="ResourcesToDeploy" class="org.jboss.embedded.DeploymentScanner"> + <property name="filter"> + <inject bean="DeploymentFilter"/> + </property> + <property name="mainDeployer"> + <inject bean="MainDeployer"/> + </property> + <property name="kernel"> + <inject bean="jboss.kernel:service=Kernel"/> + </property> + <property name="resources"> + <list elementClass="java.lang.String"> + <value>${jboss.embedded.bootstrap.resource.path}conf/jboss-service.xml</value> + </list> + </property> + </bean> - <bean name="UserTransaction" class="org.jboss.embedded.adapters.LocalOnlyUserTransaction"/> + <bean name="UserTransaction" class="org.jboss.embedded.adapters.LocalOnlyUserTransaction"/> - <bean name="UserTransactionBinding" class="org.jboss.naming.JndiBinder"> - <property name="target"> - <inject bean="UserTransaction"/> - </property> - <property name="bindTo">UserTransaction</property> - <property name="serializable">false</property> - </bean> + <bean name="UserTransactionBinding" class="org.jboss.naming.JndiBinder"> + <property name="target"> + <inject bean="UserTransaction"/> + </property> + <property name="bindTo">UserTransaction</property> + <property name="serializable">false</property> + </bean> - <!-- FIXME EMB-2 - <bean name="UserTransactionBinding2" class="org.jboss.naming.JndiBinder"> - <property name="target"> - <inject bean="UserTransaction"/> - </property> - <property name="bindTo">java:comp/UserTransaction</property> - <property name="serializable">false</property> - </bean> - --> + <!-- FIXME EMB-2 + <bean name="UserTransactionBinding2" class="org.jboss.naming.JndiBinder"> + <property name="target"> + <inject bean="UserTransaction"/> + </property> + <property name="bindTo">java:comp/UserTransaction</property> + <property name="serializable">false</property> + </bean> + --> - <!-- + <!-- <bean name="ResourcesToDeploy2" class="org.jboss.embedded.DeploymentScanner"> <property name="filter"> <inject bean="DeploymentFilter"/> Modified: trunk/core/src/test/resources/conf/jboss-service.xml =================================================================== --- trunk/core/src/test/resources/conf/jboss-service.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/resources/conf/jboss-service.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -28,125 +28,127 @@ <server> - <!-- ==================================================================== --> - <!-- Main Deployer --> - <!-- ==================================================================== --> - <mbean code="org.jboss.deployment.MainDeployer" - name="jboss.system:service=MainDeployer"> - <!-- This is used to delegate the deployment handling --> - <attribute name="KernelMainDeployer"><inject bean="MainDeployer" /></attribute> - </mbean> + <!-- ==================================================================== --> + <!-- Main Deployer --> + <!-- ==================================================================== --> + <mbean code="org.jboss.deployment.MainDeployer" + name="jboss.system:service=MainDeployer"> + <!-- This is used to delegate the deployment handling --> + <attribute name="KernelMainDeployer"> + <inject bean="MainDeployer"/> + </attribute> + </mbean> - <!-- ==================================================================== --> - <!-- SAR Deployer --> - <!-- ==================================================================== --> - <mbean code="org.jboss.deployment.SARDeployer" - name="jboss.system:service=ServiceDeployer"> - <depends>jboss.system:service=MainDeployer</depends> - </mbean> + <!-- ==================================================================== --> + <!-- SAR Deployer --> + <!-- ==================================================================== --> + <mbean code="org.jboss.deployment.SARDeployer" + name="jboss.system:service=ServiceDeployer"> + <depends>jboss.system:service=MainDeployer</depends> + </mbean> - <!-- ==================================================================== --> - <!-- Security --> - <!-- ==================================================================== --> + <!-- ==================================================================== --> + <!-- Security --> + <!-- ==================================================================== --> - <mbean code="org.jboss.security.plugins.SecurityConfig" - name="jboss.security:service=SecurityConfig"> - <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute> - <depends>jboss.security:service=XMLLoginConfig</depends> - </mbean> - <mbean code="org.jboss.security.auth.login.XMLLoginConfig" - name="jboss.security:service=XMLLoginConfig"> - <attribute name="ConfigResource">${jboss.embedded.bootstrap.resource.path}conf/login-config.xml</attribute> - </mbean> + <mbean code="org.jboss.security.plugins.SecurityConfig" + name="jboss.security:service=SecurityConfig"> + <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute> + <depends>jboss.security:service=XMLLoginConfig</depends> + </mbean> + <mbean code="org.jboss.security.auth.login.XMLLoginConfig" + name="jboss.security:service=XMLLoginConfig"> + <attribute name="ConfigResource">${jboss.embedded.bootstrap.resource.path}conf/login-config.xml</attribute> + </mbean> - <!-- JAAS security manager and realm mapping --> - <mbean code="org.jboss.security.plugins.JaasSecurityManagerService" - name="jboss.security:service=JaasSecurityManager"> - <!-- A flag which indicates whether the SecurityAssociation server mode - is set on service creation. This is true by default since the - SecurityAssociation should be thread local for multi-threaded server - operation. - --> - <attribute name="ServerMode">true</attribute> - <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute> - <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute> - <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout - in seconds. - If you want to disable caching of security credentials, set this to 0 to - force authentication to occur every time. This has no affect if the - AuthenticationCacheJndiName has been changed from the default value. - --> - <attribute name="DefaultCacheTimeout">1800</attribute> - <!-- DefaultCacheResolution: Specifies the default timed cache policy - resolution in seconds. This controls the interval at which the cache - current timestamp is updated and should be less than the DefaultCacheTimeout - in order for the timeout to be meaningful. This has no affect if the - AuthenticationCacheJndiName has been changed from the default value. - --> - <attribute name="DefaultCacheResolution">60</attribute> - <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the - security managers to be deep copies that makes copies of the subject - principals and credentials if they are cloneable. It should be set to - true if subject include mutable content that can be corrupted when - multiple threads have the same identity and cache flushes/logout clearing - the subject in one thread results in subject references affecting other - threads. - --> - <attribute name="DeepCopySubjectMode">false</attribute> - </mbean> + <!-- JAAS security manager and realm mapping --> + <mbean code="org.jboss.security.plugins.JaasSecurityManagerService" + name="jboss.security:service=JaasSecurityManager"> + <!-- A flag which indicates whether the SecurityAssociation server mode + is set on service creation. This is true by default since the + SecurityAssociation should be thread local for multi-threaded server + operation. + --> + <attribute name="ServerMode">true</attribute> + <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute> + <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute> + <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout + in seconds. + If you want to disable caching of security credentials, set this to 0 to + force authentication to occur every time. This has no affect if the + AuthenticationCacheJndiName has been changed from the default value. + --> + <attribute name="DefaultCacheTimeout">1800</attribute> + <!-- DefaultCacheResolution: Specifies the default timed cache policy + resolution in seconds. This controls the interval at which the cache + current timestamp is updated and should be less than the DefaultCacheTimeout + in order for the timeout to be meaningful. This has no affect if the + AuthenticationCacheJndiName has been changed from the default value. + --> + <attribute name="DefaultCacheResolution">60</attribute> + <!-- DeepCopySubjectMode: This set the copy mode of subjects done by the + security managers to be deep copies that makes copies of the subject + principals and credentials if they are cloneable. It should be set to + true if subject include mutable content that can be corrupted when + multiple threads have the same identity and cache flushes/logout clearing + the subject in one thread results in subject references affecting other + threads. + --> + <attribute name="DeepCopySubjectMode">false</attribute> + </mbean> - <!-- Authorization manager--> - <mbean code="org.jboss.security.plugins.AuthorizationManagerService" - name="jboss.security:service=AuthorizationManager"> - <attribute name="AuthorizationManagerClassName">org.jboss.security.plugins.JBossAuthorizationManager</attribute> - </mbean> + <!-- Authorization manager--> + <mbean code="org.jboss.security.plugins.AuthorizationManagerService" + name="jboss.security:service=AuthorizationManager"> + <attribute name="AuthorizationManagerClassName">org.jboss.security.plugins.JBossAuthorizationManager</attribute> + </mbean> - <!-- ==================================================================== --> - <!-- Transactions --> - <!-- ==================================================================== --> - - <!-- JBossTS JTA --> - <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService" - name="jboss:service=TransactionManager"> - <attribute name="TransactionTimeout">300</attribute> - <attribute name="ObjectStoreDir">${jboss.server.data.dir}/tx-object-store</attribute> - </mbean> + <!-- ==================================================================== --> + <!-- Transactions --> + <!-- ==================================================================== --> - <mbean code="org.jboss.util.threadpool.BasicThreadPool" - name="jboss.jca:service=WorkManagerThreadPool"> - <!-- The name that appears in thread names --> - <attribute name="Name">WorkManager</attribute> - <!-- The maximum amount of work in the queue --> - <attribute name="MaximumQueueSize">1024</attribute> - <!-- The maximum number of active threads --> - <attribute name="MaximumPoolSize">100</attribute> - <!-- How long to keep threads alive after their last work (default one minute) --> - <attribute name="KeepAliveTime">60000</attribute> - </mbean> + <!-- JBossTS JTA --> + <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService" + name="jboss:service=TransactionManager"> + <attribute name="TransactionTimeout">300</attribute> + <attribute name="ObjectStoreDir">${jboss.server.data.dir}/tx-object-store</attribute> + </mbean> - <mbean code="org.jboss.resource.work.JBossWorkManager" - name="jboss.jca:service=WorkManager"> - <depends optional-attribute-name="ThreadPoolName">jboss.jca:service=WorkManagerThreadPool</depends> - <depends optional-attribute-name="XATerminatorName">jboss:service=TransactionManager</depends> - </mbean> + <mbean code="org.jboss.util.threadpool.BasicThreadPool" + name="jboss.jca:service=WorkManagerThreadPool"> + <!-- The name that appears in thread names --> + <attribute name="Name">WorkManager</attribute> + <!-- The maximum amount of work in the queue --> + <attribute name="MaximumQueueSize">1024</attribute> + <!-- The maximum number of active threads --> + <attribute name="MaximumPoolSize">100</attribute> + <!-- How long to keep threads alive after their last work (default one minute) --> + <attribute name="KeepAliveTime">60000</attribute> + </mbean> - <!-- + <mbean code="org.jboss.resource.work.JBossWorkManager" + name="jboss.jca:service=WorkManager"> + <depends optional-attribute-name="ThreadPoolName">jboss.jca:service=WorkManagerThreadPool</depends> + <depends optional-attribute-name="XATerminatorName">jboss:service=TransactionManager</depends> + </mbean> + + <!-- | The CachedConnectionManager is used partly to relay started UserTransactions to | open connections so they may be enrolled in the new tx. --> - <mbean code="org.jboss.resource.connectionmanager.CachedConnectionManager" - name="jboss.jca:service=CachedConnectionManager"> - <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends> + <mbean code="org.jboss.resource.connectionmanager.CachedConnectionManager" + name="jboss.jca:service=CachedConnectionManager"> + <depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends> - <!-- Enable connection close debug monitoring --> - <attribute name="Debug">true</attribute> + <!-- Enable connection close debug monitoring --> + <attribute name="Debug">true</attribute> - </mbean> + </mbean> - <mbean code="org.jboss.naming.JNDIView" - name="jboss:service=JNDIView"> - <!-- The HANamingService service name --> - <attribute name="HANamingService">jboss:service=HAJNDI</attribute> - </mbean> + <mbean code="org.jboss.naming.JNDIView" + name="jboss:service=JNDIView"> + <!-- The HANamingService service name --> + <attribute name="HANamingService">jboss:service=HAJNDI</attribute> + </mbean> </server> Modified: trunk/core/src/test/resources/conf/jbossjta-properties.xml =================================================================== --- trunk/core/src/test/resources/conf/jbossjta-properties.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/resources/conf/jbossjta-properties.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -24,7 +24,7 @@ Transaction Reaper Timeout (default is 120000 ms). --> <property - name="com.arjuna.ats.arjuna.coordinator.txReaperTimeout" value="120000"/> + name="com.arjuna.ats.arjuna.coordinator.txReaperTimeout" value="120000"/> <!-- Transaction Reaper Mode, can be: NORMAL or DYNAMIC (default is NORMAL). --> @@ -33,17 +33,17 @@ Transaction Reaper Cancel Wait Period (default is 500 ms, min is 10 msecs). --> <property - name="com.arjuna.ats.arjuna.coordinator.txReaperCancelWaitPeriod" value="500"/> + name="com.arjuna.ats.arjuna.coordinator.txReaperCancelWaitPeriod" value="500"/> <!-- Transaction Reaper Cancel Fail Wait Period (default is 500 ms, min is 10 msecs). --> <property - name="com.arjuna.ats.arjuna.coordinator.txReaperCancelFailWaitPeriod" value="500"/> + name="com.arjuna.ats.arjuna.coordinator.txReaperCancelFailWaitPeriod" value="500"/> <!-- Transaction Reaper Zombie Max (default is 8). --> <property - name="com.arjuna.ats.arjuna.coordinator.txReaperZombieMax" value="8"/> + name="com.arjuna.ats.arjuna.coordinator.txReaperZombieMax" value="8"/> <!-- (default is NO) --> @@ -56,7 +56,7 @@ (default is YES) --> <property - name="com.arjuna.ats.arjuna.coordinator.commitOnePhase" value="YES"/> + name="com.arjuna.ats.arjuna.coordinator.commitOnePhase" value="YES"/> <!-- (default is defaultStore) --> @@ -65,27 +65,27 @@ default is under user.home - must be writeable!) --> <property - name="com.arjuna.ats.arjuna.objectstore.objectStoreDir" value="PutObjectStoreDirHere"/> + name="com.arjuna.ats.arjuna.objectstore.objectStoreDir" value="PutObjectStoreDirHere"/> <!-- (default is ON) --> <property - name="com.arjuna.ats.arjuna.objectstore.objectStoreSync" value="ON"/> + name="com.arjuna.ats.arjuna.objectstore.objectStoreSync" value="ON"/> <!-- (default is ShadowNoFileLockStore) --> <property - name="com.arjuna.ats.arjuna.objectstore.objectStoreType" value="ShadowNoFileLockStore"/> + name="com.arjuna.ats.arjuna.objectstore.objectStoreType" value="ShadowNoFileLockStore"/> <!-- (default is 255) --> <property - name="com.arjuna.ats.arjuna.objectstore.hashedDirectories" value="255"/> + name="com.arjuna.ats.arjuna.objectstore.hashedDirectories" value="255"/> <!-- (default is ON) --> <property - name="com.arjuna.ats.arjuna.objectstore.transactionSync" value="ON"/> + name="com.arjuna.ats.arjuna.objectstore.transactionSync" value="ON"/> <!-- (Must be unique across all Arjuna instances.) --> @@ -143,11 +143,11 @@ <properties name="common"> <!-- CLF 2.0 properties --> <property name="com.arjuna.common.util.logging.DebugLevel" - type="System" value="0x00000000"/> + type="System" value="0x00000000"/> <property name="com.arjuna.common.util.logging.FacilityLevel" - type="System" value="0xffffffff"/> + type="System" value="0xffffffff"/> <property name="com.arjuna.common.util.logging.VisibilityLevel" - type="System" value="0xffffffff"/> + type="System" value="0xffffffff"/> <property name="com.arjuna.common.util.logger" type="System" value="log4j"/> </properties> <properties depends="arjuna" name="txoj"> @@ -175,7 +175,7 @@ (default is YES) --> <property - name="com.arjuna.ats.txoj.lockstore.allowNestedLocking" value="YES"/> + name="com.arjuna.ats.txoj.lockstore.allowNestedLocking" value="YES"/> </properties> <properties depends="arjuna" name="jta"> <!-- @@ -183,11 +183,13 @@ Default is NO. --> <property name="com.arjuna.ats.jta.supportSubtransactions" value="NO"/> - <property name="com.arjuna.ats.jta.jtaTMImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/> + <property name="com.arjuna.ats.jta.jtaTMImplementation" + value="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple"/> <!-- com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple --> - <property name="com.arjuna.ats.jta.jtaUTImplementation" value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/> + <property name="com.arjuna.ats.jta.jtaUTImplementation" + value="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple"/> <!-- com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple --> @@ -205,22 +207,25 @@ Default is 120 seconds. --> <property - name="com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" value="120"/> + name="com.arjuna.ats.arjuna.recovery.periodicRecoveryPeriod" value="120"/> <!-- Interval in seconds between first and second pass of periodic recovery. Default is 10 seconds. --> <property - name="com.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod" value="10"/> + name="com.arjuna.ats.arjuna.recovery.recoveryBackoffPeriod" value="10"/> <!-- Periodic recovery modules to use. Invoked in sort-order of names. --> <property - name="com.arjuna.ats.arjuna.recovery.recoveryExtension1" value="com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule"/> + name="com.arjuna.ats.arjuna.recovery.recoveryExtension1" + value="com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule"/> <property - name="com.arjuna.ats.arjuna.recovery.recoveryExtension2" value="com.arjuna.ats.internal.txoj.recovery.TORecoveryModule"/> + name="com.arjuna.ats.arjuna.recovery.recoveryExtension2" + value="com.arjuna.ats.internal.txoj.recovery.TORecoveryModule"/> <property - name="com.arjuna.ats.arjuna.recovery.recoveryExtension3" value="com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"/> + name="com.arjuna.ats.arjuna.recovery.recoveryExtension3" + value="com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"/> <!-- Expired entry removal --> @@ -229,7 +234,8 @@ Names must begin with "com.arjuna.ats.arjuna.recovery.expiryScanner" --> <property - name="com.arjuna.ats.arjuna.recovery.expiryScannerTransactionStatusManager" value="com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"/> + name="com.arjuna.ats.arjuna.recovery.expiryScannerTransactionStatusManager" + value="com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner"/> <!-- Interval, in hours, between running the expiry scanners. This can be quite long. The absolute value determines the interval - @@ -239,20 +245,20 @@ Default = 12 = run immediately, then every 12 hours. --> <property - name="com.arjuna.ats.arjuna.recovery.expiryScanInterval" value="12"/> + name="com.arjuna.ats.arjuna.recovery.expiryScanInterval" value="12"/> <!-- Age, in hours, for removal of transaction status manager item. This should be longer than any ts-using process will remain running. Zero = Never removed. Default is 12. --> <property - name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerExpiryTime" value="12"/> + name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerExpiryTime" value="12"/> <!-- Use this to fix the port on which the TransactionStatusManager listens, The default behaviour is to use any free port. --> <property - name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerPort" value="0"/> + name="com.arjuna.ats.arjuna.recovery.transactionStatusManagerPort" value="0"/> </properties> <properties depends="jta" name="jdbc"> <!-- Modified: trunk/core/src/test/resources/conf/login-config.xml =================================================================== --- trunk/core/src/test/resources/conf/login-config.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/core/src/test/resources/conf/login-config.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -20,8 +20,8 @@ ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> <!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> + "-//JBoss//DTD JBOSS Security Config 3.0//EN" + "http://www.jboss.org/j2ee/dtd/security_config.dtd"> <!-- The XML based JAAS login configuration read by the org.jboss.security.auth.login.XMLLoginConfig mbean. Add @@ -70,37 +70,37 @@ </authentication> </application-policy> --> - - <!-- Used by clients within the application server VM such as - mbeans and servlets that access EJBs. - --> - <application-policy name="client-login"> - <authentication> - <login-module code="org.jboss.security.ClientLoginModule" - flag="required"> - <!-- Any existing security context will be restored on logout --> - <module-option name="restore-login-identity">true</module-option> - </login-module> - </authentication> - </application-policy> - <application-policy name="other"> - <!-- A simple server login module, which can be used when the number - of users is relatively small. It uses two properties files: - users.properties, which holds users (key) and their password (value). - roles.properties, which holds users (key) and a comma-separated list of - their roles (value). - The unauthenticatedIdentity property defines the name of the principal - that will be used when a null username and password are presented as is - the case for an unuathenticated web client or MDB. If you want to - allow such users to be authenticated add the property, e.g., - unauthenticatedIdentity="nobody" + <!-- Used by clients within the application server VM such as + mbeans and servlets that access EJBs. --> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"/> - </authentication> - </application-policy> + <application-policy name="client-login"> + <authentication> + <login-module code="org.jboss.security.ClientLoginModule" + flag="required"> + <!-- Any existing security context will be restored on logout --> + <module-option name="restore-login-identity">true</module-option> + </login-module> + </authentication> + </application-policy> + <application-policy name="other"> + <!-- A simple server login module, which can be used when the number + of users is relatively small. It uses two properties files: + users.properties, which holds users (key) and their password (value). + roles.properties, which holds users (key) and a comma-separated list of + their roles (value). + The unauthenticatedIdentity property defines the name of the principal + that will be used when a null username and password are presented as is + the case for an unuathenticated web client or MDB. If you want to + allow such users to be authenticated add the property, e.g., + unauthenticatedIdentity="nobody" + --> + <authentication> + <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" + flag="required"/> + </authentication> + </application-policy> + </policy> Modified: trunk/jbas5/etc/generated-rhq-plugin.xml =================================================================== --- trunk/jbas5/etc/generated-rhq-plugin.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/generated-rhq-plugin.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -2,9 +2,11 @@ <plugin xmlns="urn:xmlns:rhq-plugin" xmlns:c="urn:xmlns:rhq-configuration"> <service name="XA DataSource"> <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/> - <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" description="Obtain a formatted statistics report"> + <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" + description="Obtain a formatted statistics report"> <parameters> - <c:simple-property required="false" name="formatClassName" description="The StatisticsFormatter class name"/> + <c:simple-property required="false" name="formatClassName" + description="The StatisticsFormatter class name"/> </parameters> <results> <c:notes>Obtain a formatted statistics report</c:notes> @@ -17,76 +19,117 @@ <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="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"/> - <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> + <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"/> + <c:simple-property type="boolean" required="false" name="background-validation" + description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> - <c:simple-property required="false" name="check-valid-connection-sql" description="The SQL statement to validate a connection"/> - <c:map-property required="false" readOnly="true" name="config-property" description="The connection factory property info"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" + description="The time to wait for a connection to become available before giving up"/> + <c:simple-property required="false" name="check-valid-connection-sql" + description="The SQL statement to validate a connection"/> + <c:map-property required="false" readOnly="true" name="config-property" + description="The connection factory property info"/> <c:simple-property name="connection-definition" description="The connection factory class name"/> - <c:simple-property required="false" name="exception-sorter-class-name" description="The exception sorter class name"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property required="false" name="exception-sorter-class-name" + description="The exception sorter class name"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" + description="The idle timeout in minutes"/> <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> - <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> + <c:simple-property type="integer" required="false" name="max-pool-size" + description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> + <c:simple-property type="integer" required="false" name="min-pool-size" + description="The min size of the pool"/> <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> <c:simple-property required="false" name="password" description="The DataSource password"/> <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 type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/> + <c:simple-property type="boolean" required="false" name="prefill" + description="Whether to prefill the pool"/> + <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 deployment type"/> + <c:simple-property required="false" name="securityDeploymentType" + description="the security deployment 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"/> + <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"/> <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="track-statements" description="The track statements method"/> - <c:simple-property required="false" name="transaction-isolation" description="The DataSource transaction isolation level"/> + <c:simple-property required="false" name="transaction-isolation" + description="The DataSource transaction isolation level"/> <c:simple-property required="false" name="type-mapping"/> <c:simple-property required="false" name="url-delimiter" description="The DataSource url delimiter"/> <c:simple-property required="false" name="url-property" description="The url-property"/> - <c:simple-property required="false" name="url-selector-strategy-class-name" description="The DataSource url selector strategy class name"/> - <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/> + <c:simple-property required="false" name="url-selector-strategy-class-name" + description="The DataSource url selector strategy class name"/> + <c:simple-property type="boolean" required="false" name="use-java-context" + description="Should the jndi name be bound under the java: context"/> <c:simple-property type="boolean" required="false" name="use-strict-min"/> - <c:simple-property type="long" required="false" name="use-try-lock" description="The internal lock timeout"/> + <c:simple-property type="long" required="false" name="use-try-lock" + description="The internal lock timeout"/> <c:simple-property required="false" name="user-name" description="The DataSource username"/> - <c:simple-property required="false" name="valid-connection-checker-class-name" description="The DataSource connection checker class name"/> + <c:simple-property required="false" name="valid-connection-checker-class-name" + description="The DataSource connection checker class name"/> <c:simple-property type="boolean" required="false" name="validate-on-match"/> <c:simple-property name="xa-datasource-class" description="The XADataSource class"/> - <c:map-property required="false" name="xa-datasource-properties" description="The xa datasource properties"/> - <c:simple-property type="integer" required="false" name="xa-resource-timeout" description="The XAResource timeout"/> + <c:map-property required="false" name="xa-datasource-properties" + description="The xa datasource properties"/> + <c:simple-property type="integer" required="false" name="xa-resource-timeout" + description="The XAResource timeout"/> </resource-configuration> </service> <service name="LocalTx DataSource"> <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/> - <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" description="Obtain a formatted statistics report"> + <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" + description="Obtain a formatted statistics report"> <parameters> - <c:simple-property required="false" name="formatClassName" description="The StatisticsFormatter class name"/> + <c:simple-property required="false" name="formatClassName" + description="The StatisticsFormatter class name"/> </parameters> <results> <c:notes>Obtain a formatted statistics report</c:notes> @@ -99,75 +142,115 @@ <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="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"/> - <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> + <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"/> + <c:simple-property type="boolean" required="false" name="background-validation" + description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> - <c:simple-property required="false" name="check-valid-connection-sql" description="The SQL statement to validate a connection"/> - <c:map-property required="false" readOnly="true" name="config-property" description="The connection factory property info"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" + description="The time to wait for a connection to become available before giving up"/> + <c:simple-property required="false" name="check-valid-connection-sql" + description="The SQL statement to validate a connection"/> + <c:map-property required="false" readOnly="true" name="config-property" + description="The connection factory property info"/> <c:simple-property name="connection-definition" description="The connection factory class name"/> - <c:map-property required="false" name="connection-properties" description="The DataSource connection properties"/> + <c:map-property required="false" name="connection-properties" + description="The DataSource connection properties"/> <c:simple-property name="connection-url" description="The DataSource connection URL"/> <c:simple-property name="driver-class" description="The DataSource connection driver class name"/> - <c:simple-property required="false" name="exception-sorter-class-name" description="The exception sorter class name"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property required="false" name="exception-sorter-class-name" + description="The exception sorter class name"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" + description="The idle timeout in minutes"/> <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> - <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> + <c:simple-property type="integer" required="false" name="max-pool-size" + description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> + <c:simple-property type="integer" required="false" name="min-pool-size" + description="The min size of the pool"/> <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> <c:simple-property required="false" name="password" description="The DataSource password"/> <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 type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/> + <c:simple-property type="boolean" required="false" name="prefill" + description="Whether to prefill the pool"/> + <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 deployment type"/> + <c:simple-property required="false" name="securityDeploymentType" + description="the security deployment 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"/> + <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"/> <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="track-statements" description="The track statements method"/> - <c:simple-property required="false" name="transaction-isolation" description="The DataSource transaction isolation level"/> + <c:simple-property required="false" name="transaction-isolation" + description="The DataSource transaction isolation level"/> <c:simple-property required="false" name="type-mapping"/> <c:simple-property required="false" name="url-delimiter" description="The DataSource url delimiter"/> - <c:simple-property required="false" name="url-selector-strategy-class-name" description="The DataSource url selector strategy class name"/> - <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/> + <c:simple-property required="false" name="url-selector-strategy-class-name" + description="The DataSource url selector strategy class name"/> + <c:simple-property type="boolean" required="false" name="use-java-context" + description="Should the jndi name be bound under the java: context"/> <c:simple-property type="boolean" required="false" name="use-strict-min"/> - <c:simple-property type="long" required="false" name="use-try-lock" description="The internal lock timeout"/> + <c:simple-property type="long" required="false" name="use-try-lock" + description="The internal lock timeout"/> <c:simple-property required="false" name="user-name" description="The DataSource username"/> - <c:simple-property required="false" name="valid-connection-checker-class-name" description="The DataSource connection checker class name"/> + <c:simple-property required="false" name="valid-connection-checker-class-name" + description="The DataSource connection checker class name"/> <c:simple-property type="boolean" required="false" name="validate-on-match"/> </resource-configuration> </service> <service name="NoTx DataSource"> <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/> - <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" description="Obtain a formatted statistics report"> + <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" + description="Obtain a formatted statistics report"> <parameters> - <c:simple-property required="false" name="formatClassName" description="The StatisticsFormatter class name"/> + <c:simple-property required="false" name="formatClassName" + description="The StatisticsFormatter class name"/> </parameters> <results> <c:notes>Obtain a formatted statistics report</c:notes> @@ -180,75 +263,115 @@ <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="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"/> - <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> + <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"/> + <c:simple-property type="boolean" required="false" name="background-validation" + description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> - <c:simple-property required="false" name="check-valid-connection-sql" description="The SQL statement to validate a connection"/> - <c:map-property required="false" readOnly="true" name="config-property" description="The connection factory property info"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" + description="The time to wait for a connection to become available before giving up"/> + <c:simple-property required="false" name="check-valid-connection-sql" + description="The SQL statement to validate a connection"/> + <c:map-property required="false" readOnly="true" name="config-property" + description="The connection factory property info"/> <c:simple-property name="connection-definition" description="The connection factory class name"/> - <c:map-property required="false" name="connection-properties" description="The DataSource connection properties"/> + <c:map-property required="false" name="connection-properties" + description="The DataSource connection properties"/> <c:simple-property name="connection-url" description="The DataSource connection URL"/> <c:simple-property name="driver-class" description="The DataSource connection driver class name"/> - <c:simple-property required="false" name="exception-sorter-class-name" description="The exception sorter class name"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property required="false" name="exception-sorter-class-name" + description="The exception sorter class name"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" + description="The idle timeout in minutes"/> <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> - <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> + <c:simple-property type="integer" required="false" name="max-pool-size" + description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> + <c:simple-property type="integer" required="false" name="min-pool-size" + description="The min size of the pool"/> <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> <c:simple-property required="false" name="password" description="The DataSource password"/> <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 type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/> + <c:simple-property type="boolean" required="false" name="prefill" + description="Whether to prefill the pool"/> + <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 deployment type"/> + <c:simple-property required="false" name="securityDeploymentType" + description="the security deployment 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"/> + <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"/> <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="track-statements" description="The track statements method"/> - <c:simple-property required="false" name="transaction-isolation" description="The DataSource transaction isolation level"/> + <c:simple-property required="false" name="transaction-isolation" + description="The DataSource transaction isolation level"/> <c:simple-property required="false" name="type-mapping"/> <c:simple-property required="false" name="url-delimiter" description="The DataSource url delimiter"/> - <c:simple-property required="false" name="url-selector-strategy-class-name" description="The DataSource url selector strategy class name"/> - <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/> + <c:simple-property required="false" name="url-selector-strategy-class-name" + description="The DataSource url selector strategy class name"/> + <c:simple-property type="boolean" required="false" name="use-java-context" + description="Should the jndi name be bound under the java: context"/> <c:simple-property type="boolean" required="false" name="use-strict-min"/> - <c:simple-property type="long" required="false" name="use-try-lock" description="The internal lock timeout"/> + <c:simple-property type="long" required="false" name="use-try-lock" + description="The internal lock timeout"/> <c:simple-property required="false" name="user-name" description="The DataSource username"/> - <c:simple-property required="false" name="valid-connection-checker-class-name" description="The DataSource connection checker class name"/> + <c:simple-property required="false" name="valid-connection-checker-class-name" + description="The DataSource connection checker class name"/> <c:simple-property type="boolean" required="false" name="validate-on-match"/> </resource-configuration> </service> <service name="Tx ConnectionFactory"> <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/> - <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" description="Obtain a formatted statistics report"> + <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" + description="Obtain a formatted statistics report"> <parameters> - <c:simple-property required="false" name="formatClassName" description="The StatisticsFormatter class name"/> + <c:simple-property required="false" name="formatClassName" + description="The StatisticsFormatter class name"/> </parameters> <results> <c:notes>Obtain a formatted statistics report</c:notes> @@ -261,59 +384,92 @@ <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"/> + <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"/> - <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> + <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"/> + <c:simple-property type="boolean" required="false" name="background-validation" + description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> - <c:map-property required="false" name="config-property" description="The connection factory config properties"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" + description="The time to wait for a connection to become available before giving up"/> + <c:map-property required="false" name="config-property" + description="The connection factory config properties"/> <c:simple-property name="connection-definition" description="The connection factory class name"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" + description="The idle timeout in minutes"/> <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> - <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> + <c:simple-property type="integer" required="false" name="max-pool-size" + description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> + <c:simple-property type="integer" required="false" name="min-pool-size" + description="The min size of the pool"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> <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 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 deployment type"/> + <c:simple-property required="false" name="securityDeploymentType" + description="the security deployment 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"/> - <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/> + <c:simple-property type="boolean" required="false" name="use-java-context" + description="Should the jndi name be bound under the java: context"/> <c:simple-property type="boolean" required="false" name="use-strict-min"/> <c:simple-property type="boolean" required="false" name="validate-on-match"/> - <c:simple-property type="integer" required="false" name="xa-resource-timeout" description="The XA resource timeout"/> - <c:simple-property type="boolean" required="false" readOnly="true" name="xa-transaction" description="The XA/local transaction behavior flag"/> + <c:simple-property type="integer" required="false" name="xa-resource-timeout" + description="The XA resource timeout"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="xa-transaction" + description="The XA/local transaction behavior flag"/> </resource-configuration> </service> <service name="NoTx ConnectionFactory"> <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/> - <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" description="Obtain a formatted statistics report"> + <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" + description="Obtain a formatted statistics report"> <parameters> - <c:simple-property required="false" name="formatClassName" description="The StatisticsFormatter class name"/> + <c:simple-property required="false" name="formatClassName" + description="The StatisticsFormatter class name"/> </parameters> <results> <c:notes>Obtain a formatted statistics report</c:notes> @@ -326,47 +482,74 @@ <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="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"/> - <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> + <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"/> + <c:simple-property type="boolean" required="false" name="background-validation" + description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> - <c:map-property required="false" name="config-property" description="The connection factory config properties"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" + description="The time to wait for a connection to become available before giving up"/> + <c:map-property required="false" name="config-property" + description="The connection factory config properties"/> <c:simple-property name="connection-definition" description="The connection factory class name"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" + description="The idle timeout in minutes"/> <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> - <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> + <c:simple-property type="integer" required="false" name="max-pool-size" + description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> + <c:simple-property type="integer" required="false" name="min-pool-size" + description="The min size of the pool"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> <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 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 deployment type"/> + <c:simple-property required="false" name="securityDeploymentType" + description="the security deployment 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"/> - <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/> + <c:simple-property type="boolean" required="false" name="use-java-context" + description="Should the jndi name be bound under the java: context"/> <c:simple-property type="boolean" required="false" name="use-strict-min"/> <c:simple-property type="boolean" required="false" name="validate-on-match"/> </resource-configuration> @@ -389,7 +572,8 @@ </c:list-property> </results> </operation> - <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable mesages using a selector"> + <operation name="listDurableMessages" displayName="List Durable Messages" + description="List all durable mesages using a selector"> <parameters> <c:simple-property required="false" name="arg#0"/> </parameters> @@ -404,19 +588,22 @@ </c:list-property> </results> </operation> - <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML" description="Get the message counter as HTML"> + <operation name="listMessageCounterAsHTML" displayName="List Message Counter As HTML" + description="Get the message counter as HTML"> <results> <c:notes>Get the message counter as HTML</c:notes> <c:simple-property required="false" name="result"/> </results> </operation> - <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML" description="Get the message counter history as HTML"> + <operation name="listMessageCounterHistoryAsHTML" displayName="List Message Counter History As HTML" + description="Get the message counter history as HTML"> <results> <c:notes>Get the message counter history as HTML</c:notes> <c:simple-property required="false" name="result"/> </results> </operation> - <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable mesages using a selector"> + <operation name="listNonDurableMessages" displayName="List Non Durable Messages" + description="List all non durable mesages using a selector"> <parameters> <c:simple-property required="false" name="arg#0"/> </parameters> @@ -431,59 +618,119 @@ </c:list-property> </results> </operation> - <operation name="removeAllMessages" displayName="Remove All Messages" description="Remove all messages in the queue"/> - <operation name="resetMessageCounter" displayName="Reset Message Counter" description="Reset the message counter"/> - <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/> + <operation name="removeAllMessages" displayName="Remove All Messages" + description="Remove all messages in the queue"/> + <operation name="resetMessageCounter" displayName="Reset Message Counter" + description="Reset the message counter"/> + <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"/> - <metric property="messageCounter.destinationDurable" measurementType="dynamic" displayType="detail" displayName="Destination Durable" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageCounter.destinationName" displayType="detail" displayName="Destination Name" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="messageCounter.destinationSubscription" displayType="detail" displayName="Destination Subscription" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="messageCounter.destinationTopic" measurementType="dynamic" displayType="detail" displayName="Destination Topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageCounter.historyAsString" displayType="detail" displayName="History As String" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="messageCounter.historyLimit" measurementType="dynamic" displayType="detail" displayName="History Limit" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageCounter.lastUpdate" measurementType="dynamic" displayType="detail" displayName="Last Update" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageCounter.messageCount" measurementType="dynamic" displayType="detail" displayName="Message Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageCounter.messageCountDelta" measurementType="dynamic" displayType="detail" displayName="Message Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageStatistics.asString" displayType="detail" displayName="As String" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" displayName="Depth Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageStatistics.durable" measurementType="dynamic" displayType="detail" displayName="Durable" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageStatistics.name" displayType="detail" displayName="Name" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <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"/> + <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"/> + <metric property="messageCounter.destinationDurable" measurementType="dynamic" displayType="detail" + displayName="Destination Durable" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="messageCounter.destinationName" displayType="detail" displayName="Destination Name" + defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="messageCounter.destinationSubscription" displayType="detail" + displayName="Destination Subscription" defaultOn="true" defaultInterval="60000" dataType="trait" + category="performance"/> + <metric property="messageCounter.destinationTopic" measurementType="dynamic" displayType="detail" + displayName="Destination Topic" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="messageCounter.historyAsString" displayType="detail" displayName="History As String" + defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="messageCounter.historyLimit" measurementType="dynamic" displayType="detail" + displayName="History Limit" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="messageCounter.lastUpdate" measurementType="dynamic" displayType="detail" + displayName="Last Update" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="messageCounter.messageCount" measurementType="dynamic" displayType="detail" + displayName="Message Count" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="messageCounter.messageCountDelta" measurementType="dynamic" displayType="detail" + displayName="Message Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="messageStatistics.asString" displayType="detail" displayName="As String" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="messageStatistics.count" measurementType="dynamic" displayType="detail" displayName="Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="messageStatistics.countDelta" measurementType="dynamic" displayType="detail" + displayName="Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="messageStatistics.depth" measurementType="dynamic" displayType="detail" displayName="Depth" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="messageStatistics.depthDelta" measurementType="dynamic" displayType="detail" + displayName="Depth Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="messageStatistics.durable" measurementType="dynamic" displayType="detail" + displayName="Durable" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="messageStatistics.name" displayType="detail" displayName="Name" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <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 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"/> - <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" description="Is this a clustered destination?"/> - <c:simple-property type="integer" required="false" name="downCacheSize" description="The write-cache size, can only be set when queue is stopped"/> - <c:simple-property required="false" name="expiryQueue" description="The expiry queue for this queue, overrides the default expiry queue on the server peer"/> - <c:simple-property type="integer" required="false" name="fullSize" description="The in-memory message limit, can only be set when queue is stopped"/> - <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" description="The maximum delivery attempts to the queue"/> - <c:simple-property type="integer" required="false" name="maxSize" description="The maximum number of messages this queue can hold before they are dropped"/> - <c:simple-property type="integer" required="false" name="messageCounterHistoryDayLimit" description="The day limit for the message counter"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" + description="Is this a clustered destination?"/> + <c:simple-property type="integer" required="false" name="downCacheSize" + description="The write-cache size, can only be set when queue is stopped"/> + <c:simple-property required="false" name="expiryQueue" + description="The expiry queue for this queue, overrides the default expiry queue on the server peer"/> + <c:simple-property type="integer" required="false" name="fullSize" + description="The in-memory message limit, can only be set when queue is stopped"/> + <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" + description="The maximum delivery attempts to the queue"/> + <c:simple-property type="integer" required="false" name="maxSize" + description="The maximum number of messages this queue can hold before they are dropped"/> + <c:simple-property type="integer" required="false" name="messageCounterHistoryDayLimit" + description="The day limit for the message counter"/> <c:simple-property readOnly="true" name="name" description="The destination name"/> - <c:simple-property type="integer" required="false" name="pageSize" description="The paging size, can only be set when queue is stopped"/> - <c:simple-property type="long" required="false" name="redeliveryDelay" description="The delay before redelivering"/> - <c:map-property required="false" name="securityConfig" description="The destination's security configuration"/> - <c:simple-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"/> + <c:simple-property type="integer" required="false" name="pageSize" + description="The paging size, can only be set when queue is stopped"/> + <c:simple-property type="long" required="false" name="redeliveryDelay" + description="The delay before redelivering"/> + <c:map-property required="false" name="securityConfig" + description="The destination's security configuration"/> + <c:simple-property required="false" name="serverPeer" + description="The ObjectName of the server peer this destination was deployed on"/> </resource-configuration> </service> <service name="Topic JMSDestination"> <operation name="create" displayName="Create" description="Service lifecycle operation"/> <operation name="destroy" displayName="Destroy" description="Service lifecycle operation"/> - <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription with the specified selector"> + <operation name="listAllMessages" displayName="List All Messages" + description="List all messages for the specified subscription with the specified selector"> <parameters> <c:simple-property required="false" name="arg#0"/> <c:simple-property required="false" name="arg#1"/> @@ -499,7 +746,8 @@ </c:list-property> </results> </operation> - <operation name="listAllSubscriptions" displayName="List All Subscriptions" description="Return all subscriptions for the topic"> + <operation name="listAllSubscriptions" displayName="List All Subscriptions" + description="Return all subscriptions for the topic"> <results> <c:notes>Return all subscriptions for the topic</c:notes> <c:list-property name="result"> @@ -507,13 +755,15 @@ </c:list-property> </results> </operation> - <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML" description="Return all subscriptions for the topic in HTML"> + <operation name="listAllSubscriptionsAsHTML" displayName="List All Subscriptions As HTML" + description="Return all subscriptions for the topic in HTML"> <results> <c:notes>Return all subscriptions for the topic in HTML</c:notes> <c:simple-property required="false" name="result"/> </results> </operation> - <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription with the specified selector"> + <operation name="listDurableMessages" displayName="List Durable Messages" + description="List all durable messages for the specified subscription with the specified selector"> <parameters> <c:simple-property required="false" name="arg#0"/> <c:simple-property required="false" name="arg#1"/> @@ -529,7 +779,8 @@ </c:list-property> </results> </operation> - <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions" description="Return all durable subscriptions for the topic"> + <operation name="listDurableSubscriptions" displayName="List Durable Subscriptions" + description="Return all durable subscriptions for the topic"> <results> <c:notes>Return all durable subscriptions for the topic</c:notes> <c:list-property name="result"> @@ -537,19 +788,22 @@ </c:list-property> </results> </operation> - <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML" description="Return all durable subscriptions for the topic in HTML"> + <operation name="listDurableSubscriptionsAsHTML" displayName="List Durable Subscriptions As HTML" + description="Return all durable subscriptions for the topic in HTML"> <results> <c:notes>Return all durable subscriptions for the topic in HTML</c:notes> <c:simple-property required="false" name="result"/> </results> </operation> - <operation name="listNonDurableMessages" displayName="List Non Durable Messages" description="List all non durable messages for the specified subscription with the specified selector"> + <operation name="listNonDurableMessages" displayName="List Non Durable Messages" + description="List all non durable messages for the specified subscription with the specified selector"> <parameters> <c:simple-property required="false" name="arg#0"/> <c:simple-property required="false" name="arg#1"/> </parameters> <results> - <c:notes>List all non durable messages for the specified subscription with the specified selector</c:notes> + <c:notes>List all non durable messages for the specified subscription with the specified selector + </c:notes> <c:list-property name="result"> <c:map-property required="false" name="element"> <c:simple-property required="false" name="JMSCorrelationID"/> @@ -559,7 +813,8 @@ </c:list-property> </results> </operation> - <operation name="listNonDurableSubscriptions" displayName="List Non Durable Subscriptions" description="Return all non durable subscriptions for the topic"> + <operation name="listNonDurableSubscriptions" displayName="List Non Durable Subscriptions" + description="Return all non durable subscriptions for the topic"> <results> <c:notes>Return all non durable subscriptions for the topic</c:notes> <c:list-property name="result"> @@ -567,7 +822,8 @@ </c:list-property> </results> </operation> - <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non Durable Subscriptions As HTML" description="Return all non durable subscriptions for the topic in HTML"> + <operation name="listNonDurableSubscriptionsAsHTML" displayName="List Non Durable Subscriptions As HTML" + description="Return all non durable subscriptions for the topic in HTML"> <results> <c:notes>Return all non durable subscriptions for the topic in HTML</c:notes> <c:simple-property required="false" name="result"/> @@ -576,192 +832,388 @@ <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"/> + <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 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"/> - <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" description="Is this a clustered destination?"/> - <c:simple-property type="boolean" required="false" readOnly="true" name="createdProgrammatically" description="True if this destination was created programmatically"/> - <c:simple-property type="integer" required="false" name="downCacheSize" description="The write-cache size, can only be set when topic is stopped"/> - <c:simple-property required="false" name="expiryQueue" description="The expiry queue for this topic, overrides the default expiry queue on the server peer"/> - <c:simple-property type="integer" required="false" name="fullSize" description="The in-memory message limit, can only be set when topic is stopped"/> - <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" description="The maximum delivery attempts to the topic"/> - <c:simple-property type="integer" required="false" name="maxSize" description="The maximum number of messages this topic can hold before they are dropped"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" + description="Is this a clustered destination?"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="createdProgrammatically" + description="True if this destination was created programmatically"/> + <c:simple-property type="integer" required="false" name="downCacheSize" + description="The write-cache size, can only be set when topic is stopped"/> + <c:simple-property required="false" name="expiryQueue" + description="The expiry queue for this topic, overrides the default expiry queue on the server peer"/> + <c:simple-property type="integer" required="false" name="fullSize" + description="The in-memory message limit, can only be set when topic is stopped"/> + <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" + description="The maximum delivery attempts to the topic"/> + <c:simple-property type="integer" required="false" name="maxSize" + description="The maximum number of messages this topic can hold before they are dropped"/> <c:simple-property readOnly="true" name="name" description="The destination name"/> - <c:simple-property type="integer" required="false" name="pageSize" description="The paging size, can only be set when topic is stopped"/> - <c:simple-property type="long" required="false" name="redeliveryDelay" description="The delay before redelivering"/> - <c:map-property required="false" name="securityConfig" description="The destination's security configuration"/> - <c:simple-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"/> + <c:simple-property type="integer" required="false" name="pageSize" + description="The paging size, can only be set when topic is stopped"/> + <c:simple-property type="long" required="false" name="redeliveryDelay" + description="The delay before redelivering"/> + <c:map-property required="false" name="securityConfig" + description="The destination's security configuration"/> + <c:simple-property required="false" name="serverPeer" + description="The ObjectName of the server peer this destination was deployed on"/> </resource-configuration> </service> <service name="Platform MBean"> <resource-configuration> - <c:simple-property required="false" readOnly="true" name="arch" description="the operating system architecture."/> - <c:simple-property type="integer" required="false" readOnly="true" name="availableProcessors" description="the number of processors available to the virtual machine; never smaller than one."/> + <c:simple-property required="false" readOnly="true" name="arch" + description="the operating system architecture."/> + <c:simple-property type="integer" required="false" readOnly="true" name="availableProcessors" + description="the number of processors available to the virtual machine; never smaller than one."/> <c:simple-property required="false" readOnly="true" name="name" description="the operating system name."/> <c:simple-property type="double" required="false" readOnly="true" name="systemLoadAverage"/> - <c:simple-property required="false" readOnly="true" name="version" description="the operating system version."/> + <c:simple-property required="false" readOnly="true" name="version" + description="the operating system version."/> </resource-configuration> </service> <service name="Servlet MBean"> - <metric property="classLoadTime" measurementType="dynamic" displayType="detail" displayName="Class Load Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="engineName" displayType="summary" displayName="Engine Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="errorCount" measurementType="dynamic" displayType="detail" displayName="Error Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="eventProvider" displayType="summary" displayName="Event Provider" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="loadTime" measurementType="dynamic" displayType="detail" displayName="Load Time" 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="minTime" measurementType="dynamic" displayType="detail" displayName="Min Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="objectName" displayType="summary" displayName="Object Name" defaultOn="true" defaultInterval="600000" dataType="trait" 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"/> - <metric property="stateManageable" displayType="summary" displayName="State Manageable" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="statisticsProvider" displayType="summary" displayName="Statistics Provider" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="classLoadTime" measurementType="dynamic" displayType="detail" displayName="Class Load Time" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="engineName" displayType="summary" displayName="Engine Name" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="errorCount" measurementType="dynamic" displayType="detail" displayName="Error Count" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="eventProvider" displayType="summary" displayName="Event Provider" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="loadTime" measurementType="dynamic" displayType="detail" displayName="Load Time" + 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="minTime" measurementType="dynamic" displayType="detail" displayName="Min Time" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="objectName" displayType="summary" displayName="Object Name" defaultOn="true" + defaultInterval="600000" dataType="trait" 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"/> + <metric property="stateManageable" displayType="summary" displayName="State Manageable" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="statisticsProvider" displayType="summary" displayName="Statistics Provider" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> </service> <service name="Web MBean"> - <metric property="currentThreadCount" measurementType="dynamic" displayType="detail" displayName="Current Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="currentThreadsBusy" measurementType="dynamic" displayType="detail" displayName="Current Threads Busy" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxThreads" measurementType="dynamic" displayType="detail" displayName="Max Threads" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="threadPriority" measurementType="dynamic" displayType="detail" displayName="Thread Priority" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="currentThreadCount" measurementType="dynamic" displayType="detail" + displayName="Current Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="currentThreadsBusy" measurementType="dynamic" displayType="detail" + displayName="Current Threads Busy" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="maxThreads" measurementType="dynamic" displayType="detail" displayName="Max Threads" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="threadPriority" measurementType="dynamic" displayType="detail" displayName="Thread Priority" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <resource-configuration> <c:simple-property required="false" readOnly="true" name="mbeanNameAsString"/> <c:simple-property required="false" name="state" description="The bean controller state"/> </resource-configuration> </service> <service name="WebApplication MBean"> - <metric property="allowLinking" displayType="summary" displayName="Allow Linking" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="antiJARLocking" displayType="summary" displayName="Anti JAR Locking" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="antiResourceLocking" displayType="summary" displayName="Anti Resource Locking" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="cacheMaxSize" measurementType="dynamic" displayType="detail" displayName="Cache Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="cacheObjectMaxSize" measurementType="dynamic" displayType="detail" displayName="Cache Object Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="cacheTTL" measurementType="dynamic" displayType="detail" displayName="Cache TTL" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="cachingAllowed" displayType="summary" displayName="Caching Allowed" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="caseSensitive" displayType="summary" displayName="Case Sensitive" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="compilerClasspath" displayType="summary" displayName="Compiler Classpath" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="configFile" displayType="summary" displayName="Config File" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="cookies" displayType="summary" displayName="Cookies" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="crossContext" displayType="summary" displayName="Cross Context" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="defaultContextXml" displayType="summary" displayName="Default Context Xml" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="defaultWebXml" displayType="summary" displayName="Default Web Xml" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="delegate" displayType="summary" displayName="Delegate" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="deploymentDescriptor" displayType="summary" displayName="Deployment Descriptor" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="docBase" displayType="summary" displayName="Doc Base" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="engineName" displayType="summary" displayName="Engine Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="eventProvider" displayType="summary" displayName="Event Provider" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="loader.delegate" measurementType="dynamic" displayType="detail" displayName="Delegate" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="loader.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="loader.reloadable" measurementType="dynamic" displayType="detail" displayName="Reloadable" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="logger.debugEnabled" measurementType="dynamic" displayType="detail" displayName="Debug Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="logger.errorEnabled" measurementType="dynamic" displayType="detail" displayName="Error Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="logger.fatalEnabled" measurementType="dynamic" displayType="detail" displayName="Fatal Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="logger.infoEnabled" measurementType="dynamic" displayType="detail" displayName="Info Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="logger.traceEnabled" measurementType="dynamic" displayType="detail" displayName="Trace Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="logger.warnEnabled" measurementType="dynamic" displayType="detail" displayName="Warn Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.activeSessions" measurementType="dynamic" displayType="detail" displayName="Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.distributable" measurementType="dynamic" displayType="detail" displayName="Distributable" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.expiredSessions" measurementType="dynamic" displayType="detail" displayName="Expired Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="manager.maxActive" measurementType="dynamic" displayType="detail" displayName="Max Active" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.maxInactiveInterval" measurementType="dynamic" displayType="detail" displayName="Max Inactive Interval" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.rejectedSessions" measurementType="dynamic" displayType="detail" displayName="Rejected Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.sessionAverageAliveTime" measurementType="dynamic" displayType="detail" displayName="Session Average Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.sessionCounter" measurementType="dynamic" displayType="detail" displayName="Session Counter" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.sessionIdLength" measurementType="dynamic" displayType="detail" displayName="Session Id Length" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="manager.sessionMaxAliveTime" measurementType="dynamic" displayType="detail" displayName="Session Max Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="namingContextListener.name" displayType="detail" displayName="Name" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="objectName" displayType="summary" displayName="Object Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="override" displayType="summary" displayName="Override" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="parentClassLoader.defaultAssertionStatus" measurementType="dynamic" displayType="detail" displayName="Default Assertion Status" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="path" displayType="summary" displayName="Path" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="privileged" displayType="summary" displayName="Privileged" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="realm.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="reloadable" displayType="summary" displayName="Reloadable" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="saveConfig" displayType="summary" displayName="Save Config" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="server" displayType="summary" displayName="Server" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="startTime" measurementType="dynamic" displayType="detail" displayName="Start Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="startupTime" measurementType="dynamic" displayType="detail" displayName="Startup Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="state" measurementType="dynamic" displayType="detail" displayName="State" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="stateManageable" displayType="summary" displayName="State Manageable" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="statisticsProvider" displayType="summary" displayName="Statistics Provider" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="swallowOutput" displayType="summary" displayName="Swallow Output" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="tldScanTime" measurementType="dynamic" displayType="detail" displayName="Tld Scan Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="unloadDelay" measurementType="dynamic" displayType="detail" displayName="Unload Delay" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="useNaming" displayType="summary" displayName="Use Naming" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="workDir" displayType="summary" displayName="Work Dir" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="allowLinking" displayType="summary" displayName="Allow Linking" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="antiJARLocking" displayType="summary" displayName="Anti JAR Locking" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="antiResourceLocking" displayType="summary" displayName="Anti Resource Locking" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="cacheMaxSize" measurementType="dynamic" displayType="detail" displayName="Cache Max Size" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="cacheObjectMaxSize" measurementType="dynamic" displayType="detail" + displayName="Cache Object Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="cacheTTL" measurementType="dynamic" displayType="detail" displayName="Cache TTL" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="cachingAllowed" displayType="summary" displayName="Caching Allowed" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="caseSensitive" displayType="summary" displayName="Case Sensitive" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="compilerClasspath" displayType="summary" displayName="Compiler Classpath" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="configFile" displayType="summary" displayName="Config File" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="cookies" displayType="summary" displayName="Cookies" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="crossContext" displayType="summary" displayName="Cross Context" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="defaultContextXml" displayType="summary" displayName="Default Context Xml" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="defaultWebXml" displayType="summary" displayName="Default Web Xml" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="delegate" displayType="summary" displayName="Delegate" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="deploymentDescriptor" displayType="summary" displayName="Deployment Descriptor" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="docBase" displayType="summary" displayName="Doc Base" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="engineName" displayType="summary" displayName="Engine Name" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="eventProvider" displayType="summary" displayName="Event Provider" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="loader.delegate" measurementType="dynamic" displayType="detail" displayName="Delegate" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="loader.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" + dataType="trait" category="performance"/> + <metric property="loader.reloadable" measurementType="dynamic" displayType="detail" displayName="Reloadable" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="logger.debugEnabled" measurementType="dynamic" displayType="detail" + displayName="Debug Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="logger.errorEnabled" measurementType="dynamic" displayType="detail" + displayName="Error Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="logger.fatalEnabled" measurementType="dynamic" displayType="detail" + displayName="Fatal Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="logger.infoEnabled" measurementType="dynamic" displayType="detail" displayName="Info Enabled" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="logger.traceEnabled" measurementType="dynamic" displayType="detail" + displayName="Trace Enabled" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="logger.warnEnabled" measurementType="dynamic" displayType="detail" displayName="Warn Enabled" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="manager.activeSessions" measurementType="dynamic" displayType="detail" + displayName="Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="manager.distributable" measurementType="dynamic" displayType="detail" + displayName="Distributable" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="manager.expiredSessions" measurementType="dynamic" displayType="detail" + displayName="Expired Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="manager.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" + dataType="trait" category="performance"/> + <metric property="manager.maxActive" measurementType="dynamic" displayType="detail" displayName="Max Active" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="manager.maxInactiveInterval" measurementType="dynamic" displayType="detail" + displayName="Max Inactive Interval" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="manager.rejectedSessions" measurementType="dynamic" displayType="detail" + displayName="Rejected Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="manager.sessionAverageAliveTime" measurementType="dynamic" displayType="detail" + displayName="Session Average Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="manager.sessionCounter" measurementType="dynamic" displayType="detail" + displayName="Session Counter" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="manager.sessionIdLength" measurementType="dynamic" displayType="detail" + displayName="Session Id Length" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="manager.sessionMaxAliveTime" measurementType="dynamic" displayType="detail" + displayName="Session Max Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="namingContextListener.name" displayType="detail" displayName="Name" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="objectName" displayType="summary" displayName="Object Name" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="override" displayType="summary" displayName="Override" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="parentClassLoader.defaultAssertionStatus" measurementType="dynamic" displayType="detail" + displayName="Default Assertion Status" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="path" displayType="summary" displayName="Path" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="privileged" displayType="summary" displayName="Privileged" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="processingTime" measurementType="dynamic" displayType="detail" displayName="Processing Time" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="realm.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" + dataType="trait" category="performance"/> + <metric property="reloadable" displayType="summary" displayName="Reloadable" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="saveConfig" displayType="summary" displayName="Save Config" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="server" displayType="summary" displayName="Server" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="startTime" measurementType="dynamic" displayType="detail" displayName="Start Time" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="startupTime" measurementType="dynamic" displayType="detail" displayName="Startup Time" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="state" measurementType="dynamic" displayType="detail" displayName="State" defaultOn="true" + defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="stateManageable" displayType="summary" displayName="State Manageable" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="statisticsProvider" displayType="summary" displayName="Statistics Provider" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="swallowOutput" displayType="summary" displayName="Swallow Output" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="tldScanTime" measurementType="dynamic" displayType="detail" displayName="Tld Scan Time" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="unloadDelay" measurementType="dynamic" displayType="detail" displayName="Unload Delay" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="useNaming" displayType="summary" displayName="Use Naming" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="workDir" displayType="summary" displayName="Work Dir" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> </service> <service name="WebApplicationManager MBean"> - <metric property="activeSessions" measurementType="dynamic" displayType="detail" displayName="Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="algorithm" displayType="summary" displayName="Algorithm" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="className" displayType="summary" displayName="Class Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="distributable" displayType="summary" displayName="Distributable" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="duplicates" measurementType="dynamic" displayType="detail" displayName="Duplicates" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="entropy" displayType="summary" displayName="Entropy" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="expiredSessions" measurementType="dynamic" displayType="detail" displayName="Expired Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxActive" measurementType="dynamic" displayType="detail" displayName="Max Active" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxActiveSessions" measurementType="dynamic" displayType="detail" displayName="Max Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxInactiveInterval" measurementType="dynamic" displayType="detail" displayName="Max Inactive Interval" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="pathname" displayType="summary" displayName="Pathname" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="processExpiresFrequency" measurementType="dynamic" displayType="detail" displayName="Process Expires Frequency" 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="randomFile" displayType="summary" displayName="Random File" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="rejectedSessions" measurementType="dynamic" displayType="detail" displayName="Rejected Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="sessionAverageAliveTime" measurementType="dynamic" displayType="detail" displayName="Session Average Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="sessionCounter" measurementType="dynamic" displayType="detail" displayName="Session Counter" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="sessionIdLength" measurementType="dynamic" displayType="detail" displayName="Session Id Length" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="sessionMaxAliveTime" measurementType="dynamic" displayType="detail" displayName="Session Max Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="activeSessions" measurementType="dynamic" displayType="detail" displayName="Active Sessions" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="algorithm" displayType="summary" displayName="Algorithm" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="className" displayType="summary" displayName="Class Name" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="distributable" displayType="summary" displayName="Distributable" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="duplicates" measurementType="dynamic" displayType="detail" displayName="Duplicates" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="entropy" displayType="summary" displayName="Entropy" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="expiredSessions" measurementType="dynamic" displayType="detail" displayName="Expired Sessions" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="maxActive" measurementType="dynamic" displayType="detail" displayName="Max Active" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="maxActiveSessions" measurementType="dynamic" displayType="detail" + displayName="Max Active Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="maxInactiveInterval" measurementType="dynamic" displayType="detail" + displayName="Max Inactive Interval" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="pathname" displayType="summary" displayName="Pathname" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="processExpiresFrequency" measurementType="dynamic" displayType="detail" + displayName="Process Expires Frequency" 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="randomFile" displayType="summary" displayName="Random File" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="rejectedSessions" measurementType="dynamic" displayType="detail" + displayName="Rejected Sessions" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="sessionAverageAliveTime" measurementType="dynamic" displayType="detail" + displayName="Session Average Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="sessionCounter" measurementType="dynamic" displayType="detail" displayName="Session Counter" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="sessionIdLength" measurementType="dynamic" displayType="detail" + displayName="Session Id Length" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="sessionMaxAliveTime" measurementType="dynamic" displayType="detail" + displayName="Session Max Alive Time" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> </service> <service name="WebHost MBean"> - <metric property="appBase" displayType="summary" displayName="App Base" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="autoDeploy" displayType="summary" displayName="Auto Deploy" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="configClass" displayType="summary" displayName="Config Class" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="deployOnStartup" displayType="summary" displayName="Deploy On Startup" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="deployXML" displayType="summary" displayName="Deploy XML" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="realm.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="unpackWARs" displayType="summary" displayName="Unpack WA Rs" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="xmlNamespaceAware" displayType="summary" displayName="Xml Namespace Aware" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="xmlValidation" displayType="summary" displayName="Xml Validation" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="appBase" displayType="summary" displayName="App Base" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="autoDeploy" displayType="summary" displayName="Auto Deploy" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="configClass" displayType="summary" displayName="Config Class" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="deployOnStartup" displayType="summary" displayName="Deploy On Startup" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="deployXML" displayType="summary" displayName="Deploy XML" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="realm.info" displayType="detail" displayName="Info" defaultOn="true" defaultInterval="60000" + dataType="trait" category="performance"/> + <metric property="unpackWARs" displayType="summary" displayName="Unpack WA Rs" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="xmlNamespaceAware" displayType="summary" displayName="Xml Namespace Aware" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="xmlValidation" displayType="summary" displayName="Xml Validation" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> </service> <service name="WebRequestProcessor MBean"> - <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="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" 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"/> + <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="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" + defaultInterval="600000" dataType="trait" 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"/> </service> <service name="WebThreadPool MBean"> - <metric property="acceptorThreadCount" measurementType="dynamic" displayType="detail" displayName="Acceptor Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="backlog" measurementType="dynamic" displayType="detail" displayName="Backlog" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="currentThreadCount" measurementType="dynamic" displayType="detail" displayName="Current Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="currentThreadsBusy" measurementType="dynamic" displayType="detail" displayName="Current Threads Busy" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="daemon" displayType="summary" displayName="Daemon" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="maxThreads" measurementType="dynamic" displayType="detail" displayName="Max Threads" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="paused" displayType="summary" displayName="Paused" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="running" displayType="summary" displayName="Running" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="soLinger" measurementType="dynamic" displayType="detail" displayName="So Linger" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="soTimeout" measurementType="dynamic" displayType="detail" displayName="So Timeout" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="tcpNoDelay" displayType="summary" displayName="Tcp No Delay" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="threadPriority" measurementType="dynamic" displayType="detail" displayName="Thread Priority" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="acceptorThreadCount" measurementType="dynamic" displayType="detail" + displayName="Acceptor Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="backlog" measurementType="dynamic" displayType="detail" displayName="Backlog" defaultOn="true" + defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="currentThreadCount" measurementType="dynamic" displayType="detail" + displayName="Current Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="currentThreadsBusy" measurementType="dynamic" displayType="detail" + displayName="Current Threads Busy" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="daemon" displayType="summary" displayName="Daemon" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="maxThreads" measurementType="dynamic" displayType="detail" displayName="Max Threads" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="modelerType" displayType="summary" displayName="Modeler Type" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="name" displayType="summary" displayName="Name" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="paused" displayType="summary" displayName="Paused" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" + defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="running" displayType="summary" displayName="Running" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="soLinger" measurementType="dynamic" displayType="detail" displayName="So Linger" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="soTimeout" measurementType="dynamic" displayType="detail" displayName="So Timeout" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="tcpNoDelay" displayType="summary" displayName="Tcp No Delay" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="threadPriority" measurementType="dynamic" displayType="detail" displayName="Thread Priority" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> </service> <service name="DefaultAspectManager MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -769,7 +1221,8 @@ </resource-configuration> </service> <service name="JMXKernel MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -777,7 +1230,8 @@ </resource-configuration> </service> <service name="MainDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -785,7 +1239,8 @@ </resource-configuration> </service> <service name="ClassLoaderDescribeDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -793,7 +1248,8 @@ </resource-configuration> </service> <service name="AOPClassPoolFactory MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -801,7 +1257,8 @@ </resource-configuration> </service> <service name="deployers-classloader:0.0.0 MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -809,7 +1266,8 @@ </resource-configuration> </service> <service name="ClassLoaderDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -817,7 +1275,8 @@ </resource-configuration> </service> <service name="AOPDeploymentAopMetaDataDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -825,7 +1284,8 @@ </resource-configuration> </service> <service name="ServiceMetaDataICF MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -833,7 +1293,8 @@ </resource-configuration> </service> <service name="BasicProfileFactory MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -841,7 +1302,8 @@ </resource-configuration> </service> <service name="BeanMetaDataICF MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -849,7 +1311,8 @@ </resource-configuration> </service> <service name="AttachmentsSerializer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -857,7 +1320,8 @@ </resource-configuration> </service> <service name="ProfileServiceDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -865,7 +1329,8 @@ </resource-configuration> </service> <service name="ClassLoaderSystem MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -873,7 +1338,8 @@ </resource-configuration> </service> <service name="JARStructure MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -881,7 +1347,8 @@ </resource-configuration> </service> <service name="ProfileService MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -889,7 +1356,8 @@ </resource-configuration> </service> <service name="JMXRegistrationAdvice$AspectBinding MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -897,7 +1365,8 @@ </resource-configuration> </service> <service name="ProfileRepositoryFactory MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -905,7 +1374,8 @@ </resource-configuration> </service> <service name="AOPJBossIntegration MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -913,7 +1383,8 @@ </resource-configuration> </service> <service name="AOPXMLMetaDataParserDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -921,7 +1392,8 @@ </resource-configuration> </service> <service name="WebVisitorAttributes MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -929,7 +1401,8 @@ </resource-configuration> </service> <service name="JMXCreateDestroyAdvice$AspectBinding MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -937,7 +1410,8 @@ </resource-configuration> </service> <service name="bootstrap-classloader:0.0.0 MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -945,7 +1419,8 @@ </resource-configuration> </service> <service name="StructuralDeployers MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -953,7 +1428,8 @@ </resource-configuration> </service> <service name="StructureModCache MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -961,7 +1437,8 @@ </resource-configuration> </service> <service name="ServiceDeploymentComponentMapper MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -969,7 +1446,8 @@ </resource-configuration> </service> <service name="KernelDeploymentManagedObjectCreator MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -977,7 +1455,8 @@ </resource-configuration> </service> <service name="BootstrapProfileFactory MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -985,7 +1464,8 @@ </resource-configuration> </service> <service name="AttachmentStore MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -993,7 +1473,8 @@ </resource-configuration> </service> <service name="DeclaredStructure MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1001,7 +1482,8 @@ </resource-configuration> </service> <service name="AOPAnnotationMetaDataParserDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1009,7 +1491,8 @@ </resource-configuration> </service> <service name="AspectManager MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1017,7 +1500,8 @@ </resource-configuration> </service> <service name="JMXRegistrationAdvice MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1025,7 +1509,8 @@ </resource-configuration> </service> <service name="MetaDataStructureModificationChecker MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1033,7 +1518,8 @@ </resource-configuration> </service> <service name="ClassLoading MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1041,7 +1527,8 @@ </resource-configuration> </service> <service name="AOPClassLoaderDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1049,7 +1536,8 @@ </resource-configuration> </service> <service name="BeanDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1057,7 +1545,8 @@ </resource-configuration> </service> <service name="ModificationTypeStructureProcessor MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1065,7 +1554,8 @@ </resource-configuration> </service> <service name="profile-classloader:0.0.0$MODULE MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1073,7 +1563,8 @@ </resource-configuration> </service> <service name="bootstrap-classloader:0.0.0$MODULE MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1081,7 +1572,8 @@ </resource-configuration> </service> <service name="profile-classloader:0.0.0 MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1089,7 +1581,8 @@ </resource-configuration> </service> <service name="aop-classloader:0.0.0 MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1097,7 +1590,8 @@ </resource-configuration> </service> <service name="DefaultDeploymentRepositoryFactory MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1105,7 +1599,8 @@ </resource-configuration> </service> <service name="DefaultProfileKey MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1113,7 +1608,8 @@ </resource-configuration> </service> <service name="ManagedObjectCreator MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1121,7 +1617,8 @@ </resource-configuration> </service> <service name="ProfileServicePersistenceDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1129,7 +1626,8 @@ </resource-configuration> </service> <service name="Deployers MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1137,7 +1635,8 @@ </resource-configuration> </service> <service name="FileStructure MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1145,7 +1644,8 @@ </resource-configuration> </service> <service name="JARFilter MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1153,7 +1653,8 @@ </resource-configuration> </service> <service name="AttachmentStore$metaDataFilter#1 MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1161,7 +1662,8 @@ </resource-configuration> </service> <service name="BeanMetaDataDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1169,7 +1671,8 @@ </resource-configuration> </service> <service name="ClassLoaderClassPathDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1177,7 +1680,8 @@ </resource-configuration> </service> <service name="SynchAdapter MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1185,7 +1689,8 @@ </resource-configuration> </service> <service name="ManagedDeploymentCreator MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1193,7 +1698,8 @@ </resource-configuration> </service> <service name="KernelDeploymentComponentMapper MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1201,7 +1707,8 @@ </resource-configuration> </service> <service name="PersistenceFactory MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1209,7 +1716,8 @@ </resource-configuration> </service> <service name="jmx-classloader:0.0.0$MODULE MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1217,7 +1725,8 @@ </resource-configuration> </service> <service name="ProfileServiceBootstrap MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1225,7 +1734,8 @@ </resource-configuration> </service> <service name="StructureBuilder MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1233,7 +1743,8 @@ </resource-configuration> </service> <service name="JMXStartStopAdvice MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1241,7 +1752,8 @@ </resource-configuration> </service> <service name="deployers-classloader:0.0.0$MODULE MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1249,7 +1761,8 @@ </resource-configuration> </service> <service name="MetaDataStructureModificationChecker$filter#1 MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1257,7 +1770,8 @@ </resource-configuration> </service> <service name="JARStructureCandidates MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1265,7 +1779,8 @@ </resource-configuration> </service> <service name="jmx-classloader:0.0.0 MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1273,7 +1788,8 @@ </resource-configuration> </service> <service name="ProfileFactory MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1281,7 +1797,8 @@ </resource-configuration> </service> <service name="DeploymentFilter MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1289,7 +1806,8 @@ </resource-configuration> </service> <service name="BeansDeploymentAopMetaDataDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1297,7 +1815,8 @@ </resource-configuration> </service> <service name="ClassLoadingMetaDataParser MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1305,7 +1824,8 @@ </resource-configuration> </service> <service name="ServiceClassLoaderDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1313,7 +1833,8 @@ </resource-configuration> </service> <service name="InMemoryClassesDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1321,7 +1842,8 @@ </resource-configuration> </service> <service name="KernelDeploymentDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1329,7 +1851,8 @@ </resource-configuration> </service> <service name="ClassLoadingDefaultDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1337,7 +1860,8 @@ </resource-configuration> </service> <service name="AspectManagerJMXRegistrar MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1345,7 +1869,8 @@ </resource-configuration> </service> <service name="aop-classloader:0.0.0$MODULE MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1353,7 +1878,8 @@ </resource-configuration> </service> <service name="StructureModificationChecker MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1361,7 +1887,8 @@ </resource-configuration> </service> <service name="FilteredProfileFactory MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1369,7 +1896,8 @@ </resource-configuration> </service> <service name="ServiceDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1377,7 +1905,8 @@ </resource-configuration> </service> <service name="AOPClassLoaderScopingPolicy MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1385,7 +1914,8 @@ </resource-configuration> </service> <service name="JMXCreateDestroyAdvice MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1393,7 +1923,8 @@ </resource-configuration> </service> <service name="ServiceDeploymentDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1406,7 +1937,8 @@ </resource-configuration> </service> <service name="AOPRegisterModuleCallback MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1414,7 +1946,8 @@ </resource-configuration> </service> <service name="SARDeployer MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1422,7 +1955,8 @@ </resource-configuration> </service> <service name="JMXStartStopAdvice$AspectBinding MCBean"> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:list-property required="false" name="properties"> <c:map-property required="false" name="element"/> @@ -1506,10 +2040,12 @@ <c:simple-property required="false" readOnly="true" name="buildDate" description="The server build date"/> <c:simple-property required="false" readOnly="true" name="buildID" description="The server build ID"/> <c:simple-property required="false" readOnly="true" name="buildJVM" description="The server build JVM"/> - <c:simple-property required="false" readOnly="true" name="buildNumber" description="The server build number"/> + <c:simple-property required="false" readOnly="true" name="buildNumber" + description="The server build number"/> <c:simple-property required="false" readOnly="true" name="buildOS" description="The server build OS"/> <c:map-property required="false" readOnly="true" name="config"> - <c:map-property required="false" readOnly="true" name="libraryURL" description="the bootstrap library URL for the server."> + <c:map-property required="false" readOnly="true" name="libraryURL" + description="the bootstrap library URL for the server."> <c:simple-property required="false" name="authority"/> <c:simple-property type="integer" required="false" name="defaultPort"/> <c:simple-property required="false" name="file"/> @@ -1521,10 +2057,14 @@ <c:simple-property required="false" name="ref"/> <c:simple-property required="false" name="userInfo"/> </c:map-property> - <c:simple-property required="false" readOnly="true" name="serverNativeDir" description="the directory for platform native files"/> - <c:simple-property required="false" readOnly="true" name="homeDir" description="the local home directory which the server is running from"/> - <c:simple-property required="false" readOnly="true" name="serverLogDir" description="the server log directory"/> - <c:map-property required="false" readOnly="true" name="serverLibraryURL" description="the server home URL"> + <c:simple-property required="false" readOnly="true" name="serverNativeDir" + description="the directory for platform native files"/> + <c:simple-property required="false" readOnly="true" name="homeDir" + description="the local home directory which the server is running from"/> + <c:simple-property required="false" readOnly="true" name="serverLogDir" + description="the server log directory"/> + <c:map-property required="false" readOnly="true" name="serverLibraryURL" + description="the server home URL"> <c:simple-property required="false" name="authority"/> <c:simple-property type="integer" required="false" name="defaultPort"/> <c:simple-property required="false" name="file"/> @@ -1536,11 +2076,16 @@ <c:simple-property required="false" name="ref"/> <c:simple-property required="false" name="userInfo"/> </c:map-property> - <c:simple-property required="false" readOnly="true" name="serverHomeDir" description="the server home directory"/> - <c:simple-property required="false" readOnly="true" name="serverName" description="the name of the active profile the sever is using"/> - <c:simple-property required="false" name="rootDeploymentFilename" description="the filename of the root deployable that will be used to finalize the bootstrap process"/> - <c:simple-property required="false" readOnly="true" name="specificationVersion" description="the server Specification-Version"/> - <c:map-property required="false" readOnly="true" name="serverBaseURL" description="the base URL for calculating server home URLs"> + <c:simple-property required="false" readOnly="true" name="serverHomeDir" + description="the server home directory"/> + <c:simple-property required="false" readOnly="true" name="serverName" + description="the name of the active profile the sever is using"/> + <c:simple-property required="false" name="rootDeploymentFilename" + description="the filename of the root deployable that will be used to finalize the bootstrap process"/> + <c:simple-property required="false" readOnly="true" name="specificationVersion" + description="the server Specification-Version"/> + <c:map-property required="false" readOnly="true" name="serverBaseURL" + description="the base URL for calculating server home URLs"> <c:simple-property required="false" name="authority"/> <c:simple-property type="integer" required="false" name="defaultPort"/> <c:simple-property required="false" name="file"/> @@ -1552,7 +2097,8 @@ <c:simple-property required="false" name="ref"/> <c:simple-property required="false" name="userInfo"/> </c:map-property> - <c:map-property required="false" readOnly="true" name="commonBaseURL" description="the common library URL base"> + <c:map-property required="false" readOnly="true" name="commonBaseURL" + description="the common library URL base"> <c:simple-property required="false" name="authority"/> <c:simple-property type="integer" required="false" name="defaultPort"/> <c:simple-property required="false" name="file"/> @@ -1564,7 +2110,8 @@ <c:simple-property required="false" name="ref"/> <c:simple-property required="false" name="userInfo"/> </c:map-property> - <c:map-property required="false" readOnly="true" name="commonLibraryURL" description="the URL for the common library jars"> + <c:map-property required="false" readOnly="true" name="commonLibraryURL" + description="the URL for the common library jars"> <c:simple-property required="false" name="authority"/> <c:simple-property type="integer" required="false" name="defaultPort"/> <c:simple-property required="false" name="file"/> @@ -1576,7 +2123,8 @@ <c:simple-property required="false" name="ref"/> <c:simple-property required="false" name="userInfo"/> </c:map-property> - <c:simple-property required="false" readOnly="true" name="serverTempDeployDir" description="the temporary deployment dir"/> + <c:simple-property required="false" readOnly="true" name="serverTempDeployDir" + description="the temporary deployment dir"/> <c:map-property required="false" readOnly="true" name="serverHomeURL" description="the server home URL"> <c:simple-property required="false" name="authority"/> <c:simple-property type="integer" required="false" name="defaultPort"/> @@ -1589,7 +2137,8 @@ <c:simple-property required="false" name="ref"/> <c:simple-property required="false" name="userInfo"/> </c:map-property> - <c:map-property required="false" readOnly="true" name="homeURL" description="home URL which the server is running from"> + <c:map-property required="false" readOnly="true" name="homeURL" + description="home URL which the server is running from"> <c:simple-property required="false" name="authority"/> <c:simple-property type="integer" required="false" name="defaultPort"/> <c:simple-property required="false" name="file"/> @@ -1601,9 +2150,12 @@ <c:simple-property required="false" name="ref"/> <c:simple-property required="false" name="userInfo"/> </c:map-property> - <c:simple-property required="false" readOnly="true" name="serverDataDir" description="the directory where local data will be stored"/> - <c:simple-property required="false" readOnly="true" name="serverBaseDir" description="the base directory for calculating server home directories"/> - <c:simple-property required="false" readOnly="true" name="serverTempDir" description="the directory where temporary files will be stored"/> + <c:simple-property required="false" readOnly="true" name="serverDataDir" + description="the directory where local data will be stored"/> + <c:simple-property required="false" readOnly="true" name="serverBaseDir" + description="the base directory for calculating server home directories"/> + <c:simple-property required="false" readOnly="true" name="serverTempDir" + description="the directory where temporary files will be stored"/> <c:map-property required="false" readOnly="true" name="bootstrapURL" description="the bootstrap url"> <c:simple-property required="false" name="authority"/> <c:simple-property type="integer" required="false" name="defaultPort"/> @@ -1619,12 +2171,15 @@ </c:map-property> <c:simple-property required="false" readOnly="true" name="startDate" description="The server start time"/> <c:simple-property required="false" readOnly="true" name="version" description="The server version string"/> - <c:simple-property required="false" readOnly="true" name="versionName" description="The server version name"/> - <c:simple-property required="false" readOnly="true" name="versionNumber" description="The server version number string"/> + <c:simple-property required="false" readOnly="true" name="versionName" + description="The server version name"/> + <c:simple-property required="false" readOnly="true" name="versionNumber" + description="The server version number string"/> </resource-configuration> </service> <service name="Security MCBean"> - <operation name="createSecurityDomainContext" displayName="Create Security Domain Context" description="Create the context for the specified security domain"> + <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> @@ -1633,12 +2188,15 @@ <c:map-property required="false" name="result"/> </results> </operation> - <operation name="deregisterJaasSecurityDomainInstance" displayName="Deregister Jaas Security Domain Instance" description="Deregister the specified security domain"> + <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"/> + <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"> + <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> @@ -1647,7 +2205,8 @@ <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"> + <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> @@ -1656,7 +2215,8 @@ <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"> + <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> @@ -1665,7 +2225,8 @@ <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"> + <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> @@ -1674,7 +2235,8 @@ <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"> + <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> @@ -1683,7 +2245,8 @@ <c:map-property required="false" name="result"/> </results> </operation> - <operation name="registerJaasSecurityDomainInstance" displayName="Register Jaas Security Domain Instance" description="Register the specified security domain"> + <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"/> @@ -1699,7 +2262,7 @@ <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:simple-property required="false" name="element"/> </c:list-property> </c:map-property> </c:list-property> @@ -1714,146 +2277,284 @@ </parameters> </operation> <resource-configuration> - <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="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> <service name="ServerConfig MCBean"> - <metric property="bootstrapURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="bootstrapURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="bootstrapURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="commonBaseURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="commonBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="commonLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="commonLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <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"/> - <metric property="homeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="homeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="libraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="libraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <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"/> - <metric property="serverBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <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"/> - <metric property="serverHomeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverHomeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <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"/> + <metric property="bootstrapURL.authority" displayType="detail" displayName="Authority" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.defaultPort" measurementType="dynamic" displayType="detail" + displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="bootstrapURL.file" displayType="detail" displayName="File" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.host" displayType="detail" displayName="Host" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.path" displayType="detail" displayName="Path" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.port" measurementType="dynamic" displayType="detail" displayName="Port" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="bootstrapURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.query" displayType="detail" displayName="Query" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.ref" displayType="detail" displayName="Ref" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.defaultPort" measurementType="dynamic" displayType="detail" + displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="commonBaseURL.file" displayType="detail" displayName="File" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="commonBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.query" displayType="detail" displayName="Query" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" + displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="commonLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="commonLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <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"/> + <metric property="homeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" + dataType="trait" category="performance"/> + <metric property="homeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" + dataType="trait" category="performance"/> + <metric property="homeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="homeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.query" displayType="detail" displayName="Query" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" + dataType="trait" category="performance"/> + <metric property="homeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.defaultPort" measurementType="dynamic" displayType="detail" + displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="libraryURL.file" displayType="detail" displayName="File" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.host" displayType="detail" displayName="Host" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.path" displayType="detail" displayName="Path" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="libraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <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"/> + <metric property="serverBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="serverBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <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"/> + <metric property="serverHomeURL.host" displayType="detail" displayName="Host" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.path" displayType="detail" displayName="Path" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="serverHomeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.query" displayType="detail" displayName="Query" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" + displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="serverLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="serverLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" + defaultInterval="60000" dataType="trait" category="performance"/> + <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"> - <operation name="listMemoryPools" displayName="List Memory Pools" description="Return a listing of the thread pools on jdk5+"> + <operation name="listMemoryPools" displayName="List Memory Pools" + description="Return a listing of the thread pools on jdk5+"> <parameters> - <c:simple-property type="boolean" required="false" name="fancy" description="produce a text-based graph when true"/> + <c:simple-property type="boolean" required="false" name="fancy" + description="produce a text-based graph when true"/> </parameters> <results> <c:notes>Return a listing of the thread pools on jdk5+</c:notes> <c:simple-property required="false" name="result"/> </results> </operation> - <operation name="listThreadCpuUtilization" displayName="List Thread Cpu Utilization" description="Return a listing of the active threads and thread groups"> + <operation name="listThreadCpuUtilization" displayName="List Thread Cpu Utilization" + description="Return a listing of the active threads and thread groups"> <results> <c:notes>Return a listing of the active threads and thread groups</c:notes> <c:simple-property required="false" name="result"/> </results> </operation> - <operation name="listThreadDump" displayName="List Thread Dump" description="Return a listing of the active threads and thread groups"> + <operation name="listThreadDump" displayName="List Thread Dump" + description="Return a listing of the active threads and thread groups"> <results> <c:notes>Return a listing of the active threads and thread groups</c:notes> <c:simple-property required="false" name="result"/> </results> </operation> - <metric property="OSArch" displayType="summary" displayName="OS Arch" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="OSName" displayType="summary" displayName="OS Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="OSVersion" displayType="summary" displayName="OS Version" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="activeThreadCount" measurementType="dynamic" displayType="detail" displayName="Active Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="activeThreadGroupCount" measurementType="dynamic" displayType="detail" displayName="Active Thread Group Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="availableProcessors" measurementType="dynamic" displayType="detail" displayName="Available Processors" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="freeMemory" measurementType="dynamic" displayType="detail" displayName="Free Memory" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="hostAddress" displayType="summary" displayName="Host Address" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="hostName" displayType="summary" displayName="Host Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="javaVMName" displayType="summary" displayName="Java VM Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="javaVMVendor" displayType="summary" displayName="Java VM Vendor" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="javaVMVersion" displayType="summary" displayName="Java VM Version" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="javaVendor" displayType="summary" displayName="Java Vendor" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="javaVersion" displayType="summary" displayName="Java Version" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="maxMemory" measurementType="dynamic" displayType="detail" displayName="Max Memory" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="state" displayType="summary" displayName="State" description="The bean controller state" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="totalMemory" measurementType="dynamic" displayType="detail" displayName="Total Memory" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="OSArch" displayType="summary" displayName="OS Arch" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="OSName" displayType="summary" displayName="OS Name" defaultOn="true" defaultInterval="600000" + dataType="trait" category="performance"/> + <metric property="OSVersion" displayType="summary" displayName="OS Version" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="activeThreadCount" measurementType="dynamic" displayType="detail" + displayName="Active Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="activeThreadGroupCount" measurementType="dynamic" displayType="detail" + displayName="Active Thread Group Count" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="availableProcessors" measurementType="dynamic" displayType="detail" + displayName="Available Processors" defaultOn="true" defaultInterval="60000" dataType="measurement" + category="performance"/> + <metric property="freeMemory" measurementType="dynamic" displayType="detail" displayName="Free Memory" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="hostAddress" displayType="summary" displayName="Host Address" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="hostName" displayType="summary" displayName="Host Name" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="javaVMName" displayType="summary" displayName="Java VM Name" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="javaVMVendor" displayType="summary" displayName="Java VM Vendor" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="javaVMVersion" displayType="summary" displayName="Java VM Version" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="javaVendor" displayType="summary" displayName="Java Vendor" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="javaVersion" displayType="summary" displayName="Java Version" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="maxMemory" measurementType="dynamic" displayType="detail" displayName="Max Memory" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="state" displayType="summary" displayName="State" description="The bean controller state" + defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="totalMemory" measurementType="dynamic" displayType="detail" displayName="Total Memory" + defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <resource-configuration> <c:simple-property required="false" readOnly="true" name="OSArch"/> <c:simple-property required="false" readOnly="true" name="OSName"/> @@ -1869,7 +2570,8 @@ </resource-configuration> </service> <service name="Context WAR"> - <metric property="contextRoot" displayType="summary" displayName="Context Root" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="contextRoot" displayType="summary" displayName="Context Root" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:simple-property required="false" readOnly="true" name="contextRoot"/> </resource-configuration> @@ -1912,7 +2614,8 @@ </resource-configuration> </service> <service name="war"> - <metric property="contextRoot" displayType="summary" displayName="Context Root" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> + <metric property="contextRoot" displayType="summary" displayName="Context Root" defaultOn="true" + defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> <c:simple-property type="boolean" required="false" name="blackList"/> <c:simple-property type="boolean" required="false" name="cache"/> Modified: trunk/jbas5/etc/overlay/server/default/conf/jboss-log4j.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/conf/jboss-log4j.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/conf/jboss-log4j.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -16,332 +16,342 @@ <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - <!-- ================================= --> - <!-- Preserve messages in a local file --> - <!-- ================================= --> + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> - <!-- A time/date based rolling appender --> - <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="File" value="${jboss.server.log.dir}/server.log"/> - <param name="Append" value="false"/> + <!-- A time/date based rolling appender --> + <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <param name="File" value="${jboss.server.log.dir}/server.log"/> + <param name="Append" value="false"/> - <!-- Rollover at midnight each day --> - <param name="DatePattern" value="'.'yyyy-MM-dd"/> + <!-- Rollover at midnight each day --> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> - <!-- Rollover at the top of each hour - <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/> - --> + <!-- Rollover at the top of each hour + <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/> + --> - <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] (Thread) Message\n --> - <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/> + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] (Thread) Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/> - <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n - <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> - --> - </layout> - </appender> + <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n + <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> + --> + </layout> + </appender> - <!-- A size based file rolling appender - <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="File" value="${jboss.server.log.dir}/server.log"/> - <param name="Append" value="false"/> - <param name="MaxFileSize" value="500KB"/> - <param name="MaxBackupIndex" value="1"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> - </layout> - </appender> - --> - - <!-- ============================== --> - <!-- Append messages to the console --> - <!-- ============================== --> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <!-- A size based file rolling appender + <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender"> <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="Target" value="System.out"/> - <!--<param name="Threshold" value="INFO"/>--> + <param name="File" value="${jboss.server.log.dir}/server.log"/> + <param name="Append" value="false"/> + <param name="MaxFileSize" value="500KB"/> + <param name="MaxBackupIndex" value="1"/> <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> </layout> - </appender> + </appender> + --> - <!-- ====================== --> - <!-- More Appender examples --> - <!-- ====================== --> + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> - <!-- Buffer events and log them asynchronously - <appender name="ASYNC" class="org.apache.log4j.AsyncAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <appender-ref ref="FILE"/> - <appender-ref ref="CONSOLE"/> - <appender-ref ref="SMTP"/> - </appender> - --> + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <param name="Target" value="System.out"/> + <!--<param name="Threshold" value="INFO"/>--> - <!-- EMail events to an administrator - <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="Threshold" value="ERROR"/> - <param name="To" value=&quot;admin(a)myhost.domain.com&quot;/&gt; - <param name="From" value=&quot;nobody(a)myhost.domain.com&quot;/&gt; - <param name="Subject" value="JBoss Sever Errors"/> - <param name="SMTPHost" value="localhost"/> - <param name="BufferSize" value="10"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/> - </layout> - </appender> - --> + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> - <!-- Syslog events - <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="Facility" value="LOCAL7"/> - <param name="FacilityPrinting" value="true"/> - <param name="SyslogHost" value="localhost"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/> - </layout> - </appender> - --> + <!-- ====================== --> + <!-- More Appender examples --> + <!-- ====================== --> - <!-- Log events to JMS (requires a topic to be created) - <appender name="JMS" class="org.apache.log4j.net.JMSAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="Threshold" value="ERROR"/> - <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/> - <param name="TopicBindingName" value="topic/MyErrorsTopic"/> - </appender> - --> + <!-- Buffer events and log them asynchronously + <appender name="ASYNC" class="org.apache.log4j.AsyncAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <appender-ref ref="FILE"/> + <appender-ref ref="CONSOLE"/> + <appender-ref ref="SMTP"/> + </appender> + --> - <!-- Log events through SNMP - <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/> - <param name="ManagementHost" value="127.0.0.1"/> - <param name="ManagementHostTrapListenPort" value="162"/> - <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/> - <param name="LocalIPAddress" value="127.0.0.1"/> - <param name="LocalTrapSendPort" value="161"/> - <param name="GenericTrapType" value="6"/> - <param name="SpecificTrapType" value="12345678"/> - <param name="CommunityString" value="public"/> - <param name="ForwardStackTraceWithTrap" value="true"/> - <param name="Threshold" value="DEBUG"/> - <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/> - </layout> - </appender> - --> + <!-- EMail events to an administrator + <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <param name="Threshold" value="ERROR"/> + <param name="To" value=&quot;admin(a)myhost.domain.com&quot;/&gt; + <param name="From" value=&quot;nobody(a)myhost.domain.com&quot;/&gt; + <param name="Subject" value="JBoss Sever Errors"/> + <param name="SMTPHost" value="localhost"/> + <param name="BufferSize" value="10"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/> + </layout> + </appender> + --> - <!-- Emit events as JMX notifications - <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender"> + <!-- Syslog events + <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender"> <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - - <param name="Threshold" value="WARN"/> - <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/> - + <param name="Facility" value="LOCAL7"/> + <param name="FacilityPrinting" value="true"/> + <param name="SyslogHost" value="localhost"/> <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c] %m"/> + <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/> </layout> - </appender> - --> + </appender> + --> - <!-- Security AUDIT Appender --> - <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <!-- Log events to JMS (requires a topic to be created) + <appender name="JMS" class="org.apache.log4j.net.JMSAppender"> <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="File" value="${jboss.server.log.dir}/audit.log"/> - <param name="Append" value="true"/> - <param name="DatePattern" value="'.'yyyy-MM-dd"/> + <param name="Threshold" value="ERROR"/> + <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/> + <param name="TopicBindingName" value="topic/MyErrorsTopic"/> + </appender> + --> + + <!-- Log events through SNMP + <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/> + <param name="ManagementHost" value="127.0.0.1"/> + <param name="ManagementHostTrapListenPort" value="162"/> + <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/> + <param name="LocalIPAddress" value="127.0.0.1"/> + <param name="LocalTrapSendPort" value="161"/> + <param name="GenericTrapType" value="6"/> + <param name="SpecificTrapType" value="12345678"/> + <param name="CommunityString" value="public"/> + <param name="ForwardStackTraceWithTrap" value="true"/> + <param name="Threshold" value="DEBUG"/> + <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/> <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/> + <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/> </layout> - </appender> - - <!-- ================ --> - <!-- Limit categories --> - <!-- ================ --> + </appender> + --> - <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> - <category name="org.apache"> - <priority value="INFO"/> - </category> - - <!-- Limit JSF logging to DEBUG. FINER and FINEST will not be logged --> - <category name="javax.enterprise.resource.webcontainer.jsf"> - <priority value="DEBUG" /> - </category> + <!-- Emit events as JMX notifications + <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <!-- Limit the jacorb category to WARN as its INFO is verbose --> - <category name="jacorb"> - <priority value="WARN"/> - </category> - - <!-- Set the logging level of the JSF implementation --> - <category name="javax.enterprise.resource.webcontainer.jsf"> - <priority value="INFO" /> - </category> - - <!-- Limit the org.jgroups category to WARN as its INFO is verbose --> - <category name="org.jgroups"> - <priority value="WARN"/> - </category> - - <!-- Limit the org.quartz category to INFO as its DEBUG is verbose --> - <category name="org.quartz"> - <priority value="INFO"/> - </category> - - <!-- Limit JBoss categories - <category name="org.jboss"> - <priority value="INFO"/> - </category> - --> + <param name="Threshold" value="WARN"/> + <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/> - <!-- Limit the JSR77 categories --> - <category name="org.jboss.management"> - <priority value="INFO"/> - </category> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p [%c] %m"/> + </layout> + </appender> + --> - <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max] - <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool"> - <priority value="TRACE"/> - </category> - --> + <!-- Security AUDIT Appender --> + <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <param name="File" value="${jboss.server.log.dir}/audit.log"/> + <param name="Append" value="true"/> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/> + </layout> + </appender> - <!-- Category specifically for Security Audit Provider --> - <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false"> - <priority value="TRACE"/> - <appender-ref ref="AUDIT"/> - </category> - - <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose --> - <category name="org.jboss.serial"> - <priority value="INFO"/> - </category> - - <!-- Decrease the priority threshold for the org.jboss.varia category - <category name="org.jboss.varia"> - <priority value="DEBUG"/> - </category> - --> - - <!-- Enable JBossWS message tracing - <category name="org.jboss.ws.core.MessageTrace"> - <priority value="TRACE"/> - </category> - --> + <!-- ================ --> + <!-- Limit categories --> + <!-- ================ --> - <category name="org.jboss.ejb3"> - <priority value="WARN"/> - </category> + <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> + <category name="org.apache"> + <priority value="INFO"/> + </category> - <category name="org.jboss.ejb"> - <priority value="WARN"/> - </category> + <!-- Limit JSF logging to DEBUG. FINER and FINEST will not be logged --> + <category name="javax.enterprise.resource.webcontainer.jsf"> + <priority value="DEBUG"/> + </category> - <category name="org.ajax4jsf"> - <priority value="WARN"/> - </category> - - <!-- - | An example of enabling the custom TRACE level priority that is used - | by the JBoss internals to diagnose low level details. This example - | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its - | subpackages. This will produce A LOT of logging output. - | - | Note: since jboss AS 4.2.x, the trace level is supported natively by - | log4j, so although the custom org.jboss.logging.XLevel priority will - | still work, there is no need to use it. The two examples that follow - | will both enable trace logging. - <category name="org.jboss.system"> - <priority value="TRACE" class="org.jboss.logging.XLevel"/> - </category> - <category name="org.jboss.ejb.plugins"> - <priority value="TRACE"/> - </category> - --> - - <!-- - | Logs these events to SNMP: - - server starts/stops - - cluster evolution (node death/startup) - - When an EJB archive is deployed (and associated verified messages) - - When an EAR archive is deployed - - <category name="org.jboss.system.server.Server"> - <priority value="INFO" /> - <appender-ref ref="TRAP_LOG"/> - </category> - - <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle"> - <priority value="INFO" /> - <appender-ref ref="TRAP_LOG"/> - </category> + <!-- Limit the jacorb category to WARN as its INFO is verbose --> + <category name="jacorb"> + <priority value="WARN"/> + </category> - <category name="org.jboss.deployment.MainDeployer"> - <priority value="ERROR" /> - <appender-ref ref="TRAP_LOG"/> - </category> - - <category name="org.jboss.ejb.EJBDeployer"> - <priority value="INFO" /> - <appender-ref ref="TRAP_LOG"/> - </category> - - <category name="org.jboss.deployment.EARDeployer"> - <priority value="INFO" /> - <appender-ref ref="TRAP_LOG"/> - </category> - --> + <!-- Set the logging level of the JSF implementation --> + <category name="javax.enterprise.resource.webcontainer.jsf"> + <priority value="INFO"/> + </category> - <!-- Clustering logging --> - <!-- Uncomment the following to redirect the org.jgroups and - org.jboss.ha categories to a cluster.log file. + <!-- Limit the org.jgroups category to WARN as its INFO is verbose --> + <category name="org.jgroups"> + <priority value="WARN"/> + </category> - <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender"> - <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> - <param name="File" value="${jboss.server.log.dir}/cluster.log"/> - <param name="Append" value="false"/> - <param name="MaxFileSize" value="500KB"/> - <param name="MaxBackupIndex" value="1"/> + <!-- Limit the org.quartz category to INFO as its DEBUG is verbose --> + <category name="org.quartz"> + <priority value="INFO"/> + </category> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> - </layout> - </appender> - <category name="org.jgroups"> - <priority value="DEBUG" /> - <appender-ref ref="CLUSTER"/> - </category> - <category name="org.jboss.ha"> - <priority value="DEBUG" /> - <appender-ref ref="CLUSTER"/> - </category> - --> - - <category name="org.jboss.on.embedded"><priority value="DEBUG"/></category> - <category name="org.rhq.plugins.jbossas5"><priority value="DEBUG"/></category> - <category name="org.jboss.seam"><priority value="WARN"/></category> - <category name="com.sun"><priority value="WARN"/></category> - <category name="org.rhq.core.pc.inventory.RuntimeDiscoveryExecutor"><priority value="WARN"/></category> - - <!-- ======================= --> - <!-- Setup the Root category --> - <!-- ======================= --> + <!-- Limit JBoss categories + <category name="org.jboss"> + <priority value="INFO"/> + </category> + --> - <root> - <level value="INFO"/> - <appender-ref ref="CONSOLE"/> - <appender-ref ref="FILE"/> - </root> + <!-- Limit the JSR77 categories --> + <category name="org.jboss.management"> + <priority value="INFO"/> + </category> + <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max] + <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool"> + <priority value="TRACE"/> + </category> + --> + + <!-- Category specifically for Security Audit Provider --> + <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false"> + <priority value="TRACE"/> + <appender-ref ref="AUDIT"/> + </category> + + <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose --> + <category name="org.jboss.serial"> + <priority value="INFO"/> + </category> + + <!-- Decrease the priority threshold for the org.jboss.varia category + <category name="org.jboss.varia"> + <priority value="DEBUG"/> + </category> + --> + + <!-- Enable JBossWS message tracing + <category name="org.jboss.ws.core.MessageTrace"> + <priority value="TRACE"/> + </category> + --> + + <category name="org.jboss.ejb3"> + <priority value="WARN"/> + </category> + + <category name="org.jboss.ejb"> + <priority value="WARN"/> + </category> + + <category name="org.ajax4jsf"> + <priority value="WARN"/> + </category> + + <!-- + | An example of enabling the custom TRACE level priority that is used + | by the JBoss internals to diagnose low level details. This example + | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its + | subpackages. This will produce A LOT of logging output. + | + | Note: since jboss AS 4.2.x, the trace level is supported natively by + | log4j, so although the custom org.jboss.logging.XLevel priority will + | still work, there is no need to use it. The two examples that follow + | will both enable trace logging. + <category name="org.jboss.system"> + <priority value="TRACE" class="org.jboss.logging.XLevel"/> + </category> + <category name="org.jboss.ejb.plugins"> + <priority value="TRACE"/> + </category> + --> + + <!-- + | Logs these events to SNMP: + - server starts/stops + - cluster evolution (node death/startup) + - When an EJB archive is deployed (and associated verified messages) + - When an EAR archive is deployed + + <category name="org.jboss.system.server.Server"> + <priority value="INFO" /> + <appender-ref ref="TRAP_LOG"/> + </category> + + <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle"> + <priority value="INFO" /> + <appender-ref ref="TRAP_LOG"/> + </category> + + <category name="org.jboss.deployment.MainDeployer"> + <priority value="ERROR" /> + <appender-ref ref="TRAP_LOG"/> + </category> + + <category name="org.jboss.ejb.EJBDeployer"> + <priority value="INFO" /> + <appender-ref ref="TRAP_LOG"/> + </category> + + <category name="org.jboss.deployment.EARDeployer"> + <priority value="INFO" /> + <appender-ref ref="TRAP_LOG"/> + </category> + --> + + <!-- Clustering logging --> + <!-- Uncomment the following to redirect the org.jgroups and + org.jboss.ha categories to a cluster.log file. + + <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <param name="File" value="${jboss.server.log.dir}/cluster.log"/> + <param name="Append" value="false"/> + <param name="MaxFileSize" value="500KB"/> + <param name="MaxBackupIndex" value="1"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + </layout> + </appender> + <category name="org.jgroups"> + <priority value="DEBUG" /> + <appender-ref ref="CLUSTER"/> + </category> + <category name="org.jboss.ha"> + <priority value="DEBUG" /> + <appender-ref ref="CLUSTER"/> + </category> + --> + + <category name="org.jboss.on.embedded"> + <priority value="DEBUG"/> + </category> + <category name="org.rhq.plugins.jbossas5"> + <priority value="DEBUG"/> + </category> + <category name="org.jboss.seam"> + <priority value="WARN"/> + </category> + <category name="com.sun"> + <priority value="WARN"/> + </category> + <category name="org.rhq.core.pc.inventory.RuntimeDiscoveryExecutor"> + <priority value="WARN"/> + </category> + + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root> + <level value="INFO"/> + <appender-ref ref="CONSOLE"/> + <appender-ref ref="FILE"/> + </root> + </log4j:configuration> Modified: trunk/jbas5/etc/overlay/server/default/deploy/MyLocalTxCF-ds.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/MyLocalTxCF-ds.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/MyLocalTxCF-ds.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -15,7 +15,8 @@ <background-validation>false</background-validation> <background-validation-millis>0</background-validation-millis> <validate-on-match>true</validate-on-match> - <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</statistics-formatter> + <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter + </statistics-formatter> <isSameRM-override-value>false</isSameRM-override-value> <allocation-retry>0</allocation-retry> <allocation-retry-wait-millis>5000</allocation-retry-wait-millis> Modified: trunk/jbas5/etc/overlay/server/default/deploy/MyNoTxCF-ds.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/MyNoTxCF-ds.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/MyNoTxCF-ds.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -15,7 +15,8 @@ <background-validation>false</background-validation> <background-validation-millis>0</background-validation-millis> <validate-on-match>true</validate-on-match> - <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</statistics-formatter> + <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter + </statistics-formatter> <isSameRM-override-value>false</isSameRM-override-value> <interleaving/> <allocation-retry>0</allocation-retry> Modified: trunk/jbas5/etc/overlay/server/default/deploy/MyOracleLocalTxDS-ds.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/MyOracleLocalTxDS-ds.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/MyOracleLocalTxDS-ds.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -15,7 +15,8 @@ <background-validation>false</background-validation> <background-validation-millis>0</background-validation-millis> <validate-on-match>false</validate-on-match> - <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</statistics-formatter> + <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter + </statistics-formatter> <isSameRM-override-value>false</isSameRM-override-value> <allocation-retry>0</allocation-retry> <allocation-retry-wait-millis>0</allocation-retry-wait-millis> @@ -25,7 +26,8 @@ <type-mapping>oracle.jdbc.driver.OracleDriver</type-mapping> <local-transaction/> <check-valid-connection-sql>SELECT * FROM DUAL</check-valid-connection-sql> - <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> + <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter + </exception-sorter-class-name> <prepared-statement-cache-size>0</prepared-statement-cache-size> <share-prepared-statements>false</share-prepared-statements> <set-tx-query-timeout>false</set-tx-query-timeout> Modified: trunk/jbas5/etc/overlay/server/default/deploy/MyOracleNoTxDS-ds.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/MyOracleNoTxDS-ds.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/MyOracleNoTxDS-ds.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -15,7 +15,8 @@ <background-validation>false</background-validation> <background-validation-millis>0</background-validation-millis> <validate-on-match>false</validate-on-match> - <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</statistics-formatter> + <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter + </statistics-formatter> <isSameRM-override-value>false</isSameRM-override-value> <interleaving/> <allocation-retry>0</allocation-retry> @@ -25,7 +26,8 @@ </metadata> <type-mapping>oracle.jdbc.driver.OracleDriver</type-mapping> <check-valid-connection-sql>SELECT * FROM DUAL</check-valid-connection-sql> - <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> + <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter + </exception-sorter-class-name> <prepared-statement-cache-size>0</prepared-statement-cache-size> <share-prepared-statements>false</share-prepared-statements> <set-tx-query-timeout>false</set-tx-query-timeout> Modified: trunk/jbas5/etc/overlay/server/default/deploy/MyOracleXADS-ds.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/MyOracleXADS-ds.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/MyOracleXADS-ds.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -16,14 +16,16 @@ <background-validation-millis>0</background-validation-millis> <validate-on-match>false</validate-on-match> <no-tx-separate-pools/> - <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</statistics-formatter> + <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter + </statistics-formatter> <isSameRM-override-value>false</isSameRM-override-value> <allocation-retry>0</allocation-retry> <allocation-retry-wait-millis>0</allocation-retry-wait-millis> <metadata> <type-mapping>Oracle9i</type-mapping> </metadata> - <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> + <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter + </exception-sorter-class-name> <prepared-statement-cache-size>0</prepared-statement-cache-size> <share-prepared-statements>false</share-prepared-statements> <set-tx-query-timeout>false</set-tx-query-timeout> Modified: trunk/jbas5/etc/overlay/server/default/deploy/MyQueue-service.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/MyQueue-service.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/MyQueue-service.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <server> - <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=MyQueue" code="org.jboss.jms.server.destination.QueueService"> - <annotation&gt;(a)org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)&lt;/annotation&gt; + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=MyQueue" + code="org.jboss.jms.server.destination.QueueService"> + <annotation> + @org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO) + </annotation> <attribute name="JNDIName">MyQueue</attribute> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <depends>jboss.messaging:service=PostOffice</depends> Modified: trunk/jbas5/etc/overlay/server/default/deploy/MyQueueWithSecurityConfig-service.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/MyQueueWithSecurityConfig-service.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/MyQueueWithSecurityConfig-service.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -1,21 +1,25 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <server> - <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=MyQueueWithSecurityConfig" code="org.jboss.jms.server.destination.QueueService"> - - <annotation&gt;(a)org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)&lt;/annotation&gt; - + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" + name="jboss.messaging.destination:service=Queue,name=MyQueueWithSecurityConfig" + code="org.jboss.jms.server.destination.QueueService"> + + <annotation> + @org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO) + </annotation> + <attribute name="JNDIName">MyQueueWithSecurityConfig</attribute> <attribute name="SecurityConfig"> - <security> - <role name="consumer" read="true" write="false" create="false"/> - <role name="publisher" read="true" write="true" create="false"/> - <role name="administrator" read="true" write="true" create="true"/> - </security> - </attribute> - + <security> + <role name="consumer" read="true" write="false" create="false"/> + <role name="publisher" read="true" write="true" create="false"/> + <role name="administrator" read="true" write="true" create="true"/> + </security> + </attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <depends>jboss.messaging:service=PostOffice</depends> - + </mbean> </server> Modified: trunk/jbas5/etc/overlay/server/default/deploy/MyTopic-service.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/MyTopic-service.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/MyTopic-service.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <server> - <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=MyTopic" code="org.jboss.jms.server.destination.TopicService"> - <annotation&gt;(a)org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)&lt;/annotation&gt; + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=MyTopic" + code="org.jboss.jms.server.destination.TopicService"> + <annotation> + @org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO) + </annotation> <attribute name="JNDIName">MyTopic</attribute> <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> <depends>jboss.messaging:service=PostOffice</depends> Modified: trunk/jbas5/etc/overlay/server/default/deploy/MyXATxCF-ds.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/MyXATxCF-ds.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/MyXATxCF-ds.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -15,7 +15,8 @@ <background-validation>false</background-validation> <background-validation-millis>0</background-validation-millis> <validate-on-match>true</validate-on-match> - <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</statistics-formatter> + <statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter + </statistics-formatter> <isSameRM-override-value>false</isSameRM-override-value> <allocation-retry>0</allocation-retry> <allocation-retry-wait-millis>5000</allocation-retry-wait-millis> Modified: trunk/jbas5/etc/overlay/server/default/deploy/messaging/destinations-service.xml =================================================================== --- trunk/jbas5/etc/overlay/server/default/deploy/messaging/destinations-service.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/etc/overlay/server/default/deploy/messaging/destinations-service.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -8,192 +8,192 @@ <server> - <!-- - The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container. - --> + <!-- + The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container. + --> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=DLQ" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> - - <!-- - The Default Expiry Queue. - --> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=DLQ" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=ExpiryQueue" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> + <!-- + The Default Expiry Queue. + --> - <!-- - Example destinations. - --> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=ExpiryQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> - <mbean code="org.jboss.jms.server.destination.TopicService" - name="jboss.messaging.destination:service=Topic,name=testTopic" - xmbean-dd="xmdesc/Topic-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="SecurityConfig"> - <security> - <role name="guest" read="true" write="true"/> - <role name="publisher" read="true" write="true" create="false"/> - <role name="durpublisher" read="true" write="true" create="true"/> - </security> - </attribute> - </mbean> + <!-- + Example destinations. + --> - <mbean code="org.jboss.jms.server.destination.TopicService" - name="jboss.messaging.destination:service=Topic,name=securedTopic" - xmbean-dd="xmdesc/Topic-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="SecurityConfig"> - <security> - <role name="publisher" read="true" write="true" create="false"/> - </security> - </attribute> - </mbean> + <mbean code="org.jboss.jms.server.destination.TopicService" + name="jboss.messaging.destination:service=Topic,name=testTopic" + xmbean-dd="xmdesc/Topic-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="SecurityConfig"> + <security> + <role name="guest" read="true" write="true"/> + <role name="publisher" read="true" write="true" create="false"/> + <role name="durpublisher" read="true" write="true" create="true"/> + </security> + </attribute> + </mbean> - <mbean code="org.jboss.jms.server.destination.TopicService" - name="jboss.messaging.destination:service=Topic,name=testDurableTopic" - xmbean-dd="xmdesc/Topic-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="SecurityConfig"> - <security> - <role name="guest" read="true" write="true"/> - <role name="publisher" read="true" write="true" create="false"/> - <role name="durpublisher" read="true" write="true" create="true"/> - </security> - </attribute> - </mbean> + <mbean code="org.jboss.jms.server.destination.TopicService" + name="jboss.messaging.destination:service=Topic,name=securedTopic" + xmbean-dd="xmdesc/Topic-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="SecurityConfig"> + <security> + <role name="publisher" read="true" write="true" create="false"/> + </security> + </attribute> + </mbean> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=testQueue" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="SecurityConfig"> - <security> - <role name="guest" read="true" write="true"/> - <role name="publisher" read="true" write="true" create="false"/> - <role name="noacc" read="false" write="false" create="false"/> - </security> - </attribute> - </mbean> + <mbean code="org.jboss.jms.server.destination.TopicService" + name="jboss.messaging.destination:service=Topic,name=testDurableTopic" + xmbean-dd="xmdesc/Topic-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="SecurityConfig"> + <security> + <role name="guest" read="true" write="true"/> + <role name="publisher" read="true" write="true" create="false"/> + <role name="durpublisher" read="true" write="true" create="true"/> + </security> + </attribute> + </mbean> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=A" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=testQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="SecurityConfig"> + <security> + <role name="guest" read="true" write="true"/> + <role name="publisher" read="true" write="true" create="false"/> + <role name="noacc" read="false" write="false" create="false"/> + </security> + </attribute> + </mbean> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=B" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=A" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=C" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=B" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=D" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=C" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=ex" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> - - <!-- It's possible for indiviual queues and topics to use a specific queue for - an expiry or DLQ --> - - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=PrivateDLQ" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> - - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> - - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute> - <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute> - </mbean> - - <mbean code="org.jboss.jms.server.destination.TopicService" - name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue" - xmbean-dd="xmdesc/Topic-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute> - <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute> - </mbean> - - <!-- Queues and Topics can also specify their own redelivery delay --> - - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="RedeliveryDelay">5000</attribute> - </mbean> - - <mbean code="org.jboss.jms.server.destination.TopicService" - name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay" - xmbean-dd="xmdesc/Topic-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="RedeliveryDelay">5000</attribute> - </mbean> - - <!-- - Example clustered destinations. - --> - - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=testDistributedQueue" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="Clustered">true</attribute> - </mbean> - - <mbean code="org.jboss.jms.server.destination.TopicService" - name="jboss.messaging.destination:service=Topic,name=testDistributedTopic" - xmbean-dd="xmdesc/Topic-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="Clustered">true</attribute> - </mbean> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=D" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=ex" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> + + <!-- It's possible for indiviual queues and topics to use a specific queue for +an expiry or DLQ --> + + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=PrivateDLQ" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> + + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> + + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute> + <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute> + </mbean> + + <mbean code="org.jboss.jms.server.destination.TopicService" + name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue" + xmbean-dd="xmdesc/Topic-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute> + <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute> + </mbean> + + <!-- Queues and Topics can also specify their own redelivery delay --> + + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="RedeliveryDelay">5000</attribute> + </mbean> + + <mbean code="org.jboss.jms.server.destination.TopicService" + name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay" + xmbean-dd="xmdesc/Topic-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="RedeliveryDelay">5000</attribute> + </mbean> + + <!-- + Example clustered destinations. + --> + + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.messaging.destination:service=Queue,name=testDistributedQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="Clustered">true</attribute> + </mbean> + + <mbean code="org.jboss.jms.server.destination.TopicService" + name="jboss.messaging.destination:service=Topic,name=testDistributedTopic" + xmbean-dd="xmdesc/Topic-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="Clustered">true</attribute> + </mbean> + </server> Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/pom.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -1,42 +1,43 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> + <modelVersion>4.0.0</modelVersion> + + <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> <version>1.2.0-SNAPSHOT</version> - </parent> - - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-jbas5</artifactId> - <packaging>war</packaging> - <name>JBossAS 5.x Administration Console</name> + </parent> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-jbas5</artifactId> + <packaging>war</packaging> + <name>JBossAS 5.x Administration Console</name> + <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/jbas5/... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/... - </scm> - - <properties> - <warDir>${basedir}/target/${project.build.finalName}</warDir> - <warFile>${warDir}.war</warFile> - <contextRoot>admin-console</contextRoot> - </properties> - - <dependencies> - - <dependency> - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-core</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - - </dependencies> - - <build> - <finalName>${jbas5.finalName}</finalName> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/jbas5/... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/... + </scm> + + <properties> + <warDir>${basedir}/target/${project.build.finalName}</warDir> + <warFile>${warDir}.war</warFile> + <contextRoot>admin-console</contextRoot> + </properties> + + <dependencies> + + <dependency> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-core</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + + </dependencies> + + <build> + <finalName>${jbas5.finalName}</finalName> <plugins> <plugin> <artifactId>maven-dependency-plugin</artifactId> @@ -60,121 +61,124 @@ </configuration> </execution> </executions> - </plugin> - - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <filtering>true</filtering> - <directory> - ${basedir}/src/main/webapp - </directory> - </resource> - </webResources> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <filtering>true</filtering> + <directory> + ${basedir}/src/main/webapp + </directory> + </resource> + </webResources> <overlays> - <overlay> - <!-- empty groupId/artifactId detected as the current build. - earlier overlays win over later overlays, so put ourselves first. --> - </overlay> - <overlay> - <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-core</artifactId> - </overlay> - </overlays> - </configuration> - </plugin> - - <!-- - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <configuration> - <tasks> - <echo>*** Overlaying messages...</echo> - <replace file="${warDir}/WEB-INF/classes/messages.properties" token="default.windowTitle=JBoss Application Server Console" value="default.windowTitle=JBoss Administration Console for ESB" /> - - <zip destfile="${warFile}" basedir="${warDir}" includes="WEB-INF/classes/messages.properties" update="true" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - --> - </plugins> - </build> - - <profiles> - <profile> - <id>dev</id> + <overlay> + <!-- empty groupId/artifactId detected as the current build. + earlier overlays win over later overlays, so put ourselves first. --> + </overlay> + <overlay> + <groupId>org.jboss.jopr</groupId> + <artifactId>jopr-embedded-core</artifactId> + </overlay> + </overlays> + </configuration> + </plugin> - <properties> - <warDeployDir>${jbas5.configDir}/deploy/${project.build.finalName}.war</warDeployDir> - </properties> - - <build> - <plugins> - - <plugin> + <!-- + <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> - - <execution> - <id>deploy</id> - <phase>package</phase> - <configuration> + <execution> + <phase>package</phase> + <configuration> <tasks> - <property name="deployment.dir" location="${warDeployDir}" /> - <echo>*** Copying updated files from target${file.separator}${project.build.finalName} to &lt;warDir&gt;...</echo> - <touch file="${basedir}/target/${project.build.finalName}/WEB-INF/classes/messages.properties" /> - <copy todir="${deployment.dir}" verbose="${embedded.verbose}"> - <fileset dir="${basedir}/target/${project.build.finalName}" /> - </copy> - <unjar src="${project.build.directory}/${project.build.finalName}.war" dest="${deployment.dir}"> - <patternset> - <include name="META-INF/**" /> - </patternset> - </unjar> - - <!-- - <echo>*** Touching &lt;warDir&gt;/WEB-INF/web.xml to force redeploy...</echo> - <touch file="${deployment.dir}/WEB-INF/web.xml" /> - --> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> + <echo>*** Overlaying messages...</echo> + <replace file="${warDir}/WEB-INF/classes/messages.properties" token="default.windowTitle=JBoss Application Server Console" value="default.windowTitle=JBoss Administration Console for ESB" /> - <execution> - <id>undeploy</id> - <phase>clean</phase> - <configuration> - <tasks> - <property name="deployment.dir" location="${warDeployDir}" /> - <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete dir="${deployment.dir}" /> + <zip destfile="${warFile}" basedir="${warDir}" includes="WEB-INF/classes/messages.properties" update="true" /> </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + --> + </plugins> + </build> - </executions> - </plugin> + <profiles> + <profile> + <id>dev</id> - </plugins> - </build> - </profile> - </profiles> - + <properties> + <warDeployDir>${jbas5.configDir}/deploy/${project.build.finalName}.war</warDeployDir> + </properties> + + <build> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + + <execution> + <id>deploy</id> + <phase>package</phase> + <configuration> + <tasks> + <property name="deployment.dir" location="${warDeployDir}"/> + <echo>*** Copying updated files from + target${file.separator}${project.build.finalName} to &lt;warDir&gt;... + </echo> + <touch file="${basedir}/target/${project.build.finalName}/WEB-INF/classes/messages.properties"/> + <copy todir="${deployment.dir}" verbose="${embedded.verbose}"> + <fileset dir="${basedir}/target/${project.build.finalName}"/> + </copy> + <unjar src="${project.build.directory}/${project.build.finalName}.war" + dest="${deployment.dir}"> + <patternset> + <include name="META-INF/**"/> + </patternset> + </unjar> + + <!-- + <echo>*** Touching &lt;warDir&gt;/WEB-INF/web.xml to force redeploy...</echo> + <touch file="${deployment.dir}/WEB-INF/web.xml" /> + --> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>undeploy</id> + <phase>clean</phase> + <configuration> + <tasks> + <property name="deployment.dir" location="${warDeployDir}"/> + <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> + <delete dir="${deployment.dir}"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + + </plugins> + </build> + </profile> + </profiles> + </project> \ No newline at end of file Modified: trunk/jbas5/src/main/webapp/META-INF/jboss-structure.xml =================================================================== --- trunk/jbas5/src/main/webapp/META-INF/jboss-structure.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/src/main/webapp/META-INF/jboss-structure.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Fix for EMBJOPR-21: ignore the EJB3 related metadata --> <structure> - <context> - <path name=""/> - <metaDataPath> - <path name="WEB-INF"/> - </metaDataPath> - <classpath> - <path name="WEB-INF/classes"/> - <path name="WEB-INF/lib" suffixes=".jar"/> - </classpath> - </context> + <context> + <path name=""/> + <metaDataPath> + <path name="WEB-INF"/> + </metaDataPath> + <classpath> + <path name="WEB-INF/classes"/> + <path name="WEB-INF/lib" suffixes=".jar"/> + </classpath> + </context> </structure> Modified: trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml 2009-05-18 17:21:26 UTC (rev 438) +++ trunk/jbas5/src/main/webapp/WEB-INF/jboss-web.xml 2009-05-18 17:23:38 UTC (rev 439) @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE jboss-web PUBLIC - "-//JBoss//DTD Web Application 5.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> + "-//JBoss//DTD Web Application 5.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> <!-- ~ Embedded Jopr Project @@ -23,7 +23,7 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<jboss-web> +<jboss-web> <class-loading> <loader-repository> @@ -33,7 +33,7 @@ </class-loading> <security-domain>java:/jaas/jmx-console</security-domain> - + <context-root>admin-console</context-root> - + </jboss-web>