rhq-commits July 2010

rhq-commits@lists.fedorahosted.org

11 participants
338 discussions

[rhq] Branch 'release-3.0.0' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by ips 02 Jul '10

02 Jul '10

modules/common/ant-bundle/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/client-api/pom.xml | 2 +- modules/core/comm-api/pom.xml | 2 +- modules/core/dbutils/pom.xml | 2 +- modules/core/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/comm/pom.xml | 2 +- modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +- modules/enterprise/gui/base-perspective-war/pom.xml | 2 +- modules/enterprise/gui/content_http-war/pom.xml | 2 +- modules/enterprise/gui/coregui/pom.xml | 2 +- modules/enterprise/gui/installer-war/pom.xml | 2 +- modules/enterprise/gui/pom.xml | 2 +- modules/enterprise/gui/portal-war/pom.xml | 2 +- modules/enterprise/gui/webdav-war/pom.xml | 2 +- modules/enterprise/pom.xml | 2 +- modules/enterprise/remoting/cli/pom.xml | 2 +- modules/enterprise/remoting/client-api/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/remoting/webservices/pom.xml | 2 +- modules/enterprise/server/container-lib/pom.xml | 2 +- modules/enterprise/server/container/pom.xml | 2 +- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 2 +- modules/enterprise/server/plugins/alert-email/pom.xml | 2 +- modules/enterprise/server/plugins/alert-irc/pom.xml | 2 +- modules/enterprise/server/plugins/alert-microblog/pom.xml | 2 +- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2 +- modules/enterprise/server/plugins/alert-operations/pom.xml | 2 +- modules/enterprise/server/plugins/alert-roles/pom.xml | 2 +- modules/enterprise/server/plugins/alert-snmp/pom.xml | 2 +- modules/enterprise/server/plugins/alert-subject/pom.xml | 2 +- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 2 +- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +- modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +- modules/enterprise/server/plugins/pom.xml | 2 +- modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +- modules/enterprise/server/plugins/url/pom.xml | 2 +- modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +- modules/enterprise/server/plugins/yum/pom.xml | 2 +- modules/enterprise/server/safe-invoker/pom.xml | 2 +- modules/enterprise/server/sars/agent-sar/pom.xml | 2 +- modules/enterprise/server/sars/pom.xml | 2 +- modules/enterprise/server/xml-schemas/pom.xml | 2 +- modules/helpers/pluginAnnotations/pom.xml | 2 +- modules/helpers/pluginGen/pom.xml | 2 +- modules/helpers/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/plugins/aliases/pom.xml | 2 +- modules/plugins/ant-bundle/pom.xml | 2 +- modules/plugins/apache/pom.xml | 2 +- modules/plugins/augeas/pom.xml | 2 +- modules/plugins/cobbler/pom.xml | 2 +- modules/plugins/cron/pom.xml | 2 +- modules/plugins/database/pom.xml | 2 +- modules/plugins/filetemplate-bundle/pom.xml | 2 +- modules/plugins/grub/pom.xml | 2 +- modules/plugins/hibernate/pom.xml | 2 +- modules/plugins/hosts/pom.xml | 2 +- modules/plugins/hudson/pom.xml | 2 +- modules/plugins/iis/pom.xml | 2 +- modules/plugins/jboss-as-5/pom.xml | 2 +- modules/plugins/jboss-as/pom.xml | 2 +- modules/plugins/jboss-cache-v3/pom.xml | 2 +- modules/plugins/jboss-cache/pom.xml | 2 +- modules/plugins/jmx/pom.xml | 2 +- modules/plugins/mysql/pom.xml | 2 +- modules/plugins/netservices/pom.xml | 2 +- modules/plugins/oracle/pom.xml | 2 +- modules/plugins/perftest/pom.xml | 2 +- modules/plugins/platform/pom.xml | 2 +- modules/plugins/pom.xml | 2 +- modules/plugins/postfix/pom.xml | 2 +- modules/plugins/postgres/pom.xml | 2 +- modules/plugins/rhq-agent/pom.xml | 2 +- modules/plugins/rhq-server/pom.xml | 2 +- modules/plugins/samba/pom.xml | 2 +- modules/plugins/script/pom.xml | 2 +- modules/plugins/snmptrapd/pom.xml | 2 +- modules/plugins/sshd/pom.xml | 2 +- modules/plugins/sudoers/pom.xml | 2 +- modules/plugins/tomcat/pom.xml | 2 +- modules/plugins/twitter/pom.xml | 2 +- modules/plugins/validate-all-plugins/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 103 files changed, 103 insertions(+), 103 deletions(-) New commits: commit 59e9341c367e24ad78e7dafd683887080ee758dd Author: hudson auto <wnstb(a)yahoo.com> Date: Fri Jul 2 17:39:43 2010 -0400 [maven-release-plugin] prepare release RHQ_3_0_0 diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index eda9133..2671e28 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index bc7965b..d120b90 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 2cf950b..13db879 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index ee81a94..cdabe07 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index d177f9e..6ef6ac7 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index a51f92b..2b8b625 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index d536ce6..2b434aa 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index e0ced84..01ef215 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 0911918..b85d13d 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index d47d4c8..8656c25 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index e1ce7ef..750882c 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 2e58102..ed9231b 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 7739177..f8105ac 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index eeb7e81..89a85a0 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 7aad64c..832b459 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index bc41dc5..fa1d7dd 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index d9f1c1c..bdcf31f 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 8942239..701e10f 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 8b9da9c..cfac808 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 611eb9d..dbb2cc2 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 798a8ca..785e68a 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index df05645..fa3c7b6 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index ca1b68d..b0c4e49 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 1beadca..c2f18f1 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 0c529ba..9ddc2fc 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 783942c..479addc 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index aa880be..f0e1f72 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 3b0dbb8..0862d3f 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 05187c7..d263224 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index e86ef41..73f0410 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 910b617..5a27ebc 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 2ea73ee..81bddb1 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <artifactId>rhq-remoting-webservices</artifactId> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 2c98817..9df1977 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 3fd11e8..d0e93e0 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index bf15866..c05e6ac 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 9e7bb24..bd29a47 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index dd5bc18..1ff43d1 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index c0973f3..0300716 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index a62fee8..efeaf27 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 3193539..3e64d1e 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index e69bfbc..8822723 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index ca33bb7..c01583f 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index af75153..3b7a1f0 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 09839b8..f5d767a 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 73f405e..1f961af 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 4c44f10..01f152d 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 0033d1b..ad1ebe1 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 61965f2..8ff5673 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 7451668..323c494 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 0ac61d3..d39c53c 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 5a78451..a88dedc 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 2b16f4a..9e452fe 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index e4ab9b2..955aecf 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index a6cba32..b61f522 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 9c7cc74..8c4f861 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index ebdd3da..610d859 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 06c8981..722b73c 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index aa278b8..568f2a2 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 0cc2084..b36db80 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 14738d0..21b1441 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index d056f74..95d11be 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 28dc9b1..c2cf269 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index a0721a9..67674b3 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 5d327ee..bf6199e 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index c37598e..e59e4db 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index cc160c9..da8381d 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index b4f9208..8a5e218 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 915106a..c3c3731 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index d920440..dd10246 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index d5aaad5..44b5116 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 30889f7..c91d8c2 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index b79645d..0150062 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index f7cf265..a517e50 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index acb08ef..745c5e2 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 7dd0fde..d7d0846 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 65fa7b8..dd44b03 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 853c020..5bfe8b6 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index a0ade77..2fc226a 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index b9ed2b3..a0e18ef 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index b3846fa..3f3337e 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 443e524..c3f4ee7 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index ac9885a..25c1871 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index d0c9053..ffd328e 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 06ae2ae..d305b4e 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 1acdb0f..ca08b54 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 39c75da..db31afb 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 97b83b0..0be644f 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 85d6105..7394bfc 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 283ab6a..f42212b 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 5a4466c..4edf4e7 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index a190dcd..706efa2 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 8f4e675..c253427 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 0d41574..a846fac 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 7719b14..d9e5a9e 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 2d9d715..34e530a 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 3579496..a5997d7 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 41df1b8..50d3587 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 205d5b0..1c5410a 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index e299efa..51ed887 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index b3d5e87..018da41 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index bc96ae3..3065373 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 2235687..3bdbac9 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 4743b2c..4a405c3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

[rhq] Branch 'release-3.0.0' - release.sh
by ips 02 Jul '10

02 Jul '10

release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ce0c0771ce63d760fa45e6c4d925b0bf081048da Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jul 2 16:28:10 2010 -0400 temporarily update to not purge local repo in production mode diff --git a/release.sh b/release.sh index 6cb69da..57b39b0 100644 --- a/release.sh +++ b/release.sh @@ -247,7 +247,7 @@ echo if [ -f "$MAVEN_LOCAL_REPO_DIR" ]; then if [ "$MODE" = "production" ]; then echo "Purging MAVEN_LOCAL_REPO_DIR ($MAVEN_LOCAL_REPO_DIR) since this is a production build..." - rm -rf "$MAVEN_LOCAL_REPO_DIR" + #rm -rf "$MAVEN_LOCAL_REPO_DIR" else OUTPUT=`find "$MAVEN_LOCAL_REPO_DIR" -maxdepth 0 -mtime $MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS` if [ -n "$OUTPUT" ]; then

1 0

[rhq] Branch 'release-3.0.0' - modules/core modules/enterprise modules/plugins pom.xml
by ips 02 Jul '10

02 Jul '10

modules/core/native-system/ant-run.xml | 2 modules/enterprise/agent/ant-run.xml | 2 modules/enterprise/remoting/ant-run.xml | 2 modules/enterprise/remoting/cli/pom.xml | 1 modules/enterprise/remoting/cli/src/etc/build.xml | 8 +- modules/enterprise/remoting/client-api/pom.xml | 1 modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml | 27 ---------- modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ManagedComponentUtils.java | 14 +++-- pom.xml | 3 - 9 files changed, 21 insertions(+), 39 deletions(-) New commits: commit 5113a3868b3db0304ee21cb36b6f70290afda9a2 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jul 2 16:25:34 2010 -0400 upgrade all i18nlog versions throughout poms and ant scripts from 1.0.9 to 1.0.10; update ManagedComponentUtils.getSinglestoneManagedComponent to return null, rather than throwing an IllegalStateException, if no components of the specified type are found diff --git a/modules/core/native-system/ant-run.xml b/modules/core/native-system/ant-run.xml index 3856bcd..b1a23fd 100644 --- a/modules/core/native-system/ant-run.xml +++ b/modules/core/native-system/ant-run.xml @@ -14,7 +14,7 @@ Ant Script that builds a test jar to run SIGAR bug replication code. <property name="sigar.version" value="1.6.5.132"/> <fileset dir="${settings.localRepository}" id="jar.fileset"> - <include name="i18nlog/i18nlog/1.0.9/i18nlog-1.0.9.jar" /> + <include name="i18nlog/i18nlog/1.0.10/i18nlog-1.0.10.jar" /> <include name="log4j/log4j/1.2.14/log4j-1.2.14.jar" /> <include name="org/testng/testng/5.1/testng-5.1-jdk15.jar" /> <include name="commons-logging/commons-logging/1.1/commons-logging-1.1.jar" /> diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml index 16e0cd0..57ec329 100644 --- a/modules/enterprise/agent/ant-run.xml +++ b/modules/enterprise/agent/ant-run.xml @@ -34,7 +34,7 @@ Ant Script that provides ways to package the Agent. <fileset dir="${settings.localRepository}" id="run.classpath.fileset"> <include name="javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" /> - <include name="i18nlog/i18nlog/1.0.9/i18nlog-1.0.9.jar" /> + <include name="i18nlog/i18nlog/1.0.10/i18nlog-1.0.10.jar" /> <include name="log4j/log4j/1.2.14/log4j-1.2.14.jar" /> <include name="jline/jline/${jline.version}/jline-${jline.version}.jar" /> <include name="commons-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar" /> diff --git a/modules/enterprise/remoting/ant-run.xml b/modules/enterprise/remoting/ant-run.xml index 3e5fb44..163a01e 100644 --- a/modules/enterprise/remoting/ant-run.xml +++ b/modules/enterprise/remoting/ant-run.xml @@ -35,7 +35,7 @@ ANT Script that provides ways to package the agent.  <fileset dir="${settings.localRepository}" id="run.classpath.fileset"> - <include name="i18nlog/i18nlog/1.0.9/i18nlog-1.0.9.jar" /> + <include name="i18nlog/i18nlog/1.0.10/i18nlog-1.0.10.jar" /> <include name="commons-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar" /> <include name="gnu-getopt/getopt/${getopt.version}/getopt-${getopt.version}.jar" /> <include name="org/opensymphony/quartz/quartz/1.6.5/quartz-1.6.5.jar" /> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 33966bd..05187c7 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -20,7 +20,6 @@ <properties> <scm.module.path>modules/enterprise/remoting/</scm.module.path> - <i18nlog.version>1.0.9</i18nlog.version> <log4j.version>1.2.14</log4j.version> <persistence-api.version>1.0</persistence-api.version> <hibernate-all.version>1.0.0.Alpha9</hibernate-all.version> diff --git a/modules/enterprise/remoting/cli/src/etc/build.xml b/modules/enterprise/remoting/cli/src/etc/build.xml index f7f8483..6775709 100644 --- a/modules/enterprise/remoting/cli/src/etc/build.xml +++ b/modules/enterprise/remoting/cli/src/etc/build.xml @@ -21,7 +21,7 @@  <property name="i18-jar" - location="${repo}/i18nlog/i18nlog/1.0.9/i18nlog-1.0.9.jar"/> + location="${repo}/i18nlog/i18nlog/1.0.10/i18nlog-1.0.10.jar"/> <property name="jbossws" location="C:/installers/Jboss/jbossws-native-3.1.2.GA.zip"/> @@ -33,7 +33,7 @@ <pathelement location="${runLocation}/getopt-1.0.13.jar"/> <pathelement location="${runLocation}/remoting.jar"/> <pathelement location="${runLocation}/jline-0.9.94.jar"/> - <pathelement location="${runLocation}/i18nlog-1.0.9.jar"/> + <pathelement location="${runLocation}/i18nlog-1.0.10.jar"/> <pathelement location="${runLocation}/jbossws-native-3.1.2.GA.zip"/>  @@ -54,7 +54,7 @@  <copy tofile="${runLocation}/jline-0.9.94.jar" file="${jline-jar}"/> <copy tofile="${runLocation}/getopt-1.0.13.jar" file="${gnu-jar}"/> - <copy tofile="${runLocation}/i18nlog-1.0.9.jar" file="${i18-jar}"/> + <copy tofile="${runLocation}/i18nlog-1.0.10.jar" file="${i18-jar}"/> <copy tofile="${runLocation}/jbossws-native-3.1.2.GA.zip" file="${jbossws}"/> <copy tofile="${runLocation}/toRun.txt" file="${basedir}/toRun.txt"/>  </dependency> - - -  -  -  - -  - -  - -  -  - + </dependencies> <build> @@ -154,3 +130,4 @@ </profiles> </project> + diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ManagedComponentUtils.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ManagedComponentUtils.java index 177e3bb..b928584 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ManagedComponentUtils.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ManagedComponentUtils.java @@ -1,6 +1,6 @@ /* * Jopr Management Platform - * Copyright (C) 2005-2009 Red Hat, Inc. + * Copyright (C) 2005-2010 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -39,6 +39,7 @@ import org.jboss.managed.api.annotation.ViewUse; import org.jboss.metatype.api.types.MetaType; import org.jboss.metatype.api.values.EnumValue; import org.jboss.metatype.api.values.SimpleValue; +import org.jetbrains.annotations.Nullable; /** * A collection of utility methods for working with Profile Service {@link ManagedComponent}s. @@ -49,6 +50,7 @@ public class ManagedComponentUtils { private static final Comparator<ComponentType> COMPONENT_TYPE_COMPARATOR = new ComponentTypeComparator(); + @Nullable public static ManagedComponent getManagedComponent(ManagementView managementView, ComponentType componentType, String componentName) { @@ -61,22 +63,26 @@ public class ManagedComponentUtils return null; } + @Nullable public static ManagedComponent getSingletonManagedComponent(ManagementView managementView, ComponentType componentType) { Set<ManagedComponent> components = getManagedComponents(managementView, componentType); - if (components.size() != 1) + if (components.size() > 1) + { throw new IllegalStateException("Found more than one component of type " + componentType + ": " + components); + } @SuppressWarnings({"UnnecessaryLocalVariable"}) - ManagedComponent component = components.iterator().next(); + ManagedComponent component = (components.size() == 1) ? components.iterator().next() : null; return component; } public static Serializable getSimplePropertyValue(ManagedComponent component, String propertyName) throws PropertyNotFoundException { ManagedProperty property = component.getProperty(propertyName); - if (property == null) { + if (property == null) + { throw new PropertyNotFoundException("Property named '" + propertyName + "' not found for ManagedComponent [" + component + "]."); } diff --git a/pom.xml b/pom.xml index 95b0dc6..4743b2c 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,7 @@ <hibernate3.version>3.2.r14201-2</hibernate3.version> <hibernate-annotations.version>3.2.1.GA</hibernate-annotations.version> <hibernate-entitymanager.version>3.2.1.GA</hibernate-entitymanager.version> + <i18nlog.version>1.0.10</i18nlog.version> <jaxb-api.version>2.1</jaxb-api.version> <jaxb-impl.version>2.1.6</jaxb-impl.version> <jsf-api.version>1.2_14</jsf-api.version> @@ -411,7 +412,7 @@ <dependency> <groupId>i18nlog</groupId> <artifactId>i18nlog</artifactId> - <version>1.0.10</version> + <version>${i18nlog.version}</version> </dependency>

1 0

[rhq] Branch 'release-3.0.0' - 2 commits - release.sh
by ips 02 Jul '10

02 Jul '10

release.sh | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) New commits: commit 774ff1338b154d6771e46d0554811bb09af74e63 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jul 2 15:19:28 2010 -0400 oops, fix typo diff --git a/release.sh b/release.sh index 544deae..6cb69da 100644 --- a/release.sh +++ b/release.sh @@ -171,7 +171,7 @@ fi PROJECT_GIT_URL="ssh://${GIT_USERNAME}@git.fedorahosted.org/git/rhq/rhq.git" MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors -Penterprise,dist,release" -if [ "$MODE" = "production" ]; then +if [ "$MODE" = "test" ]; then MAVEN_ARGS="$MAVEN_ARGS -Dmaven.test.skip=true" fi if [ "$RELEASE_TYPE" = "enterprise" ]; then commit 45f823eebd3b01e6475790b6d009aa587c366883 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jul 2 15:18:46 2010 -0400 various tweaks to prepare for RHQ 3.0 production release build diff --git a/release.sh b/release.sh index da56c27..544deae 100644 --- a/release.sh +++ b/release.sh @@ -171,6 +171,9 @@ fi PROJECT_GIT_URL="ssh://${GIT_USERNAME}@git.fedorahosted.org/git/rhq/rhq.git" MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors -Penterprise,dist,release" +if [ "$MODE" = "production" ]; then + MAVEN_ARGS="$MAVEN_ARGS -Dmaven.test.skip=true" +fi if [ "$RELEASE_TYPE" = "enterprise" ]; then MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav -Djava5.home=$JAVA5_HOME/jre" fi @@ -181,12 +184,12 @@ if [ -n "$RELEASE_ADDITIONAL_MAVEN_ARGS" ]; then MAVEN_ARGS="$MAVEN_ARGS $RELEASE_ADDITIONAL_MAVEN_ARGS" fi if [ -z "$MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS" ]; then - MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS="12" + MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS="6" fi if [ "$MODE" = "production" ]; then MAVEN_RELEASE_PERFORM_GOAL="deploy" -else +else MAVEN_RELEASE_PERFORM_GOAL="install" fi @@ -240,14 +243,20 @@ echo # Clean the Maven local repo if it hasn't been purged recently. -# TODO: Uncomment this. -#if [ -f "$MAVEN_LOCAL_REPO_DIR" ]; then -# OUTPUT=`find "$MAVEN_LOCAL_REPO_DIR" -maxdepth 0 -mtime $MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS` -# if [ -n "$OUTPUT" ]; then -# echo "MAVEN_LOCAL_REPO_DIR ($MAVEN_LOCAL_REPO_DIR) has existed for more than $MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS hours - purging it for a clean-clean build..." -# rm -rf "$MAVEN_LOCAL_REPO_DIR" -# fi -#fi + +if [ -f "$MAVEN_LOCAL_REPO_DIR" ]; then + if [ "$MODE" = "production" ]; then + echo "Purging MAVEN_LOCAL_REPO_DIR ($MAVEN_LOCAL_REPO_DIR) since this is a production build..." + rm -rf "$MAVEN_LOCAL_REPO_DIR" + else + OUTPUT=`find "$MAVEN_LOCAL_REPO_DIR" -maxdepth 0 -mtime $MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS` + if [ -n "$OUTPUT" ]; then + echo "MAVEN_LOCAL_REPO_DIR ($MAVEN_LOCAL_REPO_DIR) has existed for more than $MAVEN_LOCAL_REPO_PURGE_INTERVAL_HOURS hours - purging it for a clean-clean build..." + rm -rf "$MAVEN_LOCAL_REPO_DIR" + fi + fi + +fi mkdir -p "$MAVEN_LOCAL_REPO_DIR" @@ -367,7 +376,9 @@ if [ -n "$EXISTING_REMOTE_TAG" ] && [ "$MODE" = "test" ]; then [ "$?" -ne 0 ] && abort "Failed to delete remote tag ($RELEASE_TAG)." fi + # See if the specified tag already exists locally - if so, delete it (even if in production mode). + EXISTING_LOCAL_TAG=`git tag -l "$RELEASE_TAG"` if [ -n "$EXISTING_LOCAL_TAG" ]; then echo "A local tag named $RELEASE_TAG already exists - deleting it..." @@ -386,6 +397,7 @@ echo "Test build succeeded!" # Clean up the snapshot jars produced by the test build from module target dirs. + echo "Cleaning up snapshot jars produced by test build from module target dirs..." mvn clean $MAVEN_ARGS [ "$?" -ne 0 ] && abort "Failed to cleanup snbapshot jars produced by test build from module target dirs. Please see above Maven output for details, fix any issues, then try again."

1 0

[rhq] Branch 'resource-upgrade' - 149 commits - .classpath etc/samples modules/common modules/core modules/enterprise modules/jopr modules/plugins release.sh
by lkrejci 02 Jul '10

02 Jul '10

.classpath | 2 dev/null |binary etc/samples/provisioning/sample-bundle/pom.xml | 92 + etc/samples/provisioning/sample-bundle/src/main/bundle/deploy.xml | 57 etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-config | 69 etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-script | 328 +++ etc/samples/provisioning/sample-bundle/src/main/petstore/petstore-db.changelog.xml | 187 ++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml | 42 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml | 19 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml | 21 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF | 4 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties | 10 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties | 10 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml | 94 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml | 10 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml | 14 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml | 126 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css | 1 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js | 249 ++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp | 80 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css | 48 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js | 269 +++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js | 136 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js | 159 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp | 23 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js | 329 +++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp | 95 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old | 95 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js | 77 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp | 22 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js | 54 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json | 7 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt | 1 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js | 241 ++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp | 266 +++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp | 134 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp | 15 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif |binary etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp | 239 ++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html | 117 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp | 164 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp | 194 ++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp | 53 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp | 36 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf | 36 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js | 21 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp | 143 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp | 65 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js | 190 ++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp | 51 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp | 21 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js | 110 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp | 33 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp | 20 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html | 60 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css | 1 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js | 643 +++++++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp | 290 +++ etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css | 130 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp | 28 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css | 47 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp | 158 + etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp | 45 etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp | 36 etc/samples/provisioning/sample-bundle/src/main/scripts/assembly.xml | 41 etc/samples/provisioning/sample-bundle/src/main/scripts/build.xml | 63 etc/samples/provisioning/sample-cli/resources/sample-bundle-v1.zip |binary etc/samples/provisioning/sample-cli/resources/sample-bundle-v2.zip |binary etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js | 59 etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js | 102 + etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js | 83 etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js | 61 etc/samples/sample-bundle/pom.xml | 92 - etc/samples/sample-bundle/src/main/bundle/deploy.xml | 57 etc/samples/sample-bundle/src/main/bundle/jbossas-init-config | 69 etc/samples/sample-bundle/src/main/bundle/jbossas-init-script | 328 --- etc/samples/sample-bundle/src/main/petstore/petstore-db.changelog.xml | 187 -- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml | 42 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml | 19 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml | 21 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF | 4 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties | 10 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties | 10 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml | 94 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml | 10 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml | 14 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml | 126 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css | 1 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js | 249 -- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp | 80 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css | 48 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js | 269 --- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js | 136 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js | 159 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp | 23 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js | 329 --- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp | 95 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old | 95 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js | 77 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp | 22 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js | 54 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json | 7 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt | 1 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js | 241 -- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp | 266 --- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp | 134 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp | 15 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp | 239 -- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html | 117 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp | 164 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp | 194 -- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp | 53 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp | 36 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf | 36 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js | 21 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp | 143 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp | 65 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js | 190 -- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp | 51 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp | 21 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js | 110 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp | 33 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp | 20 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html | 60 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css | 1 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js | 643 ------- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp | 290 --- etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css | 130 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp | 28 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css | 47 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp | 158 - etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp | 45 etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp | 36 etc/samples/sample-bundle/src/main/scripts/assembly.xml | 41 etc/samples/sample-bundle/src/main/scripts/build.xml | 63 modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java | 8 modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntMain.java | 10 modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java | 16 modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java | 15 modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/InputPropertyType.java | 78 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/measurement/MeasurementAgentService.java | 50 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java | 22 modules/core/dbutils/pom.xml | 12 modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java | 143 + modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml | 4 modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml | 10 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 148 - modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 15 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 25 modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java | 33 modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 96 - modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/ResultState.java | 14 modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SenderResult.java | 156 + modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 14 modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleFile.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 8 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/CallTimeDataCriteria.java | 219 ++ modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java | 10 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java | 34 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java | 13 modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java | 10 modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java | 58 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeFacet.java | 25 modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java | 4 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 123 - modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 18 modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java | 180 ++ modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeExecutor.java | 299 --- modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradePendingRequest.java | 35 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java | 30 modules/core/plugin-container/src/test/resources/org/rhq/core/pc/upgrade/resource-upgrade-test-plugin-2.0.0.jar |binary modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 5 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 40 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/GCPromptCommand.java | 213 ++ modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SchedulesPromptCommand.java | 80 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 13 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java | 54 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/config/SystemConfigForm.java | 23 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authorization/GlobalPermissionsUIBean.java | 9 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java | 21 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PagedListDataModel.java | 34 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java | 69 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/GroupDefinitionUIBean.java | 26 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java | 10 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java | 3 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionFormPrepareAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/calltime/CallTimeUIBean.java | 42 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java | 10 modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 1 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-auto-group/measurement-navigation.xml | 20 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/measurement-navigation.xml | 20 modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp | 15 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertNotifications.jsp | 20 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/downloads.xhtml | 21 modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/layout/main.xhtml | 144 - modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/monitor/response.xhtml | 21 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml | 8 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml | 53 modules/enterprise/gui/portal-war/src/main/webapp/rhq/definition/group/view.xhtml | 8 modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/view.xhtml | 63 modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/main.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/monitor/response.xhtml | 21 modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml | 30 modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml | 53 modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main.xhtml | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml | 95 - modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml | 53 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline.xhtml | 2 modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java | 22 modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java | 160 - modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java | 106 - modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsRegistrationManagerTest.java | 76 modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 8 modules/enterprise/server/jar/pom.xml | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 5 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 155 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java | 34 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 42 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 13 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java | 5 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/job/AbstractGroupConfigurationUpdateJob.java | 18 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerBean.java | 11 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerLocal.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerRemote.java | 214 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentHelperRemote.java | 30 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 306 ++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java | 11 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java | 47 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerLocal.java | 33 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerRemote.java | 121 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DummyLoader.java | 63 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerBean.java | 38 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerLocal.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerRemote.java | 29 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java | 24 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerRemote.java | 101 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java | 191 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerLocal.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 411 ++-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java | 7 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java | 85 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerRemote.java | 188 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java | 50 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationException.java | 38 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerBean.java | 243 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerLocal.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerRemote.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/ReleaseRepoMapping.java | 76 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 110 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 191 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 23 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestBean.java | 114 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestLocal.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 106 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 18 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java | 295 --- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java | 13 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java | 1 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java | 97 + modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/registration/test/RegistrationBeanTest.java | 113 - modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 15 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java | 7 modules/enterprise/server/jar/src/test/resources/binary-blob-sample.jar |binary modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java | 36 modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java | 14 modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java | 29 modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java | 144 - modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/AlertTokenReplacer.java | 4 modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationInfo.java | 4 modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java | 3 modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java | 15 modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java | 22 modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java | 54 modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java | 34 modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsBackingBean.java | 18 modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java | 52 modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java | 21 modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java | 6 modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java | 4 modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml | 15 modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 249 +- modules/plugins/ant-bundle/src/test/resources/test-bundle.xml | 7 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 71 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 68 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 34 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java | 307 ++- modules/plugins/augeas/pom.xml | 17 modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/PluginDescriptorBasedAugeasConfiguration.java | 2 modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java | 4 modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml | 14 modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java | 105 - modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 120 - modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java | 31 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 842 ++++------ modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java | 9 modules/plugins/nss/pom.xml | 102 - modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml | 4 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java | 44 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/util/PostgresqlConfFile.java | 22 modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 33 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java | 24 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java | 39 release.sh | 95 - 668 files changed, 12024 insertions(+), 11670 deletions(-) New commits: commit 18316510cafe27425cd1ac3cc1d08afe398d77ab Merge: 14db66f... fac71cd... Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jul 2 17:54:08 2010 +0200 Merge branch 'release-3.0.0' into resource-upgrade commit 14db66fe1f2774bcead24daebee947e6b52851dd Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jul 2 17:52:12 2010 +0200 Refactoring the resource upgrade to upgrade before the discovery during InventoryManager.initialize(). That enables us to remove all the synchronization on the resources. diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java index 825a616..f055e8c 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/upgrade/ResourceUpgradeRequest.java @@ -32,6 +32,8 @@ import org.rhq.core.domain.resource.ResourceUpgradeReport; */ public class ResourceUpgradeRequest extends ResourceUpgradeReport { + private static final long serialVersionUID = 1L; + private int resourceId; public ResourceUpgradeRequest() { @@ -52,4 +54,24 @@ public class ResourceUpgradeRequest extends ResourceUpgradeReport { public void setResourceId(int resourceId) { this.resourceId = resourceId; } + + @Override + public int hashCode() { + return 31 * resourceId; + } + + @Override + public boolean equals(Object other) { + if (other == this) { + return true; + } + + if (!(other instanceof ResourceUpgradeRequest)) { + return false; + } + + ResourceUpgradeRequest r = (ResourceUpgradeRequest) other; + + return r.getResourceId() == resourceId; + } } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java index 0f9db04..c2bc392 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceUpgradeReport.java @@ -108,4 +108,14 @@ public class ResourceUpgradeReport implements Serializable { public void setNewDescription(String newDescription) { this.newDescription = newDescription; } + + public boolean hasSomethingToUpgrade() { + return newResourceKey != null || + newName != null || + newDescription != null; + } + + public String toString() { + return "ResourceUpgradeReport[newResourceKey = '" + newResourceKey + "', newName = '" + newName + "', newDescription = '" + newDescription + "']"; + } } diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeFacet.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeFacet.java index 914641c..d122da4 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeFacet.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeFacet.java @@ -23,9 +23,6 @@ package org.rhq.core.pluginapi.upgrade; -import java.util.Map; -import java.util.Set; - import org.rhq.core.domain.resource.ResourceUpgradeReport; import org.rhq.core.pluginapi.inventory.ResourceComponent; @@ -39,19 +36,11 @@ import org.rhq.core.pluginapi.inventory.ResourceComponent; */ public interface ResourceUpgradeFacet<T extends ResourceComponent> { - /** - * This method is called on the discovery component straight after it has finished the discovery. - * The exact same discovery results are passed to this method along with the set of resources - * that already exist in the inventory. - * - * @param inventoriedSiblings the existing resources - * @param parentContext the parent of both the newly discovered and existing resources - * @param discoveryResults the discovered resources. The resources from this set that have - * the same resource key as one of the inventoried siblings (after upgrade using the results of this method) won't - * be reported. - * @return the mapping of old resources to the newly desired data. The keys are instances from the - * inventoriedSiblings set, the values are the upgrade reports detailing what the data of the - * corresponding siblings should be upgraded to. - */ - Map<ResourceUpgradeContext<T>, ResourceUpgradeReport> upgrade(Set<ResourceUpgradeContext<T>> inventoriedSiblings, ResourceUpgradeContext<? extends ResourceComponent> parentContext, Set<ResourceUpgradeContext<T>> discoveryResults); + /** + * Specifies what data should change on the provided resource to upgrade it to the current version. + * + * @param inventoriedResource a context representing the resource to be upgraded + * @return a report specifying what aspects of the resource should be changed or null if there is nothing to upgrade + */ + ResourceUpgradeReport upgrade(ResourceUpgradeContext<T> inventoriedResource); } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java index 4d61e93..7561bf7 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java @@ -261,10 +261,6 @@ public class PluginContainer implements ContainerService { } finally { releaseLock(lock); } - - //fire off the resource upgrade as soon as possible. It will run only once per plugin container - //lifetime. - inventoryManager.fireResourceUpgrade(); return; } diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java index ee42f7d..5786702 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java @@ -33,11 +33,9 @@ import java.util.IdentityHashMap; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Queue; import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.TimeUnit; @@ -93,8 +91,7 @@ import org.rhq.core.pc.plugin.BlacklistedException; import org.rhq.core.pc.plugin.CanonicalResourceKey; import org.rhq.core.pc.plugin.PluginComponentFactory; import org.rhq.core.pc.plugin.PluginManager; -import org.rhq.core.pc.upgrade.ResourceUpgradeExecutor; -import org.rhq.core.pc.upgrade.ResourceUpgradePendingRequest; +import org.rhq.core.pc.upgrade.ResourceUpgradeDelegate; import org.rhq.core.pc.util.DiscoveryComponentProxyFactory; import org.rhq.core.pc.util.FacetLockType; import org.rhq.core.pc.util.LoggingThreadFactory; @@ -195,7 +192,7 @@ public class InventoryManager extends AgentService implements ContainerService, /** * Handles the resource upgrade during the initialization of the inventory manager. */ - private ResourceUpgradeExecutor resourceUpgradeExecutor; + private ResourceUpgradeDelegate resourceUpgradeDelegate; public InventoryManager() { super(DiscoveryAgentService.class); @@ -219,12 +216,18 @@ public class InventoryManager extends AgentService implements ContainerService, loadFromDisk(); } - availabilityCollectors = new AvailabilityCollectorThreadPool(); - availabilityCollectors.initialize(); - // Discover the platform first thing. executePlatformScan(); + //try the resource upgrade before we have any schedulers set up + //so that we don't get any interventions from concurrently running + //discoveries. + resourceUpgradeDelegate = new ResourceUpgradeDelegate(this); + upgradeResources(); + + availabilityCollectors = new AvailabilityCollectorThreadPool(); + availabilityCollectors.initialize(); + // Never run more than one avail check at a time. availabilityThreadPoolExecutor = new ScheduledThreadPoolExecutor(AVAIL_THREAD_POOL_CORE_POOL_SIZE, new LoggingThreadFactory(AVAIL_THREAD_POOL_NAME, true)); @@ -251,8 +254,6 @@ public class InventoryManager extends AgentService implements ContainerService, inventoryThreadPoolExecutor.scheduleWithFixedDelay(serviceScanExecutor, configuration .getServiceDiscoveryInitialDelay(), configuration.getServiceDiscoveryPeriod(), TimeUnit.SECONDS); } - - resourceUpgradeExecutor = new ResourceUpgradeExecutor(this); } finally { inventoryLock.writeLock().unlock(); } @@ -378,20 +379,19 @@ public class InventoryManager extends AgentService implements ContainerService, return results; } - public <T extends ResourceComponent> Map<ResourceUpgradeContext<T>, ResourceUpgradeReport> invokeDiscoveryComponentResourceUpgradeFacet( + public <T extends ResourceComponent> ResourceUpgradeReport invokeDiscoveryComponentResourceUpgradeFacet( ResourceType resourceType, ResourceDiscoveryComponent<T> component, - Set<ResourceUpgradeContext<T>> inventoriedSiblings, ResourceUpgradeContext<?> parent, - Set<ResourceUpgradeContext<T>> discoveredResources) throws Throwable { + ResourceUpgradeContext<T> inventoriedResource) throws Throwable { long timeout = getDiscoveryComponentTimeout(resourceType); try { @SuppressWarnings("unchecked") ResourceUpgradeFacet<T> proxy = this.discoveryComponentProxyFactory.getDiscoveryComponentProxy(resourceType, component, timeout, ResourceUpgradeFacet.class); - return proxy.upgrade(inventoriedSiblings, parent, discoveredResources); + return proxy.upgrade(inventoriedResource); } catch (BlacklistedException e) { log.debug(e); - return Collections.emptyMap(); + return null; } } @@ -518,15 +518,6 @@ public class InventoryManager extends AgentService implements ContainerService, } } - /** - * Executes the resource upgrade asynchronously. - */ - public void fireResourceUpgrade() { - Thread resourceUpgradeThread = new Thread(resourceUpgradeExecutor, "Resource Upgrade Thread"); - resourceUpgradeThread.setDaemon(true); - resourceUpgradeThread.start(); - } - public InventoryReport executeServerScanImmediately() { try { return inventoryThreadPoolExecutor.submit((Callable<InventoryReport>) this.serverScanExecutor).get(); @@ -914,16 +905,6 @@ public class InventoryManager extends AgentService implements ContainerService, return true; } - //finish the resource upgrade. - //by now all the resource upgrade requests have been processed - //by the executor, which means that the inventory report - //we got already only contains the "correct" new resources and - //that the executor has all the upgrade requests queued up - //to be sent to the server in a batch. - if (resourceUpgradeExecutor.isEnabled()) { - resourceUpgradeExecutor.sendRequests(); - } - if (report.getAddedRoots().isEmpty() && !forceServerRoundtrip) { return true; // nothing to do } @@ -1005,7 +986,12 @@ public class InventoryManager extends AgentService implements ContainerService, // so run an avail check to report on their availabilities immediately. Also kick off // a service scan to scan those Resources for new child Resources. Kick both tasks off // asynchronously. - if (!syncedResources.isEmpty() || !unknownResourceIds.isEmpty() || !modifiedResourceIds.isEmpty()) { + // Do this only if we are finished with resource upgrade because no availability checks + // or discoveries can happen during upgrade. This is to ensure maximum consistency of the + // inventory with the server side as well as to disallow any other server-agent traffic during + // the upgrade phase. Not to mention the fact that no thread pools are initialized yet by the + // time the upgrade kicks in.. + if (!resourceUpgradeDelegate.enabled() && (!syncedResources.isEmpty() || !unknownResourceIds.isEmpty() || !modifiedResourceIds.isEmpty())) { performAvailabilityChecks(true); this.inventoryThreadPoolExecutor.schedule((Callable<? extends Object>) this.serviceScanExecutor, 5, TimeUnit.SECONDS); @@ -2180,10 +2166,6 @@ public class InventoryManager extends AgentService implements ContainerService, newResources.add(newResource); } } - - if (resourceUpgradeExecutor.isEnabled()) { - resourceUpgradeExecutor.processAndQueue(new ResourceUpgradePendingRequest(newResources, context, parentResource.getId()), newResources); - } } catch (Throwable e) { // TODO GH: Add server/parent - up/down semantics so this won't happen just because a server is not up long elapsedTime = System.currentTimeMillis() - startTime; @@ -2594,6 +2576,63 @@ public class InventoryManager extends AgentService implements ContainerService, container.setSynchronizationState(ResourceContainer.SynchronizationState.SYNCHRONIZED); } + private void upgradeResources() { + try { + if (log.isDebugEnabled()) { + log.debug("Executing resource upgrade."); + } + + boolean syncResult = handleReport(new InventoryReport(getAgent()), true); + if (!syncResult) { + log.warn("Resource upgrade failed to sync up the inventory with the server."); + return; + } + + upgradeResource(getPlatform()); + + if (log.isDebugEnabled()) { + log.debug("Sending the upgrade requests to the server."); + } + resourceUpgradeDelegate.sendRequests(); + + resourceUpgradeDelegate.disable(); + + if (log.isDebugEnabled()) { + log.debug("Resource upgrade finished."); + } + } catch (Throwable t) { + log.error("Resource upgrade failed with an exception.", t); + } + } + + private void upgradeResource(Resource resource) { + //only process committed resources + if (resource.getInventoryStatus() != InventoryStatus.COMMITTED) { + return; + } + + ResourceContainer container = getResourceContainer(resource); + if (container != null) { + try { + container = getResourceContainer(resource); + resourceUpgradeDelegate.processAndQueue(container); + } catch (PluginContainerException e) { + log.error("Exception thrown while upgrading [" + resource + "]."); + } + + if (container.getResourceComponentState() == ResourceComponentState.STARTED) { + for (Resource child : resource.getChildResources()) { + upgradeResource(child); + } + } else { + log.error("The resource container for resource [" + resource + "] wasn't started during upgrade. This should not happen."); + } + } else { + log.error("Resource container not initialized for resource [" + resource + + "] during upgrade. This should not happen."); + } + } + /** * That class implements a listener that gets called when the resource got activated * @author hrupp diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java new file mode 100644 index 0000000..cb466bd --- /dev/null +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java @@ -0,0 +1,180 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.core.pc.upgrade; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.rhq.core.clientapi.agent.PluginContainerException; +import org.rhq.core.clientapi.agent.upgrade.ResourceUpgradeRequest; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceUpgradeReport; +import org.rhq.core.pc.PluginContainer; +import org.rhq.core.pc.inventory.InventoryManager; +import org.rhq.core.pc.inventory.ResourceContainer; +import org.rhq.core.pluginapi.inventory.ResourceComponent; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext; +import org.rhq.core.pluginapi.upgrade.ResourceUpgradeFacet; + +/** + * This is a helper class to {@link InventoryManager} that takes care of resource upgrade. + * Note that this class is not thread-safe in any manner. + * + * @author Lukas Krejci + */ +public class ResourceUpgradeDelegate { + + private static final Log log = LogFactory.getLog(ResourceUpgradeDelegate.class); + + private boolean enabled = true; + + private Set<ResourceUpgradeRequest> requests = new HashSet<ResourceUpgradeRequest>(); + private InventoryManager inventoryManager; + + public ResourceUpgradeDelegate(InventoryManager inventoryManager) { + this.inventoryManager = inventoryManager; + } + + /** + * Is the delegate enabled? In another words has the resource upgrade phase finished in the {@link IventoryManager#initialize()} + * method? + */ + public boolean enabled() { + return enabled; + } + + /** + * Disables all future operations of the delegate. + */ + public void disable() { + enabled = false; + } + + /** + * Asks the resource's discovery component to upgrade the resource. + * @param resourceContainer + * @return true if the resource was queued for upgrade, false otherwise + * @throws PluginContainerException on error + */ + public boolean processAndQueue(ResourceContainer resourceContainer) throws PluginContainerException { + if (enabled) { + return executeResourceUpgradeFacetAndStoreRequest(resourceContainer); + } + + return false; + } + + public void sendRequests() { + if (enabled) { + if (requests.size() > 0) { + inventoryManager.mergeResourceFromUpgrade(requests); + requests.clear(); + } + } + } + + private <T extends ResourceComponent> boolean executeResourceUpgradeFacetAndStoreRequest( + ResourceContainer resourceContainer) throws PluginContainerException { + + @SuppressWarnings("unchecked") + ResourceComponent<T> parentResourceComponent = resourceContainer.getResourceContext() + .getParentResourceComponent(); + + Resource parentResource = resourceContainer.getResource().getParentResource(); + + ResourceContainer parentResourceContainer = (parentResource != null) ? inventoryManager + .getResourceContainer(resourceContainer.getResource().getParentResource()) : null; + + Resource resource = resourceContainer.getResource(); + + @SuppressWarnings("unchecked") + ResourceDiscoveryComponent<ResourceComponent<T>> discoveryComponent = PluginContainer.getInstance() + .getPluginComponentFactory().getDiscoveryComponent(resource.getResourceType(), parentResourceContainer); + + if (!(discoveryComponent instanceof ResourceUpgradeFacet)) { + //well, there's no point in continuing if the resource doesn't support the facet + return false; + } + + ResourceUpgradeContext<ResourceComponent<T>> upgradeContext = inventoryManager.createResourceUpgradeContext( + resource, parentResourceComponent, discoveryComponent); + + ResourceUpgradeReport upgradeReport; + try { + upgradeReport = inventoryManager.invokeDiscoveryComponentResourceUpgradeFacet(resource.getResourceType(), + discoveryComponent, upgradeContext); + } catch (Throwable t) { + log.error("ResourceUpgradeFacet threw an exception while upgrading resource [" + resource + "]", t); + return false; + } + + if (upgradeReport == null || !upgradeReport.hasSomethingToUpgrade()) { + return false; + } + + String upgradeErrors = null; + if ((upgradeErrors = checkUpgradeValid(resource, upgradeReport)) != null) { + log.error("Upgrading the resource [" + resource + "] using these updates [" + upgradeReport + + "] would render the inventory invalid because of the following reasons: " + upgradeErrors); + return false; + } + + //everything went ok, let's queue a upgrade request that will be sent to the server + requests.add(new ResourceUpgradeRequest(resource.getId(), upgradeReport)); + + return true; + } + + private String checkUpgradeValid(Resource resource, ResourceUpgradeReport upgradeReport) { + StringBuilder bld = new StringBuilder(); + + if (!checkResourceKeyUniqueAmongSiblings(resource, upgradeReport)) { + bld.append("\nAnother inventoried sibling resource of the same type already has the proposed resource key."); + } + + return bld.length() > 0 ? bld.toString() : null; + } + + private boolean checkResourceKeyUniqueAmongSiblings(Resource resource, ResourceUpgradeReport upgradeReport) { + Resource parent = resource.getParentResource(); + if (parent == null) { + return true; + } + + for (Resource sibling : parent.getChildResources()) { + //we'd have a resource key conflict if there was a resource + //of the same type under the same parent that would have the same + //resource key. + if (upgradeReport.getNewResourceKey() != null + && sibling.getResourceType().equals(resource.getResourceType()) + && !sibling.getUuid().equals(resource.getUuid())) { + + if (sibling.getResourceKey().equals(upgradeReport.getNewResourceKey())) { + return false; + } + } + } + + return true; + } +} diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeExecutor.java deleted file mode 100644 index f344900..0000000 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeExecutor.java +++ /dev/null @@ -1,299 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 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, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * 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 and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package org.rhq.core.pc.upgrade; - -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.rhq.core.clientapi.agent.PluginContainerException; -import org.rhq.core.clientapi.agent.upgrade.ResourceUpgradeRequest; -import org.rhq.core.clientapi.server.discovery.InventoryReport; -import org.rhq.core.domain.resource.InventoryStatus; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.resource.ResourceUpgradeReport; -import org.rhq.core.pc.PluginContainer; -import org.rhq.core.pc.inventory.InventoryManager; -import org.rhq.core.pc.inventory.ResourceContainer; -import org.rhq.core.pluginapi.inventory.ResourceComponent; -import org.rhq.core.pluginapi.inventory.ResourceContext; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.pluginapi.upgrade.ResourceUpgradeContext; -import org.rhq.core.pluginapi.upgrade.ResourceUpgradeFacet; - -/** - * This class is responsible for performing the resource upgrade on behalf on of {@link InventoryManager}. - * Despite its name, it is not an {@link java.util.concurrent.Executor} implementation. - * - * @author Lukas Krejci - */ -public class ResourceUpgradeExecutor implements Runnable { - private static final Log log = LogFactory.getLog(ResourceUpgradeExecutor.class); - - /** - * The upgrade runs only once in its lifetime. - */ - private AtomicBoolean enabled = new AtomicBoolean(true); - private AtomicBoolean started = new AtomicBoolean(false); - - private InventoryManager inventoryManager; - - private ConcurrentLinkedQueue<ResourceUpgradeRequest> requests; - - public ResourceUpgradeExecutor(InventoryManager inventoryManager) { - this.inventoryManager = inventoryManager; - requests = new ConcurrentLinkedQueue<ResourceUpgradeRequest>(); - } - - /** - * This method is called from within the {@link InventoryManager} during the - * discovery process as individual upgrade requests are generated. - * <p> - * This method calls the appropriate discovery component to perform the upgrade and - * at the same time stores off the results so that they can be sent to the server - * at the end of the discovery in one big batch. - * <p> - * The provided set of discovery results is updated if this method detects that an existing - * resource upgrade would result in a resource key collision with some of the newly discovered - * resources. - * - * @param request the upgrade request - * @param discoveredResources the set of discovered resources that this method can optionally remove some elements from. - */ - public <T extends ResourceComponent> Map<ResourceUpgradeContext<T>, ResourceUpgradeReport> processAndQueue( - ResourceUpgradePendingRequest<T> request, Set<Resource> discoveredResources) { - - return enabled.get() ? executeResourceUpgradeAndStoreRequest(request, discoveredResources) : null; - } - - /** - * @return true if the executor is ready to perform the upgrade, false otherwise. - */ - public boolean isEnabled() { - return enabled.get(); - } - - /** - * This method is called from within the {@link InventoryManager} once it's collected - * all the upgrade requests. - */ - public void sendRequests() { - if (enabled.get() && requests.size() > 0) { - HashSet<ResourceUpgradeRequest> currentCopy = new HashSet<ResourceUpgradeRequest>(requests); - inventoryManager.mergeResourceFromUpgrade(currentCopy); - requests.removeAll(currentCopy); - } - } - - /** - * Performs the resource upgrade. First, a full inventory report is pulled down from the - * server to ensure we have an up-to-date picture of the inventory. - * After that a full discovery is performed and both the upgrade report and discovery report - * are sent to the server. - */ - public void run() { - if (!started.getAndSet(true)) { - if (log.isDebugEnabled()) { - log.debug("Starting resource upgrade."); - } - - try { - //pull the inventory down from the server. - //this will ensure that we have an up-to-date info on the - //server inventory before we try to upgrade. - boolean syncResult = inventoryManager.handleReport(new InventoryReport(inventoryManager.getAgent()), true); - if (!syncResult) { - log.warn("Resource upgrade failed to sync up the inventory with the server."); - return; - } - - //fire off the full discovery - inventoryManager.executeServerScanImmediately(); - inventoryManager.executeServiceScanImmediately(); - } catch (Throwable t) { - log.warn("Resource upgrade failed.", t); - } finally { - //make sure to switch off the upgrade... - this.enabled.set(false); - - //clear up so that we don't hold unnecessary instances. - requests.clear(); - - if (log.isDebugEnabled()) { - log.debug("Resource upgrade finished."); - } - } - - } else { - if (log.isDebugEnabled()) { - log.debug("ResourceUpgradeExecutor already ran before. Skipping the execution."); - } - } - } - - /** - * Executes the resource upgrade request on the agent (if the appropriate discovery component support {@link ResourceUpgradeFacet}). - * - * @param request the upgrade request to execute on the agent. - * @param discoveredResources the set of the discovered resources that this method can remove some elements from - * @return the resulting upgrade map as reported by the plugin from {@link ResourceUpgradeFacet#upgrade(Set, ResourceUpgradeContext, Set)} method. - * - * @throws PluginContainerException - */ - private <T extends ResourceComponent> Map<ResourceUpgradeContext<T>, ResourceUpgradeReport> executeResourceUpgradeAndStoreRequest( - ResourceUpgradePendingRequest<T> request, Set<Resource> discoveredResources) { - - ResourceDiscoveryContext<T> discoveryContext = request.getDiscoveryContext(); - Set<Resource> newResources = request.getDiscoveredResources(); - Integer parentResourceId = request.getParentResourceId(); - - try { - ResourceType resourceType = discoveryContext.getResourceType(); - ResourceContainer parentResourceContainer = null; - Resource parentResource = null; - if (parentResourceId != null) { - parentResourceContainer = inventoryManager.getResourceContainer(parentResourceId); - if (parentResourceContainer != null) { - parentResource = parentResourceContainer.getResource(); - } - } - - @SuppressWarnings("unchecked") - ResourceDiscoveryComponent<T> discoveryComponent = PluginContainer.getInstance() - .getPluginComponentFactory().getDiscoveryComponent(resourceType, parentResourceContainer); - - ResourceContext<?> parentResourceContext = discoveryContext.getParentResourceContext(); - - T parentComponent = discoveryContext.getParentResourceComponent(); - - //check if the discovery component supports resource upgrade - //if it does, perform the resource upgrade straight away here during the discovery process. - if (discoveryComponent instanceof ResourceUpgradeFacet) { - //the siblings are the resources of the type that is currently being discovered that are already - //present in the inventory. These are the candidate resources for the upgrade. - Set<Resource> siblings = parentResource == null ? Collections.singleton(inventoryManager.getPlatform()) - : inventoryManager.getResourcesWithType(resourceType, parentResource.getChildResources()); - - //filter out not committed resources - //XXX what about uninventoried or ignored ones? is it correct to not upgrade those? - Iterator<Resource> siblingsIterator = siblings.iterator(); - while (siblingsIterator.hasNext()) { - if (siblingsIterator.next().getInventoryStatus() != InventoryStatus.COMMITTED) { - siblingsIterator.remove(); - } - } - - //get the upgrade context of the parent resource so that it can be passed to the upgrade method - //of the discovery component. - ResourceUpgradeContext<?> parentUpgradeContext = null; - - if (parentResource != null) { - Resource grandParent = parentResource.getParentResource(); - ResourceContainer grandParentContainer = grandParent == null ? null : inventoryManager - .getResourceContainer(grandParent); - - @SuppressWarnings("unchecked") - ResourceDiscoveryComponent<ResourceComponent> parentDiscoveryComponent = PluginContainer - .getInstance().getPluginComponentFactory().getDiscoveryComponent( - parentResource.getResourceType(), grandParentContainer); - - ResourceComponent<?> grandParentResourceComponent = grandParentContainer == null ? null - : grandParentContainer.getResourceComponent(); - - parentUpgradeContext = inventoryManager.createResourceUpgradeContext(parentResource, - grandParentResourceComponent, parentDiscoveryComponent); - } - - //convert the sibling resources into upgrade context objects so that the plugin methods don't access the - //domain objects directly. - Set<ResourceUpgradeContext<T>> siblingContexts = new HashSet<ResourceUpgradeContext<T>>(siblings.size()); - - //but we are going to need to update the resources in the end, so map the contexts with the resources. - Map<ResourceUpgradeContext<T>, Resource> siblingContextToResource = new HashMap<ResourceUpgradeContext<T>, Resource>(); - - for (Resource sibling : siblings) { - ResourceUpgradeContext<T> siblingContext = inventoryManager.createResourceUpgradeContext(sibling, - parentComponent, discoveryComponent); - siblingContexts.add(siblingContext); - siblingContextToResource.put(siblingContext, sibling); - } - - //convert the new resources into contexts. - //map the resources by resource key so that we can later check for uniqueness of the reported results. - Set<ResourceUpgradeContext<T>> newResourceContexts = new HashSet<ResourceUpgradeContext<T>>(); - Map<String, Resource> newResourceKeyToResource = new HashMap<String, Resource>(); - - for (Resource newResource : newResources) { - ResourceUpgradeContext<T> newUpgradeContext = inventoryManager.createResourceUpgradeContext( - newResource, parentComponent, discoveryComponent); - newResourceContexts.add(newUpgradeContext); - newResourceKeyToResource.put(newResource.getResourceKey(), newResource); - } - - //ask the discovery component to upgrade the siblings. - Map<ResourceUpgradeContext<T>, ResourceUpgradeReport> results; - try { - results = inventoryManager.invokeDiscoveryComponentResourceUpgradeFacet(resourceType, - discoveryComponent, siblingContexts, parentUpgradeContext, newResourceContexts); - - //now go through the results and create the upgrade requests. - for (Map.Entry<ResourceUpgradeContext<T>, ResourceUpgradeReport> upgradeEntry : results.entrySet()) { - Resource siblingToUpgrade = siblingContextToResource.get(upgradeEntry.getKey()); - ResourceUpgradeRequest newData = new ResourceUpgradeRequest(siblingToUpgrade.getId(), upgradeEntry.getValue()); - - requests.add(newData); - - //if there was a resource key upgrade, remove a resource with the same resource key - //from the discovery results. Otherwise we'd end up with 2 sibling resources with - //the same resource key, which is illegal. - if (newData.getNewResourceKey() != null) { - Resource newResourceToRemove = newResourceKeyToResource.get(newData.getNewResourceKey()); - if (newResourceToRemove != null) { - discoveredResources.remove(newResourceToRemove); - } - } - } - - return results; - } catch (Throwable t) { - log.warn("Exception in discovery component " + discoveryComponent.getClass() + " upgrade method.", - t); - } - } - } catch (PluginContainerException e) { - log.warn("Failed resource upgrade of children of resource id " + parentResourceId, e); - } - return null; - } -} diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradePendingRequest.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradePendingRequest.java deleted file mode 100644 index 1099643..0000000 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradePendingRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.rhq.core.pc.upgrade; - -import java.util.Set; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.pluginapi.inventory.ResourceComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; - -/** - * This class is used to store the requests for resource upgrade that originate in - * the discovery workflow, but can only be executed after an inventory sync. - */ -public class ResourceUpgradePendingRequest<T extends ResourceComponent> { - private Set<Resource> discoveredResources; - private ResourceDiscoveryContext<T> discoveryContext; - private Integer parentResourceId; - - public ResourceUpgradePendingRequest(Set<Resource> discoveredResources, ResourceDiscoveryContext<T> discoveryContext, Integer parentResourceId) { - this.discoveredResources = discoveredResources; - this.discoveryContext = discoveryContext; - this.parentResourceId = parentResourceId; - } - - public Set<Resource> getDiscoveredResources() { - return discoveredResources; - } - - public ResourceDiscoveryContext<T> getDiscoveryContext() { - return discoveryContext; - } - - public Integer getParentResourceId() { - return parentResourceId; - } -} \ No newline at end of file diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java index 087b46f..b5d571f 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java @@ -151,34 +151,8 @@ public class ResourceUpgradeTest { } @Test - public void testResourceUpgradeRunsOnlyOnce() throws Exception { - currentServerSideInventory = new FakeServerInventory(); - initialSyncAndDiscovery(InventoryStatus.COMMITTED); - - executeTestWithPlugins(Collections.singleton(PLUGIN_V2_FILENAME), false, new TestPayload() { - public void test(Resource discoveredResource) { - for(int i = 0; i < 100; i++) { - PluginContainer.getInstance().getInventoryManager().fireResourceUpgrade(); - } - } - - @SuppressWarnings("unchecked") - public Expectations getExpectations(Mockery context) throws Exception { - return new Expectations() { - { - defineDefaultExpectations(this); - - between(1, 4).of(currentDiscoveryServerService).mergeInventoryReport(with(any(InventoryReport.class))); - will(currentServerSideInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); - - //even though we fire the resource upgrade 100 times above, - //only 1 upgrade should actually occur and go up to the server. - oneOf(currentDiscoveryServerService).upgradeResources(with(any(Set.class))); - will(currentServerSideInventory.upgradeResources()); - } - }; - } - }); + public void testRecoveryWithServerUnavailable() throws Exception { + //TODO implement } private void initialSyncAndDiscovery(final InventoryStatus requiredInventoryStatus) throws Exception { diff --git a/modules/core/plugin-container/src/test/resources/org/rhq/core/pc/upgrade/resource-upgrade-test-plugin-2.0.0.jar b/modules/core/plugin-container/src/test/resources/org/rhq/core/pc/upgrade/resource-upgrade-test-plugin-2.0.0.jar index 412ae00..7ffc5bb 100644 Binary files a/modules/core/plugin-container/src/test/resources/org/rhq/core/pc/upgrade/resource-upgrade-test-plugin-2.0.0.jar and b/modules/core/plugin-container/src/test/resources/org/rhq/core/pc/upgrade/resource-upgrade-test-plugin-2.0.0.jar differ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index 329f476..add8168 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -20,7 +20,6 @@ package org.rhq.enterprise.server.discovery; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java index 7fe7a5e..de265eb 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java @@ -1715,8 +1715,16 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage Query query = entityManager.createNamedQuery(Resource.QUERY_FIND_PLATFORM_BY_AGENT); query.setParameter("category", ResourceCategory.PLATFORM); query.setParameter("agent", agent); - Resource platform = (Resource) query.getSingleResult(); - return platform; + + try { + Resource platform = (Resource) query.getSingleResult(); + return platform; + } catch (NoResultException e) { + //this means that the agent didn't send any info to us yet. + //this can happen during the inital resource upgrade sync between + //the agent and server. + return null; + } } @SuppressWarnings("unchecked") diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java index 327c439..faf0b11 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java @@ -376,7 +376,7 @@ public interface ResourceManagerLocal { * * @param agent an Agent * - * @return the platform Resource associated with the specified Agent + * @return the platform Resource associated with the specified Agent or null if the platform for the agent is not known yet. */ Resource getPlatform(Agent agent); diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java index 362a1df..c31d153 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java @@ -170,45 +170,40 @@ public class ApacheServerDiscoveryComponent implements ResourceDiscoveryComponen return discoveredResources; } - public Map<ResourceUpgradeContext<PlatformComponent>, ResourceUpgradeReport> upgrade(Set<ResourceUpgradeContext<PlatformComponent>> inventoriedSiblings, - ResourceUpgradeContext<?> parentContext, Set<ResourceUpgradeContext<PlatformComponent>> discoveryResults) { - - Map<ResourceUpgradeContext<PlatformComponent>, ResourceUpgradeReport> ret = new HashMap<ResourceUpgradeContext<PlatformComponent>, ResourceUpgradeReport>(); - - for (ResourceUpgradeContext context : inventoriedSiblings) { - String inventoriedResourceKey = context.getResourceKey(); - File inventoriedResourceKeyAsPath = new File(inventoriedResourceKey); - - //the resource key we use now is a full path to the httpdconf. - //in the old version, it was the server root. - //so if the inventoried resource key is a path to a file, - //we know it's a new style resource key. - if (inventoriedResourceKeyAsPath.isFile()) { - continue; - } - - Configuration pluginConfiguration = context.getPluginConfiguration(); - - String serverRoot = pluginConfiguration.getSimpleValue("serverRoot", null); - String httpdConf = pluginConfiguration.getSimpleValue("configFile", null); - - String resourceKey = null; - - if (httpdConf != null) { - File httpdConfFile = new File(httpdConf); - if (!httpdConfFile.isAbsolute()) { - httpdConfFile = new File(serverRoot, httpdConf); - } - - resourceKey = httpdConfFile.getPath(); - - ResourceUpgradeReport rep = new ResourceUpgradeReport(); - rep.setNewResourceKey(resourceKey); - - ret.put(context, rep); + public ResourceUpgradeReport upgrade(ResourceUpgradeContext<PlatformComponent> context) { + String inventoriedResourceKey = context.getResourceKey(); + File inventoriedResourceKeyAsPath = new File(inventoriedResourceKey); + + //the resource key we use now is a full path to the httpd.conf. + //in the old version, it was the server root. + //so if the inventoried resource key is a path to a file, + //we know it's a new style resource key. + if (inventoriedResourceKeyAsPath.isFile()) { + return null; + } + + Configuration pluginConfiguration = context.getPluginConfiguration(); + + String serverRoot = pluginConfiguration.getSimpleValue("serverRoot", null); + String httpdConf = pluginConfiguration.getSimpleValue("configFile", null); + + String resourceKey = null; + + if (httpdConf != null) { + File httpdConfFile = new File(httpdConf); + if (!httpdConfFile.isAbsolute()) { + httpdConfFile = new File(serverRoot, httpdConf); } + + resourceKey = httpdConfFile.getPath(); + + ResourceUpgradeReport rep = new ResourceUpgradeReport(); + rep.setNewResourceKey(resourceKey); + + return rep; } - return ret; + + return null; } public DiscoveredResourceDetails discoverResource(Configuration pluginConfig, commit fac71cddc3bd3965cfd4396a6f3c6fb5a6074048 Author: Joseph Marques <joseph(a)redhat.com> Date: Fri Jul 2 11:41:49 2010 -0400 BZ-610854: filter the aggregate metric counts by the appropriate entity context diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java index 704042d..15b5267 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java @@ -453,6 +453,14 @@ public class MeasurementChartsManagerBean implements MeasurementChartsManagerLoc for (int definitionId : measurementDefinitionIds) { MeasurementScheduleCriteria criteria = new MeasurementScheduleCriteria(); + if (context.category == EntityContext.Category.Resource) { + criteria.addFilterResourceId(context.resourceId); + } else if (context.category == EntityContext.Category.ResourceGroup) { + criteria.addFilterResourceGroupId(context.groupId); + } else if (context.category == EntityContext.Category.AutoGroup) { + criteria.addFilterAutoGroupParentResourceId(context.parentResourceId); + criteria.addFilterAutoGroupResourceTypeId(context.resourceTypeId); + } criteria.addFilterDefinitionIds(definitionId); PageList<MeasurementSchedule> theSchedules = scheduleManager.findSchedulesByCriteria(subject, criteria); int totalScheduleCount = theSchedules.getTotalSize(); commit 9bd087c2b141aff52b67917a604c6075ea76fb39 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jul 1 13:49:18 2010 -0400 BZ-610163: add more resilience/tolerance to generated sortable tables for when JSF hiccups diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java index 1ed3d05..1437ae2 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java @@ -26,7 +26,6 @@ import javax.faces.component.UIData; import javax.faces.component.UIGraphic; import javax.faces.component.UIOutput; import javax.faces.component.html.HtmlOutputLabel; -import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import com.sun.faces.renderkit.html_basic.CommandLinkRenderer; @@ -45,26 +44,6 @@ public class SortableColumnHeaderRenderer extends CommandLinkRenderer { super(); } - @Override - public void decode(FacesContext context, UIComponent component) { - super.decode(context, component); - } - - @Override - public void encodeBegin(FacesContext context, UIComponent component) throws IOException { - super.encodeBegin(context, component); - } - - @Override - public void encodeEnd(FacesContext context, UIComponent component) throws IOException { - super.encodeEnd(context, component); - } - - @Override - public void encodeChildren(FacesContext context, UIComponent component) throws IOException { - super.encodeChildren(context, component); - } - /* easy trick to override and put addition attributes in the writer */ @Override protected void writeValue(UIComponent component, ResponseWriter writer) throws IOException { @@ -87,14 +66,12 @@ public class SortableColumnHeaderRenderer extends CommandLinkRenderer { children.remove(i); } - if (children.size() > i && children.get(i) instanceof UIOutput) { + if (children.get(i) instanceof UIOutput) { UIOutput output = (UIOutput) children.get(i); String value = output.getValue().toString(); - if (value.length() > 0) { - if (Character.isDigit(value.charAt(0))) { - // also remove sort index labels, they will be reconstructed below - children.remove(i); - } + if (isNumber(value)) { + // also remove sort index labels ('1', '2', '3') since they will be reconstructed below + children.remove(i); } } } @@ -140,17 +117,41 @@ public class SortableColumnHeaderRenderer extends CommandLinkRenderer { super.writeValue(component, writer); } + private boolean isNumber(String value) { + if (value == null) { + return false; + } + + value = value.trim(); + if (value.equals("")) { + return false; + } + + for (char c : value.toCharArray()) { + if (Character.isDigit(c) == false) { + return false; + } + } + + return true; + } + private PageControl getPageControl(UIComponent component) { - UIData enclosingTable = getEnclosingUIData(component); + try { + UIData enclosingTable = getEnclosingUIData(component); - UIComponent facet = enclosingTable.getFacet("PageControlView"); - String viewName = facet.getId(); + UIComponent facet = enclosingTable.getFacet("PageControlView"); + String viewName = facet.getId(); - PageControlView currentView = PageControlView.valueOf(viewName); - WebUser user = EnterpriseFacesContextUtility.getWebUser(); - WebUserPreferences preferences = user.getWebPreferences(); + PageControlView currentView = PageControlView.valueOf(viewName); + WebUser user = EnterpriseFacesContextUtility.getWebUser(); + WebUserPreferences preferences = user.getWebPreferences(); - return preferences.getPageControl(currentView); + return preferences.getPageControl(currentView); + } catch (Throwable t) { + // be tolerant of JSF + return new PageControl(0, 15); // return something reasonable + } } private UIData getEnclosingUIData(UIComponent component) { commit 19fe58e4a5f500eaa95c79eb41fd957c9589e05f Merge: f36efc3... ed06919... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jul 2 09:12:40 2010 -0400 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit f36efc3c6df28459c7580fa4a3ed3f377a859c22 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jul 2 09:11:01 2010 -0400 trivial - Remove some left-behind dev logging diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java index dfd4ec6..3007520 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java @@ -24,8 +24,6 @@ package org.jboss.on.plugins.tomcat; import java.io.File; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -35,7 +33,9 @@ import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.jboss.on.plugins.tomcat.helper.TomcatConfig; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; @@ -109,7 +109,6 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man public static final String EWS_TOMCAT_5 = "tomcat5"; public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) { - log.warn("DEBUG DEPLOYMENT...."); log.debug("Discovering Tomcat servers..."); Set<DiscoveredResourceDetails> resources = new HashSet<DiscoveredResourceDetails>(); @@ -139,10 +138,9 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man } public DiscoveredResourceDetails discoverResource(Configuration pluginConfig, - ResourceDiscoveryContext discoveryContext) - throws InvalidPluginConfigurationException { - String catalinaHome = pluginConfig.getSimple( - TomcatServerComponent.PLUGIN_CONFIG_CATALINA_HOME_PATH).getStringValue(); + ResourceDiscoveryContext discoveryContext) throws InvalidPluginConfigurationException { + String catalinaHome = pluginConfig.getSimple(TomcatServerComponent.PLUGIN_CONFIG_CATALINA_HOME_PATH) + .getStringValue(); try { catalinaHome = FileUtils.getCanonicalPath(catalinaHome); } catch (Exception e) { @@ -151,8 +149,8 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man } File catalinaHomeDir = new File(catalinaHome); - String catalinaBase = pluginConfig.getSimple( - TomcatServerComponent.PLUGIN_CONFIG_CATALINA_BASE_PATH).getStringValue(); + String catalinaBase = pluginConfig.getSimple(TomcatServerComponent.PLUGIN_CONFIG_CATALINA_BASE_PATH) + .getStringValue(); try { catalinaBase = FileUtils.getCanonicalPath(catalinaBase); } catch (Exception e) { @@ -190,24 +188,23 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man TomcatConfig tomcatConfig = parseTomcatConfig(catalinaBase); version = determineVersion(catalinaHome, catalinaBase, systemInfo); if (tomcatConfig.getAddress() != null) { - address = tomcatConfig.getAddress(); - }else + address = tomcatConfig.getAddress(); + } else address = hostname; if (tomcatConfig.getPort() != null) { - port = tomcatConfig.getPort(); + port = tomcatConfig.getPort(); } } String productDescription = PRODUCT_DESCRIPTION + ((hostname == null) ? "" : (" (" + hostname + ")")); - String resourceName=null; - - + String resourceName = null; + resourceName = address + (port == null ? "" : ":" + port); String resourceKey = catalinaBase; populatePluginConfiguration(pluginConfig, catalinaHome, catalinaBase, null); - DiscoveredResourceDetails resource = new DiscoveredResourceDetails(discoveryContext.getResourceType(), resourceKey, - resourceName, version, productDescription, pluginConfig, null); + DiscoveredResourceDetails resource = new DiscoveredResourceDetails(discoveryContext.getResourceType(), + resourceKey, resourceName, version, productDescription, pluginConfig, null); log.debug("Verified manually-added Tomcat Resource with plugin config: " + pluginConfig); return resource; @@ -270,7 +267,7 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man String hostname = systemInfo.getHostname(); TomcatConfig tomcatConfig = parseTomcatConfig(catalinaBase); tomcatConfig = applySystemProperties(tomcatConfig, commandLine); - + // Create pieces necessary for the resource creation String resourceVersion = determineVersion(catalinaHome, catalinaBase, systemInfo); String productName = PRODUCT_NAME; @@ -563,13 +560,13 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man String address = applySystemProperty(config.getAddress(), commandLine); return new TomcatConfig(port, address); } - + private String applySystemProperty(String variable, String[] commandLine) { if (variable != null && variable.startsWith("${") && variable.endsWith("}")) { String variableName = variable.substring(2, variable.length() - 1); //${var} - + String envVarDefine = "-D" + variableName + "="; - for(String commandLineArg : commandLine) { + for (String commandLineArg : commandLine) { if (commandLineArg.startsWith(envVarDefine)) { return commandLineArg.substring(envVarDefine.length()); } commit 00b2aae2f27dd64092eee3c2d09df33e48736e10 Merge: 90ca72b... ed06919... Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jul 2 14:25:47 2010 +0200 Merge branch 'release-3.0.0' into resource-upgrade diff --cc modules/core/dbutils/pom.xml index 2013b3d,d536ce6..96685db --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@@ -22,7 -22,7 +22,7 @@@ <properties> <scm.module.path>modules/core/dbutils/</scm.module.path> -- <db.schema.version>2.88</db.schema.version> ++ <db.schema.version>2.89</db.schema.version> </properties> <dependencies> diff --cc modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index 3ee8217,7f8f9da..20e9d2f --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@@ -2994,15 -3000,17 +3000,27 @@@ </statement> </schema-directSQL> </schemaSpec> - - <schemaSpec version="2.88"> + + <schemaSpec version="2.88"> + <schema-directSQL> + <statement desc="Add end time index on call time data to speed up purges"> + CREATE INDEX RHQ_CT_DA_VA_END_TIM_IDX ON RHQ_CALLTIME_DATA_VALUE (end_time) + </statement> + <statement desc="Add index on measurement definition numeric type"> + CREATE INDEX RHQ_METRIC_DEF_NT_IDX ON RHQ_MEASUREMENT_DEF (numeric_type) + </statement> + </schema-directSQL> + </schemaSpec> ++ ++ <schemaSpec version="2.89"> + <schema-directSQL> + <statement desc="Adding 'Allow Agent Plugins To Upgrade Generic Resource Properties' system configuration setting"> + INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value) + VALUES (56, 'RESOURCE_GENERIC_PROPERTIES_UPGRADE', 'false', 'false') + </statement> + </schema-directSQL> + </schemaSpec> ++ </dbupgrade> </target> </project> commit ed06919e4cf55e206a6cd6dec0afcf0ab3213c73 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jul 2 00:52:37 2010 +0200 BZ 602678 - Hardening the snmp www service index matching algorithm some more... diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java index e44fef5..73d6ee5 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java @@ -547,10 +547,6 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac int snmpPort = Integer.parseInt(fullPort.substring(fullPort.lastIndexOf(".") + 1)); - //the snmp represent wildcard ports as 0 and so does HttpdAddressUtility.Address class - //we can therefore match the Address generated from the snmp values and the Addresses - //stored for this vhost directly. - HttpdAddressUtility.Address snmpAddress = new HttpdAddressUtility.Address(snmpHost, snmpPort); int matchRate = matchRate(vhostAddresses, snmpAddress); @@ -570,32 +566,59 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac return snmpWwwServiceIndex; } - private int matchRate(List<HttpdAddressUtility.Address> addresses, HttpdAddressUtility.Address addressToCheck) throws UnknownHostException { + private int matchRate(List<HttpdAddressUtility.Address> addresses, HttpdAddressUtility.Address addressToCheck) { for(HttpdAddressUtility.Address a : addresses) { - if (HttpdAddressUtility.isAddressConforming(addressToCheck, a.host, a.port)) { + if (HttpdAddressUtility.isAddressConforming(addressToCheck, a.host, a.port, true)) { return 3; } } //try to get the IP of the address to check - InetAddress[] ipAddresses = InetAddress.getAllByName(addressToCheck.host); - - for(InetAddress ip : ipAddresses) { - HttpdAddressUtility.Address newCheck = new HttpdAddressUtility.Address(ip.getHostAddress(), addressToCheck.port); - - for(HttpdAddressUtility.Address a : addresses) { - if (HttpdAddressUtility.isAddressConforming(newCheck, a.host, a.port)) { - return 2; + InetAddress[] ipAddresses; + try { + ipAddresses = InetAddress.getAllByName(addressToCheck.host); + for(InetAddress ip : ipAddresses) { + HttpdAddressUtility.Address newCheck = new HttpdAddressUtility.Address(ip.getHostAddress(), addressToCheck.port); + + for(HttpdAddressUtility.Address a : addresses) { + if (HttpdAddressUtility.isAddressConforming(newCheck, a.host, a.port, true)) { + return 2; + } } - } + } + } catch (UnknownHostException e) { + log.debug("Unknown host encountered in the httpd configuration: " + addressToCheck.host); + return 0; + } + + //this stupid 80 = 0 rule is to conform with snmp module + //the problem is that snmp module represents both 80 and * port defs as 0, + //so whatever we do, we might mismatch the vhost. But there's no working around that + //but to modify the snmp module itself. + + int addressPort = addressToCheck.port; + if (addressPort == 80) { + addressPort = 0; } //ok, try the hardest... for(HttpdAddressUtility.Address listAddress: addresses) { - InetAddress[] listAddresses = InetAddress.getAllByName(listAddress.host); + int listPort = listAddress.port; + if (listPort == 80) { + listPort = 0; + } + + InetAddress[] listAddresses; + try { + listAddresses = InetAddress.getAllByName(listAddress.host); + } catch (UnknownHostException e) { + log.debug("Unknown host encountered in the httpd configuration: " + listAddress.host); + return 0; + } + for (InetAddress listInetAddr : listAddresses) { for (InetAddress ip : ipAddresses) { - if (ip.equals(listInetAddr) && addressToCheck.port == listAddress.port) { + if (ip.equals(listInetAddr) && addressPort == listPort) { return 1; } } diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java index 261c446..c5589fd 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java @@ -74,7 +74,7 @@ public enum HttpdAddressUtility { } for (Address address : addressesToMatch) { - if (isAddressConforming(address, limitToHost, limitToPort)) { + if (isAddressConforming(address, limitToHost, limitToPort, false)) { if (!address.isPortDefined() || address.isPortWildcard()) { address.port = 80; } @@ -101,7 +101,7 @@ public enum HttpdAddressUtility { try { for(ApacheDirective n : ag.search("/Listen")) { Address addr = parseListen(n.getValues().get(0)); - if (isAddressConforming(addr, limitToHost, limitToPort)) { + if (isAddressConforming(addr, limitToHost, limitToPort, false)) { if (addr.host == null || addr.isHostDefault() || addr.isHostWildcard()) { addr = getLocalhost(addr.port); } @@ -285,7 +285,18 @@ public enum HttpdAddressUtility { return ret; } - public static boolean isAddressConforming(Address listen, String limitingHost, int limitingPort) { + /** + * Checks that given address represents a possibly wildcarded limitingHost and limitingPort values. + * + * @param listen the address to check + * @param limitingHost the host to limit to. The null value or the {@link Address#DEFAULT_HOST} + * or the {@link Address#WILDCARD} are not considered limiting + * @param limitingPort the port to limit the address to. Values <= 0 are not considered limiting + * @param snmpModuleCompatibleMode the snmp module represents both port 80 and port wildcard (*) as '0'. + * If this flag is set to true, this method takes that into account. + * @return + */ + public static boolean isAddressConforming(Address listen, String limitingHost, int limitingPort, boolean snmpModuleCompatibleMode) { if (Address.DEFAULT_HOST.equals(limitingHost) || Address.WILDCARD.equals(limitingHost)) { limitingHost = null; } @@ -298,7 +309,22 @@ public enum HttpdAddressUtility { hostOk = true; } - if (!portOk && limitingPort == listen.port) { + int listenPort = listen.port; + + //this stupid 80 = 0 rule is to conform with snmp module + //the problem is that snmp module represents both 80 and * port defs as 0, + //so whatever we do, we might mismatch the vhost. But there's no working around that + //but to modify the snmp module itself. + if (snmpModuleCompatibleMode) { + if (limitingPort == 80) { + limitingPort = 0; + } + if (listenPort == 80) { + listenPort = 0; + } + } + + if (!portOk && limitingPort == listenPort) { portOk = true; } commit e2401654dc65cec944f17b4c260bfa59544684ee Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu Jul 1 18:14:00 2010 -0400 PluginDescriptorGenerator's main method now accepts jnp URL as optional arg diff --git a/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java b/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java index 7551e42..49e6089 100644 --- a/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java +++ b/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java @@ -104,7 +104,11 @@ public class PluginDescriptorGenerator public static void main(String[] args) throws Exception { - String namingURL = "jnp://127.0.0.1:1099/"; + if (args.length > 1) + { + throw new IllegalArgumentException("Too many args. Usage: " + PluginDescriptorGenerator.class.getSimpleName() + " [jnpURL]"); + } + String namingURL = (args.length == 1) ? args[0] : "jnp://127.0.0.1:1099/"; String principal = "admin"; String credentials = "admin"; ProfileServiceConnectionProvider connectionProvider = commit a00d97747e7998561aab6c50923d75c21784eda3 Merge: aa0c4ae... 275fc74... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Jul 1 15:23:53 2010 -0400 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit aa0c4ae5a1d95a08c2acefb3019130155a4f97f8 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Jul 1 15:09:43 2010 -0400 trivial change for readability diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java index 6d7995a..0aa7f26 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java @@ -131,9 +131,9 @@ public class MBeanResourceComponent<T extends JMXComponent> implements Measureme EmsConnection beanConn = (null != this.bean) ? this.bean.getConnectionProvider().getExistingConnection() : null; EmsConnection currConn = (null != this.bean) ? getEmsConnection() : null; - if ((this.bean == null) || !beanConn.equals(currConn)) { + if ((null == this.bean) || !beanConn.equals(currConn)) { this.bean = loadBean(); - if (this.bean == null) + if (null == this.bean) throw new IllegalStateException("EMS bean was null for Resource with type [" + this.resourceContext.getResourceType() + "] and key [" + this.resourceContext.getResourceKey() + "]."); commit eb21005eea0ec8b61ab97ee21671264415278e32 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Jul 1 15:05:48 2010 -0400 As a best practice for overriding JMX getAvail, make sure the bean is valid before continuing on with other validity requirements. diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java index 7082b5b..0265123 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.mc4j.ems.connection.EmsConnection; import org.mc4j.ems.connection.bean.EmsBean; import org.mc4j.ems.connection.bean.attribute.EmsAttribute; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; @@ -84,14 +85,21 @@ public class TomcatConnectorComponent extends MBeanResourceComponent<TomcatServe @Override public AvailabilityType getAvailability() { - // When the connector is stopped its associated GlobalRequestProcessor will not exist. We test - // for availability by checking the existence of objectName Catalina:type=GlobalRequestProcessor,name=%handler%[%address%]-%port%. - String objectName = getGlobalRequestProcessorName(); - EmsConnection connection = getEmsConnection(); - ObjectNameQueryUtility queryUtility = new ObjectNameQueryUtility(objectName); - List<EmsBean> beans = connection.queryBeans(queryUtility.getTranslatedQuery()); - - return (beans.isEmpty()) ? AvailabilityType.DOWN : AvailabilityType.UP; + // First, ensure the underlying mbean for the connector is active + AvailabilityType result = super.getAvailability(); + + if (AvailabilityType.UP == result) { + // When the connector is stopped its associated GlobalRequestProcessor will not exist. We test + // for availability by checking the existence of objectName Catalina:type=GlobalRequestProcessor,name=%handler%[%address%]-%port%. + String objectName = getGlobalRequestProcessorName(); + EmsConnection connection = getEmsConnection(); + ObjectNameQueryUtility queryUtility = new ObjectNameQueryUtility(objectName); + List<EmsBean> beans = connection.queryBeans(queryUtility.getTranslatedQuery()); + + result = (beans.isEmpty()) ? AvailabilityType.DOWN : AvailabilityType.UP; + } + + return result; } @Override commit c6a959a6fd636f15c76493bf20a9ad779e441175 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Thu Jul 1 12:09:58 2010 -0400 [BZ 608148] Ensure the cached mbean is valid before returning it. If it has a stale connection refresh the bean. diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java index 33a64db..6d7995a 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java @@ -127,13 +127,18 @@ public class MBeanResourceComponent<T extends JMXComponent> implements Measureme * @see #loadBean() */ public EmsBean getEmsBean() { - if (this.bean == null) { + // make sure the connection used to cache the bean is still the current connection. if not, re-cache the bean + EmsConnection beanConn = (null != this.bean) ? this.bean.getConnectionProvider().getExistingConnection() : null; + EmsConnection currConn = (null != this.bean) ? getEmsConnection() : null; + + if ((this.bean == null) || !beanConn.equals(currConn)) { this.bean = loadBean(); if (this.bean == null) throw new IllegalStateException("EMS bean was null for Resource with type [" + this.resourceContext.getResourceType() + "] and key [" + this.resourceContext.getResourceKey() + "]."); } + return this.bean; } commit 275fc7441e3ea61fef5b3abbecf01c9c98713ade Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jul 1 10:57:53 2010 -0400 BZ-608920 - fix sorting on location column of event>history page diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml index a6b25a7..0dd0db8 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml @@ -130,7 +130,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="location"> + <onc:sortableColumnHeader sort="source.location"> <h:outputText styleClass="headerText" value="Source" /> </onc:sortableColumnHeader> </f:facet> commit e4b46e67e9dc33ef523d505f94fea84dbef507c0 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jul 1 01:59:57 2010 -0400 BZ-535692: improve short-cutting logic for alert condition processing * if an alert definition has been deleted, looking up by alert condition id should return no results * this will prevent downstream out-of-band alert processing from throwing exceptions later diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java index 94ae2fe..770c211 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java @@ -177,9 +177,11 @@ import org.rhq.core.domain.resource.group.ResourceGroup; + " WHERE aadc.category = :category ) " // + " OR :category IS NULL) "), // @NamedQuery(name = AlertDefinition.QUERY_FIND_DEFINITION_ID_BY_CONDITION_ID, query = "" // - + "SELECT ac.alertDefinition.id " // + + "SELECT ad.id " // + " FROM AlertCondition ac " // - + " WHERE ac.id = :alertConditionId "), // + + " JOIN ac.alertDefinition ad" // + + " WHERE ac.id = :alertConditionId " // + + " AND ad.enabled = true "), // @NamedQuery(name = AlertDefinition.QUERY_IS_ENABLED, query = "" // + "SELECT ad.id " // + " FROM AlertDefinition ad " // commit 41348de6f90b9a7335a0e48e13752745eb64937e Merge: 9b0cd1f... 968f756... Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com> Date: Thu Jul 1 12:00:16 2010 +0200 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit 9b0cd1f7ca26880dd57176153c78c7ffbcaeea6e Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com> Date: Thu Jul 1 11:59:11 2010 +0200 fix of bugs in equals methods diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java index ab4f537..2b36da6 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java @@ -146,7 +146,7 @@ public class AdvisoryBuglist implements Serializable { final AdvisoryBuglist other = (AdvisoryBuglist) obj; if (advisory == null) { - if (advisory != null) { + if (other.advisory != null) { return false; } } else if (!advisory.equals(other.advisory)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java index 346880c..24d0c9b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java @@ -148,7 +148,7 @@ public class AdvisoryCVE implements Serializable { final AdvisoryCVE other = (AdvisoryCVE) obj; if (advisory == null) { - if (advisory != null) { + if (other.advisory != null) { return false; } } else if (!advisory.equals(other.advisory)) { @@ -156,7 +156,7 @@ public class AdvisoryCVE implements Serializable { } if (cve == null) { - if (cve != null) { + if (other.cve != null) { return false; } } else if (!cve.equals(other.cve)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java index 2185c65..a44136b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java @@ -148,7 +148,7 @@ public class AdvisoryPackage implements Serializable { final AdvisoryPackage other = (AdvisoryPackage) obj; if (advisory == null) { - if (advisory != null) { + if (other.advisory != null) { return false; } } else if (!advisory.equals(other.advisory)) { @@ -156,7 +156,7 @@ public class AdvisoryPackage implements Serializable { } if (pkg == null) { - if (pkg != null) { + if (other.pkg != null) { return false; } } else if (!pkg.equals(other.pkg)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java index 0ba61b0..1bf02b8 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java @@ -173,7 +173,7 @@ public class DistributionFile { DistributionFile other = (DistributionFile) obj; if (getDistribution() == null) { - if (getDistribution() != null) { + if (other.getDistribution() != null) { return false; } } else if (!getDistribution().equals(other.getDistribution())) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java index ffaaed7..316150b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java @@ -196,7 +196,7 @@ public class PackageVersionContentSource implements Serializable { final PackageVersionContentSource other = (PackageVersionContentSource) obj; if (packageVersion == null) { - if (packageVersion != null) { + if (other.packageVersion != null) { return false; } } else if (!packageVersion.equals(other.packageVersion)) { @@ -204,7 +204,7 @@ public class PackageVersionContentSource implements Serializable { } if (contentSource == null) { - if (contentSource != null) { + if (other.contentSource != null) { return false; } } else if (!contentSource.equals(other.contentSource)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java index 982c961..a8571bd 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java @@ -108,7 +108,7 @@ public class ProductVersionPackageVersion implements Serializable { final ProductVersionPackageVersion other = (ProductVersionPackageVersion) obj; if (productVersion == null) { - if (productVersion != null) { + if (other.productVersion != null) { return false; } } else if (!productVersion.equals(other.productVersion)) { @@ -116,7 +116,7 @@ public class ProductVersionPackageVersion implements Serializable { } if (packageVersion == null) { - if (packageVersion != null) { + if (other.packageVersion != null) { return false; } } else if (!packageVersion.equals(other.packageVersion)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java index dac537a..9f31e1c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java @@ -147,7 +147,7 @@ public class RepoAdvisory implements Serializable { final RepoAdvisory other = (RepoAdvisory) obj; if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -155,7 +155,7 @@ public class RepoAdvisory implements Serializable { } if (advisory == null) { - if (advisory != null) { + if (other.advisory != null) { return false; } } else if (!advisory.equals(other.advisory)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java index 4311cc9..3c87044 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java @@ -130,7 +130,7 @@ public class RepoContentSource implements Serializable { final RepoContentSource other = (RepoContentSource) obj; if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -138,7 +138,7 @@ public class RepoContentSource implements Serializable { } if (contentSource == null) { - if (contentSource != null) { + if (other.contentSource != null) { return false; } } else if (!contentSource.equals(other.contentSource)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java index 113c543..d9b8c8b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java @@ -142,7 +142,7 @@ public class RepoDistribution implements Serializable { final RepoDistribution other = (RepoDistribution) obj; if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -150,7 +150,7 @@ public class RepoDistribution implements Serializable { } if (dist == null) { - if (dist != null) { + if (other.dist != null) { return false; } } else if (!dist.equals(other.dist)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java index 668fa32..90754ac 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java @@ -138,7 +138,7 @@ public class RepoPackageVersion implements Serializable { final RepoPackageVersion other = (RepoPackageVersion) obj; if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -146,7 +146,7 @@ public class RepoPackageVersion implements Serializable { } if (packageVersion == null) { - if (packageVersion != null) { + if (other.packageVersion != null) { return false; } } else if (!packageVersion.equals(other.packageVersion)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java index 9a06210..527c83a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java @@ -127,7 +127,7 @@ public class RepoRepoGroup implements Serializable { final RepoRepoGroup other = (RepoRepoGroup) obj; if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -135,7 +135,7 @@ public class RepoRepoGroup implements Serializable { } if (repoGroup == null) { - if (repoGroup != null) { + if (other.repoGroup != null) { return false; } } else if (!repoGroup.equals(other.repoGroup)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java index c93f374..3375c69 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java @@ -134,7 +134,7 @@ public class RepoRepoRelationship implements Serializable { final RepoRepoRelationship other = (RepoRepoRelationship) obj; if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { @@ -142,7 +142,7 @@ public class RepoRepoRelationship implements Serializable { } if (repoRelationship == null) { - if (repoRelationship != null) { + if (other.repoRelationship != null) { return false; } } else if (!repoRelationship.equals(other.repoRelationship)) { diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java index 54721eb..2944bef 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java @@ -137,7 +137,7 @@ public class ResourceRepo implements Serializable { final ResourceRepo other = (ResourceRepo) obj; if (resource == null) { - if (resource != null) { + if (other.resource != null) { return false; } } else if (!resource.equals(other.resource)) { @@ -145,7 +145,7 @@ public class ResourceRepo implements Serializable { } if (repo == null) { - if (repo != null) { + if (other.repo != null) { return false; } } else if (!repo.equals(other.repo)) { commit 968f756a62a0931ee7e1addd6c9041864a8db336 Merge: abc1adc... 5055dca... Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed Jun 30 18:44:06 2010 -0400 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit abc1adc013a10a6b6d3a380be91ec12457c66524 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed Jun 30 18:42:59 2010 -0400 fix so "Partition Name" trait returns a non-null value for an EAP 5.0.x server running "production" config (https://bugzilla.redhat.com/show_bug.cgi?id=594520) diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java index e21153e..6b5dfa4 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java @@ -28,7 +28,6 @@ import java.io.Serializable; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,13 +43,10 @@ import org.jboss.deployers.spi.management.ManagementView; import org.jboss.deployers.spi.management.deploy.ProgressEvent; import org.jboss.deployers.spi.management.deploy.ProgressListener; import org.jboss.managed.api.ComponentType; -import org.jboss.managed.api.DeploymentTemplateInfo; import org.jboss.managed.api.ManagedComponent; -import org.jboss.managed.api.ManagedProperty; import org.jboss.metatype.api.values.SimpleValue; import org.jboss.on.common.jbossas.JBPMWorkflowManager; import org.jboss.on.common.jbossas.JBossASPaths; -import org.jboss.profileservice.spi.NoSuchDeploymentException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -60,11 +56,7 @@ import org.mc4j.ems.connection.support.metadata.InternalVMTypeDescriptor; import org.rhq.core.domain.content.transfer.DeployPackagesResponse; import org.rhq.core.domain.content.transfer.RemovePackagesResponse; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; -import org.rhq.core.domain.configuration.definition.PropertyDefinition; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.transfer.DeployPackageStep; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; @@ -74,9 +66,6 @@ import org.rhq.core.domain.measurement.MeasurementDataNumeric; import org.rhq.core.domain.measurement.MeasurementDataTrait; import org.rhq.core.domain.measurement.MeasurementReport; import org.rhq.core.domain.measurement.MeasurementScheduleRequest; -import org.rhq.core.domain.resource.CreateResourceStatus; -import org.rhq.core.domain.resource.ResourceCreationDataType; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pluginapi.availability.AvailabilityCollectorRunnable; import org.rhq.core.pluginapi.availability.AvailabilityFacet; import org.rhq.core.pluginapi.configuration.ConfigurationFacet; @@ -93,23 +82,15 @@ import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.measurement.MeasurementFacet; import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; -import org.rhq.plugins.jbossas5.adapter.api.PropertyAdapter; -import org.rhq.plugins.jbossas5.adapter.api.PropertyAdapterFactory; import org.rhq.plugins.jbossas5.connection.LocalProfileServiceConnectionProvider; import org.rhq.plugins.jbossas5.connection.ProfileServiceConnection; import org.rhq.plugins.jbossas5.connection.ProfileServiceConnectionProvider; import org.rhq.plugins.jbossas5.connection.RemoteProfileServiceConnectionProvider; -import org.rhq.plugins.jbossas5.deploy.Deployer; -import org.rhq.plugins.jbossas5.deploy.LocalDeployer; -import org.rhq.plugins.jbossas5.deploy.RemoteDeployer; import org.rhq.plugins.jbossas5.helper.CreateChildResourceFacetDelegate; import org.rhq.plugins.jbossas5.helper.JBossAS5ConnectionTypeDescriptor; import org.rhq.plugins.jbossas5.helper.JmxConnectionHelper; import org.rhq.plugins.jbossas5.helper.InPluginControlActionFacade; -import org.rhq.plugins.jbossas5.util.ConversionUtils; -import org.rhq.plugins.jbossas5.util.DebugUtils; import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; -import org.rhq.plugins.jbossas5.util.ResourceComponentUtils; import com.jboss.jbossnetwork.product.jbpm.handlers.ControlActionFacade; @@ -125,13 +106,16 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer private static final Pattern METRIC_NAME_PATTERN = Pattern.compile("(.*)\\|(.*)\\|(.*)\\|(.*)"); - public static final Map<String, String> NEW_PROPERTY_NAMES = new HashMap<String, String>(); + private static final Map<String, String> ALTERNATE_METRIC_NAMES = new HashMap<String, String>(); static { - NEW_PROPERTY_NAMES.put("transactionCount", "numberOfTransactions"); - NEW_PROPERTY_NAMES.put("commitCount", "numberOfCommittedTransactions"); - NEW_PROPERTY_NAMES.put("rollbackCount", "numberOfApplicationRollbacks"); + ALTERNATE_METRIC_NAMES.put("MCBean|JTA|*|transactionCount", "MCBean|JTA|*|numberOfTransactions"); + ALTERNATE_METRIC_NAMES.put("MCBean|JTA|*|commitCount", "MCBean|JTA|*|numberOfCommittedTransactions"); + ALTERNATE_METRIC_NAMES.put("MCBean|JTA|*|rollbackCount", "MCBean|JTA|*|numberOfApplicationRollbacks"); + ALTERNATE_METRIC_NAMES.put("MCBean|ServerConfig|*|partitionName", "MCBean|HAPartition|*|partitionName"); } + private static final Map<String, String> VERIFIED_METRIC_NAMES = new HashMap<String, String>(); + private final Log log = LogFactory.getLog(this.getClass()); private ResourceContext resourceContext; @@ -244,59 +228,44 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) { ManagementView managementView = getConnection().getManagementView(); for (MeasurementScheduleRequest request : requests) { - String metricName = request.getName(); + String requestName = request.getName(); + String verifiedMetricName = VERIFIED_METRIC_NAMES.get(requestName); + String metricName = (verifiedMetricName != null) ? verifiedMetricName : requestName; try { - // All other metric names are expected to have the following syntax: - // "<componentType>|<componentSubType>|<componentName>|<propertyName>" - Matcher matcher = METRIC_NAME_PATTERN.matcher(metricName); - if (!matcher.matches()) { - log.error("Metric name '" + metricName + "' does not match pattern '" + METRIC_NAME_PATTERN + "'."); - continue; - } - String componentCategory = matcher.group(1); - String componentSubType = matcher.group(2); - String componentName = matcher.group(3); - String propertyName = matcher.group(4); - ComponentType componentType = new ComponentType(componentCategory, componentSubType); - ManagedComponent component; - if (componentName.equals("*")) { - component = ManagedComponentUtils.getSingletonManagedComponent(managementView, componentType); - } else { - component = ManagedComponentUtils.getManagedComponent(managementView, componentType, componentName); - } - Serializable value = null; boolean foundProperty = false; try { - value = ManagedComponentUtils.getSimplePropertyValue(component, propertyName); + value = getMetric(managementView, metricName); foundProperty = true; } catch (ManagedComponentUtils.PropertyNotFoundException e) { - if (NEW_PROPERTY_NAMES.containsKey(propertyName)) { - String newPropertyName = NEW_PROPERTY_NAMES.get(propertyName); + // ignore + } + + if (value == null) { + metricName = ALTERNATE_METRIC_NAMES.get(metricName); + if (metricName != null) { try { - value = ManagedComponentUtils.getSimplePropertyValue(component, newPropertyName); + value = getMetric(managementView, metricName); foundProperty = true; - } catch (ManagedComponentUtils.PropertyNotFoundException e1) { + } catch (ManagedComponentUtils.PropertyNotFoundException e) { // ignore } } } if (!foundProperty) { - if (NEW_PROPERTY_NAMES.containsKey(propertyName)) { - List<String> propertyNames = new ArrayList<String>(2); - propertyNames.add(propertyName); - propertyNames.add(NEW_PROPERTY_NAMES.get(propertyName)); - log.error("Property with one of the following names was not found for ManagedComponent [" - + component + "]: " + propertyNames); - } else { - log.error("Property '" + propertyName + "' was not found for ManagedComponent [" - + component + "]."); + List<String> propertyNames = new ArrayList<String>(2); + propertyNames.add(requestName); + if (ALTERNATE_METRIC_NAMES.containsKey(requestName)) { + propertyNames.add(ALTERNATE_METRIC_NAMES.get(requestName)); } - continue; + throw new IllegalStateException("A property was not found with any of the following names: " + + propertyNames); } - if (value == null) { + if (value != null) { + VERIFIED_METRIC_NAMES.put(requestName, metricName); + } else { log.debug("Null value returned for metric '" + metricName + "'."); continue; } @@ -308,7 +277,7 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer report.addData(new MeasurementDataTrait(request, value.toString())); } } catch (RuntimeException e) { - log.error("Failed to obtain metric '" + metricName + "'.", e); + log.error("Failed to obtain metric '" + requestName + "'.", e); } } } @@ -550,4 +519,28 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer } return configPath; } + + private static Serializable getMetric(ManagementView managementView, String metricName) + throws ManagedComponentUtils.PropertyNotFoundException { + // All metric names are expected to have the following syntax: + // "<componentType>|<componentSubType>|<componentName>|<propertyName>" + Matcher matcher = METRIC_NAME_PATTERN.matcher(metricName); + if (!matcher.matches()) { + throw new IllegalStateException("Metric name '" + metricName + "' does not match pattern '" + + METRIC_NAME_PATTERN + "'."); + } + String componentCategory = matcher.group(1); + String componentSubType = matcher.group(2); + String componentName = matcher.group(3); + String propertyName = matcher.group(4); + ComponentType componentType = new ComponentType(componentCategory, componentSubType); + ManagedComponent component; + if (componentName.equals("*")) { + component = ManagedComponentUtils.getSingletonManagedComponent(managementView, componentType); + } else { + component = ManagedComponentUtils.getManagedComponent(managementView, componentType, componentName); + } + + return ManagedComponentUtils.getSimplePropertyValue(component, propertyName); + } } diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml index b470905..ea8ff2d 100644 --- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml @@ -1084,7 +1084,7 @@ <results><c:simple-property name="operationResult" description="Outcome of restarting the server."/></results> </operation> - <metric displayName="Partition Name" property="MCBean|ServerConfig|*|partitionName" + <metric displayName="Cluster Partition Name" property="MCBean|ServerConfig|*|partitionName" dataType="trait" displayType="summary" description="the name of the cluster partition this server belongs to"/> commit 5055dca9b0d0bfde336be48704d50628663bd804 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Jun 30 18:06:30 2010 -0400 BZ:607799 modifed content source to detect redirects, reinitialize and log occurrence. diff --git a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java b/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java index 788961e..2758e2b 100644 --- a/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java +++ b/modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java @@ -23,8 +23,6 @@ import java.net.URI; import java.net.URL; import java.util.Collection; -import javax.xml.parsers.ParserConfigurationException; - import churchillobjects.rss4j.RssDocument; import churchillobjects.rss4j.parser.RssParser; @@ -216,8 +214,27 @@ public class JBossSoftwareContentSourceAdapter implements ContentProvider, Packa // Perform the connection and capture its response XML String rawFeed = null; try { + //store off original url to detect forwarding as 401 results otherwise + //url forwarding is true by default. + String originalUrl = method.getURI().getURI(); + int status = client.executeMethod(method); + //Check to see if redirection has occurred + String currentUrl = method.getURI().getURI(); + //if redirection has occurred, reconnect with correct address. + if (!originalUrl.trim().equalsIgnoreCase(currentUrl.trim())) { + method = new GetMethod(currentUrl); + method.setDoAuthentication(true); + if (username != null && password != null) { + UsernamePasswordCredentials upc = new UsernamePasswordCredentials(username, password); + client.getState().setCredentials("users", method.getHostConfiguration().getHost(), upc); + } + log.warn("Following redirect to [" + currentUrl + + "]. You may need to update your feed URL if redirect is permanent."); + status = client.executeMethod(method); + } + if (status == 404) { throw new SyncException("Could not find the feed at URL [" + url + "]. Make sure the URL field correctly refers to the CSP feed location."); commit 4cdf9b082af3a8298b5efd6b218475b190e1cba2 Merge: 41b640f... 68af83f... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 30 15:24:54 2010 -0400 Merge branch 'release-3.0.0' into release-3.0.0-jay Conflicts: modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java release.sh diff --cc release.sh index 5ce7396,da56c27..da56c27 mode 100755,100755..100644 --- a/release.sh +++ b/release.sh commit 68af83f4b44a2c80f2e1ca31a031deb96bffe33b Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 30 15:22:48 2010 -0400 git is forcing this commit, i am just a pawn diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js new file mode 100644 index 0000000..b099286 --- /dev/null +++ b/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js @@ -0,0 +1,102 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * This sample script shows how to deploy a Bundle. It deploys the bundle created + * by the cli-1-createBundle.js script. The Bundle uses the Ant Bundle Type provided with + * RHQ. + * <pre> + * + * The deployment is to /tmp/sample-bundle. + * + * Prerequisites: + * 1) run cli-1-createBundle.js + * 2) At least one platform must be in inventory. If the "platforms" group does not exist it will + * be created with all imported platforms as members. The sample bundle will be deployed to the + * "platforms" group. + * 3) For successful deployment the RHQ Agents must be running on the "platforms" group platforms. + * + * Usage: + * Note, the CLI must be executed in its own bin directory, so have <path> below be the path to the + * sample-cli directory. + * + * 1) start the CLI (can be downloaded from the GUI, Administration->Downloads, RHQ Client) + * 2) login user password serverHost serverPort + * 3) exec <path>/scripts/cli-2-deployBundle.js + * 4) validate the deployment and that the config settings are applied correctly + * </pre> + */ + +var bundleName = 'sample-bundle'; + +// get the bundle if it exists +var bc = new BundleCriteria(); +bc.addFilterName(bundleName); +bc.fetchBundleVersions( true ); +var bundles = BundleManager.findBundlesByCriteria(bc); +Assert.assertTrue( null != bundles && bundles.size() > 0 ); +var bundle = bundles.get(0); +Assert.assertTrue( null != bundle.getBundleVersions() && bundle.getBundleVersions().size() == 1 ); +var bundleVersion = bundle.getBundleVersions().get(0); + + +// Find or create the "platforms" group +var rgc = new ResourceGroupCriteria(); +rgc.addFilterName("platforms"); // wINdows, lINux +var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc); +var groupId; +// create if needed (and possible) +if ( groups.isEmpty() ) { + var c = new ResourceCriteria(); + c.addFilterResourceCategory(ResourceCategory.PLATFORM); + var platforms = ResourceManager.findResourcesByCriteria(c); + Assert.assertTrue( platforms.size() > 0 ); + + var rg = new ResourceGroup("platforms"); + var platformSet = new java.util.HashSet(); + platformSet.addAll( platforms ); + rg.setExplicitResources(platformSet); + rg = ResourceGroupManager.createResourceGroup(rg); + groupId = rg.getId(); +} else { + groupId = groups.get(0).getId(); +} + +// create a destination for the deployment +var dest = BundleManager.createBundleDestination(bundle.getId(), "sample destination", "sample destination", "/tmp/sample-bundle", groupId); + +// create a config for the V1.0 deployment, setting the required properties for recipe in distro 1.0 +var config1 = new Configuration(); +var property11 = new PropertySimple("sample.name", "V1 Name"); +config1.put( property11 ); +var property12 = new PropertySimple("sample.port", "11111"); +config1.put( property12 ); + + +// create a deployment for sample bundle 1.0 using the 1.0 config +var deployment = BundleManager.createBundleDeployment(bundleVersion.getId(), dest.getId(), "Deploying Sample Ant Bundle V1", config1); +deployment = BundleManager.scheduleBundleDeployment(deployment.getId(), true); +Assert.assertNotNull( deployment, "Failed to create 1.0 deployment" ); + +print("\nBundle Deployment Status=" + deployment.getStatus()); + diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js new file mode 100644 index 0000000..84b2d3a --- /dev/null +++ b/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js @@ -0,0 +1,83 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * This sample script shows how to upgrade a Bundle to a new version. It upgrades the bundle version + * deployed by the cli-2-deployBundle.js script. The Bundle uses the Ant Bundle Type provided with + * RHQ. + * <pre> + * + * The deployment is to /tmp/sample-bundle. + * + * Prerequisites: + * 1) run cli-1-createBundle.js and cli-2-deployBundle.js + * 2) For successful deployment the RHQ Agents must be running on the "platforms" group platforms. + * + * Usage: + * Note, the CLI must be executed in its own bin directory, so have <path> below be the path to the + * sample-cli directory. + * + * 1) start the CLI (can be downloaded from the GUI, Administration->Downloads, RHQ Client) + * 2) login user password serverHost serverPort + * 3) exec <path>/cli-3-upgradeBundle.js <path> + * 4) validate the upgrade deployment and that the config settings are applied correctly + * </pre> + */ + +var bundleName = 'sample-bundle'; +var bundleDistroV2Path = args[0] + '/resources/sample-bundle-v2.zip'; + +//get the bundle if it exists +var bc = new BundleCriteria(); +bc.addFilterName(bundleName); +bc.fetchDestinations( true ); +var bundles = BundleManager.findBundlesByCriteria(bc); +Assert.assertTrue( null != bundles && bundles.size() > 0 ); +var bundle = bundles.get(0); +Assert.assertTrue( null != bundle.getDestinations() && bundle.getDestinations().size() == 1 ); +var dest = bundle.getDestinations().get(0); + +//create bundleVersion 2.0 for the sample bundle +var distributionFile = new java.io.File(bundleDistroV2Path); +distributionFile = new java.io.File(distributionFile.getAbsolutePath()); +Assert.assertTrue(distributionFile.exists(), "Missing ant bundle distribution file: " + distributionFile); +var bundleVersion2 = BundleManager.createBundleVersionViaFile(distributionFile); + +print("\nCreated " + bundleVersion1 + "!") + +//create a config for the V2.0 deployment, setting the required properties for recipe in distro 2.0 +var config2 = new Configuration(); +var property21 = new PropertySimple("sample.name", "V2 Name"); +config2.put( property21 ); +var property22 = new PropertySimple("sample.port", "22222"); +config2.put( property22 ); +var property23 = new PropertySimple("sample.new", "V2.0 ONLY!"); +config2.put( property23 ); + +// upgrade the deployment to 2.0 using the 2.0 config +var deployment = BundleManager.createBundleDeployment(bundleVersion2.getId(), dest.getId(), "Upgrading Sample Ant Bundle to V2", config2); +deployment = BundleManager.scheduleBundleDeployment(deployment.getId(), false); +Assert.assertNotNull( deployment, "Failed to upgrade to 2.0 deployment" ); + +print("\nBundle Upgrade Deployment Status=" + deployment.getStatus()); + diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js new file mode 100644 index 0000000..95626ec --- /dev/null +++ b/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js @@ -0,0 +1,61 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * This sample script shows how to revert the "live" deployment for a destination. The revert + * will return to the previous "replaced" deployment. So, this will undo the V2 deployment + * performed in cli-3-upgradeBundle.js and return to the V1 deployment performed in + * cli-2-deployBundle.js. The Bundle uses the Ant Bundle Type provided with RHQ. + * <pre> + * Prerequisites: + * 1) run cli-1-createBundle.js, cli-2-deployBundle.js and cli-3-upgradeBundle.js + * 2) For successful deployment the RHQ Agents must be running on the "platforms" group platforms. + * + * Usage: + * Note, the CLI must be executed in its own bin directory, so have <path> below be the path to the + * sample-cli directory. + * + * 1) start the CLI (can be downloaded from the GUI, Administration->Downloads, RHQ Client) + * 2) login user password serverHost serverPort + * 3) exec <path>/cli-4-revertBundle.js + * 4) validate the revert deployment and that V1 is again the live deployment. + * </pre> + */ + +var bundleName = 'sample-bundle'; + +//get the bundle if it exists +var bc = new BundleCriteria(); +bc.addFilterName(bundleName); +bc.fetchDestinations( true ); +var bundles = BundleManager.findBundlesByCriteria(bc); +Assert.assertTrue( null != bundles && bundles.size() > 0 ); +var bundle = bundles.get(0); +Assert.assertTrue( null != bundle.getDestinations() && bundle.getDestinations().size() == 1 ); +var dest = bundle.getDestinations().get(0); + +//revert the live V2 deployment to the replaced V1 deployment +var deployment = BundleManager.scheduleRevertBundleDeployment(dest.getId(), "Reverting Sample Ant Bundle from V2 to V1", false); +Assert.assertNotNull( deployment, "Failed to revert 2.0 deployment" ); + +print("\nBundle Revert Status=" + deployment.getStatus()); commit 41b640f240a7a98404079988b2fa4ac793c36ca4 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 30 15:12:59 2010 -0400 Working version of sample bundle scripts. diff --git a/etc/samples/provisioning/sample-cli/resources/sample-bundle-v2.zip b/etc/samples/provisioning/sample-cli/resources/sample-bundle-v2.zip new file mode 100644 index 0000000..f8b3392 Binary files /dev/null and b/etc/samples/provisioning/sample-cli/resources/sample-bundle-v2.zip differ diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js index 563858e..71a3324 100644 --- a/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js +++ b/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js @@ -30,13 +30,16 @@ * none * * Usage: + * Note, the CLI must be executed in its own bin directory, so have <path> below be the path to the + * sample-cli directory. + * * 1) start the CLI (can be downloaded from the GUI, Administration->Downloads, RHQ Client) * 2) login user password serverHost serverPort - * 3) exec <path>/cli-1-createBundle.js + * 3) exec <path>/scripts/cli-1-createBundle.js <path> */ var bundleName = 'sample-bundle'; -var bundleDistroV1Path = '../resources/sample-bundle-v1.zip'; +var bundleDistroV1Path = args[0] + '/resources/sample-bundle-v1.zip'; // delete the test bundle if it exists var bc = new BundleCriteria(); @@ -53,4 +56,4 @@ distributionFile = new java.io.File(distributionFile.getAbsolutePath()); Assert.assertTrue(distributionFile.exists(), "Missing ant bundle distribution file: " + distributionFile); var bundleVersion1 = BundleManager.createBundleVersionViaFile(distributionFile); -print("\nCreated Bundle [" + bundleVersion1 + "]!") +print("\nCreated " + bundleVersion1 + "!") diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js index 0b3bd75..b099286 100644 --- a/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js +++ b/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js @@ -23,17 +23,27 @@ /** * This sample script shows how to deploy a Bundle. It deploys the bundle created - * by the cli-1-deployBundle.js script. The Bundle uses the Ant Bundle Type provided with + * by the cli-1-createBundle.js script. The Bundle uses the Ant Bundle Type provided with * RHQ. * <pre> - * Prerequisites: - * At least one platform must be in inventory. If the "platforms" group does not exist it will - * be created with all platforms as members. + * + * The deployment is to /tmp/sample-bundle. + * + * Prerequisites: + * 1) run cli-1-createBundle.js + * 2) At least one platform must be in inventory. If the "platforms" group does not exist it will + * be created with all imported platforms as members. The sample bundle will be deployed to the + * "platforms" group. + * 3) For successful deployment the RHQ Agents must be running on the "platforms" group platforms. * * Usage: + * Note, the CLI must be executed in its own bin directory, so have <path> below be the path to the + * sample-cli directory. + * * 1) start the CLI (can be downloaded from the GUI, Administration->Downloads, RHQ Client) * 2) login user password serverHost serverPort - * 3) exec <path>/cli-1-createBundle.js + * 3) exec <path>/scripts/cli-2-deployBundle.js + * 4) validate the deployment and that the config settings are applied correctly * </pre> */ @@ -79,13 +89,13 @@ var dest = BundleManager.createBundleDestination(bundle.getId(), "sample destina var config1 = new Configuration(); var property11 = new PropertySimple("sample.name", "V1 Name"); config1.put( property11 ); -var property12 = new PropertySimple("sample.port", "12345"); +var property12 = new PropertySimple("sample.port", "11111"); config1.put( property12 ); // create a deployment for sample bundle 1.0 using the 1.0 config var deployment = BundleManager.createBundleDeployment(bundleVersion.getId(), dest.getId(), "Deploying Sample Ant Bundle V1", config1); -deployment = BundleManager.scheduleBundleDeployment(testDeployment.getId(), true); +deployment = BundleManager.scheduleBundleDeployment(deployment.getId(), true); Assert.assertNotNull( deployment, "Failed to create 1.0 deployment" ); print("\nBundle Deployment Status=" + deployment.getStatus()); diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js index e4e61ec..84b2d3a 100644 --- a/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js +++ b/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js @@ -22,45 +22,62 @@ */ /** - * Thus test script works with a real env including at least one platform resource and a running agent on - * said platform. It will deploy an original distro file then upgrade it, utilitizing the - * Ant bundle system. + * This sample script shows how to upgrade a Bundle to a new version. It upgrades the bundle version + * deployed by the cli-2-deployBundle.js script. The Bundle uses the Ant Bundle Type provided with + * RHQ. + * <pre> + * + * The deployment is to /tmp/sample-bundle. + * + * Prerequisites: + * 1) run cli-1-createBundle.js and cli-2-deployBundle.js + * 2) For successful deployment the RHQ Agents must be running on the "platforms" group platforms. + * + * Usage: + * Note, the CLI must be executed in its own bin directory, so have <path> below be the path to the + * sample-cli directory. + * + * 1) start the CLI (can be downloaded from the GUI, Administration->Downloads, RHQ Client) + * 2) login user password serverHost serverPort + * 3) exec <path>/cli-3-upgradeBundle.js <path> + * 4) validate the upgrade deployment and that the config settings are applied correctly + * </pre> */ -var TestsEnabled = true; +var bundleName = 'sample-bundle'; +var bundleDistroV2Path = args[0] + '/resources/sample-bundle-v2.zip'; -var bundleName = 'test-bundle-upgrade-ant'; -var bundleZipFile1 = 'src/test/resources/test-upgrade-bundle-ant1.zip'; -var bundleZipFile2 = 'src/test/resources/test-upgrade-bundle-ant2.zip'; +//get the bundle if it exists +var bc = new BundleCriteria(); +bc.addFilterName(bundleName); +bc.fetchDestinations( true ); +var bundles = BundleManager.findBundlesByCriteria(bc); +Assert.assertTrue( null != bundles && bundles.size() > 0 ); +var bundle = bundles.get(0); +Assert.assertTrue( null != bundle.getDestinations() && bundle.getDestinations().size() == 1 ); +var dest = bundle.getDestinations().get(0); -// note, super-user, will not test any security constraints -var subject = rhq.login('rhqadmin', 'rhqadmin'); +//create bundleVersion 2.0 for the sample bundle +var distributionFile = new java.io.File(bundleDistroV2Path); +distributionFile = new java.io.File(distributionFile.getAbsolutePath()); +Assert.assertTrue(distributionFile.exists(), "Missing ant bundle distribution file: " + distributionFile); +var bundleVersion2 = BundleManager.createBundleVersionViaFile(distributionFile); -executeAllTests(); +print("\nCreated " + bundleVersion1 + "!") -rhq.logout(); +//create a config for the V2.0 deployment, setting the required properties for recipe in distro 2.0 +var config2 = new Configuration(); +var property21 = new PropertySimple("sample.name", "V2 Name"); +config2.put( property21 ); +var property22 = new PropertySimple("sample.port", "22222"); +config2.put( property22 ); +var property23 = new PropertySimple("sample.new", "V2.0 ONLY!"); +config2.put( property23 ); -function testGroupDeployment() { - if ( !TestsEnabled ) { - return; - } +// upgrade the deployment to 2.0 using the 2.0 config +var deployment = BundleManager.createBundleDeployment(bundleVersion2.getId(), dest.getId(), "Upgrading Sample Ant Bundle to V2", config2); +deployment = BundleManager.scheduleBundleDeployment(deployment.getId(), false); +Assert.assertNotNull( deployment, "Failed to upgrade to 2.0 deployment" ); - var groupId = getGroupId(); - var bundleType = getBundleType(); - Assert.assertNotNull(bundleType, "need ant bundle plugin installed for this test"); - - // delete the test bundle if it exists - var bc = new BundleCriteria(); - bc.addFilterName( bundleName ); - var bundles = BundleManager.findBundlesByCriteria( bc ); - if ( null != bundles && bundles.size() > 0 ) { - print( "\nDeleting existing test ant bundle in order to test a fresh deploy...") - BundleManager.deleteBundle( bundles.get(0).getId() ); - } - - // create bundleVersion 1.0 - var distributionFile1 = new java.io.File(bundleZipFile1); - distributionFile1 = new java.io.File(distributionFile1.getAbsolutePath()); - Assert.assertTrue(distributionFile1.exists(), "missing ant bundle file 1: " + distributionFile1); - var testBundleVersion1 = BundleManager.createBundleVersionViaFile( distributionFile1 ); +print("\nBundle Upgrade Deployment Status=" + deployment.getStatus()); diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js index e4e61ec..95626ec 100644 --- a/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js +++ b/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js @@ -22,45 +22,40 @@ */ /** - * Thus test script works with a real env including at least one platform resource and a running agent on - * said platform. It will deploy an original distro file then upgrade it, utilitizing the - * Ant bundle system. + * This sample script shows how to revert the "live" deployment for a destination. The revert + * will return to the previous "replaced" deployment. So, this will undo the V2 deployment + * performed in cli-3-upgradeBundle.js and return to the V1 deployment performed in + * cli-2-deployBundle.js. The Bundle uses the Ant Bundle Type provided with RHQ. + * <pre> + * Prerequisites: + * 1) run cli-1-createBundle.js, cli-2-deployBundle.js and cli-3-upgradeBundle.js + * 2) For successful deployment the RHQ Agents must be running on the "platforms" group platforms. + * + * Usage: + * Note, the CLI must be executed in its own bin directory, so have <path> below be the path to the + * sample-cli directory. + * + * 1) start the CLI (can be downloaded from the GUI, Administration->Downloads, RHQ Client) + * 2) login user password serverHost serverPort + * 3) exec <path>/cli-4-revertBundle.js + * 4) validate the revert deployment and that V1 is again the live deployment. + * </pre> */ -var TestsEnabled = true; +var bundleName = 'sample-bundle'; -var bundleName = 'test-bundle-upgrade-ant'; -var bundleZipFile1 = 'src/test/resources/test-upgrade-bundle-ant1.zip'; -var bundleZipFile2 = 'src/test/resources/test-upgrade-bundle-ant2.zip'; +//get the bundle if it exists +var bc = new BundleCriteria(); +bc.addFilterName(bundleName); +bc.fetchDestinations( true ); +var bundles = BundleManager.findBundlesByCriteria(bc); +Assert.assertTrue( null != bundles && bundles.size() > 0 ); +var bundle = bundles.get(0); +Assert.assertTrue( null != bundle.getDestinations() && bundle.getDestinations().size() == 1 ); +var dest = bundle.getDestinations().get(0); -// note, super-user, will not test any security constraints -var subject = rhq.login('rhqadmin', 'rhqadmin'); - -executeAllTests(); - -rhq.logout(); - -function testGroupDeployment() { - if ( !TestsEnabled ) { - return; - } - - var groupId = getGroupId(); - var bundleType = getBundleType(); - Assert.assertNotNull(bundleType, "need ant bundle plugin installed for this test"); - - // delete the test bundle if it exists - var bc = new BundleCriteria(); - bc.addFilterName( bundleName ); - var bundles = BundleManager.findBundlesByCriteria( bc ); - if ( null != bundles && bundles.size() > 0 ) { - print( "\nDeleting existing test ant bundle in order to test a fresh deploy...") - BundleManager.deleteBundle( bundles.get(0).getId() ); - } - - // create bundleVersion 1.0 - var distributionFile1 = new java.io.File(bundleZipFile1); - distributionFile1 = new java.io.File(distributionFile1.getAbsolutePath()); - Assert.assertTrue(distributionFile1.exists(), "missing ant bundle file 1: " + distributionFile1); - var testBundleVersion1 = BundleManager.createBundleVersionViaFile( distributionFile1 ); +//revert the live V2 deployment to the replaced V1 deployment +var deployment = BundleManager.scheduleRevertBundleDeployment(dest.getId(), "Reverting Sample Ant Bundle from V2 to V1", false); +Assert.assertNotNull( deployment, "Failed to revert 2.0 deployment" ); +print("\nBundle Revert Status=" + deployment.getStatus()); commit 4698a79902c681798b33c18c991f6c5ef6674e25 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed Jun 30 11:02:47 2010 -0400 get rid of inputProperties field, which was no longer needed diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java index c67cdc8..db684e8 100644 --- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java +++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java @@ -28,11 +28,9 @@ import org.rhq.bundle.ant.type.InputPropertyType; import java.io.File; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.Hashtable; import java.util.List; import java.util.Map; -import java.util.Set; /** * The rhq:bundle task defines the metadata needed to deploy, redeploy, or undeploy an RHQ bundle. @@ -44,7 +42,6 @@ public class BundleTask extends AbstractBundleTask { private String version; private String description; private Map<String, DeploymentUnitType> deploymentUnits = new HashMap<String, DeploymentUnitType>(); - private Set<InputPropertyType> inputProperties = new HashSet<InputPropertyType>(); @Override public void maybeConfigure() throws BuildException { @@ -190,7 +187,6 @@ public class BundleTask extends AbstractBundleTask { } public void addConfigured(InputPropertyType inputProperty) { - this.inputProperties.add(inputProperty); inputProperty.init(); } @@ -225,7 +221,7 @@ public class BundleTask extends AbstractBundleTask { } /** - * Ensure we have a legal set of types. + * Ensure we have a legal set of child types. * * @throws BuildException if an error occurs */ commit 85bdf62f88f1e99bcef1184d57b3121020cd0e18 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed Jun 30 10:54:56 2010 -0400 make sure that the rhq:inputProperty element sets the default value on the corresponding project property during the configuration, and not the execution, of the rhq:bundle task; that way, the other child elements of the rhq:bundle task can reference the input property via ${inputProp} and know that it will be initialized to its default value, if it had one; add validation of input properties according to their specified type diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java index 03b58df..bfc8d2e 100644 --- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java +++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java @@ -88,7 +88,7 @@ public class AntLauncher { // Parse and validate the build file before even attempting to execute it. parseBundleDeployFile(buildFile); - BundleAntProject project = createProject(buildFile); + BundleAntProject project = createProject(buildFile, false); try { if (buildProperties != null) { @@ -127,7 +127,7 @@ public class AntLauncher { } public BundleAntProject parseBundleDeployFile(File buildFile) throws InvalidBuildFileException { - BundleAntProject project = createProject(buildFile); + BundleAntProject project = createProject(buildFile, true); ProjectHelper2 projectHelper = new ProjectHelper2(); try { @@ -153,10 +153,10 @@ public class AntLauncher { return project; } - private BundleAntProject createProject(File buildFile) { + private BundleAntProject createProject(File buildFile, boolean parseOnly) { ClassLoader classLoader = getClass().getClassLoader(); - BundleAntProject project = new BundleAntProject(); + BundleAntProject project = new BundleAntProject(parseOnly); project.setCoreLoader(classLoader); project.init(); project.setBaseDir(buildFile.getParentFile()); diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java index 412b22c..a80e61e 100644 --- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java +++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java @@ -48,12 +48,14 @@ import org.rhq.core.util.updater.DeployDifferences; */ public class BundleAntProject extends Project { // Bundle-level attributes + private boolean parseOnly; + private String bundleName; private String bundleVersion; private String bundleDescription; - private ConfigurationDefinition configDef; // Deployment-level attributes + private ConfigurationDefinition configDef; private Configuration config; private File deployDir; private final Set<String> bundleFileNames = new HashSet<String>(); @@ -62,6 +64,18 @@ public class BundleAntProject extends Project { private DeployDifferences deployDiffs = new DeployDifferences(); private boolean dryRun; + public BundleAntProject() { + this(false); + } + + public BundleAntProject(boolean parseOnly) { + this.parseOnly = parseOnly; + } + + public boolean isParseOnly() { + return parseOnly; + } + public Set<String> getBundleFileNames() { return bundleFileNames; } diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java index fe20433..c67cdc8 100644 --- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java +++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java @@ -132,11 +132,6 @@ public class BundleTask extends AbstractBundleTask { } getProject().setDeploymentPhase(deploymentPhase); - // Initialize the deployment configuration. - for (InputPropertyType inputProperty : this.inputProperties) { - inputProperty.execute(); - } - String dryRunString = (String) projectProps.get(DeployPropertyNames.DEPLOY_DRY_RUN); boolean dryRun = Boolean.valueOf(dryRunString); getProject().setDryRun(dryRun); @@ -196,10 +191,10 @@ public class BundleTask extends AbstractBundleTask { public void addConfigured(InputPropertyType inputProperty) { this.inputProperties.add(inputProperty); - inputProperty.init(); + inputProperty.init(); } - public void addConfigured(DeploymentUnitType deployment) { + public void add(DeploymentUnitType deployment) { this.deploymentUnits.put(deployment.getName(), deployment); } diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/InputPropertyType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/InputPropertyType.java index 35aca70..2b44a3a 100644 --- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/InputPropertyType.java +++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/InputPropertyType.java @@ -26,11 +26,11 @@ import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; import org.rhq.core.domain.configuration.definition.PropertySimpleType; /** - * An Ant task that defines a basic property that the user provides as input for deployment of a bundle. Typically, the + * An Ant type that defines a basic property that the user provides as input for deployment of a bundle. Typically, the * property will be substituted into configuration files from the bundle during deployment - see ReplaceTask. * * If the deployment script is invoked from the GUI, the user will be prompted for values for any input properties that - * are defined via this task. If the script is invoked from the command line, the properties must be passed using the -D + * are defined via this type. If the script is invoked from the command line, the properties must be passed using the -D * and/or -propertyfile options. * * @author Ian Springer @@ -42,36 +42,39 @@ public class InputPropertyType extends AbstractBundleType { private String defaultValue; private String type = PropertySimpleType.STRING.xmlName(); - public void init() { + public void init() throws BuildException { validateAttributes(); ConfigurationDefinition configDef = getProject().getConfigurationDefinition(); - PropertySimpleType propSimpleType = PropertySimpleType.fromXmlName(this.type); + PropertySimpleType propType = PropertySimpleType.fromXmlName(this.type); PropertyDefinitionSimple propDef = new PropertyDefinitionSimple(this.name, this.description, this.required, - propSimpleType); + propType); configDef.put(propDef); - } - - public void execute() throws BuildException { + String value = getProject().getProperty(this.name); if (value == null) { value = this.defaultValue; + getProject().setProperty(this.name, value); } - if (value == null && this.required) { - throw new BuildException("No value was specified for required input property '" + this.name - + "', and no default is defined for the property."); + + boolean parseOnly = getProject().isParseOnly(); + if (!parseOnly) { + if (value == null && this.required) { + throw new BuildException("No value was specified for required input property '" + this.name + + "', and no default is defined for the property."); + } + validateValue(value, propType); + String valueString = (value != null) ? "'" + value + "'" : "<null>"; + log("Initializing input property '" + this.name + "' with value " + valueString + "..."); } - String valueString = (value != null) ? "'" + value + "'" : "<null>"; - log("Initializing input property '" + this.name + "' with value " + valueString + "..."); - PropertySimple prop = new PropertySimple(this.name, value); - ConfigurationDefinition configDef = getProject().getConfigurationDefinition(); Configuration config = getProject().getConfiguration(); - // TODO: validate the config + PropertySimple prop = new PropertySimple(this.name, value); config.put(prop); + return; } - + public String getDescription() { return description; } @@ -126,8 +129,9 @@ public class InputPropertyType extends AbstractBundleType { if (this.name.length() == 0) { throw new BuildException("The 'name' attribute must have a non-empty value."); } + PropertySimpleType propType; try { - PropertySimpleType.fromXmlName(this.type); + propType = PropertySimpleType.fromXmlName(this.type); } catch (IllegalArgumentException e) { throw new BuildException("Illegal value for 'type' attribute: " + this.type); } @@ -135,6 +139,44 @@ public class InputPropertyType extends AbstractBundleType { if (!this.required) { log("No default value was specified for optional input property '" + this.name + "'.", Project.MSG_WARN); } + } else { + // Make sure the default value is valid according to the property's type. + try { + validateValue(this.defaultValue, propType); + } catch (RuntimeException e) { + throw new BuildException("Default value '" + this.defaultValue + + "' is not valid according to 'type' attribute: " + this.type, e); + } + } + } + + private void validateValue(String value, PropertySimpleType propType) { + if (value != null) { + try { + switch (propType) { + case BOOLEAN: + if (!value.equals(Boolean.TRUE.toString()) && !value.equals(Boolean.FALSE.toString())) { + throw new RuntimeException("Illegal value for boolean property - value must be 'true' or 'false'." + + value); + } + break; + case DOUBLE: + Double.valueOf(value); + break; + case FLOAT: + Float.valueOf(value); + break; + case INTEGER: + Integer.valueOf(value); + break; + case LONG: + Long.valueOf(value); + break; + } + } catch (RuntimeException e) { + throw new BuildException("'" + value + "' is not a legal value for input property '" + this.name + + "', which has type '" + this.type + "'.", e); + } } } } \ No newline at end of file diff --git a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java index aae419c..ae06f0d 100644 --- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java +++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java @@ -107,6 +107,7 @@ public class AntBundlePluginComponentTest { FileUtil.purge(this.destDir, true); } + @Test(enabled = true) public void testAntBundleRevert() throws Exception { // install then upgrade a bundle first testAntBundleUpgrade(); @@ -214,136 +215,20 @@ public class AntBundlePluginComponentTest { assert previousProps.getBundleVersion().equals("3.0"); // testAntBundleUpgrade deployed version 3.0 } + @Test(enabled = true) public void testAntBundleUpgrade() throws Exception { upgrade(false); } + @Test(enabled = true) public void testAntBundleCleanUpgrade() throws Exception { upgrade(true); } - private void upgrade(boolean clean) throws Exception { - testAntBundleInitialInstall(); // install a bundle first - cleanPluginDirs(); // clean everything but the dest dir - we want to upgrade the destination - prepareBeforeTestMethod(); // prepare for our new test - - // deploy upgrade and test it - ResourceType resourceType = new ResourceType("testSimpleBundle2Type", "plugin", ResourceCategory.SERVER, null); - BundleType bundleType = new BundleType("testSimpleBundle2BType", resourceType); - Repo repo = new Repo("test-bundle-two"); - PackageType packageType = new PackageType("test-bundle-two", resourceType); - Bundle bundle = new Bundle("test-bundle-two", bundleType, repo, packageType); - BundleVersion bundleVersion = new BundleVersion("test-bundle-two", "3.0", bundle, - getRecipeFromFile("test-bundle-three.xml")); - BundleDestination destination = new BundleDestination(bundle, "testSimpleBundle2Dest", new ResourceGroup( - "testSimpleBundle2Group"), this.destDir.getAbsolutePath()); - - Configuration config = new Configuration(); - String customPropName = "custom.prop"; - String customPropValue = "DEF"; - String onePropName = "one.prop"; - String onePropValue = "one-one-one"; - String threePropName = "three.prop"; - String threePropValue = "333"; - config.put(new PropertySimple(customPropName, customPropValue)); - config.put(new PropertySimple(onePropName, onePropValue)); - config.put(new PropertySimple(threePropName, threePropValue)); - - BundleDeployment deployment = new BundleDeployment(); - deployment.setId(456); - deployment.setName("test bundle 3 deployment name - upgrades test bundle 2"); - deployment.setBundleVersion(bundleVersion); - deployment.setConfiguration(config); - deployment.setDestination(destination); - - // copy the test archive file to the bundle files dir - FileUtil.copyFile(new File("src/test/resources/test-bundle-three-archive.zip"), new File(this.bundleFilesDir, - "test-bundle-three-archive.zip")); - - // create test.properties file in the bundle files dir - File file1 = new File(this.bundleFilesDir, "test.properties"); - Properties props = new Properties(); - props.setProperty(customPropName, "@@" + customPropName + "@@"); - FileOutputStream outputStream = new FileOutputStream(file1); - props.store(outputStream, "test.properties comment"); - outputStream.close(); - - // create some additional files - note: receipe says to ignore "ignore/**" - File ignoreDir = new File(this.destDir, "ignore"); - File extraDir = new File(this.destDir, "extra"); - ignoreDir.mkdirs(); - extraDir.mkdirs(); - File ignoredFile = new File(ignoreDir, "ignore-file.txt"); - File extraFile = new File(extraDir, "extra-file.txt"); - FileUtil.writeFile(new ByteArrayInputStream("ignore".getBytes()), ignoredFile); - FileUtil.writeFile(new ByteArrayInputStream("extra".getBytes()), extraFile); - - BundleDeployRequest request = new BundleDeployRequest(); - request.setBundleFilesLocation(this.bundleFilesDir); - request.setResourceDeployment(new BundleResourceDeployment(deployment, null)); - request.setBundleManagerProvider(new MockBundleManagerProvider()); - request.setCleanDeployment(clean); - - BundleDeployResult results = plugin.deployBundle(request); - - assertResultsSuccess(results); - - // test that the prop was replaced in raw file test.properties - Properties realizedProps = new Properties(); - realizedProps.load(new FileInputStream(new File(this.destDir, "config/test.properties"))); - assert customPropValue.equals(realizedProps.getProperty(customPropName)) : "didn't replace prop"; - - // test that the archive was extracted properly. These are the files in the archive or removed from original: - // REMOVED: zero-file.txt - // one/one-file.txt (content: "@@one.prop@@") <-- recipe says this is to be replaced - // two/two-file.txt (content: "@@two.prop@@") <-- recipe does not say to replace this - // three/three-file.txt (content: "@@three.prop@@") <-- recipe says this is to be replaced - File zeroFile = new File(this.destDir, "zero-file.txt"); - File oneFile = new File(this.destDir, "one/one-file.txt"); - File twoFile = new File(this.destDir, "two/two-file.txt"); - File threeFile = new File(this.destDir, "three/three-file.txt"); - assert !zeroFile.exists() : "zero file should have been removed during upgrade"; - assert oneFile.exists() : "one file missing"; - assert twoFile.exists() : "two file missing"; - assert threeFile.exists() : "three file missing"; - if (clean) { - assert !ignoredFile.exists() : "ignored file should have been deleted due to clean deployment request"; - assert !extraFile.exists() : "extra file should have been deleted due to clean deployment request"; - } else { - assert ignoredFile.exists() : "ignored file wasn't ignored, it was deleted"; - assert !extraFile.exists() : "extra file ignored, but it should have been deleted/backed up"; - } - assert readFile(oneFile).startsWith(onePropValue); - assert readFile(twoFile).startsWith("@@two.prop@@"); - assert readFile(threeFile).startsWith(threePropValue); - - DeploymentsMetadata metadata = new DeploymentsMetadata(this.destDir); - DeploymentProperties deploymentProps = metadata.getDeploymentProperties(deployment.getId()); - assert deploymentProps.getDeploymentId() == deployment.getId(); - assert deploymentProps.getBundleName().equals(bundle.getName()); - assert deploymentProps.getBundleVersion().equals(bundleVersion.getVersion()); - - DeploymentProperties currentProps = metadata.getCurrentDeploymentProperties(); - assert deploymentProps.equals(currentProps); - - // check the backup directory - note, clean flag is irrelevent when determining what should be backed up - File backupDir = metadata.getDeploymentBackupDirectory(deployment.getId()); - File extraBackupFile = new File(backupDir, extraDir.getName() + File.separatorChar + extraFile.getName()); - File ignoredBackupFile = new File(backupDir, ignoreDir.getName() + File.separatorChar + ignoredFile.getName()); - assert !ignoredBackupFile.exists() : "ignored file was backed up but it should not have been"; - assert extraBackupFile.exists() : "extra file was not backed up"; - assert "extra".equals(new String(StreamUtil.slurp(new FileInputStream(extraBackupFile)))) : "bad backup of extra"; - - DeploymentProperties previousProps = metadata.getPreviousDeploymentProperties(456); - assert previousProps != null : "There should be previous deployment metadata"; - assert previousProps.getDeploymentId() == 123 : "bad previous deployment metadata"; // testAntBundleInitialInstall used 123 - assert previousProps.getBundleName().equals(deploymentProps.getBundleName()); - assert previousProps.getBundleVersion().equals("2.5"); // testAntBundleInitialInstall deployed version 2.5 - } - /** * Test deployment of an RHQ bundle recipe with archive file and raw file */ + @Test(enabled = true) public void testAntBundleInitialInstall() throws Exception { ResourceType resourceType = new ResourceType("testSimpleBundle2Type", "plugin", ResourceCategory.SERVER, null); BundleType bundleType = new BundleType("testSimpleBundle2BType", resourceType); @@ -424,6 +309,7 @@ public class AntBundlePluginComponentTest { /** * Test deployment of an RHQ bundle recipe. */ + @Test(enabled = true) public void testAntBundle() throws Exception { ResourceType resourceType = new ResourceType("testSimpleBundle", "plugin", ResourceCategory.SERVER, null); BundleType bundleType = new BundleType("testSimpleBundle", resourceType); @@ -459,6 +345,12 @@ public class AntBundlePluginComponentTest { props.store(outputStream, "noreplace"); outputStream.close(); + // create foo test file + File foofile = new File(this.bundleFilesDir, "foo.properties"); + outputStream = new FileOutputStream(foofile); + props.store(outputStream, "foo"); + outputStream.close(); + BundleDeployRequest request = new BundleDeployRequest(); request.setBundleFilesLocation(this.bundleFilesDir); request.setResourceDeployment(new BundleResourceDeployment(deployment, null)); @@ -479,6 +371,125 @@ public class AntBundlePluginComponentTest { assert "@@custom.prop1@@".equals(notrealizedProps.getProperty("custom.prop1")) : "replaced prop when it shouldn't"; } + private void upgrade(boolean clean) throws Exception { + testAntBundleInitialInstall(); // install a bundle first + cleanPluginDirs(); // clean everything but the dest dir - we want to upgrade the destination + prepareBeforeTestMethod(); // prepare for our new test + + // deploy upgrade and test it + ResourceType resourceType = new ResourceType("testSimpleBundle2Type", "plugin", ResourceCategory.SERVER, null); + BundleType bundleType = new BundleType("testSimpleBundle2BType", resourceType); + Repo repo = new Repo("test-bundle-two"); + PackageType packageType = new PackageType("test-bundle-two", resourceType); + Bundle bundle = new Bundle("test-bundle-two", bundleType, repo, packageType); + BundleVersion bundleVersion = new BundleVersion("test-bundle-two", "3.0", bundle, + getRecipeFromFile("test-bundle-three.xml")); + BundleDestination destination = new BundleDestination(bundle, "testSimpleBundle2Dest", new ResourceGroup( + "testSimpleBundle2Group"), this.destDir.getAbsolutePath()); + + Configuration config = new Configuration(); + String customPropName = "custom.prop"; + String customPropValue = "DEF"; + String onePropName = "one.prop"; + String onePropValue = "one-one-one"; + String threePropName = "three.prop"; + String threePropValue = "333"; + config.put(new PropertySimple(customPropName, customPropValue)); + config.put(new PropertySimple(onePropName, onePropValue)); + config.put(new PropertySimple(threePropName, threePropValue)); + + BundleDeployment deployment = new BundleDeployment(); + deployment.setId(456); + deployment.setName("test bundle 3 deployment name - upgrades test bundle 2"); + deployment.setBundleVersion(bundleVersion); + deployment.setConfiguration(config); + deployment.setDestination(destination); + + // copy the test archive file to the bundle files dir + FileUtil.copyFile(new File("src/test/resources/test-bundle-three-archive.zip"), new File(this.bundleFilesDir, + "test-bundle-three-archive.zip")); + + // create test.properties file in the bundle files dir + File file1 = new File(this.bundleFilesDir, "test.properties"); + Properties props = new Properties(); + props.setProperty(customPropName, "@@" + customPropName + "@@"); + FileOutputStream outputStream = new FileOutputStream(file1); + props.store(outputStream, "test.properties comment"); + outputStream.close(); + + // create some additional files - note: recipe says to ignore "ignore/**" + File ignoreDir = new File(this.destDir, "ignore"); + File extraDir = new File(this.destDir, "extra"); + ignoreDir.mkdirs(); + extraDir.mkdirs(); + File ignoredFile = new File(ignoreDir, "ignore-file.txt"); + File extraFile = new File(extraDir, "extra-file.txt"); + FileUtil.writeFile(new ByteArrayInputStream("ignore".getBytes()), ignoredFile); + FileUtil.writeFile(new ByteArrayInputStream("extra".getBytes()), extraFile); + + BundleDeployRequest request = new BundleDeployRequest(); + request.setBundleFilesLocation(this.bundleFilesDir); + request.setResourceDeployment(new BundleResourceDeployment(deployment, null)); + request.setBundleManagerProvider(new MockBundleManagerProvider()); + request.setCleanDeployment(clean); + + BundleDeployResult results = plugin.deployBundle(request); + + assertResultsSuccess(results); + + // test that the prop was replaced in raw file test.properties + Properties realizedProps = new Properties(); + realizedProps.load(new FileInputStream(new File(this.destDir, "config/test.properties"))); + assert customPropValue.equals(realizedProps.getProperty(customPropName)) : "didn't replace prop"; + + // test that the archive was extracted properly. These are the files in the archive or removed from original: + // REMOVED: zero-file.txt + // one/one-file.txt (content: "@@one.prop@@") <-- recipe says this is to be replaced + // two/two-file.txt (content: "@@two.prop@@") <-- recipe does not say to replace this + // three/three-file.txt (content: "@@three.prop@@") <-- recipe says this is to be replaced + File zeroFile = new File(this.destDir, "zero-file.txt"); + File oneFile = new File(this.destDir, "one/one-file.txt"); + File twoFile = new File(this.destDir, "two/two-file.txt"); + File threeFile = new File(this.destDir, "three/three-file.txt"); + assert !zeroFile.exists() : "zero file should have been removed during upgrade"; + assert oneFile.exists() : "one file missing"; + assert twoFile.exists() : "two file missing"; + assert threeFile.exists() : "three file missing"; + if (clean) { + assert !ignoredFile.exists() : "ignored file should have been deleted due to clean deployment request"; + assert !extraFile.exists() : "extra file should have been deleted due to clean deployment request"; + } else { + assert ignoredFile.exists() : "ignored file wasn't ignored, it was deleted"; + assert !extraFile.exists() : "extra file ignored, but it should have been deleted/backed up"; + } + assert readFile(oneFile).startsWith(onePropValue); + assert readFile(twoFile).startsWith("@@two.prop@@"); + assert readFile(threeFile).startsWith(threePropValue); + + DeploymentsMetadata metadata = new DeploymentsMetadata(this.destDir); + DeploymentProperties deploymentProps = metadata.getDeploymentProperties(deployment.getId()); + assert deploymentProps.getDeploymentId() == deployment.getId(); + assert deploymentProps.getBundleName().equals(bundle.getName()); + assert deploymentProps.getBundleVersion().equals(bundleVersion.getVersion()); + + DeploymentProperties currentProps = metadata.getCurrentDeploymentProperties(); + assert deploymentProps.equals(currentProps); + + // check the backup directory - note, clean flag is irrelevent when determining what should be backed up + File backupDir = metadata.getDeploymentBackupDirectory(deployment.getId()); + File extraBackupFile = new File(backupDir, extraDir.getName() + File.separatorChar + extraFile.getName()); + File ignoredBackupFile = new File(backupDir, ignoreDir.getName() + File.separatorChar + ignoredFile.getName()); + assert !ignoredBackupFile.exists() : "ignored file was backed up but it should not have been"; + assert extraBackupFile.exists() : "extra file was not backed up"; + assert "extra".equals(new String(StreamUtil.slurp(new FileInputStream(extraBackupFile)))) : "bad backup of extra"; + + DeploymentProperties previousProps = metadata.getPreviousDeploymentProperties(456); + assert previousProps != null : "There should be previous deployment metadata"; + assert previousProps.getDeploymentId() == 123 : "bad previous deployment metadata"; // testAntBundleInitialInstall used 123 + assert previousProps.getBundleName().equals(deploymentProps.getBundleName()); + assert previousProps.getBundleVersion().equals("2.5"); // testAntBundleInitialInstall deployed version 2.5 + } + private void assertResultsSuccess(BundleDeployResult results) { assert (results.getErrorMessage() == null) : "Failed to process bundle: [" + results.getErrorMessage() + "]"; assert results.isSuccess() : "Failed to process bundle!: [" + results.getErrorMessage() + "]"; diff --git a/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml index 96e7a14..a828dff 100644 --- a/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml +++ b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml @@ -22,9 +22,16 @@ required="true" defaultValue="default 2"/> + <rhq:input-property + name="custom.prop3" + description="my prop 3" + required="true" + defaultValue="foo.properties"/> + <rhq:deployment-unit name="doodibittydoo"> <rhq:file name="test.properties" destinationFile="config/test.properties" replace="true"/> <rhq:file name="noreplace.properties" destinationFile="config/noreplace.properties"/> + <rhq:file name="${custom.prop3}" destinationDir="config"/> </rhq:deployment-unit> </rhq:bundle> commit be0dd59b289eec8af1688708e224945a46aeda6f Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 30 10:26:30 2010 -0400 LT commit diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java index aefb351..e4511fd 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java @@ -1,422 +1,422 @@ -/* -* Jopr Management Platform -* Copyright (C) 2005-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, version 2, as -* published by the Free Software Foundation, and/or the GNU Lesser -* General Public License, version 2.1, also as published by the Free -* Software Foundation. -* -* 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 and the GNU Lesser General Public License -* for more details. -* -* You should have received a copy of the GNU General Public License -* and the GNU Lesser General Public License along with this program; -* if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -package org.rhq.plugins.jbossas5; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.deployers.spi.management.ManagementView; -import org.jboss.deployers.spi.management.deploy.DeploymentManager; -import org.jboss.deployers.spi.management.deploy.DeploymentProgress; -import org.jboss.deployers.spi.management.deploy.DeploymentStatus; -import org.jboss.managed.api.ComponentType; -import org.jboss.managed.api.ManagedComponent; -import org.jboss.managed.api.ManagedDeployment; -import org.jboss.managed.api.ManagedOperation; -import org.jboss.managed.api.ManagedProperty; -import org.jboss.managed.api.RunState; -import org.jboss.metatype.api.values.ArrayValue; -import org.jboss.metatype.api.values.CollectionValue; -import org.jboss.metatype.api.values.CompositeValue; -import org.jboss.metatype.api.values.EnumValue; -import org.jboss.metatype.api.values.MetaValue; -import org.jboss.metatype.api.values.SimpleValue; -import org.jboss.remoting.CannotConnectException; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.measurement.AvailabilityType; -import org.rhq.core.domain.measurement.DataType; -import org.rhq.core.domain.measurement.MeasurementDataNumeric; -import org.rhq.core.domain.measurement.MeasurementDataTrait; -import org.rhq.core.domain.measurement.MeasurementReport; -import org.rhq.core.domain.measurement.MeasurementScheduleRequest; -import org.rhq.core.domain.operation.OperationDefinition; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.pluginapi.configuration.ConfigurationFacet; -import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; -import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; -import org.rhq.core.pluginapi.inventory.ResourceContext; -import org.rhq.core.pluginapi.measurement.MeasurementFacet; -import org.rhq.core.pluginapi.operation.OperationFacet; -import org.rhq.core.pluginapi.operation.OperationResult; -import org.rhq.core.util.exception.ThrowableUtil; -import org.rhq.plugins.jbossas5.util.ConversionUtils; -import org.rhq.plugins.jbossas5.util.DeploymentUtils; -import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; -import org.rhq.plugins.jbossas5.util.ResourceTypeUtils; -import org.rhq.plugins.jbossas5.util.ResourceComponentUtils; -import org.rhq.plugins.jbossas5.util.DebugUtils; - -/** - * Service ResourceComponent for all {@link ManagedComponent}s in a Profile. - * - * @author Ian Springer - * @author Jason Dobies - * @author Mark Spritzler - */ -public class ManagedComponentComponent extends AbstractManagedComponent implements ConfigurationFacet, - DeleteResourceFacet, OperationFacet, MeasurementFacet { - public static interface Config { - String COMPONENT_TYPE = "componentType"; - String COMPONENT_SUBTYPE = "componentSubtype"; - String COMPONENT_NAME = "componentName"; - String TEMPLATE_NAME = "templateName"; - String COMPONENT_NAME_PROPERTY = "componentNameProperty"; - } - - protected static final char PREFIX_DELIMITER = '|'; - - private final Log log = LogFactory.getLog(this.getClass()); - - private String componentName; - private ComponentType componentType; - - // ResourceComponent Implementation -------------------------------------------- - - public AvailabilityType getAvailability() { - RunState runState; - try { - runState = getManagedComponent().getRunState(); - } catch (CannotConnectException e) { - return AvailabilityType.DOWN; - } - return (runState == RunState.RUNNING) ? AvailabilityType.UP : AvailabilityType.DOWN; - } - - public void start(ResourceContext<ProfileServiceComponent> resourceContext) throws Exception { - super.start(resourceContext); - this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType()); - Configuration pluginConfig = resourceContext.getPluginConfiguration(); - this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue(); - log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType - + " component '" + this.componentName + "'."); - } - - public void stop() { - return; - } - - // ConfigurationComponent Implementation -------------------------------------------- - - public Configuration loadResourceConfiguration() - { - Configuration resourceConfig; - try - { - Map<String, ManagedProperty> managedProperties = getManagedComponent().getProperties(); - Map<String, PropertySimple> customProps = - ResourceComponentUtils.getCustomProperties(getResourceContext().getPluginConfiguration()); - if (this.log.isDebugEnabled()) this.log.debug("*** AFTER LOAD:\n" - + DebugUtils.convertPropertiesToString(managedProperties)); - resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, - customProps, getResourceContext().getResourceType()); - } - catch (Exception e) - { - RunState runState = getManagedComponent().getRunState(); - if (runState == RunState.RUNNING) { - this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e); - } else { - this.log.debug("Failed to load configuration for " + getResourceDescription() - + ", but managed component is not in the RUNNING state.", e); - } - throw new RuntimeException(ThrowableUtil.getAllMessages(e)); - } - return resourceConfig; - } - - public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) - { - Configuration resourceConfig = configurationUpdateReport.getConfiguration(); - Configuration pluginConfig = getResourceContext().getPluginConfiguration(); - try - { - ManagedComponent managedComponent = getManagedComponent(); - Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); - Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig); - if (this.log.isDebugEnabled()) this.log.debug("*** BEFORE UPDATE:\n" - + DebugUtils.convertPropertiesToString(managedProperties)); - ConversionUtils.convertConfigurationToManagedProperties(managedProperties, resourceConfig, - getResourceContext().getResourceType(), customProps); - if (this.log.isDebugEnabled()) this.log.debug("*** AFTER UPDATE:\n" - + DebugUtils.convertPropertiesToString(managedProperties)); - updateComponent(managedComponent); - configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); - } - catch (Exception e) - { - this.log.error("Failed to update configuration for " + getResourceDescription() + ".", e); - configurationUpdateReport.setStatus(ConfigurationUpdateStatus.FAILURE); - configurationUpdateReport.setErrorMessage(ThrowableUtil.getAllMessages(e)); - } - } - - // DeleteResourceFacet Implementation -------------------------------------------- - - public void deleteResource() throws Exception { - DeploymentManager deploymentManager = getConnection().getDeploymentManager(); - if (!deploymentManager.isRedeploySupported()) - throw new UnsupportedOperationException("Deletion of " + getResourceContext().getResourceType().getName() - + " Resources is not currently supported."); - ManagedComponent managedComponent = getManagedComponent(); - log.debug("Removing " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); - ManagementView managementView = getConnection().getManagementView(); - managementView.removeComponent(managedComponent); - ManagedDeployment parentDeployment = managedComponent.getDeployment(); - log.debug("Redeploying parent deployment '" + parentDeployment.getName() - + "' in order to complete removal of component " + toString(managedComponent) + "..."); - DeploymentProgress progress = deploymentManager.redeploy(parentDeployment.getName()); - DeploymentStatus redeployStatus = DeploymentUtils.run(progress); - if (redeployStatus.isFailed()) { - log.error("Failed to redeploy parent deployment '" + parentDeployment.getName() - + "during removal of component " + toString(managedComponent) - + " - removal may not persist when the app server is restarted.", redeployStatus.getFailure()); - } - managementView.load(); - } - - // OperationFacet Implementation -------------------------------------------- - - public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { - OperationDefinition operationDefinition = getOperationDefinition(name); - ManagedOperation managedOperation = getManagedOperation(operationDefinition); - // Convert parameters into MetaValue array. - MetaValue[] parameterMetaValues = ConversionUtils.convertOperationsParametersToMetaValues(managedOperation, - parameters, operationDefinition); - // invoke() takes a varargs, so we need to pass an empty array, rather than null. - MetaValue resultMetaValue = managedOperation.invoke(parameterMetaValues); - OperationResult result = new OperationResult(); - // Convert result MetaValue to corresponding Property type. - ConversionUtils.convertManagedOperationResults(managedOperation, resultMetaValue, result.getComplexResults(), - operationDefinition); - return result; - } - - // MeasurementFacet Implementation -------------------------------------------- - - public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { - ManagedComponent managedComponent = getManagedComponent(); - RunState runState = managedComponent.getRunState(); - for (MeasurementScheduleRequest request : metrics) { - try { - if (request.getName().equals("runState")) { - report.addData(new MeasurementDataTrait(request, runState.name())); - } else { - Object value = getSimpleValue(managedComponent, request); - addValueToMeasurementReport(report, request, value); - } - } catch (Exception e) { - if (runState == RunState.RUNNING) { - log.error("Failed to collect metric for " + request, e); - } else { - log.debug("Failed to collect metric for " + request - + ", but managed component is not in the RUNNING state.", e); - } - } - } - } - - protected void updateComponent(ManagedComponent managedComponent) throws Exception { - log.trace("Updating " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); - ManagementView managementView = getConnection().getManagementView(); - managementView.updateComponent(managedComponent); - managementView.load(); - } - - // ------------------------------------------------------------------------------ - - /** - * The name of the measurement schedule request (i.e. the metric name) can be in one of two forms: - * <p/> - * [prefix'|']simplePropertyName (e.g. "maxTime" or "ThreadPool|currentThreadCount") - * [prefix'|']compositePropertyName'.'key (e.g. "consumerCount" or "messageStatistics.count") - * - * @param managedComponent a managed component - * @param request a measurement schedule request - * @return the metric value - */ - @Nullable - protected Object getSimpleValue(ManagedComponent managedComponent, MeasurementScheduleRequest request) { - String metricName = request.getName(); - int pipeIndex = metricName.indexOf(PREFIX_DELIMITER); - // Remove the prefix if there is one (e.g. "ThreadPool|currentThreadCount" -> "currentThreadCount"). - String compositePropName = (pipeIndex == -1) ? metricName : metricName.substring(pipeIndex + 1); - int dotIndex = compositePropName.indexOf('.'); - String metricPropName = (dotIndex == -1) ? compositePropName : compositePropName.substring(0, dotIndex); - ManagedProperty metricProp = managedComponent.getProperty(metricPropName); - if (metricProp == null) { - return null; - } - MetaValue metaValue; - if (dotIndex == -1) { - metaValue = metricProp.getValue(); - } else { - CompositeValue compositeValue = (CompositeValue) metricProp.getValue(); - String key = compositePropName.substring(dotIndex + 1); - metaValue = compositeValue.get(key); - } - return getInnerValue(metaValue); - } - - // TODO: Move this to a utility class. - @Nullable - private static Object getInnerValue(MetaValue metaValue) { - if (metaValue == null) { - return null; - } - Object value; - if (metaValue.getMetaType().isSimple()) { - SimpleValue simpleValue = (SimpleValue) metaValue; - value = simpleValue.getValue(); - } else if (metaValue.getMetaType().isEnum()) { - EnumValue enumValue = (EnumValue) metaValue; - value = enumValue.getValue(); - } else if (metaValue.getMetaType().isArray()) { - ArrayValue arrayValue = (ArrayValue) metaValue; - value = arrayValue.getValue(); - } else if (metaValue.getMetaType().isCollection()) { - CollectionValue collectionValue = (CollectionValue) metaValue; - List list = new ArrayList(); - for (MetaValue element : collectionValue.getElements()) { - list.add(getInnerValue(element)); - } - value = list; - } else { - value = metaValue.toString(); - } - return value; - } - - protected void addValueToMeasurementReport(MeasurementReport report, MeasurementScheduleRequest request, - Object value) { - if (value == null) { - return; - } - String stringValue = toString(value); - - DataType dataType = request.getDataType(); - switch (dataType) { - case MEASUREMENT: - try { - MeasurementDataNumeric dataNumeric = new MeasurementDataNumeric(request, Double.valueOf(stringValue)); - report.addData(dataNumeric); - } catch (NumberFormatException e) { - log.error("Profile service did not return a numeric value as expected for metric [" + request.getName() - + "] - value returned was " + value + ".", e); - } - break; - case TRAIT: - MeasurementDataTrait dataTrait = new MeasurementDataTrait(request, stringValue); - report.addData(dataTrait); - break; - default: - throw new IllegalStateException("Unsupported measurement data type: " + dataType); - } - } - - protected ComponentType getComponentType() { - return componentType; - } - - protected String getComponentName() { - return componentName; - } - - protected ManagedComponent getManagedComponent() { - ManagedComponent managedComponent; - try { - ManagementView managementView = getConnection().getManagementView(); - managedComponent = ManagedComponentUtils.getManagedComponent(managementView, this.componentType, - this.componentName); - } catch (Exception e) { - throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent [" - + this.componentName + "].", e); - } - if (managedComponent == null) - throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named [" - + this.componentName + "]."); - log.trace("Retrieved " + toString(managedComponent) + "."); - return managedComponent; - } - - @NotNull - private OperationDefinition getOperationDefinition(String operationName) { - ResourceType resourceType = getResourceContext().getResourceType(); - OperationDefinition operationDefinition = ResourceTypeUtils.getOperationDefinition(resourceType, operationName); - if (operationDefinition == null) - throw new IllegalStateException("Operation named '" + operationName - + "' is not defined for Resource type '" + resourceType.getName() + "' in the '" - + resourceType.getPlugin() + "' plugin's descriptor."); - return operationDefinition; - } - - @NotNull - private ManagedOperation getManagedOperation(OperationDefinition operationDefinition) { - ManagedComponent managedComponent = getManagedComponent(); - Set<ManagedOperation> operations = managedComponent.getOperations(); - for (ManagedOperation operation : operations) { - ConfigurationDefinition paramsConfigDef = operationDefinition.getParametersConfigurationDefinition(); - int paramCount = (paramsConfigDef != null) ? paramsConfigDef.getPropertyDefinitions().size() : 0; - if (operation.getName().equals(operationDefinition.getName()) - && (operation.getParameters().length == paramCount)) - return operation; - } - throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName() - + "' not found on ManagedComponent [" + getManagedComponent() + "]."); - } - - private static String toString(ManagedComponent managedComponent) { - Map<String, ManagedProperty> properties = managedComponent.getProperties(); - return managedComponent.getClass().getSimpleName() + "@" + System.identityHashCode(managedComponent) + "[" - + "type=" + managedComponent.getType() + ", name=" + managedComponent.getName() + ", properties=" - + properties.getClass().getSimpleName() + "@" + System.identityHashCode(properties) + "]"; - } - - private static String toString(@NotNull Object value) { - if (value.getClass().isArray()) { - StringBuilder buffer = new StringBuilder(); - int lastIndex = Array.getLength(value) - 1; - for (int i = 0; i < Array.getLength(value); i++) { - buffer.append(String.valueOf(Array.get(value, i))); - if (i == lastIndex) { - break; - } - buffer.append(", "); - } - return buffer.toString(); - } else { - return value.toString(); - } - } -} +/* +* Jopr Management Platform +* Copyright (C) 2005-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, version 2, as +* published by the Free Software Foundation, and/or the GNU Lesser +* General Public License, version 2.1, also as published by the Free +* Software Foundation. +* +* 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 and the GNU Lesser General Public License +* for more details. +* +* You should have received a copy of the GNU General Public License +* and the GNU Lesser General Public License along with this program; +* if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +package org.rhq.plugins.jbossas5; + +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.deployers.spi.management.ManagementView; +import org.jboss.deployers.spi.management.deploy.DeploymentManager; +import org.jboss.deployers.spi.management.deploy.DeploymentProgress; +import org.jboss.deployers.spi.management.deploy.DeploymentStatus; +import org.jboss.managed.api.ComponentType; +import org.jboss.managed.api.ManagedComponent; +import org.jboss.managed.api.ManagedDeployment; +import org.jboss.managed.api.ManagedOperation; +import org.jboss.managed.api.ManagedProperty; +import org.jboss.managed.api.RunState; +import org.jboss.metatype.api.values.ArrayValue; +import org.jboss.metatype.api.values.CollectionValue; +import org.jboss.metatype.api.values.CompositeValue; +import org.jboss.metatype.api.values.EnumValue; +import org.jboss.metatype.api.values.MetaValue; +import org.jboss.metatype.api.values.SimpleValue; +import org.jboss.remoting.CannotConnectException; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDataNumeric; +import org.rhq.core.domain.measurement.MeasurementDataTrait; +import org.rhq.core.domain.measurement.MeasurementReport; +import org.rhq.core.domain.measurement.MeasurementScheduleRequest; +import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.configuration.ConfigurationFacet; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; +import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.pluginapi.measurement.MeasurementFacet; +import org.rhq.core.pluginapi.operation.OperationFacet; +import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.plugins.jbossas5.util.ConversionUtils; +import org.rhq.plugins.jbossas5.util.DeploymentUtils; +import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; +import org.rhq.plugins.jbossas5.util.ResourceTypeUtils; +import org.rhq.plugins.jbossas5.util.ResourceComponentUtils; +import org.rhq.plugins.jbossas5.util.DebugUtils; + +/** + * Service ResourceComponent for all {@link ManagedComponent}s in a Profile. + * + * @author Ian Springer + * @author Jason Dobies + * @author Mark Spritzler + */ +public class ManagedComponentComponent extends AbstractManagedComponent implements ConfigurationFacet, + DeleteResourceFacet, OperationFacet, MeasurementFacet { + public static interface Config { + String COMPONENT_TYPE = "componentType"; + String COMPONENT_SUBTYPE = "componentSubtype"; + String COMPONENT_NAME = "componentName"; + String TEMPLATE_NAME = "templateName"; + String COMPONENT_NAME_PROPERTY = "componentNameProperty"; + } + + protected static final char PREFIX_DELIMITER = '|'; + + private final Log log = LogFactory.getLog(this.getClass()); + + private String componentName; + private ComponentType componentType; + + // ResourceComponent Implementation -------------------------------------------- + + public AvailabilityType getAvailability() { + RunState runState; + try { + runState = getManagedComponent().getRunState(); + } catch (CannotConnectException e) { + return AvailabilityType.DOWN; + } + return (runState == RunState.RUNNING) ? AvailabilityType.UP : AvailabilityType.DOWN; + } + + public void start(ResourceContext<ProfileServiceComponent> resourceContext) throws Exception { + super.start(resourceContext); + this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType()); + Configuration pluginConfig = resourceContext.getPluginConfiguration(); + this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue(); + log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType + + " component '" + this.componentName + "'."); + } + + public void stop() { + return; + } + + // ConfigurationComponent Implementation -------------------------------------------- + + public Configuration loadResourceConfiguration() + { + Configuration resourceConfig; + try + { + Map<String, ManagedProperty> managedProperties = getManagedComponent().getProperties(); + Map<String, PropertySimple> customProps = + ResourceComponentUtils.getCustomProperties(getResourceContext().getPluginConfiguration()); + if (this.log.isDebugEnabled()) this.log.debug("*** AFTER LOAD:\n" + + DebugUtils.convertPropertiesToString(managedProperties)); + resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, + customProps, getResourceContext().getResourceType()); + } + catch (Exception e) + { + RunState runState = getManagedComponent().getRunState(); + if (runState == RunState.RUNNING) { + this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e); + } else { + this.log.debug("Failed to load configuration for " + getResourceDescription() + + ", but managed component is not in the RUNNING state.", e); + } + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + } + return resourceConfig; + } + + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) + { + Configuration resourceConfig = configurationUpdateReport.getConfiguration(); + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); + try + { + ManagedComponent managedComponent = getManagedComponent(); + Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); + Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig); + if (this.log.isDebugEnabled()) this.log.debug("*** BEFORE UPDATE:\n" + + DebugUtils.convertPropertiesToString(managedProperties)); + ConversionUtils.convertConfigurationToManagedProperties(managedProperties, resourceConfig, + getResourceContext().getResourceType(), customProps); + if (this.log.isDebugEnabled()) this.log.debug("*** AFTER UPDATE:\n" + + DebugUtils.convertPropertiesToString(managedProperties)); + updateComponent(managedComponent); + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); + } + catch (Exception e) + { + this.log.error("Failed to update configuration for " + getResourceDescription() + ".", e); + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.FAILURE); + configurationUpdateReport.setErrorMessage(ThrowableUtil.getAllMessages(e)); + } + } + + // DeleteResourceFacet Implementation -------------------------------------------- + + public void deleteResource() throws Exception { + DeploymentManager deploymentManager = getConnection().getDeploymentManager(); + if (!deploymentManager.isRedeploySupported()) + throw new UnsupportedOperationException("Deletion of " + getResourceContext().getResourceType().getName() + + " Resources is not currently supported."); + ManagedComponent managedComponent = getManagedComponent(); + log.debug("Removing " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); + ManagementView managementView = getConnection().getManagementView(); + managementView.removeComponent(managedComponent); + ManagedDeployment parentDeployment = managedComponent.getDeployment(); + log.debug("Redeploying parent deployment '" + parentDeployment.getName() + + "' in order to complete removal of component " + toString(managedComponent) + "..."); + DeploymentProgress progress = deploymentManager.redeploy(parentDeployment.getName()); + DeploymentStatus redeployStatus = DeploymentUtils.run(progress); + if (redeployStatus.isFailed()) { + log.error("Failed to redeploy parent deployment '" + parentDeployment.getName() + + "during removal of component " + toString(managedComponent) + + " - removal may not persist when the app server is restarted.", redeployStatus.getFailure()); + } + managementView.load(); + } + + // OperationFacet Implementation -------------------------------------------- + + public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { + OperationDefinition operationDefinition = getOperationDefinition(name); + ManagedOperation managedOperation = getManagedOperation(operationDefinition); + // Convert parameters into MetaValue array. + MetaValue[] parameterMetaValues = ConversionUtils.convertOperationsParametersToMetaValues(managedOperation, + parameters, operationDefinition); + // invoke() takes a varargs, so we need to pass an empty array, rather than null. + MetaValue resultMetaValue = managedOperation.invoke(parameterMetaValues); + OperationResult result = new OperationResult(); + // Convert result MetaValue to corresponding Property type. + ConversionUtils.convertManagedOperationResults(managedOperation, resultMetaValue, result.getComplexResults(), + operationDefinition); + return result; + } + + // MeasurementFacet Implementation -------------------------------------------- + + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { + ManagedComponent managedComponent = getManagedComponent(); + RunState runState = managedComponent.getRunState(); + for (MeasurementScheduleRequest request : metrics) { + try { + if (request.getName().equals("runState")) { + report.addData(new MeasurementDataTrait(request, runState.name())); + } else { + Object value = getSimpleValue(managedComponent, request); + addValueToMeasurementReport(report, request, value); + } + } catch (Exception e) { + if (runState == RunState.RUNNING) { + log.error("Failed to collect metric for " + request, e); + } else { + log.debug("Failed to collect metric for " + request + + ", but managed component is not in the RUNNING state.", e); + } + } + } + } + + protected void updateComponent(ManagedComponent managedComponent) throws Exception { + log.trace("Updating " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); + ManagementView managementView = getConnection().getManagementView(); + managementView.updateComponent(managedComponent); + managementView.load(); + } + + // ------------------------------------------------------------------------------ + + /** + * The name of the measurement schedule request (i.e. the metric name) can be in one of two forms: + * <p/> + * [prefix'|']simplePropertyName (e.g. "maxTime" or "ThreadPool|currentThreadCount") + * [prefix'|']compositePropertyName'.'key (e.g. "consumerCount" or "messageStatistics.count") + * + * @param managedComponent a managed component + * @param request a measurement schedule request + * @return the metric value + */ + @Nullable + protected Object getSimpleValue(ManagedComponent managedComponent, MeasurementScheduleRequest request) { + String metricName = request.getName(); + int pipeIndex = metricName.indexOf(PREFIX_DELIMITER); + // Remove the prefix if there is one (e.g. "ThreadPool|currentThreadCount" -> "currentThreadCount"). + String compositePropName = (pipeIndex == -1) ? metricName : metricName.substring(pipeIndex + 1); + int dotIndex = compositePropName.indexOf('.'); + String metricPropName = (dotIndex == -1) ? compositePropName : compositePropName.substring(0, dotIndex); + ManagedProperty metricProp = managedComponent.getProperty(metricPropName); + if (metricProp == null) { + return null; + } + MetaValue metaValue; + if (dotIndex == -1) { + metaValue = metricProp.getValue(); + } else { + CompositeValue compositeValue = (CompositeValue) metricProp.getValue(); + String key = compositePropName.substring(dotIndex + 1); + metaValue = compositeValue.get(key); + } + return getInnerValue(metaValue); + } + + // TODO: Move this to a utility class. + @Nullable + private static Object getInnerValue(MetaValue metaValue) { + if (metaValue == null) { + return null; + } + Object value; + if (metaValue.getMetaType().isSimple()) { + SimpleValue simpleValue = (SimpleValue) metaValue; + value = simpleValue.getValue(); + } else if (metaValue.getMetaType().isEnum()) { + EnumValue enumValue = (EnumValue) metaValue; + value = enumValue.getValue(); + } else if (metaValue.getMetaType().isArray()) { + ArrayValue arrayValue = (ArrayValue) metaValue; + value = arrayValue.getValue(); + } else if (metaValue.getMetaType().isCollection()) { + CollectionValue collectionValue = (CollectionValue) metaValue; + List list = new ArrayList(); + for (MetaValue element : collectionValue.getElements()) { + list.add(getInnerValue(element)); + } + value = list; + } else { + value = metaValue.toString(); + } + return value; + } + + protected void addValueToMeasurementReport(MeasurementReport report, MeasurementScheduleRequest request, + Object value) { + if (value == null) { + return; + } + String stringValue = toString(value); + + DataType dataType = request.getDataType(); + switch (dataType) { + case MEASUREMENT: + try { + MeasurementDataNumeric dataNumeric = new MeasurementDataNumeric(request, Double.valueOf(stringValue)); + report.addData(dataNumeric); + } catch (NumberFormatException e) { + log.error("Profile service did not return a numeric value as expected for metric [" + request.getName() + + "] - value returned was " + value + ".", e); + } + break; + case TRAIT: + MeasurementDataTrait dataTrait = new MeasurementDataTrait(request, stringValue); + report.addData(dataTrait); + break; + default: + throw new IllegalStateException("Unsupported measurement data type: " + dataType); + } + } + + protected ComponentType getComponentType() { + return componentType; + } + + protected String getComponentName() { + return componentName; + } + + protected ManagedComponent getManagedComponent() { + ManagedComponent managedComponent; + try { + ManagementView managementView = getConnection().getManagementView(); + managedComponent = ManagedComponentUtils.getManagedComponent(managementView, this.componentType, + this.componentName); + } catch (Exception e) { + throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent [" + + this.componentName + "].", e); + } + if (managedComponent == null) + throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named [" + + this.componentName + "]."); + log.trace("Retrieved " + toString(managedComponent) + "."); + return managedComponent; + } + + @NotNull + private OperationDefinition getOperationDefinition(String operationName) { + ResourceType resourceType = getResourceContext().getResourceType(); + OperationDefinition operationDefinition = ResourceTypeUtils.getOperationDefinition(resourceType, operationName); + if (operationDefinition == null) + throw new IllegalStateException("Operation named '" + operationName + + "' is not defined for Resource type '" + resourceType.getName() + "' in the '" + + resourceType.getPlugin() + "' plugin's descriptor."); + return operationDefinition; + } + + @NotNull + private ManagedOperation getManagedOperation(OperationDefinition operationDefinition) { + ManagedComponent managedComponent = getManagedComponent(); + Set<ManagedOperation> operations = managedComponent.getOperations(); + for (ManagedOperation operation : operations) { + ConfigurationDefinition paramsConfigDef = operationDefinition.getParametersConfigurationDefinition(); + int paramCount = (paramsConfigDef != null) ? paramsConfigDef.getPropertyDefinitions().size() : 0; + if (operation.getName().equals(operationDefinition.getName()) + && (operation.getParameters().length == paramCount)) + return operation; + } + throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName() + + "' not found on ManagedComponent [" + getManagedComponent() + "]."); + } + + private static String toString(ManagedComponent managedComponent) { + Map<String, ManagedProperty> properties = managedComponent.getProperties(); + return managedComponent.getClass().getSimpleName() + "@" + System.identityHashCode(managedComponent) + "[" + + "type=" + managedComponent.getType() + ", name=" + managedComponent.getName() + ", properties=" + + properties.getClass().getSimpleName() + "@" + System.identityHashCode(properties) + "]"; + } + + private static String toString(@NotNull Object value) { + if (value.getClass().isArray()) { + StringBuilder buffer = new StringBuilder(); + int lastIndex = Array.getLength(value) - 1; + for (int i = 0; i < Array.getLength(value); i++) { + buffer.append(String.valueOf(Array.get(value, i))); + if (i == lastIndex) { + break; + } + buffer.append(", "); + } + return buffer.toString(); + } else { + return value.toString(); + } + } +} commit 584b2d4ad057cd04b5c32eb83d82b0094801aba5 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 30 10:25:11 2010 -0400 Add pull prior to push creating remote branch of of local branch. This seems to establish that the local branch head is up to date. If not done the subsequent push to origin fails with non-fast-forward error. diff --git a/release.sh b/release.sh index ccf6f72..da56c27 100755 --- a/release.sh +++ b/release.sh @@ -334,7 +334,7 @@ if [ "$MODE" = "production" ]; then BUILD_BRANCH="${RELEASE_BRANCH}" else BUILD_BRANCH="${RELEASE_BRANCH}-test-build" -# delete the branch if it exists, so we can recreate it fresh +# delete the branch if it exists, so we can recreate it fresh EXISTING_BUILD_BRANCH=`git ls-remote --heads origin "$BUILD_BRANCH"` if [ -n "$EXISTING_BUILD_BRANCH" ]; then echo "Deleting remote branch origin/$BUILD_BRANCH" @@ -344,7 +344,8 @@ else fi echo "Creating and checking out local branch $BUILD_BRANCH from $RELEASE_BRANCH" git checkout -b "$BUILD_BRANCH" - echo "Creating remote branch $BUILD_BRANCH" + echo "Creating remote branch $BUILD_BRANCH" + git pull origin "$BUILD_BRANCH" git push origin "$BUILD_BRANCH" fi commit f9d920d56d03b7a0185224e155dd30a10f5b5538 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Jun 30 14:28:15 2010 +0200 Monitor call time values separately. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java index 253765d..08f3418 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java @@ -125,12 +125,15 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi } log.debug("Persisting call-time data for " + callTimeDataSet.size() + " schedules..."); + long startTime = System.currentTimeMillis(); // First make sure a single row exists in the key table for each reported call destination. callTimeDataManager.insertCallTimeDataKeys(callTimeDataSet); // Finally, add the stats themselves to the value table. callTimeDataManager.insertCallTimeDataValues(callTimeDataSet); + MeasurementMonitor.getMBean().incrementCallTimeInsertTime(System.currentTimeMillis() - startTime); + } @SuppressWarnings("unchecked") @@ -408,7 +411,12 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi notifyAlertConditionCacheManager("insertCallTimeDataValues", callTimeDataSet .toArray(new CallTimeData[callTimeDataSet.size()])); - log.debug("Inserted " + ((insertedRowCount >= 0) ? insertedRowCount : "?") + " call-time data value rows."); + if (insertedRowCount>0) { + MeasurementMonitor.getMBean().incrementCalltimeValuesInserted(insertedRowCount); + + log.debug("Inserted " + insertedRowCount + " call-time data value rows."); + } + } catch (SQLException e) { logSQLException("Failed to persist call-time data values", e); } catch (Throwable t) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java index 9ad1f24..3ff3a17 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitor.java @@ -35,6 +35,10 @@ public class MeasurementMonitor implements MeasurementMonitorMBean, MBeanRegistr private AtomicLong measurementsInserted = new AtomicLong(); + private AtomicLong callTimeInsertTime = new AtomicLong(); + + private AtomicLong calltimeValuesInserted = new AtomicLong(); + private AtomicLong availabilityInsertTime = new AtomicLong(); private AtomicLong availabilitiesInserted = new AtomicLong(); @@ -101,6 +105,22 @@ public class MeasurementMonitor implements MeasurementMonitorMBean, MBeanRegistr this.measurementsInserted.addAndGet(delta); } + public long getCalltimeValuesInserted() { + return calltimeValuesInserted.get(); + } + + public void incrementCalltimeValuesInserted(long delta) { + this.calltimeValuesInserted.addAndGet(delta); + } + + public long getCallTimeInsertTime() { + return callTimeInsertTime.get(); + } + + public void incrementCallTimeInsertTime(long delta) { + this.callTimeInsertTime.addAndGet(delta); + } + public long getAvailabilityInsertTime() { return availabilityInsertTime.get(); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java index 04fc6cd..df7b05c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/instrumentation/MeasurementMonitorMBean.java @@ -31,6 +31,14 @@ public interface MeasurementMonitorMBean { void incrementMeasurementsInserted(long delta); + long getCallTimeInsertTime(); + + void incrementCallTimeInsertTime(long delta); + + long getCalltimeValuesInserted(); + + void incrementCalltimeValuesInserted(long delta); + int getScheduledMeasurementsPerMinute(); long getPurgeTime(); diff --git a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml index 94db789..2ad0785 100644 --- a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml @@ -23,7 +23,7 @@ <c:simple-property name="nameTemplate" default="Alert Subsystem"/> <c:simple-property name="descriptionTemplate" default="Statistics for the RHQ Server Alerts Engine Subsystem."/> </plugin-configuration> - + <operation name="reloadCaches" description="Unloads then reloads all caches managed by the containing RHQ Server"> <results> <c:list-property name="reloadStatistics"> @@ -75,7 +75,7 @@ description="The total amount of time spent by the alerts cache processing resource configuration data"/> <metric property="OperationProcessingTime" units="milliseconds" displayType="summary" measurementType="trendsup" description="The total amount of time spent by the alerts cache processing operation history data"/> - + </service> <service name="RHQ Server Measurement Subsystem" @@ -94,8 +94,13 @@ <c:simple-property name="descriptionTemplate" default="Statistics for the RHQ Server Measurement Subsystem."/> </plugin-configuration> + <metric property="CalltimeValuesInserted" category="throughput" displayType="summary" measurementType="trendsup" + description="The total number of call time data records inserted into the database by this RHQ Server instance since it was started"/> + <metric property="CallTimeInsertTime" units="milliseconds" displayType="summary" measurementType="trendsup" + description="The total amount of time taken to insert call time data into the database by this RHQ Server instance since it was started"/> + <metric property="MeasurementsInserted" category="throughput" displayType="summary" measurementType="trendsup" - description="The total number of measurement records inserted into the database by this RHQ Server instance since it was started"/> + description="The total number of measurement records (incl. Calltime data) inserted into the database by this RHQ Server instance since it was started"/> <metric property="ScheduledMeasurementsPerMinute" description="The average number of measurements expected to be collected per minute"/> <metric property="MeasurementInsertTime" units="milliseconds" displayType="summary" measurementType="trendsup" @@ -118,23 +123,23 @@ <metric property="FullAvailabilityReports" displayType="summary" measurementType="trendsup" description="The number of full availability reports received and processed by this RHQ Server since it was started"/> - <metric property="PurgedAlerts" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedAlerts" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" description="Number of alerts purged by the last purge job"/> - <metric property="PurgedAlertConditions" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedAlertConditions" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" description="Number of alert conditions purged by the last purge job"/> - <metric property="PurgedAlertNotifications" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedAlertNotifications" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" description="Number of alert notifications purged by the last purge job"/> - <metric property="PurgedAvailabilities" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedAvailabilities" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" description="Number of availabilities purged by the last purge job"/> - <metric property="PurgedCallTimeData" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedCallTimeData" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" description="Number of call time data purged by the last purge job"/> - <metric property="PurgedEvents" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedEvents" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" description="Number of events purged by the last purge job"/> - <metric property="PurgedMeasurementTraits" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" + <metric property="PurgedMeasurementTraits" displayType="summary" measurementType="dynamic" category="utilization" defaultInterval="900000" description="Number of traits purged by the last purge job"/> - + </service> - + <service name="RHQ Server Group Definition / DynaGroups Subsystem" discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent" class="GroupDefinitionResourceComponent" @@ -144,13 +149,13 @@ <runs-inside> <parent-resource-type name="JBossAS Server" plugin="JBossAS"/> </runs-inside> - + <plugin-configuration> <c:simple-property name="objectName" readOnly="true" default="rhq:service=GroupDefinitionRecalculationThreadMonitor"/> <c:simple-property name="nameTemplate" default="Group Definition Subsystem"/> <c:simple-property name="descriptionTemplate" default="Statistics for the RHQ Server Group Definition / DynaGroups Subsystem."/> </plugin-configuration> - + <operation name="clear" displayName="Clear Statistics" description="Clear the collected statistics, and start collecting anew"/> <operation name="retrieveStatistics" description="View a snapshot of statistical information about the recalculation cost of each GroupDefinition in the system"> commit 894b6792a5f614d63b10703a726a29e4aab603e0 Author: Joseph Marques <joseph(a)redhat.com> Date: Wed Jun 30 03:26:37 2010 -0400 BZ-602123: BZ-602270: various tweaks for alert notification processing * never allow any exceptions to bubble up during notification processing * add new UNKNOWN status for AlertNotificationLogs ** use the UNKNOWN state to catching mishaving plugins during alert processing * add new DEFERRED status for AlertNotificationLogs ** use the DEFERRED state or operations ** since we don't wait for the operation to complete, we don't know it's termination state) * add new PARTIAL status for AlertNotificationLogs ** use it to represent mixed success/failures during email sending * * do not defer email sending anymore, execute during each notification processing ** by processing them all upfront, easier to reason about terminating ResultState diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml b/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml index a9ad342..bce92a3 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml @@ -96,11 +96,9 @@ <index name="RHQ_ALERT_IDX_ALERT" unique="false"> <field ref="ALERT_ID"/> </index> - <column name="SENDER" required="false" size="200" type="VARCHAR2"/> + <column name="SENDER" required="false" size="100" type="VARCHAR2"/> <column name="RESULT_STATE" required="false" size="20" type="VARCHAR2"/> <column name="MESSAGE" required="false" size="4000" type="VARCHAR2"/> - <column name="ALL_EMAILS" required="false" size="4000" type="VARCHAR2"/> - <column name="EMAILS_FAILED" required="false" size="4000" type="VARCHAR2"/> </table> <table name="RHQ_ALERT_CONDITION_LOG" tablespace="@@@LARGE_TABLESPACE_FOR_DATA@@@" diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index daf68f4..7f8f9da 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2062,6 +2062,7 @@ </schemaSpec> <schemaSpec version="2.70.1"> <schema-addColumn table="RHQ_ALERT_NOTIFICATION" column="SENDER_NAME" precision="100" columnType="VARCHAR2" /> + <schema-alterColumn table="RHQ_ALERT_NOTIFICATION" column="SENDER_NAME" nullable="FALSE" /> <schema-addColumn table="RHQ_ALERT_NOTIFICATION" column="SENDER_CONFIG_ID" columnType="INTEGER" /> <schema-addColumn table="RHQ_ALERT_NOTIFICATION" column="EXTRA_CONFIG_ID" columnType="INTEGER" /> <schema-directSQL> @@ -2082,11 +2083,10 @@ </schema-directSQL> </schemaSpec> <schemaSpec version="2.70.2"> - <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="SENDER" columnType="VARCHAR2" precision="200" /> + <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="SENDER" columnType="VARCHAR2" precision="100" /> + <schema-alterColumn table="RHQ_ALERT_NOTIF_LOG" column="SENDER" nullable="FALSE" /> <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="RESULT_STATE" columnType="VARCHAR2" precision="20" /> <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="MESSAGE" columnType="VARCHAR2" precision="4000" /> - <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="ALL_EMAILS" columnType="VARCHAR2" precision="4000" /> - <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="EMAILS_FAILED" columnType="VARCHAR2" precision="4000" /> </schemaSpec> <schemaSpec version="2.70.3"> <schema-directSQL> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index 6e25431..de07675 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -23,8 +23,6 @@ package org.rhq.core.domain.alert.notification; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; import javax.persistence.Column; import javax.persistence.Entity; @@ -41,13 +39,11 @@ import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.SequenceGenerator; import javax.persistence.Table; -import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; import org.rhq.core.domain.alert.Alert; -import org.rhq.core.domain.util.StringUtils; @Entity @NamedQueries( { @NamedQuery(name = AlertNotificationLog.QUERY_DELETE_BY_ALERT_CTIME, // @@ -90,23 +86,16 @@ public class AlertNotificationLog implements Serializable { @XmlTransient private Alert alert; + @Column(name = "SENDER") private String sender; @Column(name = "RESULT_STATE") @Enumerated(EnumType.STRING) private ResultState resultState; + @Column(name = "MESSAGE") private String message; - @Column(name = "ALL_EMAILS") - private String allEmails; - - @Column(name = "EMAILS_FAILED") - private String badEmails; - - @Transient - transient List<String> transientEmails = new ArrayList<String>(); - @PrePersist @PreUpdate public void trimMessage() { @@ -122,24 +111,45 @@ public class AlertNotificationLog implements Serializable { this.alert = alert; this.sender = sender; this.resultState = senderResult.getState(); - this.message = senderResult.getMessage(); - if (resultState == ResultState.DEFERRED_EMAIL && senderResult.getEmails() != null) { - this.transientEmails.addAll(senderResult.getEmails()); - this.allEmails = StringUtils.getListAsString(senderResult.getEmails(), ","); - } - } - - public AlertNotificationLog(Alert alert, String sender) { - this.alert = alert; - this.sender = sender; - this.resultState = ResultState.FAILURE; // Default if nothing specified + this.message = getMessage(senderResult); } public AlertNotificationLog(Alert alert, String senderName, ResultState state, String message) { this.alert = alert; + this.sender = senderName; this.resultState = state; this.message = message; + } + + private String getMessage(SenderResult result) { + StringBuilder builder = new StringBuilder(); + boolean first = true; + + if (result.getSummary() != null) { + first = false; + builder.append(result.getSummary()); + } + + for (String success : result.getSuccessMessages()) { + if (first) { + first = false; + } else { + builder.append("<br/>"); + } + builder.append(success); + } + + for (String failure : result.getFailureMessages()) { + if (first) { + first = false; + } else { + builder.append("<br/>"); + } + builder.append(failure); + } + + return builder.toString(); } public int getId() { @@ -150,10 +160,6 @@ public class AlertNotificationLog implements Serializable { return alert; } - public void setAlert(Alert alert) { - this.alert = alert; - } - public String getSender() { return sender; } @@ -166,38 +172,6 @@ public class AlertNotificationLog implements Serializable { return message; } - public String getAllEmails() { - return allEmails; - } - - public String getBadEmails() { - return badEmails; - } - - public void setResultState(ResultState resultState) { - this.resultState = resultState; - } - - public void setMessage(String message) { - this.message = message; - } - - public void setAllEmails(String allEmails) { - this.allEmails = allEmails; - } - - public void setBadEmails(String badEmails) { - this.badEmails = badEmails; - } - - public List<String> getTransientEmails() { - return transientEmails; - } - - public void setTransientEmails(List<String> transientEmails) { - this.transientEmails = transientEmails; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder(); @@ -207,8 +181,6 @@ public class AlertNotificationLog implements Serializable { sb.append(", sender='").append(sender).append('\''); sb.append(", resultState=").append(resultState); sb.append(", message='").append(message).append('\''); - sb.append(", allEmails='").append(allEmails).append('\''); - sb.append(", badEmails='").append(badEmails).append('\''); sb.append('}'); return sb.toString(); } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/ResultState.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/ResultState.java index 0c8d1bc..a2de159 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/ResultState.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/ResultState.java @@ -24,12 +24,14 @@ package org.rhq.core.domain.alert.notification; * @see SenderResult */ public enum ResultState { - /** Success: sending of the notification was a success */ + /** Success: sending of the notification was a known success */ SUCCESS, - /** Deferred_email: this sender itself was successful, but l8er email sending may fail */ - DEFERRED_EMAIL, - /** Failure: sending of the notification failed */ + /** Partial: sending of the notification has some failures */ + PARTIAL, + /** Failure: sending of the notification was a known failure */ FAILURE, - /** Sending one ore more emails from the plugin failed */ - FAILED_EMAIL + /** Deferred: sender action was invoked, but response can not be immediately determined */ + DEFERRED, + /** Unknown: alert sender returned a null result */ + UNKNOWN } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SenderResult.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SenderResult.java index b4ec8e1..7191636 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SenderResult.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SenderResult.java @@ -27,88 +27,156 @@ import java.util.List; */ public class SenderResult { - /** Message returned for logging purposes */ - private String message; - /** Was calling the AlertSender.send() method successful? */ - private ResultState state; - /** A list of email addresses that should be notified */ - private List<String> emails = new ArrayList<String>(); - - /** - * Default constructor. State is FAILURE by default + /* + * the state is UNKNOWN by default, but will be determined as messages are added. if only success messages + * are added, then the result is considered a SUCCESS. if only failure messages are added, then the result + * is considered a FAILURE. if a mixed of success and failure messages are added, then the result is considered + * PARTIAL. the user is free to manually set */ + private boolean deferred; + private String summary; // can be set, will not affect calculated ResultState + private List<String> successMessages = new ArrayList<String>(); + private List<String> failureMessages = new ArrayList<String>(); + public SenderResult() { - this.message = "No message set"; - this.state = ResultState.FAILURE; + this.deferred = false; + } + + public static SenderResult getSimpleSuccess(String message) { + SenderResult result = new SenderResult(); + result.addSuccessMessage(message); + return result; } - public SenderResult(ResultState state, String message) { - this.message = message; - this.state = state; + public static SenderResult getSimpleFailure(String message) { + SenderResult result = new SenderResult(); + result.addFailureMessage(message); + return result; } - public SenderResult(ResultState state, String message, List<String> emails) { - this.message = message; - this.state = state; - this.emails = emails; + public static SenderResult getSimpleDeffered(String message) { + SenderResult result = new SenderResult(); + result.setSummary(message); + result.setDeffered(); + return result; } - public String getMessage() { - return message; + public void setSummary(String summary) { + this.summary = summary; } - public void setMessage(String message) { - this.message = message; + public String getSummary() { + return summary; } public ResultState getState() { - return state; + if (deferred) { + return ResultState.DEFERRED; + } + + if (successMessages.size() != 0) { + if (failureMessages.size() == 0) { + return ResultState.SUCCESS; + } else { + return ResultState.PARTIAL; + } + } else { + if (failureMessages.size() != 0) { + return ResultState.FAILURE; + } + } + + return ResultState.UNKNOWN; } - public void setState(ResultState state) { - this.state = state; + public void setDeffered() { + deferred = true; } - public List<String> getEmails() { - return emails; + public void addSuccessMessage(String message) { + successMessages.add(message); } - public void setEmails(List<String> emails) { - this.emails = emails; + public List<String> getSuccessMessages() { + return successMessages; } - public void addEmail(String email) { - emails.add(email); + public void addFailureMessage(String message) { + failureMessages.add(message); + } + + public List<String> getFailureMessages() { + return failureMessages; } @Override public String toString() { final StringBuilder sb = new StringBuilder(); sb.append("SenderResult"); - sb.append("{message='").append(message).append('\''); - sb.append(", state=").append(state); - sb.append(", emails=").append(emails); + sb.append("{state=").append(getState()); + sb.append(", summary=").append(summary); + sb.append(", successMessages=").append(successMessages); + sb.append(", failureMessages=").append(failureMessages); sb.append('}'); return sb.toString(); } @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - SenderResult that = (SenderResult) o; - - if (message != null ? !message.equals(that.message) : that.message != null) return false; - if (state != that.state) return false; + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + + if (obj == null) { + return false; + } + + if (getClass() != obj.getClass()) { + return false; + } + + SenderResult other = (SenderResult) obj; + + if (getState() != other.getState()) { + return false; + } + + if (summary == null) { + if (other.summary != null) { + return false; + } + } else if (!summary.equals(other.summary)) { + return false; + } + + if (failureMessages == null) { + if (other.failureMessages != null) { + return false; + } + } else if (!failureMessages.equals(other.failureMessages)) { + return false; + } + + if (successMessages == null) { + if (other.successMessages != null) { + return false; + } + } else if (!successMessages.equals(other.successMessages)) { + return false; + } return true; } @Override public int hashCode() { - int result = message != null ? message.hashCode() : 0; - result = 31 * result + (state != null ? state.hashCode() : 0); + final int prime = 31; + int result = 1; + result = prime * result + ((summary == null) ? 0 : summary.hashCode()); + result = prime * result + ((failureMessages == null) ? 0 : failureMessages.hashCode()); + result = prime * result + ((successMessages == null) ? 0 : successMessages.hashCode()); + result = prime * result + (getState() != null ? getState().hashCode() : 0); return result; } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java index de4d5ea..6e5430f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java @@ -38,7 +38,6 @@ import com.smartgwt.client.data.fields.DataSourceBooleanField; import com.smartgwt.client.data.fields.DataSourceIntegerField; import com.smartgwt.client.data.fields.DataSourceTextField; import com.smartgwt.client.rpc.RPCResponse; -import com.smartgwt.client.types.FieldType; import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridRecord; @@ -99,13 +98,9 @@ public class AlertDataSource extends RPCDataSource<Alert> { resourceName.setCanSortClientOnly(true); fields.add(resourceName); - -// DataSourceTextField recoveryInfoField = new DataSourceTextField("recoveryInfo", "Recovery Info"); -// recoveryInfoField.setCanSortClientOnly(true); -// fields.add(recoveryInfoField); - - - + // DataSourceTextField recoveryInfoField = new DataSourceTextField("recoveryInfo", "Recovery Info"); + // recoveryInfoField.setCanSortClientOnly(true); + // fields.add(recoveryInfoField); // TODO: Will using DataSourceEnumField here allow us to do // record.setAttribute("priority", alert.getAlertDefinition().getPriority()), rather than @@ -269,8 +264,6 @@ public class AlertDataSource extends RPCDataSource<Alert> { dc.setAttribute("sender", log.getSender()); dc.setAttribute("status", log.getResultState()); dc.setAttribute("message", log.getMessage()); - dc.setAttribute("allEmails", log.getAllEmails()); - dc.setAttribute("badEmails", log.getBadEmails()); notifications[i++] = dc; diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertNotifications.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertNotifications.jsp index f228d2b..282db80 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertNotifications.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertNotifications.jsp @@ -15,20 +15,21 @@ <c:choose> <c:when test="${not empty aNotifLogs }"> <tr> - <td class="BlockLeftAlignLabel" width="10%">Sender</td> - <td class="BlockLeftAlignLabel" width="10%">Result</td> - <td class="BlockLeftAlignLabel" width="30%">Message</td> - <td class="BlockLeftAlignLabel" width="25%">All emails</td> - <td class="BlockLeftAlignLabel" width="25%">Failed emails</td> + <td class="BlockLeftAlignLabel" width="15%">Sender</td> + <td class="BlockLeftAlignLabel" width="15%">Result</td> + <td class="BlockLeftAlignLabel" width="70%">Message</td> + </tr> + <tr> + <td colspan="3" class="BlockBottomLine"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> </tr> <c:forEach var="notif" items="${aNotifLogs}"> <tr valign="top"> <td class="BlockContent"><c:out value="${notif.sender}"/></td> <td class="BlockContent"><c:out value="${notif.resultState}"/></td> <td class="BlockContent"><c:out escapeXml="false" value="${fn:replace(fn:replace(notif.message, '<', '<'), '>', '>')}"/></td> - <td class="BlockContent"><c:out value="${notif.allEmails}"/></td> - <td class="BlockContent"><c:out value="${notif.badEmails}"/></td> - <p/> + </tr> + <tr> + <td colspan="3" class="BlockBottomLine"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> </tr> </c:forEach> </c:when> @@ -37,6 +38,9 @@ <td class="BlockContent"> <strong>No notifications were specified for this alert's definition</strong> </td> + <tr> + <td class="BlockBottomLine"><html:img page="/images/spacer.gif" width="1" height="1" border="0"/></td> + </tr> </tr> </c:otherwise> </c:choose> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java index c856a24..108e2d5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java @@ -27,7 +27,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashMap; -import java.util.LinkedHashSet; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -67,7 +67,6 @@ import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; -import org.rhq.core.domain.util.StringUtils; import org.rhq.core.server.MeasurementConverter; import org.rhq.core.server.PersistenceUtility; import org.rhq.core.util.collection.ArrayUtils; @@ -654,94 +653,48 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { try { log.debug("Sending alert notifications for " + alert.toSimpleString() + "..."); List<AlertNotification> alertNotifications = alert.getAlertDefinition().getAlertNotifications(); - Set<String> emailAddresses = new LinkedHashSet<String>(); + //Set<String> emailAddresses = new LinkedHashSet<String>(); AlertSenderPluginManager alertSenderPluginManager = getAlertPluginManager(); for (AlertNotification alertNotification : alertNotifications) { + AlertNotificationLog notificationLog = null; - // Send over the new AlertSender plugins String senderName = alertNotification.getSenderName(); if (senderName == null) { - log.error("Alert notification " + alertNotification + " has no sender name defined"); - continue; - } - - AlertNotificationLog alNoLo; - AlertSender<?> sender = alertSenderPluginManager.getAlertSenderForNotification(alertNotification); - - if (sender != null) { - try { - SenderResult result = sender.send(alert); - - if (result == null) { - log.warn("- !! -- sender [" + senderName - + "] did not return a SenderResult. Please fix this -- !! - "); - alNoLo = new AlertNotificationLog(alert, senderName); - alNoLo.setMessage("Sender did not return a SenderResult, assuming failure"); + notificationLog = new AlertNotificationLog(alert, senderName, ResultState.FAILURE, "Sender '" + + senderName + "' is not defined"); + } else { - } else if (result.getState() == ResultState.DEFERRED_EMAIL) { + AlertSender<?> notificationSender = alertSenderPluginManager + .getAlertSenderForNotification(alertNotification); + if (notificationSender == null) { + notificationLog = new AlertNotificationLog(alert, senderName, ResultState.FAILURE, + "Failed to obtain a sender with given name"); + } else { + try { + SenderResult result = notificationSender.send(alert); + if (log.isDebugEnabled()) { + log.debug(result); + } - alNoLo = new AlertNotificationLog(alert, senderName, result); - if (result.getEmails() != null && !result.getEmails().isEmpty()) { - emailAddresses.addAll(result.getEmails()); + if (result == null) { + notificationLog = new AlertNotificationLog(alert, senderName, ResultState.UNKNOWN, + "Sender did not return any result"); + } else { + notificationLog = new AlertNotificationLog(alert, senderName, result); } - } else { - alNoLo = new AlertNotificationLog(alert, senderName, result); + } catch (Throwable t) { + log.error("Notification processing terminated abruptly" + t.getMessage()); + notificationLog = new AlertNotificationLog(alert, senderName, ResultState.FAILURE, + "Notification processing terminated abruptly, cause: " + t.getMessage()); } - log.debug(result); - } catch (Throwable t) { - log.error("Sender failed: " + t.getMessage()); - if (log.isDebugEnabled()) - log.debug("Sender " + sender.toString() + "failed: \n", t); - alNoLo = new AlertNotificationLog(alert, senderName, ResultState.FAILURE, - "Failed with exception: " + t.getMessage()); } - } else { - alNoLo = new AlertNotificationLog(alert, senderName, ResultState.FAILURE, - "Failed to obtain a sender with given name"); } - entityManager.persist(alNoLo); - alert.addAlertNotificatinLog(alNoLo); - } - // send them off - Collection<String> badAddresses = null; - try { - badAddresses = sendAlertNotificationEmails(alert, emailAddresses); - } catch (Throwable t) { - badAddresses = new ArrayList<String>(); - log.error("Could not send emails to " + emailAddresses + " for " + alert + ", cause:", t); - } - // TODO we may do the same for SMS in the future. - - // log those bad addresses to the gui and their individual senders (if possible) - if (!badAddresses.isEmpty()) { - for (AlertNotificationLog anl : alert.getAlertNotificationLogs()) { - if (!(anl.getResultState() == ResultState.DEFERRED_EMAIL)) - continue; - - List<String> badList = new ArrayList<String>(); - for (String badOne : badAddresses) { - if (anl.getTransientEmails().contains(badOne)) { - anl.setResultState(ResultState.FAILED_EMAIL); - badList.add(badOne); - } - } - if (anl.getResultState() == ResultState.FAILED_EMAIL) - anl.setBadEmails(StringUtils.getListAsString(badList, ",")); - if (anl.getResultState() == ResultState.DEFERRED_EMAIL && badList.isEmpty()) - anl.setResultState(ResultState.SUCCESS); - } - } else { // No bad addresses - // Only set the result state to success for email sending notifications - // We must not set them if the notification failed. - for (AlertNotificationLog anl : alert.getAlertNotificationLogs()) { - if (anl.getResultState() == ResultState.DEFERRED_EMAIL) - anl.setResultState(ResultState.SUCCESS); - } + entityManager.persist(notificationLog); + alert.addAlertNotificatinLog(notificationLog); } - } catch (Throwable t) { log.error("Failed to send all notifications for " + alert.toSimpleString(), t); } @@ -767,35 +720,37 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { return manager; } - /** - * - * @param alert - * @param emailAddresses - * @return - */ - private Collection<String> sendAlertNotificationEmails(Alert alert, Set<String> emailAddresses) { + public Collection<String> sendAlertNotificationEmails(Alert alert, Collection<String> emailAddresses) { + log.debug("Sending alert notifications for " + alert.toSimpleString() + "..."); - if (emailAddresses.size() == 0) + if (emailAddresses.size() == 0) { return new ArrayList<String>(0); // No email to send -> no bad addresses - - log.debug("Sending alert notifications for " + alert.toSimpleString() + "..."); + } AlertDefinition alertDefinition = alert.getAlertDefinition(); Map<String, String> alertMessage = emailManager.getAlertEmailMessage( - prettyPrintResourceHierarchy(alertDefinition.getResource()), alertDefinition.getResource().getName(), - alertDefinition.getName(), alertDefinition.getPriority().toString(), new Date(alert.getCtime()).toString(), - prettyPrintAlertConditions(alert.getConditionLogs(), false), prettyPrintAlertURL(alert)); + prettyPrintResourceHierarchy(alertDefinition.getResource()), // + alertDefinition.getResource().getName(), // + alertDefinition.getName(), // + alertDefinition.getPriority().toString(), // + new Date(alert.getCtime()).toString(), // + prettyPrintAlertConditions(alert.getConditionLogs(), false), // + prettyPrintAlertURL(alert)); + String messageSubject = alertMessage.keySet().iterator().next(); String messageBody = alertMessage.values().iterator().next(); - Collection<String> badAddresses; - badAddresses = emailManager.sendEmail(emailAddresses, messageSubject, messageBody); + Set<String> uniqueAddresses = new HashSet<String>(emailAddresses); + Collection<String> badAddresses = emailManager.sendEmail(uniqueAddresses, messageSubject, messageBody); + if (log.isDebugEnabled()) { - if (badAddresses.isEmpty()) + if (badAddresses.isEmpty()) { log.debug("All notifications for " + alert.toSimpleString() + " succeeded"); - else + } else { log.debug("Sending email notifications for " + badAddresses + " failed"); + } } + return badAddresses; } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java index f32c82e..528fdf5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java @@ -18,6 +18,7 @@ */ package org.rhq.enterprise.server.alert; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -109,6 +110,8 @@ public interface AlertManagerLocal { */ boolean willDefinitionBeDisabled(Alert alert); + Collection<String> sendAlertNotificationEmails(Alert alert, Collection<String> emailAddresses); + // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // // The following are shared with the Remote Interface diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java index 5a958b1..de35d54 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java @@ -161,4 +161,5 @@ public abstract class AlertSender<T extends ServerPluginComponent> { } return builder.toString(); } + } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java index 3d6ab03..79fcb3b 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java @@ -35,6 +35,7 @@ import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.AlertPriority; import org.rhq.core.domain.alert.BooleanExpression; import org.rhq.core.domain.alert.notification.AlertNotificationLog; +import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.Resource; @@ -115,7 +116,7 @@ public class AlertManagerBeanTest extends AbstractEJB3Test { Alert a = new Alert(ad, now); em.persist(a); - AlertNotificationLog anl = new AlertNotificationLog(a, "dummy"); + AlertNotificationLog anl = new AlertNotificationLog(a, "dummy", ResultState.SUCCESS, "message"); em.persist(anl); } catch (Exception e) { diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java index 7f06451..6f6ec38 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java @@ -49,6 +49,7 @@ import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.AlertPriority; import org.rhq.core.domain.alert.BooleanExpression; import org.rhq.core.domain.alert.notification.AlertNotificationLog; +import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.event.Event; import org.rhq.core.domain.event.EventDefinition; @@ -427,7 +428,7 @@ public class DataPurgeJobTest extends AbstractEJB3Test { Alert a = new Alert(ad, timestamp); em.persist(a); - AlertNotificationLog anl = new AlertNotificationLog(a, "dummy"); + AlertNotificationLog anl = new AlertNotificationLog(a, "dummy", ResultState.SUCCESS, "message"); em.persist(anl); AlertCondition ac = ad.getConditions().iterator().next(); diff --git a/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java b/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java index 81b1383..5b07b7b 100644 --- a/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java +++ b/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java @@ -18,12 +18,16 @@ */ package org.rhq.enterprise.server.plugins.alertEmail; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.rhq.core.domain.alert.Alert; -import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.enterprise.server.plugin.pc.alert.AlertSender; +import org.rhq.enterprise.server.util.LookupUtil; /** * Class to send emails. Actually it does not do the work @@ -37,11 +41,32 @@ public class EmailSender extends AlertSender { public SenderResult send(Alert alert) { String emailAddressString = alertParameters.getSimpleValue("emailAddress", null); if (emailAddressString == null) { - return new SenderResult(ResultState.FAILURE, "No email address given"); + return SenderResult.getSimpleFailure("No email address given"); } List<String> emails = AlertSender.unfence(emailAddressString, String.class, ","); - return new SenderResult(ResultState.DEFERRED_EMAIL, "Sending to addresses: " + emails, emails); + try { + Set<String> uniqueEmails = new HashSet<String>(emails); + Collection<String> badEmails = LookupUtil.getAlertManager() + .sendAlertNotificationEmails(alert, uniqueEmails); + + List<String> goodEmails = new ArrayList<String>(uniqueEmails); + goodEmails.removeAll(badEmails); + + SenderResult result = new SenderResult(); + result.setSummary("Target addresses were: " + uniqueEmails); + if (goodEmails.size() > 0) { + result.addSuccessMessage("Successfully sent to: " + goodEmails); + } + if (badEmails.size() > 0) { + result.addFailureMessage("Failed to send to: " + badEmails); + } + return result; + } catch (Throwable t) { + return SenderResult.getSimpleFailure("Error sending email notifications to " + emails + ", cause: " + + t.getMessage()); + } + } @Override diff --git a/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java b/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java index 95abdb9..d0a48bf 100644 --- a/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java +++ b/modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java @@ -22,7 +22,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.alert.Alert; -import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.enterprise.server.alert.AlertManagerLocal; import org.rhq.enterprise.server.plugin.pc.alert.AlertSender; @@ -39,20 +38,17 @@ public class IrcSender extends AlertSender<IrcAlertComponent> { @Override public SenderResult send(Alert alert) { - SenderResult result; String channel = this.alertParameters.getSimpleValue("channel", null); - String server = preferences.getSimpleValue("server","-not set-"); + String server = preferences.getSimpleValue("server", "-not set-"); String chan = "irc://" + server + "/" + channel; try { this.pluginComponent.sendIrcMessage(channel, getIrcMessage(alert)); - result = new SenderResult(ResultState.SUCCESS, "IRC Alert sent to channel [" + chan + "]."); - } catch (IllegalStateException e) { - log.error(e.getMessage()); - result = new SenderResult(ResultState.FAILURE, "IRC Alert to [" + chan + "] failed! " + e.getMessage()); + return SenderResult.getSimpleSuccess("IRC Alert sent to channel [" + chan + "]."); + } catch (Throwable t) { + log.error(t.getMessage()); + return SenderResult.getSimpleFailure("IRC Alert to [" + chan + "] failed! " + t.getMessage()); } - - return result; } private String getIrcMessage(Alert alert) { diff --git a/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java b/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java index b13763e..37f724a 100644 --- a/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java +++ b/modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java @@ -18,20 +18,19 @@ */ package org.rhq.enterprise.server.plugins.alertMicroblog; -import twitter4j.Status; -import twitter4j.Twitter; -import twitter4j.TwitterException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.alert.Alert; -import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.enterprise.server.alert.AlertManagerLocal; import org.rhq.enterprise.server.plugin.pc.alert.AlertSender; import org.rhq.enterprise.server.util.LookupUtil; +import twitter4j.Status; +import twitter4j.Twitter; +import twitter4j.TwitterException; + /** * Send alert notifications via Microblogging services like Twitter or laconi.ca * @author Heiko W. Rupp @@ -43,12 +42,12 @@ public class MicroblogSender extends AlertSender { @Override public SenderResult send(Alert alert) { - String user = preferences.getSimpleValue("user",null); - String password = preferences.getSimpleValue("password",null); - String baseUrl = preferences.getSimpleValue("microblogServerUrl","http://twitter.com/"); + String user = preferences.getSimpleValue("user", null); + String password = preferences.getSimpleValue("password", null); + String baseUrl = preferences.getSimpleValue("microblogServerUrl", "http://twitter.com/"); if (!baseUrl.endsWith("/")) - baseUrl = baseUrl +"/"; - Twitter twitter = new Twitter(user,password,baseUrl); + baseUrl = baseUrl + "/"; + Twitter twitter = new Twitter(user, password, baseUrl); AlertManagerLocal alertManager = LookupUtil.getAlertManager(); twitter.setSource("Jopr"); StringBuilder b = new StringBuilder("Alert "); @@ -61,22 +60,20 @@ public class MicroblogSender extends AlertSender { b.append("-by @JBossJopr"); // TODO not for production :-) // TODO use some alert url shortening service - SenderResult result ; String txt = "user@baseUrl [" + user + "@" + baseUrl + "]:"; try { String msg = b.toString(); - if (msg.length()>140) - msg = msg.substring(0,140); + if (msg.length() > 140) + msg = msg.substring(0, 140); Status status = twitter.updateStatus(msg); - result = new SenderResult(ResultState.SUCCESS,"Send notification to " + txt + ", msg-id: " + status.getId()); + return SenderResult.getSimpleSuccess("Send notification to " + txt + ", msg-id: " + status.getId()); } catch (TwitterException e) { log.warn("Notification via Microblog failed for " + txt + " ", e); - result = new SenderResult(ResultState.FAILURE,"Sending failed :" + e.getMessage()); + return SenderResult.getSimpleFailure("Sending failed :" + e.getMessage()); } - return result; } } diff --git a/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java b/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java index b14c85d..4884e3a 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java +++ b/modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.alert.Alert; -import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.core.domain.resource.Resource; import org.rhq.enterprise.server.alert.AlertManagerLocal; @@ -46,13 +45,13 @@ public class MobicentsSender extends AlertSender { @Override public SenderResult send(Alert alert) { - String baseUrl = preferences.getSimpleValue("mobicentsServerUrl","http://localhost:8080/mobicents"); - String tel = alertParameters.getSimpleValue("targetAddress",null); - if (tel==null) { + String baseUrl = preferences.getSimpleValue("mobicentsServerUrl", "http://localhost:8080/mobicents"); + String tel = alertParameters.getSimpleValue("targetAddress", null); + if (tel == null) { log.warn("No number to call given, not sending"); - return new SenderResult(ResultState.FAILURE, "No target address given"); + return SenderResult.getSimpleFailure("No target address given"); } - String kindString = alertParameters.getSimpleValue("kind","VOICE"); + String kindString = alertParameters.getSimpleValue("kind", "VOICE"); MobiKind kind = MobiKind.valueOf(kindString); Integer alertId = alert.getId(); @@ -61,81 +60,81 @@ public class MobicentsSender extends AlertSender { AlertManagerLocal alertManager = LookupUtil.getAlertManager(); switch (kind) { - case VOICE: - b.append("Alert on resource "); - do { - b.append(res.getName()); - res = res.getParentResource(); - if (res!=null) - b.append(" with parent "); - } while (res!=null); - b.append(". Cause is "); - - // Switch locale to english, as the voice synthesizer expects this for now - Locale currentLocale = Locale.getDefault(); - Locale.setDefault(Locale.ENGLISH); - b.append(alertManager.prettyPrintAlertConditions(alert, false)); - Locale.setDefault(currentLocale); - - boolean willBeDisabled = alertManager.willDefinitionBeDisabled(alert); - - if (willBeDisabled) - b.append(" The alert definition will now be disabled. \n\n"); - - // b.append(" Please press "); - // - // if (willBeDisabled) { - // b.append(AlertFeedback.REENABLE.getText()); - // } else { - // b.append(AlertFeedback.DISABLE.getText()); - // } - // b.append(", "); - // b.append(AlertFeedback.DELETE.getText()); - // b.append(" or just hang up to do nothing."); - break; - case SMS: - b.append("Alert: "); + case VOICE: + b.append("Alert on resource "); + do { b.append(res.getName()); - b.append(",id=(").append(res.getId()).append(")"); - b.append("Brought by RHQ"); - break; - default: - log.warn("Unsupported Mobicents notification type for now"); + res = res.getParentResource(); + if (res != null) + b.append(" with parent "); + } while (res != null); + b.append(". Cause is "); + + // Switch locale to english, as the voice synthesizer expects this for now + Locale currentLocale = Locale.getDefault(); + Locale.setDefault(Locale.ENGLISH); + b.append(alertManager.prettyPrintAlertConditions(alert, false)); + Locale.setDefault(currentLocale); + + boolean willBeDisabled = alertManager.willDefinitionBeDisabled(alert); + + if (willBeDisabled) + b.append(" The alert definition will now be disabled. \n\n"); + + // b.append(" Please press "); + // + // if (willBeDisabled) { + // b.append(AlertFeedback.REENABLE.getText()); + // } else { + // b.append(AlertFeedback.DISABLE.getText()); + // } + // b.append(", "); + // b.append(AlertFeedback.DELETE.getText()); + // b.append(" or just hang up to do nothing."); + break; + case SMS: + b.append("Alert: "); + b.append(res.getName()); + b.append(",id=(").append(res.getId()).append(")"); + b.append("Brought by RHQ"); + break; + default: + log.warn("Unsupported Mobicents notification type for now"); } URL url; - int code=0; + int code = 0; HttpURLConnection conn = null; try { tel = tel.trim(); - String telEnc = URLEncoder.encode(tel,"UTF-8"); // url encode tel-no, as it can contain '+' + String telEnc = URLEncoder.encode(tel, "UTF-8"); // url encode tel-no, as it can contain '+' switch (kind) { - case SMS: - baseUrl = baseUrl + "sms"; // No trailing '/' ! - break; - case VOICE: - baseUrl = baseUrl + "call"; // No trailing '/' ! - break; - default: - baseUrl = baseUrl + "--not-supported-yet--"; + case SMS: + baseUrl = baseUrl + "sms"; // No trailing '/' ! + break; + case VOICE: + baseUrl = baseUrl + "call"; // No trailing '/' ! + break; + default: + baseUrl = baseUrl + "--not-supported-yet--"; } - baseUrl = baseUrl +"?alertId="+alertId; - baseUrl = baseUrl +"&tel="; - if (kind==MobiKind.VOICE) { + baseUrl = baseUrl + "?alertId=" + alertId; + baseUrl = baseUrl + "&tel="; + if (kind == MobiKind.VOICE) { if (!tel.startsWith("sip:")) { - baseUrl = baseUrl +"sip:"; + baseUrl = baseUrl + "sip:"; } } - baseUrl = baseUrl +telEnc; - if (kind==MobiKind.VOICE) { + baseUrl = baseUrl + telEnc; + if (kind == MobiKind.VOICE) { if (!tel.contains("@")) { // Append domain from preferences if user has none provided - String domain = preferences.getSimpleValue("defaultVoipDomain","localhost"); + String domain = preferences.getSimpleValue("defaultVoipDomain", "localhost"); baseUrl = baseUrl + "@" + domain; } } // TODO SMS url - log.info("Mobicents alert ["+ kind + "] to baseUrl [" + baseUrl + "] with message:\n" + b.toString()); + log.info("Mobicents alert [" + kind + "] to baseUrl [" + baseUrl + "] with message:\n" + b.toString()); url = new URL(baseUrl); conn = (HttpURLConnection) url.openConnection(); conn.setRequestMethod("POST"); @@ -151,20 +150,17 @@ public class MobicentsSender extends AlertSender { code = conn.getResponseCode(); } catch (Exception e) { log.warn("Notification via VoIP failed: " + e); - return new SenderResult(ResultState.FAILURE,"Sending failed " + e.getMessage()); - } - finally { - if (conn!=null) + return SenderResult.getSimpleFailure("Sending failed " + e.getMessage()); + } finally { + if (conn != null) conn.disconnect(); } - SenderResult result; - if (code!=200) { + + if (code != 200) { log.info("Notification via Mobicents returned code " + code); - result=new SenderResult(ResultState.FAILURE,"Notification via Mobicents returned code " + code); - } - else { - result=new SenderResult(ResultState.SUCCESS,"Mobicents alert ["+ kind + "] to baseUrl [" + baseUrl + "]" ); + return SenderResult.getSimpleFailure("Notification via Mobicents returned code " + code); + } else { + return SenderResult.getSimpleSuccess("Mobicents alert [" + kind + "] to baseUrl [" + baseUrl + "]"); } - return result; } } diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/AlertTokenReplacer.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/AlertTokenReplacer.java index 21c3bfe..cdf03ac 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/AlertTokenReplacer.java +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/AlertTokenReplacer.java @@ -67,7 +67,9 @@ public class AlertTokenReplacer { String work = input; Matcher matcher = pattern.matcher(work); if (!matcher.find()) { - log.warn("No tokens found in " + input); + if (log.isDebugEnabled()) { + log.debug("No tokens found in " + input); + } return input; } matcher.reset(); diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java index 83563e6..e50b143 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java @@ -19,7 +19,6 @@ package org.rhq.enterprise.server.plugins.alertOperations; import org.rhq.core.domain.alert.Alert; -import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; @@ -47,7 +46,7 @@ public class OperationsSender extends AlertSender { OperationInfo info = OperationInfo.load(alertParameters, extraParameters); if (info.error != null) { - return new SenderResult(ResultState.FAILURE, info.error); + return SenderResult.getSimpleFailure(info.error); } Subject subject = LookupUtil.getSubjectManager().getOverlord(); // TODO get real subject for authz? @@ -61,7 +60,7 @@ public class OperationsSender extends AlertSender { } catch (Throwable t) { String message = getResultMessage(info, "could not calculate which resources to execute the operation on: " + t.getMessage()); - return new SenderResult(ResultState.FAILURE, message); + return SenderResult.getSimpleFailure(message); } Configuration replacedParameters = null; @@ -79,7 +78,7 @@ public class OperationsSender extends AlertSender { } } catch (Exception e) { String message = getResultMessage(info, "parameterized argument replacement failed with " + e.getMessage()); - return new SenderResult(ResultState.FAILURE, message); + return SenderResult.getSimpleFailure(message); } // Now fire off the operation with no delay and no repetition. @@ -89,13 +88,17 @@ public class OperationsSender extends AlertSender { targetResource.getId(), operation.getName(), 0, 0, 0, 0, replacedParameters, description); String message = getResultMessage(info, getHyperLinkForOperationSchedule(subject, targetResource.getId(), operation.getName(), schedule.getJobId())); - return new SenderResult(ResultState.SUCCESS, message); + return SenderResult.getSimpleDeffered(message); } catch (Throwable t) { String message = getResultMessage(info, "invocation failed with " + t.getMessage()); - return new SenderResult(ResultState.FAILURE, message); + return SenderResult.getSimpleFailure(message); } } + /* + * if we actually execute the operation at the time of alert sending, we can report the + * operation's failure/success accurately instead of just returning a "deferred" result + */ private String getHyperLinkForOperationSchedule(Subject subject, int resourceId, String operationName, JobId jobId) { /* OperationManagerLocal operationManager = LookupUtil.getOperationManager(); diff --git a/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java b/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java index 2846266..35b558e 100644 --- a/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java +++ b/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java @@ -19,10 +19,12 @@ package org.rhq.enterprise.server.plugins.alertRoles; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.rhq.core.domain.alert.Alert; -import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Role; @@ -45,12 +47,33 @@ public class RolesSender extends AlertSender { public SenderResult send(Alert alert) { List<Integer> roleIds = getRoleIdsFromConfiguration(); if (roleIds == null) { - return new SenderResult(ResultState.FAILURE, "No roles defined"); + return SenderResult.getSimpleFailure("No roles defined"); } - List<String> emails = getRoleEmails(roleIds); List<String> names = getRoleNames(roleIds); - return new SenderResult(ResultState.DEFERRED_EMAIL, "Sending to roles: " + names, emails); + List<String> emails = getRoleEmails(roleIds); + + try { + Set<String> uniqueEmails = new HashSet<String>(emails); + Collection<String> badEmails = LookupUtil.getAlertManager() + .sendAlertNotificationEmails(alert, uniqueEmails); + + List<String> goodEmails = new ArrayList<String>(uniqueEmails); + goodEmails.removeAll(badEmails); + + SenderResult result = new SenderResult(); + result.setSummary("Target roles were: " + names); + if (goodEmails.size() > 0) { + result.addSuccessMessage("Successfully sent to: " + goodEmails); + } + if (badEmails.size() > 0) { + result.addFailureMessage("Failed to send to: " + badEmails); + } + return result; + } catch (Throwable t) { + return SenderResult.getSimpleFailure("Error sending role notifications to " + names + ", cause: " + + t.getMessage()); + } } @Override diff --git a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java index 1639e81..627e23d 100644 --- a/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java +++ b/modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.domain.alert.Alert; -import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.core.domain.resource.Resource; import org.rhq.enterprise.server.alert.AlertManagerLocal; @@ -46,34 +45,29 @@ public class SnmpSender extends AlertSender { SnmpInfo info = SnmpInfo.load(alertParameters); if (info.error != null) { - return new SenderResult(ResultState.FAILURE, info.error); + return SenderResult.getSimpleFailure(info.error); } log.debug("Sending SNMP trap to: " + info); - AlertManagerLocal alertManager = LookupUtil.getAlertManager(); - ResourceManagerLocal resourceManager = LookupUtil.getResourceManager(); + try { + AlertManagerLocal alertManager = LookupUtil.getAlertManager(); + ResourceManagerLocal resourceManager = LookupUtil.getResourceManager(); - SnmpTrapSender snmpTrapSender = new SnmpTrapSender(preferences); + SnmpTrapSender snmpTrapSender = new SnmpTrapSender(preferences); - List<Resource> lineage = resourceManager.getResourceLineage(alert.getAlertDefinition().getResource().getId()); - String platformName = lineage.get(0).getName(); - String conditions = alertManager.prettyPrintAlertConditions(alert, false); - String alertUrl = alertManager.prettyPrintAlertURL(alert); + List<Resource> lineage = resourceManager.getResourceLineage(alert.getAlertDefinition().getResource() + .getId()); + String platformName = lineage.get(0).getName(); + String conditions = alertManager.prettyPrintAlertConditions(alert, false); + String alertUrl = alertManager.prettyPrintAlertURL(alert); - String result; - SenderResult res; - try { Date bootTime = new Date(); // TODO: want to use LookupUtil.getCoreServer().getBootTime() but ServiceMBean is not visible - result = snmpTrapSender.sendSnmpTrap(alert, alertParameters, platformName, conditions, bootTime, alertUrl); - res = new SenderResult(ResultState.SUCCESS, result); + String result = snmpTrapSender.sendSnmpTrap(alert, alertParameters, platformName, conditions, bootTime, + alertUrl); + return SenderResult.getSimpleSuccess(result); } catch (Throwable t) { - result = "failed - cause: " + t; - res = new SenderResult(ResultState.FAILURE, result); + return SenderResult.getSimpleFailure("failed - cause: " + t); } - - log.debug("Result of sending SNMP trap: " + result); - - return res; } @Override diff --git a/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java b/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java index 13f4f32..201e13f 100644 --- a/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java +++ b/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java @@ -19,10 +19,12 @@ package org.rhq.enterprise.server.plugins.alertSubject; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.rhq.core.domain.alert.Alert; -import org.rhq.core.domain.alert.notification.ResultState; import org.rhq.core.domain.alert.notification.SenderResult; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.PropertySimple; @@ -44,12 +46,33 @@ public class SubjectsSender extends AlertSender { public SenderResult send(Alert alert) { List<Integer> subjectIds = getSubjectIdsFromConfiguration(); if (subjectIds == null) { - return new SenderResult(ResultState.FAILURE, "No subjects defined"); + return SenderResult.getSimpleFailure("No subjects defined"); } - List<String> emails = getSubjectEmails(subjectIds); List<String> names = getSubjectNames(subjectIds); - return new SenderResult(ResultState.DEFERRED_EMAIL, "Sending to subjects: " + names, emails); + List<String> emails = getSubjectEmails(subjectIds); + + try { + Set<String> uniqueEmails = new HashSet<String>(emails); + Collection<String> badEmails = LookupUtil.getAlertManager() + .sendAlertNotificationEmails(alert, uniqueEmails); + + List<String> goodEmails = new ArrayList<String>(uniqueEmails); + goodEmails.removeAll(badEmails); + + SenderResult result = new SenderResult(); + result.setSummary("Target subjects were: " + names); + if (goodEmails.size() > 0) { + result.addSuccessMessage("Successfully sent to: " + goodEmails); + } + if (badEmails.size() > 0) { + result.addFailureMessage("Failed to send to: " + badEmails); + } + return result; + } catch (Throwable t) { + return SenderResult.getSimpleFailure("Error sending subject notifications to " + names + ", cause: " + + t.getMessage()); + } } @Override commit 589acd80903f723af322f9ec68ea16c23efee224 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 23:05:09 2010 -0400 fix conditional *again* diff --git a/release.sh b/release.sh index b800233..ccf6f72 100755 --- a/release.sh +++ b/release.sh @@ -336,7 +336,7 @@ else BUILD_BRANCH="${RELEASE_BRANCH}-test-build" # delete the branch if it exists, so we can recreate it fresh EXISTING_BUILD_BRANCH=`git ls-remote --heads origin "$BUILD_BRANCH"` - if [ -n "$EXISTING_REMOTE_TAG" ]; then + if [ -n "$EXISTING_BUILD_BRANCH" ]; then echo "Deleting remote branch origin/$BUILD_BRANCH" git branch -D -r "origin/$BUILD_BRANCH" echo "Deleting local branch $BUILD_BRANCH" commit 050ec9212aa8f3df421a5c9f7983252853b0d8bf Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 22:56:07 2010 -0400 fix a script conditional diff --git a/release.sh b/release.sh index 5ce7396..b800233 100755 --- a/release.sh +++ b/release.sh @@ -336,7 +336,7 @@ else BUILD_BRANCH="${RELEASE_BRANCH}-test-build" # delete the branch if it exists, so we can recreate it fresh EXISTING_BUILD_BRANCH=`git ls-remote --heads origin "$BUILD_BRANCH"` - if [ "$EXISTING_REMOTE_TAG" ]; then + if [ -n "$EXISTING_REMOTE_TAG" ]; then echo "Deleting remote branch origin/$BUILD_BRANCH" git branch -D -r "origin/$BUILD_BRANCH" echo "Deleting local branch $BUILD_BRANCH" commit 92ce59765e28e91b02aa7a6583ae402615a39693 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 22:37:01 2010 -0400 Revise tag deletion logic diff --git a/release.sh b/release.sh index c4b9e46..5ce7396 100755 --- a/release.sh +++ b/release.sh @@ -327,15 +327,6 @@ if [ ! -d "$WORKING_DIR" ]; then fi -# If the specified tag already exists then abort. It should not exist since production runs should have -# unique tags and test runs should have been done in a temporary branch - -EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"` -if [ -n "$EXISTING_REMOTE_TAG" ]; then - abort "A remote tag named $RELEASE_TAG already exists - aborting, perhaps a bad build configuration..." -fi - - # if this is a test build then create a temporary build branch off of RELEASE_BRANCH. This allows checkins to # continue in RELEASE_BRANCH without affecting the release plugin work, which will fail if the branch contents # change before it completes. @@ -360,7 +351,28 @@ fi # We should now have the build_branch checked out echo "Current Branch is $BUILD_BRANCH" - + +# If the specified tag already exists remotely and we're in production mode, then abort. If it exists and +# we're in test mode, delete it + +EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"` +if [ -n "$EXISTING_REMOTE_TAG" ] && [ "$MODE" = "production" ]; then + abort "A remote tag named $RELEASE_TAG already exists - aborting, since we are in production mode..." +fi + +if [ -n "$EXISTING_REMOTE_TAG" ] && [ "$MODE" = "test" ]; then + echo "A remote tag named $RELEASE_TAG already exists - deleting it, since we are in test mode..." + git push origin ":refs/tags/$RELEASE_TAG" + [ "$?" -ne 0 ] && abort "Failed to delete remote tag ($RELEASE_TAG)." +fi + +# See if the specified tag already exists locally - if so, delete it (even if in production mode). +EXISTING_LOCAL_TAG=`git tag -l "$RELEASE_TAG"` +if [ -n "$EXISTING_LOCAL_TAG" ]; then + echo "A local tag named $RELEASE_TAG already exists - deleting it..." + git tag -d "$RELEASE_TAG" + [ "$?" -ne 0 ] && abort "Failed to delete local tag ($RELEASE_TAG)." +fi # Run a test build before tagging. This will publish the snapshot artifacts to the local repo to "bootstrap" the repo. commit 9122675265f8107fa4ff616a6e8ea522297cd1bc Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 22:39:44 2010 -0400 LT commit diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java index 74130b4..fb292ee 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java @@ -1,420 +1,420 @@ -/* -* Jopr Management Platform -* Copyright (C) 2005-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, version 2, as -* published by the Free Software Foundation, and/or the GNU Lesser -* General Public License, version 2.1, also as published by the Free -* Software Foundation. -* -* 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 and the GNU Lesser General Public License -* for more details. -* -* You should have received a copy of the GNU General Public License -* and the GNU Lesser General Public License along with this program; -* if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -package org.rhq.plugins.jbossas5; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import org.jboss.deployers.spi.management.ManagementView; -import org.jboss.deployers.spi.management.deploy.DeploymentManager; -import org.jboss.deployers.spi.management.deploy.DeploymentProgress; -import org.jboss.deployers.spi.management.deploy.DeploymentStatus; -import org.jboss.managed.api.ComponentType; -import org.jboss.managed.api.ManagedComponent; -import org.jboss.managed.api.ManagedDeployment; -import org.jboss.managed.api.ManagedOperation; -import org.jboss.managed.api.ManagedProperty; -import org.jboss.managed.api.RunState; -import org.jboss.metatype.api.values.ArrayValue; -import org.jboss.metatype.api.values.CollectionValue; -import org.jboss.metatype.api.values.CompositeValue; -import org.jboss.metatype.api.values.EnumValue; -import org.jboss.metatype.api.values.MetaValue; -import org.jboss.metatype.api.values.SimpleValue; - -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.measurement.AvailabilityType; -import org.rhq.core.domain.measurement.DataType; -import org.rhq.core.domain.measurement.MeasurementDataNumeric; -import org.rhq.core.domain.measurement.MeasurementDataTrait; -import org.rhq.core.domain.measurement.MeasurementReport; -import org.rhq.core.domain.measurement.MeasurementScheduleRequest; -import org.rhq.core.domain.operation.OperationDefinition; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.pluginapi.configuration.ConfigurationFacet; -import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; -import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; -import org.rhq.core.pluginapi.inventory.ResourceContext; -import org.rhq.core.pluginapi.measurement.MeasurementFacet; -import org.rhq.core.pluginapi.operation.OperationFacet; -import org.rhq.core.pluginapi.operation.OperationResult; -import org.rhq.core.util.exception.ThrowableUtil; -import org.rhq.plugins.jbossas5.util.ConversionUtils; -import org.rhq.plugins.jbossas5.util.DebugUtils; -import org.rhq.plugins.jbossas5.util.DeploymentUtils; -import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; -import org.rhq.plugins.jbossas5.util.ResourceComponentUtils; -import org.rhq.plugins.jbossas5.util.ResourceTypeUtils; - -/** - * Service ResourceComponent for all {@link ManagedComponent}s in a Profile. - * - * @author Ian Springer - * @author Jason Dobies - * @author Mark Spritzler - */ -public class ManagedComponentComponent extends AbstractManagedComponent implements ConfigurationFacet, - DeleteResourceFacet, OperationFacet, MeasurementFacet { - public static interface Config { - String COMPONENT_TYPE = "componentType"; - String COMPONENT_SUBTYPE = "componentSubtype"; - String COMPONENT_NAME = "componentName"; - String TEMPLATE_NAME = "templateName"; - String COMPONENT_NAME_PROPERTY = "componentNameProperty"; - } - - protected static final char PREFIX_DELIMITER = '|'; - - private final Log log = LogFactory.getLog(this.getClass()); - - private String componentName; - private ComponentType componentType; - - // ResourceComponent Implementation -------------------------------------------- - - public AvailabilityType getAvailability() { - RunState runState = null; - try { - runState = getManagedComponent().getRunState(); - } catch (Throwable t) { - log.debug("Could not get component state, cause: ", t); - return AvailabilityType.DOWN; - } - - if (runState == RunState.RUNNING) { - return AvailabilityType.UP; - } else { - log.debug("Component was not running, state was: " + runState); - return AvailabilityType.DOWN; - } - } - - public void start(ResourceContext<ProfileServiceComponent> resourceContext) throws Exception { - super.start(resourceContext); - this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType()); - Configuration pluginConfig = resourceContext.getPluginConfiguration(); - this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue(); - log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType - + " component '" + this.componentName + "'."); - } - - public void stop() { - return; - } - - // ConfigurationComponent Implementation -------------------------------------------- - - public Configuration loadResourceConfiguration() { - Configuration resourceConfig; - try { - Map<String, ManagedProperty> managedProperties = getManagedComponent().getProperties(); - Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext() - .getPluginConfiguration()); - if (this.log.isDebugEnabled()) - this.log.debug("*** AFTER LOAD:\n" + DebugUtils.convertPropertiesToString(managedProperties)); - resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, customProps, - getResourceContext().getResourceType()); - } catch (Exception e) { - RunState runState = getManagedComponent().getRunState(); - if (runState == RunState.RUNNING) { - this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e); - } else { - this.log.debug("Failed to load configuration for " + getResourceDescription() - + ", but managed component is not in the RUNNING state.", e); - } - throw new RuntimeException(ThrowableUtil.getAllMessages(e)); - } - return resourceConfig; - } - - public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { - Configuration resourceConfig = configurationUpdateReport.getConfiguration(); - Configuration pluginConfig = getResourceContext().getPluginConfiguration(); - try { - ManagedComponent managedComponent = getManagedComponent(); - Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); - Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig); - if (this.log.isDebugEnabled()) - this.log.debug("*** BEFORE UPDATE:\n" + DebugUtils.convertPropertiesToString(managedProperties)); - ConversionUtils.convertConfigurationToManagedProperties(managedProperties, resourceConfig, - getResourceContext().getResourceType(), customProps); - if (this.log.isDebugEnabled()) - this.log.debug("*** AFTER UPDATE:\n" + DebugUtils.convertPropertiesToString(managedProperties)); - updateComponent(managedComponent); - configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); - } catch (Exception e) { - this.log.error("Failed to update configuration for " + getResourceDescription() + ".", e); - configurationUpdateReport.setStatus(ConfigurationUpdateStatus.FAILURE); - configurationUpdateReport.setErrorMessage(ThrowableUtil.getAllMessages(e)); - } - } - - // DeleteResourceFacet Implementation -------------------------------------------- - - public void deleteResource() throws Exception { - DeploymentManager deploymentManager = getConnection().getDeploymentManager(); - if (!deploymentManager.isRedeploySupported()) - throw new UnsupportedOperationException("Deletion of " + getResourceContext().getResourceType().getName() - + " Resources is not currently supported."); - ManagedComponent managedComponent = getManagedComponent(); - log.debug("Removing " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); - ManagementView managementView = getConnection().getManagementView(); - managementView.removeComponent(managedComponent); - ManagedDeployment parentDeployment = managedComponent.getDeployment(); - log.debug("Redeploying parent deployment '" + parentDeployment.getName() - + "' in order to complete removal of component " + toString(managedComponent) + "..."); - DeploymentProgress progress = deploymentManager.redeploy(parentDeployment.getName()); - DeploymentStatus redeployStatus = DeploymentUtils.run(progress); - if (redeployStatus.isFailed()) { - log.error("Failed to redeploy parent deployment '" + parentDeployment.getName() - + "during removal of component " + toString(managedComponent) - + " - removal may not persist when the app server is restarted.", redeployStatus.getFailure()); - } - managementView.load(); - } - - // OperationFacet Implementation -------------------------------------------- - - public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { - OperationDefinition operationDefinition = getOperationDefinition(name); - ManagedOperation managedOperation = getManagedOperation(operationDefinition); - // Convert parameters into MetaValue array. - MetaValue[] parameterMetaValues = ConversionUtils.convertOperationsParametersToMetaValues(managedOperation, - parameters, operationDefinition); - // invoke() takes a varargs, so we need to pass an empty array, rather than null. - MetaValue resultMetaValue = managedOperation.invoke(parameterMetaValues); - OperationResult result = new OperationResult(); - // Convert result MetaValue to corresponding Property type. - ConversionUtils.convertManagedOperationResults(managedOperation, resultMetaValue, result.getComplexResults(), - operationDefinition); - return result; - } - - // MeasurementFacet Implementation -------------------------------------------- - - public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { - ManagedComponent managedComponent = getManagedComponent(); - RunState runState = managedComponent.getRunState(); - for (MeasurementScheduleRequest request : metrics) { - try { - if (request.getName().equals("runState")) { - report.addData(new MeasurementDataTrait(request, runState.name())); - } else { - Object value = getSimpleValue(managedComponent, request); - addValueToMeasurementReport(report, request, value); - } - } catch (Exception e) { - if (runState == RunState.RUNNING) { - log.error("Failed to collect metric for " + request, e); - } else { - log.debug("Failed to collect metric for " + request - + ", but managed component is not in the RUNNING state.", e); - } - } - } - } - - protected void updateComponent(ManagedComponent managedComponent) throws Exception { - log.trace("Updating " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); - ManagementView managementView = getConnection().getManagementView(); - managementView.updateComponent(managedComponent); - managementView.load(); - } - - // ------------------------------------------------------------------------------ - - /** - * The name of the measurement schedule request (i.e. the metric name) can be in one of two forms: - * <p/> - * [prefix'|']simplePropertyName (e.g. "maxTime" or "ThreadPool|currentThreadCount") - * [prefix'|']compositePropertyName'.'key (e.g. "consumerCount" or "messageStatistics.count") - * - * @param managedComponent a managed component - * @param request a measurement schedule request - * @return the metric value - */ - @Nullable - protected Object getSimpleValue(ManagedComponent managedComponent, MeasurementScheduleRequest request) { - String metricName = request.getName(); - int pipeIndex = metricName.indexOf(PREFIX_DELIMITER); - // Remove the prefix if there is one (e.g. "ThreadPool|currentThreadCount" -> "currentThreadCount"). - String compositePropName = (pipeIndex == -1) ? metricName : metricName.substring(pipeIndex + 1); - int dotIndex = compositePropName.indexOf('.'); - String metricPropName = (dotIndex == -1) ? compositePropName : compositePropName.substring(0, dotIndex); - ManagedProperty metricProp = managedComponent.getProperty(metricPropName); - if (metricProp == null) { - return null; - } - MetaValue metaValue; - if (dotIndex == -1) { - metaValue = metricProp.getValue(); - } else { - CompositeValue compositeValue = (CompositeValue) metricProp.getValue(); - String key = compositePropName.substring(dotIndex + 1); - metaValue = compositeValue.get(key); - } - return getInnerValue(metaValue); - } - - // TODO: Move this to a utility class. - @Nullable - private static Object getInnerValue(MetaValue metaValue) { - if (metaValue == null) { - return null; - } - Object value; - if (metaValue.getMetaType().isSimple()) { - SimpleValue simpleValue = (SimpleValue) metaValue; - value = simpleValue.getValue(); - } else if (metaValue.getMetaType().isEnum()) { - EnumValue enumValue = (EnumValue) metaValue; - value = enumValue.getValue(); - } else if (metaValue.getMetaType().isArray()) { - ArrayValue arrayValue = (ArrayValue) metaValue; - value = arrayValue.getValue(); - } else if (metaValue.getMetaType().isCollection()) { - CollectionValue collectionValue = (CollectionValue) metaValue; - List list = new ArrayList(); - for (MetaValue element : collectionValue.getElements()) { - list.add(getInnerValue(element)); - } - value = list; - } else { - value = metaValue.toString(); - } - return value; - } - - protected void addValueToMeasurementReport(MeasurementReport report, MeasurementScheduleRequest request, - Object value) { - if (value == null) { - return; - } - String stringValue = toString(value); - - DataType dataType = request.getDataType(); - switch (dataType) { - case MEASUREMENT: - try { - MeasurementDataNumeric dataNumeric = new MeasurementDataNumeric(request, Double.valueOf(stringValue)); - report.addData(dataNumeric); - } catch (NumberFormatException e) { - log.error("Profile service did not return a numeric value as expected for metric [" + request.getName() - + "] - value returned was " + value + ".", e); - } - break; - case TRAIT: - MeasurementDataTrait dataTrait = new MeasurementDataTrait(request, stringValue); - report.addData(dataTrait); - break; - default: - throw new IllegalStateException("Unsupported measurement data type: " + dataType); - } - } - - protected ComponentType getComponentType() { - return componentType; - } - - protected String getComponentName() { - return componentName; - } - - protected ManagedComponent getManagedComponent() { - ManagedComponent managedComponent; - try { - ManagementView managementView = getConnection().getManagementView(); - managedComponent = ManagedComponentUtils.getManagedComponent(managementView, this.componentType, - this.componentName); - } catch (Exception e) { - throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent [" - + this.componentName + "].", e); - } - if (managedComponent == null) - throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named [" - + this.componentName + "]."); - log.trace("Retrieved " + toString(managedComponent) + "."); - return managedComponent; - } - - @NotNull - private OperationDefinition getOperationDefinition(String operationName) { - ResourceType resourceType = getResourceContext().getResourceType(); - OperationDefinition operationDefinition = ResourceTypeUtils.getOperationDefinition(resourceType, operationName); - if (operationDefinition == null) - throw new IllegalStateException("Operation named '" + operationName - + "' is not defined for Resource type '" + resourceType.getName() + "' in the '" - + resourceType.getPlugin() + "' plugin's descriptor."); - return operationDefinition; - } - - @NotNull - private ManagedOperation getManagedOperation(OperationDefinition operationDefinition) { - ManagedComponent managedComponent = getManagedComponent(); - Set<ManagedOperation> operations = managedComponent.getOperations(); - for (ManagedOperation operation : operations) { - ConfigurationDefinition paramsConfigDef = operationDefinition.getParametersConfigurationDefinition(); - int paramCount = (paramsConfigDef != null) ? paramsConfigDef.getPropertyDefinitions().size() : 0; - if (operation.getName().equals(operationDefinition.getName()) - && (operation.getParameters().length == paramCount)) - return operation; - } - throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName() - + "' not found on ManagedComponent [" + getManagedComponent() + "]."); - } - - private static String toString(ManagedComponent managedComponent) { - Map<String, ManagedProperty> properties = managedComponent.getProperties(); - return managedComponent.getClass().getSimpleName() + "@" + System.identityHashCode(managedComponent) + "[" - + "type=" + managedComponent.getType() + ", name=" + managedComponent.getName() + ", properties=" - + properties.getClass().getSimpleName() + "@" + System.identityHashCode(properties) + "]"; - } - - private static String toString(@NotNull Object value) { - if (value.getClass().isArray()) { - StringBuilder buffer = new StringBuilder(); - int lastIndex = Array.getLength(value) - 1; - for (int i = 0; i < Array.getLength(value); i++) { - buffer.append(String.valueOf(Array.get(value, i))); - if (i == lastIndex) { - break; - } - buffer.append(", "); - } - return buffer.toString(); - } else { - return value.toString(); - } - } -} +/* +* Jopr Management Platform +* Copyright (C) 2005-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, version 2, as +* published by the Free Software Foundation, and/or the GNU Lesser +* General Public License, version 2.1, also as published by the Free +* Software Foundation. +* +* 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 and the GNU Lesser General Public License +* for more details. +* +* You should have received a copy of the GNU General Public License +* and the GNU Lesser General Public License along with this program; +* if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +package org.rhq.plugins.jbossas5; + +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import org.jboss.deployers.spi.management.ManagementView; +import org.jboss.deployers.spi.management.deploy.DeploymentManager; +import org.jboss.deployers.spi.management.deploy.DeploymentProgress; +import org.jboss.deployers.spi.management.deploy.DeploymentStatus; +import org.jboss.managed.api.ComponentType; +import org.jboss.managed.api.ManagedComponent; +import org.jboss.managed.api.ManagedDeployment; +import org.jboss.managed.api.ManagedOperation; +import org.jboss.managed.api.ManagedProperty; +import org.jboss.managed.api.RunState; +import org.jboss.metatype.api.values.ArrayValue; +import org.jboss.metatype.api.values.CollectionValue; +import org.jboss.metatype.api.values.CompositeValue; +import org.jboss.metatype.api.values.EnumValue; +import org.jboss.metatype.api.values.MetaValue; +import org.jboss.metatype.api.values.SimpleValue; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDataNumeric; +import org.rhq.core.domain.measurement.MeasurementDataTrait; +import org.rhq.core.domain.measurement.MeasurementReport; +import org.rhq.core.domain.measurement.MeasurementScheduleRequest; +import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.configuration.ConfigurationFacet; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; +import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.pluginapi.measurement.MeasurementFacet; +import org.rhq.core.pluginapi.operation.OperationFacet; +import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.plugins.jbossas5.util.ConversionUtils; +import org.rhq.plugins.jbossas5.util.DebugUtils; +import org.rhq.plugins.jbossas5.util.DeploymentUtils; +import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; +import org.rhq.plugins.jbossas5.util.ResourceComponentUtils; +import org.rhq.plugins.jbossas5.util.ResourceTypeUtils; + +/** + * Service ResourceComponent for all {@link ManagedComponent}s in a Profile. + * + * @author Ian Springer + * @author Jason Dobies + * @author Mark Spritzler + */ +public class ManagedComponentComponent extends AbstractManagedComponent implements ConfigurationFacet, + DeleteResourceFacet, OperationFacet, MeasurementFacet { + public static interface Config { + String COMPONENT_TYPE = "componentType"; + String COMPONENT_SUBTYPE = "componentSubtype"; + String COMPONENT_NAME = "componentName"; + String TEMPLATE_NAME = "templateName"; + String COMPONENT_NAME_PROPERTY = "componentNameProperty"; + } + + protected static final char PREFIX_DELIMITER = '|'; + + private final Log log = LogFactory.getLog(this.getClass()); + + private String componentName; + private ComponentType componentType; + + // ResourceComponent Implementation -------------------------------------------- + + public AvailabilityType getAvailability() { + RunState runState = null; + try { + runState = getManagedComponent().getRunState(); + } catch (Throwable t) { + log.debug("Could not get component state, cause: ", t); + return AvailabilityType.DOWN; + } + + if (runState == RunState.RUNNING) { + return AvailabilityType.UP; + } else { + log.debug("Component was not running, state was: " + runState); + return AvailabilityType.DOWN; + } + } + + public void start(ResourceContext<ProfileServiceComponent> resourceContext) throws Exception { + super.start(resourceContext); + this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType()); + Configuration pluginConfig = resourceContext.getPluginConfiguration(); + this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue(); + log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType + + " component '" + this.componentName + "'."); + } + + public void stop() { + return; + } + + // ConfigurationComponent Implementation -------------------------------------------- + + public Configuration loadResourceConfiguration() { + Configuration resourceConfig; + try { + Map<String, ManagedProperty> managedProperties = getManagedComponent().getProperties(); + Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext() + .getPluginConfiguration()); + if (this.log.isDebugEnabled()) + this.log.debug("*** AFTER LOAD:\n" + DebugUtils.convertPropertiesToString(managedProperties)); + resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, customProps, + getResourceContext().getResourceType()); + } catch (Exception e) { + RunState runState = getManagedComponent().getRunState(); + if (runState == RunState.RUNNING) { + this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e); + } else { + this.log.debug("Failed to load configuration for " + getResourceDescription() + + ", but managed component is not in the RUNNING state.", e); + } + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + } + return resourceConfig; + } + + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { + Configuration resourceConfig = configurationUpdateReport.getConfiguration(); + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); + try { + ManagedComponent managedComponent = getManagedComponent(); + Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); + Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig); + if (this.log.isDebugEnabled()) + this.log.debug("*** BEFORE UPDATE:\n" + DebugUtils.convertPropertiesToString(managedProperties)); + ConversionUtils.convertConfigurationToManagedProperties(managedProperties, resourceConfig, + getResourceContext().getResourceType(), customProps); + if (this.log.isDebugEnabled()) + this.log.debug("*** AFTER UPDATE:\n" + DebugUtils.convertPropertiesToString(managedProperties)); + updateComponent(managedComponent); + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); + } catch (Exception e) { + this.log.error("Failed to update configuration for " + getResourceDescription() + ".", e); + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.FAILURE); + configurationUpdateReport.setErrorMessage(ThrowableUtil.getAllMessages(e)); + } + } + + // DeleteResourceFacet Implementation -------------------------------------------- + + public void deleteResource() throws Exception { + DeploymentManager deploymentManager = getConnection().getDeploymentManager(); + if (!deploymentManager.isRedeploySupported()) + throw new UnsupportedOperationException("Deletion of " + getResourceContext().getResourceType().getName() + + " Resources is not currently supported."); + ManagedComponent managedComponent = getManagedComponent(); + log.debug("Removing " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); + ManagementView managementView = getConnection().getManagementView(); + managementView.removeComponent(managedComponent); + ManagedDeployment parentDeployment = managedComponent.getDeployment(); + log.debug("Redeploying parent deployment '" + parentDeployment.getName() + + "' in order to complete removal of component " + toString(managedComponent) + "..."); + DeploymentProgress progress = deploymentManager.redeploy(parentDeployment.getName()); + DeploymentStatus redeployStatus = DeploymentUtils.run(progress); + if (redeployStatus.isFailed()) { + log.error("Failed to redeploy parent deployment '" + parentDeployment.getName() + + "during removal of component " + toString(managedComponent) + + " - removal may not persist when the app server is restarted.", redeployStatus.getFailure()); + } + managementView.load(); + } + + // OperationFacet Implementation -------------------------------------------- + + public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { + OperationDefinition operationDefinition = getOperationDefinition(name); + ManagedOperation managedOperation = getManagedOperation(operationDefinition); + // Convert parameters into MetaValue array. + MetaValue[] parameterMetaValues = ConversionUtils.convertOperationsParametersToMetaValues(managedOperation, + parameters, operationDefinition); + // invoke() takes a varargs, so we need to pass an empty array, rather than null. + MetaValue resultMetaValue = managedOperation.invoke(parameterMetaValues); + OperationResult result = new OperationResult(); + // Convert result MetaValue to corresponding Property type. + ConversionUtils.convertManagedOperationResults(managedOperation, resultMetaValue, result.getComplexResults(), + operationDefinition); + return result; + } + + // MeasurementFacet Implementation -------------------------------------------- + + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { + ManagedComponent managedComponent = getManagedComponent(); + RunState runState = managedComponent.getRunState(); + for (MeasurementScheduleRequest request : metrics) { + try { + if (request.getName().equals("runState")) { + report.addData(new MeasurementDataTrait(request, runState.name())); + } else { + Object value = getSimpleValue(managedComponent, request); + addValueToMeasurementReport(report, request, value); + } + } catch (Exception e) { + if (runState == RunState.RUNNING) { + log.error("Failed to collect metric for " + request, e); + } else { + log.debug("Failed to collect metric for " + request + + ", but managed component is not in the RUNNING state.", e); + } + } + } + } + + protected void updateComponent(ManagedComponent managedComponent) throws Exception { + log.trace("Updating " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); + ManagementView managementView = getConnection().getManagementView(); + managementView.updateComponent(managedComponent); + managementView.load(); + } + + // ------------------------------------------------------------------------------ + + /** + * The name of the measurement schedule request (i.e. the metric name) can be in one of two forms: + * <p/> + * [prefix'|']simplePropertyName (e.g. "maxTime" or "ThreadPool|currentThreadCount") + * [prefix'|']compositePropertyName'.'key (e.g. "consumerCount" or "messageStatistics.count") + * + * @param managedComponent a managed component + * @param request a measurement schedule request + * @return the metric value + */ + @Nullable + protected Object getSimpleValue(ManagedComponent managedComponent, MeasurementScheduleRequest request) { + String metricName = request.getName(); + int pipeIndex = metricName.indexOf(PREFIX_DELIMITER); + // Remove the prefix if there is one (e.g. "ThreadPool|currentThreadCount" -> "currentThreadCount"). + String compositePropName = (pipeIndex == -1) ? metricName : metricName.substring(pipeIndex + 1); + int dotIndex = compositePropName.indexOf('.'); + String metricPropName = (dotIndex == -1) ? compositePropName : compositePropName.substring(0, dotIndex); + ManagedProperty metricProp = managedComponent.getProperty(metricPropName); + if (metricProp == null) { + return null; + } + MetaValue metaValue; + if (dotIndex == -1) { + metaValue = metricProp.getValue(); + } else { + CompositeValue compositeValue = (CompositeValue) metricProp.getValue(); + String key = compositePropName.substring(dotIndex + 1); + metaValue = compositeValue.get(key); + } + return getInnerValue(metaValue); + } + + // TODO: Move this to a utility class. + @Nullable + private static Object getInnerValue(MetaValue metaValue) { + if (metaValue == null) { + return null; + } + Object value; + if (metaValue.getMetaType().isSimple()) { + SimpleValue simpleValue = (SimpleValue) metaValue; + value = simpleValue.getValue(); + } else if (metaValue.getMetaType().isEnum()) { + EnumValue enumValue = (EnumValue) metaValue; + value = enumValue.getValue(); + } else if (metaValue.getMetaType().isArray()) { + ArrayValue arrayValue = (ArrayValue) metaValue; + value = arrayValue.getValue(); + } else if (metaValue.getMetaType().isCollection()) { + CollectionValue collectionValue = (CollectionValue) metaValue; + List list = new ArrayList(); + for (MetaValue element : collectionValue.getElements()) { + list.add(getInnerValue(element)); + } + value = list; + } else { + value = metaValue.toString(); + } + return value; + } + + protected void addValueToMeasurementReport(MeasurementReport report, MeasurementScheduleRequest request, + Object value) { + if (value == null) { + return; + } + String stringValue = toString(value); + + DataType dataType = request.getDataType(); + switch (dataType) { + case MEASUREMENT: + try { + MeasurementDataNumeric dataNumeric = new MeasurementDataNumeric(request, Double.valueOf(stringValue)); + report.addData(dataNumeric); + } catch (NumberFormatException e) { + log.error("Profile service did not return a numeric value as expected for metric [" + request.getName() + + "] - value returned was " + value + ".", e); + } + break; + case TRAIT: + MeasurementDataTrait dataTrait = new MeasurementDataTrait(request, stringValue); + report.addData(dataTrait); + break; + default: + throw new IllegalStateException("Unsupported measurement data type: " + dataType); + } + } + + protected ComponentType getComponentType() { + return componentType; + } + + protected String getComponentName() { + return componentName; + } + + protected ManagedComponent getManagedComponent() { + ManagedComponent managedComponent; + try { + ManagementView managementView = getConnection().getManagementView(); + managedComponent = ManagedComponentUtils.getManagedComponent(managementView, this.componentType, + this.componentName); + } catch (Exception e) { + throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent [" + + this.componentName + "].", e); + } + if (managedComponent == null) + throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named [" + + this.componentName + "]."); + log.trace("Retrieved " + toString(managedComponent) + "."); + return managedComponent; + } + + @NotNull + private OperationDefinition getOperationDefinition(String operationName) { + ResourceType resourceType = getResourceContext().getResourceType(); + OperationDefinition operationDefinition = ResourceTypeUtils.getOperationDefinition(resourceType, operationName); + if (operationDefinition == null) + throw new IllegalStateException("Operation named '" + operationName + + "' is not defined for Resource type '" + resourceType.getName() + "' in the '" + + resourceType.getPlugin() + "' plugin's descriptor."); + return operationDefinition; + } + + @NotNull + private ManagedOperation getManagedOperation(OperationDefinition operationDefinition) { + ManagedComponent managedComponent = getManagedComponent(); + Set<ManagedOperation> operations = managedComponent.getOperations(); + for (ManagedOperation operation : operations) { + ConfigurationDefinition paramsConfigDef = operationDefinition.getParametersConfigurationDefinition(); + int paramCount = (paramsConfigDef != null) ? paramsConfigDef.getPropertyDefinitions().size() : 0; + if (operation.getName().equals(operationDefinition.getName()) + && (operation.getParameters().length == paramCount)) + return operation; + } + throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName() + + "' not found on ManagedComponent [" + getManagedComponent() + "]."); + } + + private static String toString(ManagedComponent managedComponent) { + Map<String, ManagedProperty> properties = managedComponent.getProperties(); + return managedComponent.getClass().getSimpleName() + "@" + System.identityHashCode(managedComponent) + "[" + + "type=" + managedComponent.getType() + ", name=" + managedComponent.getName() + ", properties=" + + properties.getClass().getSimpleName() + "@" + System.identityHashCode(properties) + "]"; + } + + private static String toString(@NotNull Object value) { + if (value.getClass().isArray()) { + StringBuilder buffer = new StringBuilder(); + int lastIndex = Array.getLength(value) - 1; + for (int i = 0; i < Array.getLength(value); i++) { + buffer.append(String.valueOf(Array.get(value, i))); + if (i == lastIndex) { + break; + } + buffer.append(", "); + } + return buffer.toString(); + } else { + return value.toString(); + } + } +} commit 8a5eb613403c7b95f4f9616139db627eeedac989 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 22:37:33 2010 -0400 more work on sample bundle scripts diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js index 05f8b79..563858e 100644 --- a/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js +++ b/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js @@ -35,7 +35,7 @@ * 3) exec <path>/cli-1-createBundle.js */ -var bundleName = 'test-bundle-upgrade-ant'; +var bundleName = 'sample-bundle'; var bundleDistroV1Path = '../resources/sample-bundle-v1.zip'; // delete the test bundle if it exists @@ -43,7 +43,7 @@ var bc = new BundleCriteria(); bc.addFilterName(bundleName); var bundles = BundleManager.findBundlesByCriteria(bc); if (null != bundles && bundles.size() > 0) { - print("\nDeleting sample bundle [" + bundleName + "] to re-run sample scripts...") + print("\nDeleting [" + bundleName + "] to re-run sample scripts...") BundleManager.deleteBundle(bundles.get(0).getId()); } diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js index e4e61ec..0b3bd75 100644 --- a/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js +++ b/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js @@ -22,45 +22,71 @@ */ /** - * Thus test script works with a real env including at least one platform resource and a running agent on - * said platform. It will deploy an original distro file then upgrade it, utilitizing the - * Ant bundle system. + * This sample script shows how to deploy a Bundle. It deploys the bundle created + * by the cli-1-deployBundle.js script. The Bundle uses the Ant Bundle Type provided with + * RHQ. + * <pre> + * Prerequisites: + * At least one platform must be in inventory. If the "platforms" group does not exist it will + * be created with all platforms as members. + * + * Usage: + * 1) start the CLI (can be downloaded from the GUI, Administration->Downloads, RHQ Client) + * 2) login user password serverHost serverPort + * 3) exec <path>/cli-1-createBundle.js + * </pre> */ -var TestsEnabled = true; +var bundleName = 'sample-bundle'; -var bundleName = 'test-bundle-upgrade-ant'; -var bundleZipFile1 = 'src/test/resources/test-upgrade-bundle-ant1.zip'; -var bundleZipFile2 = 'src/test/resources/test-upgrade-bundle-ant2.zip'; +// get the bundle if it exists +var bc = new BundleCriteria(); +bc.addFilterName(bundleName); +bc.fetchBundleVersions( true ); +var bundles = BundleManager.findBundlesByCriteria(bc); +Assert.assertTrue( null != bundles && bundles.size() > 0 ); +var bundle = bundles.get(0); +Assert.assertTrue( null != bundle.getBundleVersions() && bundle.getBundleVersions().size() == 1 ); +var bundleVersion = bundle.getBundleVersions().get(0); -// note, super-user, will not test any security constraints -var subject = rhq.login('rhqadmin', 'rhqadmin'); -executeAllTests(); +// Find or create the "platforms" group +var rgc = new ResourceGroupCriteria(); +rgc.addFilterName("platforms"); // wINdows, lINux +var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc); +var groupId; +// create if needed (and possible) +if ( groups.isEmpty() ) { + var c = new ResourceCriteria(); + c.addFilterResourceCategory(ResourceCategory.PLATFORM); + var platforms = ResourceManager.findResourcesByCriteria(c); + Assert.assertTrue( platforms.size() > 0 ); + + var rg = new ResourceGroup("platforms"); + var platformSet = new java.util.HashSet(); + platformSet.addAll( platforms ); + rg.setExplicitResources(platformSet); + rg = ResourceGroupManager.createResourceGroup(rg); + groupId = rg.getId(); +} else { + groupId = groups.get(0).getId(); +} -rhq.logout(); +// create a destination for the deployment +var dest = BundleManager.createBundleDestination(bundle.getId(), "sample destination", "sample destination", "/tmp/sample-bundle", groupId); -function testGroupDeployment() { - if ( !TestsEnabled ) { - return; - } +// create a config for the V1.0 deployment, setting the required properties for recipe in distro 1.0 +var config1 = new Configuration(); +var property11 = new PropertySimple("sample.name", "V1 Name"); +config1.put( property11 ); +var property12 = new PropertySimple("sample.port", "12345"); +config1.put( property12 ); - var groupId = getGroupId(); - var bundleType = getBundleType(); - Assert.assertNotNull(bundleType, "need ant bundle plugin installed for this test"); - // delete the test bundle if it exists - var bc = new BundleCriteria(); - bc.addFilterName( bundleName ); - var bundles = BundleManager.findBundlesByCriteria( bc ); - if ( null != bundles && bundles.size() > 0 ) { - print( "\nDeleting existing test ant bundle in order to test a fresh deploy...") - BundleManager.deleteBundle( bundles.get(0).getId() ); - } +// create a deployment for sample bundle 1.0 using the 1.0 config +var deployment = BundleManager.createBundleDeployment(bundleVersion.getId(), dest.getId(), "Deploying Sample Ant Bundle V1", config1); +deployment = BundleManager.scheduleBundleDeployment(testDeployment.getId(), true); +Assert.assertNotNull( deployment, "Failed to create 1.0 deployment" ); - // create bundleVersion 1.0 - var distributionFile1 = new java.io.File(bundleZipFile1); - distributionFile1 = new java.io.File(distributionFile1.getAbsolutePath()); - Assert.assertTrue(distributionFile1.exists(), "missing ant bundle file 1: " + distributionFile1); - var testBundleVersion1 = BundleManager.createBundleVersionViaFile( distributionFile1 ); +print("\nBundle Deployment Status=" + deployment.getStatus()); commit e95efbb18f704ee8b85c702b7c36d0eeb08bf129 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 22:37:01 2010 -0400 Revise tag deletion logic diff --git a/release.sh b/release.sh index c4b9e46..5ce7396 100755 --- a/release.sh +++ b/release.sh @@ -327,15 +327,6 @@ if [ ! -d "$WORKING_DIR" ]; then fi -# If the specified tag already exists then abort. It should not exist since production runs should have -# unique tags and test runs should have been done in a temporary branch - -EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"` -if [ -n "$EXISTING_REMOTE_TAG" ]; then - abort "A remote tag named $RELEASE_TAG already exists - aborting, perhaps a bad build configuration..." -fi - - # if this is a test build then create a temporary build branch off of RELEASE_BRANCH. This allows checkins to # continue in RELEASE_BRANCH without affecting the release plugin work, which will fail if the branch contents # change before it completes. @@ -360,7 +351,28 @@ fi # We should now have the build_branch checked out echo "Current Branch is $BUILD_BRANCH" - + +# If the specified tag already exists remotely and we're in production mode, then abort. If it exists and +# we're in test mode, delete it + +EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"` +if [ -n "$EXISTING_REMOTE_TAG" ] && [ "$MODE" = "production" ]; then + abort "A remote tag named $RELEASE_TAG already exists - aborting, since we are in production mode..." +fi + +if [ -n "$EXISTING_REMOTE_TAG" ] && [ "$MODE" = "test" ]; then + echo "A remote tag named $RELEASE_TAG already exists - deleting it, since we are in test mode..." + git push origin ":refs/tags/$RELEASE_TAG" + [ "$?" -ne 0 ] && abort "Failed to delete remote tag ($RELEASE_TAG)." +fi + +# See if the specified tag already exists locally - if so, delete it (even if in production mode). +EXISTING_LOCAL_TAG=`git tag -l "$RELEASE_TAG"` +if [ -n "$EXISTING_LOCAL_TAG" ]; then + echo "A local tag named $RELEASE_TAG already exists - deleting it..." + git tag -d "$RELEASE_TAG" + [ "$?" -ne 0 ] && abort "Failed to delete local tag ($RELEASE_TAG)." +fi # Run a test build before tagging. This will publish the snapshot artifacts to the local repo to "bootstrap" the repo. commit 49344810743edbf032ab6506de606c8e881f62bf Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 19:38:35 2010 -0400 fix typo in log message diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java index de39733..e7a1194 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java @@ -119,7 +119,7 @@ public abstract class AbstractManagedDeploymentComponent extends AbstractManaged if (deploymentState == DeploymentState.STARTED) { return AvailabilityType.UP; } else { - log.debug("Deployment was not running, state was: " + deploymentState); + log.debug("Deployment was not STARTED, state was: " + deploymentState); return AvailabilityType.DOWN; } } commit ab54c29d4306abe51df706b72f90b6454d20a057 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 18:15:20 2010 -0400 improve availability checking routines for JBossAS5 managed components * be tolerant of the underlying API changes - catch throwable * when getting the state object back, log if it's not UP/STARTED/RUNNING diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java index 09892a0..de39733 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java @@ -39,7 +39,6 @@ import org.jboss.deployers.spi.management.deploy.ProgressListener; import org.jboss.managed.api.DeploymentState; import org.jboss.managed.api.ManagedDeployment; import org.jboss.profileservice.spi.NoSuchDeploymentException; -import org.jboss.remoting.CannotConnectException; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.measurement.AvailabilityType; @@ -105,14 +104,22 @@ public abstract class AbstractManagedDeploymentComponent extends AbstractManaged } public AvailabilityType getAvailability() { + DeploymentState deploymentState = null; try { - return (getManagedDeployment().getDeploymentState() == DeploymentState.STARTED) ? AvailabilityType.UP - : AvailabilityType.DOWN; + deploymentState = getManagedDeployment().getDeploymentState(); } catch (NoSuchDeploymentException e) { log.warn(this.deploymentType + " deployment '" + this.deploymentName + "' not found. Cause: " + e.getLocalizedMessage()); return AvailabilityType.DOWN; - } catch (CannotConnectException e) { + } catch (Throwable t) { + log.debug("Could not get deployment state, cause: ", t); + return AvailabilityType.DOWN; + } + + if (deploymentState == DeploymentState.STARTED) { + return AvailabilityType.UP; + } else { + log.debug("Deployment was not running, state was: " + deploymentState); return AvailabilityType.DOWN; } } diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java index 0bf55c2..74130b4 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java @@ -49,7 +49,6 @@ import org.jboss.metatype.api.values.CompositeValue; import org.jboss.metatype.api.values.EnumValue; import org.jboss.metatype.api.values.MetaValue; import org.jboss.metatype.api.values.SimpleValue; -import org.jboss.remoting.CannotConnectException; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; @@ -105,13 +104,20 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen // ResourceComponent Implementation -------------------------------------------- public AvailabilityType getAvailability() { - RunState runState; + RunState runState = null; try { runState = getManagedComponent().getRunState(); - } catch (CannotConnectException e) { + } catch (Throwable t) { + log.debug("Could not get component state, cause: ", t); + return AvailabilityType.DOWN; + } + + if (runState == RunState.RUNNING) { + return AvailabilityType.UP; + } else { + log.debug("Component was not running, state was: " + runState); return AvailabilityType.DOWN; } - return (runState == RunState.RUNNING) ? AvailabilityType.UP : AvailabilityType.DOWN; } public void start(ResourceContext<ProfileServiceComponent> resourceContext) throws Exception { commit 80ac41afa88f74bc69a2032b74efad2d542d1e4a Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 18:05:03 2010 -0400 cosmetic - automatic relayout of code diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java index b2963cd..09892a0 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java @@ -28,6 +28,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.jboss.deployers.spi.management.KnownDeploymentTypes; import org.jboss.deployers.spi.management.ManagementView; import org.jboss.deployers.spi.management.deploy.DeploymentManager; @@ -56,10 +57,8 @@ import org.rhq.plugins.jbossas5.util.DeploymentUtils; * @author Mark Spritzler * @author Ian Springer */ -public abstract class AbstractManagedDeploymentComponent - extends AbstractManagedComponent - implements MeasurementFacet, OperationFacet, ProgressListener -{ +public abstract class AbstractManagedDeploymentComponent extends AbstractManagedComponent implements MeasurementFacet, + OperationFacet, ProgressListener { public static final String DEPLOYMENT_NAME_PROPERTY = "deploymentName"; public static final String DEPLOYMENT_TYPE_NAME_PROPERTY = "deploymentTypeName"; public static final String EXTENSION_PROPERTY = "extension"; @@ -85,8 +84,7 @@ public abstract class AbstractManagedDeploymentComponent // ----------- ResourceComponent Implementation ------------ - public void start(ResourceContext<ProfileServiceComponent> resourceContext) throws Exception - { + public void start(ResourceContext<ProfileServiceComponent> resourceContext) throws Exception { super.start(resourceContext); Configuration pluginConfig = getResourceContext().getPluginConfiguration(); this.deploymentName = pluginConfig.getSimple(DEPLOYMENT_NAME_PROPERTY).getStringValue(); @@ -94,41 +92,35 @@ public abstract class AbstractManagedDeploymentComponent String deploymentTypeName = pluginConfig.getSimple(DEPLOYMENT_TYPE_NAME_PROPERTY).getStringValue(); this.deploymentType = KnownDeploymentTypes.valueOf(deploymentTypeName); log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.deploymentType - + " deployment '" + this.deploymentName + "' with path '" + this.deploymentFile + "'."); - + + " deployment '" + this.deploymentName + "' with path '" + this.deploymentFile + "'."); + try { getManagedDeployment(); } catch (Exception e) { - log.warn("The underlying file [" + this.deploymentFile + "] no longer exists. It may have been deleted from the filesystem external to Jopr. If you wish to remove this Resource from inventory, you may add &debug=true to the URL for the Browse Resources > Services page and then click the UNINVENTORY button next to this Resource"); + log + .warn("The underlying file [" + + this.deploymentFile + + "] no longer exists. It may have been deleted from the filesystem external to Jopr. If you wish to remove this Resource from inventory, you may add &debug=true to the URL for the Browse Resources > Services page and then click the UNINVENTORY button next to this Resource"); } } - public AvailabilityType getAvailability() - { - try - { - return (getManagedDeployment().getDeploymentState() == DeploymentState.STARTED) ? AvailabilityType.UP : - AvailabilityType.DOWN; - } - catch (NoSuchDeploymentException e) - { + public AvailabilityType getAvailability() { + try { + return (getManagedDeployment().getDeploymentState() == DeploymentState.STARTED) ? AvailabilityType.UP + : AvailabilityType.DOWN; + } catch (NoSuchDeploymentException e) { log.warn(this.deploymentType + " deployment '" + this.deploymentName + "' not found. Cause: " - + e.getLocalizedMessage()); + + e.getLocalizedMessage()); return AvailabilityType.DOWN; - } - catch (CannotConnectException e) - { + } catch (CannotConnectException e) { return AvailabilityType.DOWN; } } // ------------ MeasurementFacet Implementation ------------ - public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) - throws Exception - { - if (this.deploymentType == KnownDeploymentTypes.JavaEEWebApplication) - { + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception { + if (this.deploymentType == KnownDeploymentTypes.JavaEEWebApplication) { WarMeasurementFacetDelegate warMeasurementFacetDelegate = new WarMeasurementFacetDelegate(this); warMeasurementFacetDelegate.getValues(report, requests); } @@ -136,43 +128,32 @@ public abstract class AbstractManagedDeploymentComponent // ------------ OperationFacet Implementation ------------ - public OperationResult invokeOperation(String name, Configuration parameters) throws Exception - { + public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { DeploymentManager deploymentManager = getConnection().getDeploymentManager(); DeploymentProgress progress; - if (name.equals("start")) - { - //FIXME: This is a workaround until JOPR-309 will be fixed. - if(getAvailability() != AvailabilityType.UP) - { - progress = deploymentManager.start(this.deploymentName); - } - else - { - log.warn("Operation '" + name + "' on " + getResourceDescription() + " failed because the Resource is already started."); - OperationResult result = new OperationResult(); - result.setErrorMessage(this.deploymentFile.getName() + " is already started."); - return result; - } - } - else if (name.equals("stop")) - { + if (name.equals("start")) { + //FIXME: This is a workaround until JOPR-309 will be fixed. + if (getAvailability() != AvailabilityType.UP) { + progress = deploymentManager.start(this.deploymentName); + } else { + log.warn("Operation '" + name + "' on " + getResourceDescription() + + " failed because the Resource is already started."); + OperationResult result = new OperationResult(); + result.setErrorMessage(this.deploymentFile.getName() + " is already started."); + return result; + } + } else if (name.equals("stop")) { progress = deploymentManager.stop(this.deploymentName); - } - else if (name.equals("restart")) - { + } else if (name.equals("restart")) { progress = deploymentManager.stop(this.deploymentName); DeploymentStatus stopStatus = DeploymentUtils.run(progress); // Still try to start, even if stop fails (maybe the app wasn't running to begin with). progress = deploymentManager.start(this.deploymentName); - } - else - { + } else { throw new UnsupportedOperationException(name); } DeploymentStatus status = DeploymentUtils.run(progress); - log.debug("Operation '" + name + "' on " + getResourceDescription() + " returned status [" + status - + "]."); + log.debug("Operation '" + name + "' on " + getResourceDescription() + " returned status [" + status + "]."); if (status.isFailed()) { throw status.getFailure(); } @@ -181,8 +162,7 @@ public abstract class AbstractManagedDeploymentComponent // ------------ ProgressListener implementation ------------- - public void progressEvent(ProgressEvent event) - { + public void progressEvent(ProgressEvent event) { log.debug(event); } @@ -196,15 +176,13 @@ public abstract class AbstractManagedDeploymentComponent return deploymentType; } - protected ManagedDeployment getManagedDeployment() throws NoSuchDeploymentException - { + protected ManagedDeployment getManagedDeployment() throws NoSuchDeploymentException { ManagementView managementView = getConnection().getManagementView(); managementView.load(); return managementView.getDeployment(this.deploymentName); } - private File getDeploymentFile() - { + private File getDeploymentFile() { // e.g.: vfszip:/C:/opt/jboss-5.0.0.GA/server/default/deploy/foo.war URI vfsURI = URI.create(this.deploymentName); // e.g.: foo.war diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java index aefb351..0bf55c2 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java @@ -30,6 +30,9 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import org.jboss.deployers.spi.management.ManagementView; import org.jboss.deployers.spi.management.deploy.DeploymentManager; import org.jboss.deployers.spi.management.deploy.DeploymentProgress; @@ -48,12 +51,9 @@ import org.jboss.metatype.api.values.MetaValue; import org.jboss.metatype.api.values.SimpleValue; import org.jboss.remoting.CannotConnectException; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.DataType; @@ -72,11 +72,11 @@ import org.rhq.core.pluginapi.operation.OperationFacet; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.plugins.jbossas5.util.ConversionUtils; +import org.rhq.plugins.jbossas5.util.DebugUtils; import org.rhq.plugins.jbossas5.util.DeploymentUtils; import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; -import org.rhq.plugins.jbossas5.util.ResourceTypeUtils; import org.rhq.plugins.jbossas5.util.ResourceComponentUtils; -import org.rhq.plugins.jbossas5.util.DebugUtils; +import org.rhq.plugins.jbossas5.util.ResourceTypeUtils; /** * Service ResourceComponent for all {@link ManagedComponent}s in a Profile. @@ -93,7 +93,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen String COMPONENT_NAME = "componentName"; String TEMPLATE_NAME = "templateName"; String COMPONENT_NAME_PROPERTY = "componentNameProperty"; - } + } protected static final char PREFIX_DELIMITER = '|'; @@ -129,53 +129,45 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen // ConfigurationComponent Implementation -------------------------------------------- - public Configuration loadResourceConfiguration() - { + public Configuration loadResourceConfiguration() { Configuration resourceConfig; - try - { + try { Map<String, ManagedProperty> managedProperties = getManagedComponent().getProperties(); - Map<String, PropertySimple> customProps = - ResourceComponentUtils.getCustomProperties(getResourceContext().getPluginConfiguration()); - if (this.log.isDebugEnabled()) this.log.debug("*** AFTER LOAD:\n" - + DebugUtils.convertPropertiesToString(managedProperties)); - resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, - customProps, getResourceContext().getResourceType()); - } - catch (Exception e) - { + Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(getResourceContext() + .getPluginConfiguration()); + if (this.log.isDebugEnabled()) + this.log.debug("*** AFTER LOAD:\n" + DebugUtils.convertPropertiesToString(managedProperties)); + resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, customProps, + getResourceContext().getResourceType()); + } catch (Exception e) { RunState runState = getManagedComponent().getRunState(); if (runState == RunState.RUNNING) { - this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e); + this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e); } else { - this.log.debug("Failed to load configuration for " + getResourceDescription() - + ", but managed component is not in the RUNNING state.", e); + this.log.debug("Failed to load configuration for " + getResourceDescription() + + ", but managed component is not in the RUNNING state.", e); } throw new RuntimeException(ThrowableUtil.getAllMessages(e)); } return resourceConfig; } - public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) - { + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) { Configuration resourceConfig = configurationUpdateReport.getConfiguration(); Configuration pluginConfig = getResourceContext().getPluginConfiguration(); - try - { + try { ManagedComponent managedComponent = getManagedComponent(); Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig); - if (this.log.isDebugEnabled()) this.log.debug("*** BEFORE UPDATE:\n" - + DebugUtils.convertPropertiesToString(managedProperties)); + if (this.log.isDebugEnabled()) + this.log.debug("*** BEFORE UPDATE:\n" + DebugUtils.convertPropertiesToString(managedProperties)); ConversionUtils.convertConfigurationToManagedProperties(managedProperties, resourceConfig, - getResourceContext().getResourceType(), customProps); - if (this.log.isDebugEnabled()) this.log.debug("*** AFTER UPDATE:\n" - + DebugUtils.convertPropertiesToString(managedProperties)); + getResourceContext().getResourceType(), customProps); + if (this.log.isDebugEnabled()) + this.log.debug("*** AFTER UPDATE:\n" + DebugUtils.convertPropertiesToString(managedProperties)); updateComponent(managedComponent); configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); - } - catch (Exception e) - { + } catch (Exception e) { this.log.error("Failed to update configuration for " + getResourceDescription() + ".", e); configurationUpdateReport.setStatus(ConfigurationUpdateStatus.FAILURE); configurationUpdateReport.setErrorMessage(ThrowableUtil.getAllMessages(e)); @@ -241,7 +233,7 @@ public class ManagedComponentComponent extends AbstractManagedComponent implemen log.error("Failed to collect metric for " + request, e); } else { log.debug("Failed to collect metric for " + request - + ", but managed component is not in the RUNNING state.", e); + + ", but managed component is not in the RUNNING state.", e); } } } commit 1dab7fe90f9f6e477878751dbeb50c56166de3f9 Author: Ian Springer <ian.springer(a)redhat.com> Date: Tue Jun 29 17:21:51 2010 -0400 make nsswitch plugin pom and descriptor follow same conventions as the other agent plugins diff --git a/modules/plugins/nss/pom.xml b/modules/plugins/nss/pom.xml index 47b015b..0b8578a 100644 --- a/modules/plugins/nss/pom.xml +++ b/modules/plugins/nss/pom.xml @@ -6,109 +6,19 @@ <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-plugins-parent</artifactId> + <version>3.0.0-SNAPSHOT</version> + </parent> + <groupId>org.rhq.plugin.nss</groupId> <artifactId>nameservices-switch-plugin</artifactId> - <version>0.0.7</version> <packaging>jar</packaging> <name>Name Service Switch</name> <description>A Plugin for managing the Name Service Switch infrastructure of a Linux System</description> - <properties> - <rhq.version>1.4.0-SNAPSHOT</rhq.version> - </properties> - - <dependencies> - -  - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-domain</artifactId> - <version>${rhq.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-plugin-api</artifactId> - <version>${rhq.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-native-system</artifactId> - <version>${rhq.version}</version> - <scope>provided</scope>  - </dependency> - -  - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope>  - </dependency> - -  - <dependency> - <groupId>hibernate-annotations</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.2.1.GA</version> - <scope>provided</scope>  - </dependency> - -  - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <scope>provided</scope>  - </dependency> - -  - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - -  -  - - </dependencies> - - <build> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.rhq</groupId> - <artifactId>rhq-plugin-validator</artifactId> - <version>${rhq.version}</version> - </plugin> - - - </plugins> - </build> - <profiles> <profile> <id>dev</id> diff --git a/modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml index 305129e..2ad376e 100644 --- a/modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> -<plugin name="" +<plugin name="NSS" displayName="Name Service Switch" version="1.0" package="org.rhq.plugin.nss" @@ -30,4 +30,6 @@ <c:simple-property name="aliases" displayName="aliases" default="" /> </resource-configuration> </server> + </plugin> + commit e4637fefe54591d1b7a8001dd153755f388d382a Author: Ian Springer <ian.springer(a)redhat.com> Date: Tue Jun 29 17:20:56 2010 -0400 disable raw config support in GUI (https://bugzilla.redhat.com/show_bug.cgi?id=609211) diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml index d10c5f4..9aafddc 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml @@ -25,27 +25,6 @@ THIS TEXT WILL BE REMOVED. <ui:param name="selectedTabName" value="Configuration.Current"/> <ui:define name="content"> - <script type="text/javascript"> - function cursor_wait() { - document.body.style.cursor = 'wait'; - } - - function cursor_clear() { - document.body.style.cursor = 'default'; - } - - var currentFileModified = false; - - var selectedFile = ''; - - function setCurrentFileModified() { - currentFileModified = true; - } - - function resetCurrentFile() { - currentFileModified; - } - </script> <h:panelGroup layout="block" styleClass="InfoBlock" rendered="#{configurationEditor.updateInProgress}"> @@ -82,64 +61,11 @@ THIS TEXT WILL BE REMOVED. </h:panelGrid> </h:panelGrid> - <c:choose> - <c:when test="${configurationEditor.rawSupported}"> - <rich:tabPanel> - <rich:tab label="Advanced Mode" onlabelclick="cursor_wait();" oncomplete="cursor_clear();"> - <ui:include src="raw.xhtml"> - <ui:param name="readOnly" value="false"/> - </ui:include> - </rich:tab> - </rich:tabPanel> - </c:when> - - <c:when test="${configurationEditor.structuredSupported}"> - <rich:tabPanel> - <rich:tab label="Basic Mode" onlabelclick="cursor_wait();" oncomplete="cursor_clear();"> - <ui:include src="structured.xhtml"> - <ui:param name="readOnly" value="false"/> - </ui:include> - - <ui:remove> - <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell" - rendered="#{resourceConfiguration != null}"> - <h:commandButton value="SAVE" action="#{configurationEditor.updateConfiguration}" - title="Click to Save Changes" styleClass="buttonmed" - rendered="${ResourceUIBean.permissions.configure}"/> - <h:commandButton value="RESET" type="reset" immediate="true" - title="Click to Reset Fields" styleClass="buttonmed"/> - </h:panelGrid> - </ui:remove> - </rich:tab> - </rich:tabPanel> - </c:when> - - <c:when test="${configurationEditor.structuredAndRawSupported}"> - <rich:tabPanel id="configTabPanel" - selectedTab="#{configurationEditor.selectedTab}" - switchType="ajax" - valueChangeListener="#{configurationEditor.changeTabs}"> - <rich:tab id="structuredTab" - label="Basic Mode" - reRender="lowerCommitPanel,upperCommitPanel,modalEditor" - onlabelclick="cursor_wait();" - oncomplete="cursor_clear();"> - <ui:include src="structured.xhtml"> - <ui:param name="readOnly" value="false"/> - </ui:include> - </rich:tab> - <rich:tab id="rawTab" - label="Advanced Mode" - reRender="fileMenuPanel,upperCommitPanel,lowerCommitPanel,modalEditor" - onlabelclick="cursor_wait();" - oncomplete="cursor_clear();"> - <ui:include src="raw.xhtml"> - <ui:param name="readOnly" value="false"/> - </ui:include> - </rich:tab> - </rich:tabPanel> - </c:when> - </c:choose> + <c:if test="${configurationEditor.structuredSupported or configurationEditor.structuredAndRawSupported}"> + <ui:include src="structured.xhtml"> + <ui:param name="readOnly" value="false"/> + </ui:include> + </c:if> <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup id="lowerCommitPanel" style="text-align:right"> @@ -163,19 +89,8 @@ THIS TEXT WILL BE REMOVED. </h:panelGroup> </h:panelGrid> - <ui:include src="view-raw-modal.xhtml"> - <ui:param name="readOnly" value="false"/> - </ui:include> - - <ui:include src="error-window.xhtml"/> </h:form> -  - <ui:include src="upload-modal.xhtml"/> - </ui:define> </ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml index 6541456..7a40797 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml @@ -27,15 +27,6 @@ THIS TEXT WILL BE REMOVED. <ui:param name="selectedTabName" value="Configuration.Current"/> <ui:define name="content"> - <script type="text/javascript"> - function cursor_wait() { - document.body.style.cursor = 'wait'; - } - - function cursor_clear() { - document.body.style.cursor = 'default'; - } - </script> <h:panelGroup layout="block" styleClass="InfoBlock" rendered="#{configurationViewer.updateInProgress}"> @@ -60,46 +51,9 @@ THIS TEXT WILL BE REMOVED. </h:panelGrid> </h:panelGrid> - <c:choose> - <c:when test="${configurationViewer.rawSupported}"> - <rich:tabPanel> - <rich:tab label="Advanced Mode"> - <ui:include src="raw.xhtml"/> - </rich:tab> - </rich:tabPanel> - </c:when> - - <c:when test="${configurationViewer.structuredSupported}"> - <rich:tabPanel> - <rich:tab label="Basic Mode"> - <ui:include src="structured.xhtml"/> - </rich:tab> - </rich:tabPanel> - </c:when> - - <c:when test="${configurationViewer.structuredAndRawSupported}"> - <rich:tabPanel id="resourceConfigurationTabPanel" - switchType="ajax" - valueChangeListener="#{configurationViewer.changeTabs}"> - <rich:tab id="structuredTab" - label="Basic Mode" - onlabelclick="cursor_wait();" - oncomplete="cursor_clear();" - limitToList="true" - reRender="upperEditButton,lowerEditButton,modalEditor"> - <ui:include src="structured.xhtml"/> - </rich:tab> - <rich:tab id="rawTab" - label="Advanced Mode" - onlabelclick="cursor_wait();" - oncomplete="cursor_clear();" - limitToList="true" - reRender="upperEditButton,lowerEditButton,modalEditor"> - <ui:include src="raw.xhtml"/> - </rich:tab> - </rich:tabPanel> - </c:when> - </c:choose> + <c:if test="${configurationViewer.structuredSupported or configurationViewer.structuredAndRawSupported}"> + <ui:include src="structured.xhtml"/> + </c:if> <h:panelGrid columns="1" style="width:100%" columnClasses="raw-edit-footer"> <h:panelGroup style="text-align:right"> @@ -114,7 +68,6 @@ THIS TEXT WILL BE REMOVED. </h:panelGroup> </h:panelGrid> - <ui:include src="view-raw-modal.xhtml"/> </h:form> </ui:define> commit e6438c474e3eb5788b913893ab8c5db270dbbe3a Author: Ian Springer <ian.springer(a)redhat.com> Date: Tue Jun 29 17:18:30 2010 -0400 fix issue caused by original fix for IE scrollbar issue (https://bugzilla.redhat.com/show_bug.cgi?id=601744) which was causing vertical scrollbar on Resource tab pages to be displayed by FF at 2/3 of the correct width diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml index 7629fd7..e249621 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml @@ -49,8 +49,8 @@ id - the id of the Resource being accessed </div> </div> <div id="centerContent" class="column" style="width: #{100 - UserPreferencesUIBean.leftResourceNavState}%;"> - <div id="centerContentWrapper" class="content-right" style="position: relative"> - <div style="left: 0; right: 0; height: 100%;"> + <div id="centerContentWrapper" class="content-right"> + <div style="left: 0; right: 0; height: 100%; position: relative"> <ui:insert name="summary"><p>Default Entity Summary</p></ui:insert> <ui:insert name="tabBar"><p>Default Entity TabBar</p></ui:insert> <ui:insert name="content"><p>Default Entity Content</p></ui:insert> commit eee5ad2d562b8377c670f44a07fa1a0d59257c95 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 17:08:05 2010 -0400 BZ-607672: add more silience during notfication processing * gracefully handle cases when server-plugin plugin container is in one of various initializing states * do not bomb during alert notification sender if server-side plugin container hasn't started completely diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java index 0fc7840..c856a24 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java @@ -656,6 +656,8 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { List<AlertNotification> alertNotifications = alert.getAlertDefinition().getAlertNotifications(); Set<String> emailAddresses = new LinkedHashSet<String>(); + AlertSenderPluginManager alertSenderPluginManager = getAlertPluginManager(); + for (AlertNotification alertNotification : alertNotifications) { // Send over the new AlertSender plugins @@ -666,7 +668,7 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { } AlertNotificationLog alNoLo; - AlertSender sender = getAlertSender(alertNotification); + AlertSender<?> sender = alertSenderPluginManager.getAlertSenderForNotification(alertNotification); if (sender != null) { try { @@ -704,7 +706,13 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { } // send them off - Collection<String> badAddresses = sendAlertNotificationEmails(alert, emailAddresses); + Collection<String> badAddresses = null; + try { + badAddresses = sendAlertNotificationEmails(alert, emailAddresses); + } catch (Throwable t) { + badAddresses = new ArrayList<String>(); + log.error("Could not send emails to " + emailAddresses + " for " + alert + ", cause:", t); + } // TODO we may do the same for SMS in the future. // log those bad addresses to the gui and their individual senders (if possible) @@ -734,8 +742,8 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { } } - } catch (Exception e) { - log.error("Failed to send all notifications for " + alert.toSimpleString(), e); + } catch (Throwable t) { + log.error("Failed to send all notifications for " + alert.toSimpleString(), t); } } @@ -745,18 +753,20 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { */ public AlertSenderPluginManager getAlertPluginManager() { MasterServerPluginContainer container = LookupUtil.getServerPluginService().getMasterPluginContainer(); + if (container == null) { + log.warn(MasterServerPluginContainer.class.getSimpleName() + " is not started yet"); + return null; + } AlertServerPluginContainer pc = container.getPluginContainerByClass(AlertServerPluginContainer.class); + if (pc == null) { + log.warn(AlertServerPluginContainer.class.getSimpleName() + " has not been loaded by the " + + MasterServerPluginContainer.class.getSimpleName() + " yet"); + return null; + } AlertSenderPluginManager manager = (AlertSenderPluginManager) pc.getPluginManager(); - return manager; } - AlertSender getAlertSender(AlertNotification notification) { - AlertSenderPluginManager manager = getAlertPluginManager(); - AlertSender sender = manager.getAlertSenderForNotification(notification); - return sender; - } - /** * * @param alert @@ -765,9 +775,9 @@ public class AlertManagerBean implements AlertManagerLocal, AlertManagerRemote { */ private Collection<String> sendAlertNotificationEmails(Alert alert, Set<String> emailAddresses) { - if (emailAddresses.size()==0) + if (emailAddresses.size() == 0) return new ArrayList<String>(0); // No email to send -> no bad addresses - + log.debug("Sending alert notifications for " + alert.toSimpleString() + "..."); AlertDefinition alertDefinition = alert.getAlertDefinition(); commit 27502131a4a4be2e06983cecbbb44361be756267 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 17:02:01 2010 -0400 LT commit diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp index 30df9ef..45526f7 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp @@ -1,104 +1,104 @@ -<%@ page language="java" %> -<%@ page errorPage="/common/Error.jsp" %> - -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> - -<script src="<html:rewrite page="/js/"/>functions.js" type="text/javascript"></script> -<link rel=stylesheet href="<html:rewrite page="/css/"/>win.css" type="text/css"> - -<hq:constant - classname="org.rhq.enterprise.gui.legacy.Constants" - symbol="MINUTES_LABEL" var="CONST_MINUTES" /> -<hq:constant - classname="org.rhq.enterprise.gui.legacy.Constants" - symbol="HOURS_LABEL" var="CONST_HOURS" /> -<hq:constant - classname="org.rhq.enterprise.gui.legacy.Constants" - symbol="DAYS_LABEL" var="CONST_DAYS" /> - - -<tiles:insert definition=".header.tab"> - <tiles:put name="tabKey" value="admin.settings.BaseConfigTab"/> -</tiles:insert> - - - -<table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> - <td width="45%" class="BlockLabel"><fmt:message key="admin.settings.BaseURL"/></td> - <td width="55%" class="BlockContent"><html:text size="31" property="baseUrl" /></td> - </tr> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.AgentMaxQuietTimeAllowed"/></td> - <td class="BlockContent"> - <table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> -<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> - <td class="ErrorField"> - <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> - </td> - <td class="ErrorField" width="100%"> - <html:select property="agentMaxQuietTimeAllowed"> - <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> - </html:select> - </td> -</logic:messagesPresent> -<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> - <td class="BlockContent"> - <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> - </td> - <td class="BlockContent" width="100%"> - <html:select property="agentMaxQuietTimeAllowed"> - <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> - </html:select> - </td> -</logic:messagesNotPresent> - </tr> -<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> - <tr> - <td class="ErrorField" colspan="2"> - <span class="ErrorFieldContent"> <html:errors property="agentMaxQuietTimeAllowedVal"/></span> - </td> - </tr> -</logic:messagesPresent> -<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> - <tr> - <td class="BlockContent" colspan="2"> - </td> - </tr> -</logic:messagesNotPresent> - </table> - </td> - </tr> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.EnableAgentAutoUpdate"/></td> - <td class="BlockContent"> - <table cellpadding="0" cellspacing="4" border="0"> - <tr> - <td align="left"><html:radio property="enableAgentAutoUpdate" value="true"/><fmt:message key="yesno.true"/></td> - <td align="left"><html:radio property="enableAgentAutoUpdate" value="false"/><fmt:message key="yesno.false"/></td> - </tr> - </table> - </td> - </tr> - -<hq:authorization permission="superuser"> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.EnableDebugMode"/></td> - <td class="BlockContent"> - <table cellpadding="0" cellspacing="4" border="0"> - <tr> - <td align="left"><html:radio property="enableDebugMode" value="true"/><fmt:message key="yesno.true"/></td> - <td align="left"><html:radio property="enableDebugMode" value="false"/><fmt:message key="yesno.false"/></td> - </tr> - </table> - </td> - </tr> -</hq:authorization> - -</table> +<%@ page language="java" %> +<%@ page errorPage="/common/Error.jsp" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> + +<script src="<html:rewrite page="/js/"/>functions.js" type="text/javascript"></script> +<link rel=stylesheet href="<html:rewrite page="/css/"/>win.css" type="text/css"> + +<hq:constant + classname="org.rhq.enterprise.gui.legacy.Constants" + symbol="MINUTES_LABEL" var="CONST_MINUTES" /> +<hq:constant + classname="org.rhq.enterprise.gui.legacy.Constants" + symbol="HOURS_LABEL" var="CONST_HOURS" /> +<hq:constant + classname="org.rhq.enterprise.gui.legacy.Constants" + symbol="DAYS_LABEL" var="CONST_DAYS" /> + + +<tiles:insert definition=".header.tab"> + <tiles:put name="tabKey" value="admin.settings.BaseConfigTab"/> +</tiles:insert> + + + +<table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td width="45%" class="BlockLabel"><fmt:message key="admin.settings.BaseURL"/></td> + <td width="55%" class="BlockContent"><html:text size="31" property="baseUrl" /></td> + </tr> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.AgentMaxQuietTimeAllowed"/></td> + <td class="BlockContent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> +<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> + <td class="ErrorField"> + <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> + </td> + <td class="ErrorField" width="100%"> + <html:select property="agentMaxQuietTimeAllowed"> + <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> + </html:select> + </td> +</logic:messagesPresent> +<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> + <td class="BlockContent"> + <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> + </td> + <td class="BlockContent" width="100%"> + <html:select property="agentMaxQuietTimeAllowed"> + <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> + </html:select> + </td> +</logic:messagesNotPresent> + </tr> +<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> + <tr> + <td class="ErrorField" colspan="2"> + <span class="ErrorFieldContent"> <html:errors property="agentMaxQuietTimeAllowedVal"/></span> + </td> + </tr> +</logic:messagesPresent> +<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> + <tr> + <td class="BlockContent" colspan="2"> + </td> + </tr> +</logic:messagesNotPresent> + </table> + </td> + </tr> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.EnableAgentAutoUpdate"/></td> + <td class="BlockContent"> + <table cellpadding="0" cellspacing="4" border="0"> + <tr> + <td align="left"><html:radio property="enableAgentAutoUpdate" value="true"/><fmt:message key="yesno.true"/></td> + <td align="left"><html:radio property="enableAgentAutoUpdate" value="false"/><fmt:message key="yesno.false"/></td> + </tr> + </table> + </td> + </tr> + +<hq:authorization permission="superuser"> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.EnableDebugMode"/></td> + <td class="BlockContent"> + <table cellpadding="0" cellspacing="4" border="0"> + <tr> + <td align="left"><html:radio property="enableDebugMode" value="true"/><fmt:message key="yesno.true"/></td> + <td align="left"><html:radio property="enableDebugMode" value="false"/><fmt:message key="yesno.false"/></td> + </tr> + </table> + </td> + </tr> +</hq:authorization> + +</table> commit 1e10fbe07f2d55aa118baffbaec4e02127983ff5 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 16:33:27 2010 -0400 Work to perform rhq tag release script in its own branch diff --git a/release.sh b/release.sh index 2722eda..c4b9e46 100755 --- a/release.sh +++ b/release.sh @@ -286,7 +286,6 @@ cat <<EOF >"${MAVEN_SETTINGS_FILE}" </settings> EOF - # Clone and/or checkout the source from git. if [ -d "$WORKING_DIR" ]; then @@ -328,15 +327,42 @@ if [ ! -d "$WORKING_DIR" ]; then fi -# If the specified tag already exists remotely and we're in production mode, then abort. If it exists and we're in test mode, then we'll delete it after we've had a successful dry run of release:prepare and are ready to tag. +# If the specified tag already exists then abort. It should not exist since production runs should have +# unique tags and test runs should have been done in a temporary branch EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"` -if [ -n "$EXISTING_REMOTE_TAG" ] && [ "$MODE" = "production" ]; then - abort "A remote tag named $RELEASE_TAG already exists - aborting, since we are in production mode..." +if [ -n "$EXISTING_REMOTE_TAG" ]; then + abort "A remote tag named $RELEASE_TAG already exists - aborting, perhaps a bad build configuration..." fi -# Run a test build before tagging. This will also publish the snapshot artifacts to the local repo to "bootstrap" the repo. +# if this is a test build then create a temporary build branch off of RELEASE_BRANCH. This allows checkins to +# continue in RELEASE_BRANCH without affecting the release plugin work, which will fail if the branch contents +# change before it completes. +if [ "$MODE" = "production" ]; then + BUILD_BRANCH="${RELEASE_BRANCH}" +else + BUILD_BRANCH="${RELEASE_BRANCH}-test-build" +# delete the branch if it exists, so we can recreate it fresh + EXISTING_BUILD_BRANCH=`git ls-remote --heads origin "$BUILD_BRANCH"` + if [ "$EXISTING_REMOTE_TAG" ]; then + echo "Deleting remote branch origin/$BUILD_BRANCH" + git branch -D -r "origin/$BUILD_BRANCH" + echo "Deleting local branch $BUILD_BRANCH" + git branch -D "$BUILD_BRANCH" + fi + echo "Creating and checking out local branch $BUILD_BRANCH from $RELEASE_BRANCH" + git checkout -b "$BUILD_BRANCH" + echo "Creating remote branch $BUILD_BRANCH" + git push origin "$BUILD_BRANCH" +fi + + +# We should now have the build_branch checked out +echo "Current Branch is $BUILD_BRANCH" + + +# Run a test build before tagging. This will publish the snapshot artifacts to the local repo to "bootstrap" the repo. echo "Building project to ensure tests pass and to bootstrap local Maven repo (this will take about 15-30 minutes)..." # NOTE: There is no need to do a mvn clean below, since we just did either a clone or clean checkout above. @@ -347,42 +373,26 @@ echo "Test build succeeded!" # Clean up the snapshot jars produced by the test build from module target dirs. - echo "Cleaning up snapshot jars produced by test build from module target dirs..." mvn clean $MAVEN_ARGS [ "$?" -ne 0 ] && abort "Failed to cleanup snbapshot jars produced by test build from module target dirs. Please see above Maven output for details, fix any issues, then try again." -# Do a dry run of tagging the release. +# If this is a production build perform a dry run of tagging the release. Skip this for test builds to reduce the +# build time -echo "Doing a dry run of tagging the release..." -mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true" -DdryRun=true -[ "$?" -ne 0 ] && abort "Tagging dry run failed. Please see above Maven output for details, fix any issues, then try again." -mvn release:clean $MAVEN_ARGS -[ "$?" -ne 0 ] && abort "Failed to cleanup release plugin working files from tagging dry run. Please see above Maven output for details, fix any issues, then try again." -echo -echo "Tagging dry run succeeded!" - - -# If there's an existing remote tag, and we didn't abort earlier, we must be in test mode, so we can safely delete it before we call mvn release:prepare to recreate it. - -if [ -n "$EXISTING_REMOTE_TAG" ]; then - echo "A remote tag named $RELEASE_TAG already exists - deleting it, since we are in test mode..." - git push origin ":refs/tags/$RELEASE_TAG" - [ "$?" -ne 0 ] && abort "Failed to delete remote tag ($RELEASE_TAG)." -fi - - -# See if the specified tag already exists locally - if so, delete it (even if in production mode). -EXISTING_LOCAL_TAG=`git tag -l "$RELEASE_TAG"` -if [ -n "$EXISTING_LOCAL_TAG" ]; then - echo "A local tag named $RELEASE_TAG already exists - deleting it..." - git tag -d "$RELEASE_TAG" - [ "$?" -ne 0 ] && abort "Failed to delete local tag ($RELEASE_TAG)." +if [ "$MODE" = "production" ]; then + echo "Doing a dry run of tagging the release..." + mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true" -DdryRun=true + [ "$?" -ne 0 ] && abort "Tagging dry run failed. Please see above Maven output for details, fix any issues, then try again." + mvn release:clean $MAVEN_ARGS + [ "$?" -ne 0 ] && abort "Failed to cleanup release plugin working files from tagging dry run. Please see above Maven output for details, fix any issues, then try again." + echo + echo "Tagging dry run succeeded!" fi -# If the dry run succeeded, tag it for real. +# If the dry run was skipped or succeeded, tag it for real. echo "Tagging the release..." mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true" -DdryRun=false -Dusername=$GIT_USERNAME commit 436507fb74a475f4c1161becf06c5331c7ae9fbf Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 16:50:31 2010 -0400 LT commit diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp index 7b91970..2c8a8a2 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp @@ -1,121 +1,121 @@ -<%@ page language="java" %> -<%@ page errorPage="/common/Error.jsp" %> - -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> - -<script src="<html:rewrite page="/js/"/>functions.js" type="text/javascript"></script> -<link rel=stylesheet href="<html:rewrite page="/css/"/>win.css" type="text/css"> - -<hq:constant - classname="org.rhq.enterprise.gui.legacy.Constants" - symbol="MINUTES_LABEL" var="CONST_MINUTES" /> -<hq:constant - classname="org.rhq.enterprise.gui.legacy.Constants" - symbol="HOURS_LABEL" var="CONST_HOURS" /> -<hq:constant - classname="org.rhq.enterprise.gui.legacy.Constants" - symbol="DAYS_LABEL" var="CONST_DAYS" /> - - -<tiles:insert definition=".header.tab"> - <tiles:put name="tabKey" value="admin.settings.BaseConfigTab"/> -</tiles:insert> - - - -<table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> - <td width="45%" class="BlockLabel"><fmt:message key="admin.settings.BaseURL"/></td> - <td width="55%" class="BlockContent"><html:text size="31" property="baseUrl" /></td> - </tr> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.AgentMaxQuietTimeAllowed"/></td> - <td class="BlockContent"> - <table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> -<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> - <td class="ErrorField"> - <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> - </td> - <td class="ErrorField" width="100%"> - <html:select property="agentMaxQuietTimeAllowed"> - <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> - </html:select> - </td> -</logic:messagesPresent> -<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> - <td class="BlockContent"> - <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> - </td> - <td class="BlockContent" width="100%"> - <html:select property="agentMaxQuietTimeAllowed"> - <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> - </html:select> - </td> -</logic:messagesNotPresent> - </tr> -<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> - <tr> - <td class="ErrorField" colspan="2"> - <span class="ErrorFieldContent"> <html:errors property="agentMaxQuietTimeAllowedVal"/></span> - </td> - </tr> -</logic:messagesPresent> -<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> - <tr> - <td class="BlockContent" colspan="2"> - </td> - </tr> -</logic:messagesNotPresent> - </table> - </td> - </tr> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.EnableAgentAutoUpdate"/></td> - <td class="BlockContent"> - <table cellpadding="0" cellspacing="4" border="0"> - <tr> - <td align="left"><html:radio property="enableAgentAutoUpdate" value="true"/><fmt:message key="yesno.true"/></td> - <td align="left"><html:radio property="enableAgentAutoUpdate" value="false"/><fmt:message key="yesno.false"/></td> - </tr> - </table> - </td> - </tr> - -<hq:authorization permission="superuser"> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.EnableDebugMode"/></td> - <td class="BlockContent"> - <table cellpadding="0" cellspacing="4" border="0"> - <tr> - <td align="left"><html:radio property="enableDebugMode" value="true"/><fmt:message key="yesno.true"/></td> - <td align="left"><html:radio property="enableDebugMode" value="false"/><fmt:message key="yesno.false"/></td> - </tr> - </table> - </td> - </tr> -</hq:authorization> - -<fmt:message var="productName" key="product.shortName" /> -<c:if test="${productName eq 'RHQ'}"> -<hq:authorization permission="superuser"> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.EnableExperimentalFeatures"/></td> - <td class="BlockContent"> - <table cellpadding="0" cellspacing="4" border="0"> - <tr> - <td align="left"><html:radio property="enableExperimentalFeatures" value="true"/><fmt:message key="yesno.true"/></td> - <td align="left"><html:radio property="enableExperimentalFeatures" value="false"/><fmt:message key="yesno.false"/></td> - </tr> - </table> - </td> - </tr> -</hq:authorization> -</c:if> - -</table> +<%@ page language="java" %> +<%@ page errorPage="/common/Error.jsp" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> + +<script src="<html:rewrite page="/js/"/>functions.js" type="text/javascript"></script> +<link rel=stylesheet href="<html:rewrite page="/css/"/>win.css" type="text/css"> + +<hq:constant + classname="org.rhq.enterprise.gui.legacy.Constants" + symbol="MINUTES_LABEL" var="CONST_MINUTES" /> +<hq:constant + classname="org.rhq.enterprise.gui.legacy.Constants" + symbol="HOURS_LABEL" var="CONST_HOURS" /> +<hq:constant + classname="org.rhq.enterprise.gui.legacy.Constants" + symbol="DAYS_LABEL" var="CONST_DAYS" /> + + +<tiles:insert definition=".header.tab"> + <tiles:put name="tabKey" value="admin.settings.BaseConfigTab"/> +</tiles:insert> + + + +<table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td width="45%" class="BlockLabel"><fmt:message key="admin.settings.BaseURL"/></td> + <td width="55%" class="BlockContent"><html:text size="31" property="baseUrl" /></td> + </tr> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.AgentMaxQuietTimeAllowed"/></td> + <td class="BlockContent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> +<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> + <td class="ErrorField"> + <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> + </td> + <td class="ErrorField" width="100%"> + <html:select property="agentMaxQuietTimeAllowed"> + <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> + </html:select> + </td> +</logic:messagesPresent> +<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> + <td class="BlockContent"> + <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> + </td> + <td class="BlockContent" width="100%"> + <html:select property="agentMaxQuietTimeAllowed"> + <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> + </html:select> + </td> +</logic:messagesNotPresent> + </tr> +<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> + <tr> + <td class="ErrorField" colspan="2"> + <span class="ErrorFieldContent"> <html:errors property="agentMaxQuietTimeAllowedVal"/></span> + </td> + </tr> +</logic:messagesPresent> +<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> + <tr> + <td class="BlockContent" colspan="2"> + </td> + </tr> +</logic:messagesNotPresent> + </table> + </td> + </tr> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.EnableAgentAutoUpdate"/></td> + <td class="BlockContent"> + <table cellpadding="0" cellspacing="4" border="0"> + <tr> + <td align="left"><html:radio property="enableAgentAutoUpdate" value="true"/><fmt:message key="yesno.true"/></td> + <td align="left"><html:radio property="enableAgentAutoUpdate" value="false"/><fmt:message key="yesno.false"/></td> + </tr> + </table> + </td> + </tr> + +<hq:authorization permission="superuser"> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.EnableDebugMode"/></td> + <td class="BlockContent"> + <table cellpadding="0" cellspacing="4" border="0"> + <tr> + <td align="left"><html:radio property="enableDebugMode" value="true"/><fmt:message key="yesno.true"/></td> + <td align="left"><html:radio property="enableDebugMode" value="false"/><fmt:message key="yesno.false"/></td> + </tr> + </table> + </td> + </tr> +</hq:authorization> + +<fmt:message var="productName" key="product.shortName" /> +<c:if test="${productName eq 'RHQ'}"> +<hq:authorization permission="superuser"> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.EnableExperimentalFeatures"/></td> + <td class="BlockContent"> + <table cellpadding="0" cellspacing="4" border="0"> + <tr> + <td align="left"><html:radio property="enableExperimentalFeatures" value="true"/><fmt:message key="yesno.true"/></td> + <td align="left"><html:radio property="enableExperimentalFeatures" value="false"/><fmt:message key="yesno.false"/></td> + </tr> + </table> + </td> + </tr> +</hq:authorization> +</c:if> + +</table> commit fd5b4d0d7b17c983ef5424a372baab9e3fdabf6f Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 16:33:27 2010 -0400 Work to perform rhq tag release script in its own branch diff --git a/release.sh b/release.sh index 2722eda..c4b9e46 100755 --- a/release.sh +++ b/release.sh @@ -286,7 +286,6 @@ cat <<EOF >"${MAVEN_SETTINGS_FILE}" </settings> EOF - # Clone and/or checkout the source from git. if [ -d "$WORKING_DIR" ]; then @@ -328,15 +327,42 @@ if [ ! -d "$WORKING_DIR" ]; then fi -# If the specified tag already exists remotely and we're in production mode, then abort. If it exists and we're in test mode, then we'll delete it after we've had a successful dry run of release:prepare and are ready to tag. +# If the specified tag already exists then abort. It should not exist since production runs should have +# unique tags and test runs should have been done in a temporary branch EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"` -if [ -n "$EXISTING_REMOTE_TAG" ] && [ "$MODE" = "production" ]; then - abort "A remote tag named $RELEASE_TAG already exists - aborting, since we are in production mode..." +if [ -n "$EXISTING_REMOTE_TAG" ]; then + abort "A remote tag named $RELEASE_TAG already exists - aborting, perhaps a bad build configuration..." fi -# Run a test build before tagging. This will also publish the snapshot artifacts to the local repo to "bootstrap" the repo. +# if this is a test build then create a temporary build branch off of RELEASE_BRANCH. This allows checkins to +# continue in RELEASE_BRANCH without affecting the release plugin work, which will fail if the branch contents +# change before it completes. +if [ "$MODE" = "production" ]; then + BUILD_BRANCH="${RELEASE_BRANCH}" +else + BUILD_BRANCH="${RELEASE_BRANCH}-test-build" +# delete the branch if it exists, so we can recreate it fresh + EXISTING_BUILD_BRANCH=`git ls-remote --heads origin "$BUILD_BRANCH"` + if [ "$EXISTING_REMOTE_TAG" ]; then + echo "Deleting remote branch origin/$BUILD_BRANCH" + git branch -D -r "origin/$BUILD_BRANCH" + echo "Deleting local branch $BUILD_BRANCH" + git branch -D "$BUILD_BRANCH" + fi + echo "Creating and checking out local branch $BUILD_BRANCH from $RELEASE_BRANCH" + git checkout -b "$BUILD_BRANCH" + echo "Creating remote branch $BUILD_BRANCH" + git push origin "$BUILD_BRANCH" +fi + + +# We should now have the build_branch checked out +echo "Current Branch is $BUILD_BRANCH" + + +# Run a test build before tagging. This will publish the snapshot artifacts to the local repo to "bootstrap" the repo. echo "Building project to ensure tests pass and to bootstrap local Maven repo (this will take about 15-30 minutes)..." # NOTE: There is no need to do a mvn clean below, since we just did either a clone or clean checkout above. @@ -347,42 +373,26 @@ echo "Test build succeeded!" # Clean up the snapshot jars produced by the test build from module target dirs. - echo "Cleaning up snapshot jars produced by test build from module target dirs..." mvn clean $MAVEN_ARGS [ "$?" -ne 0 ] && abort "Failed to cleanup snbapshot jars produced by test build from module target dirs. Please see above Maven output for details, fix any issues, then try again." -# Do a dry run of tagging the release. +# If this is a production build perform a dry run of tagging the release. Skip this for test builds to reduce the +# build time -echo "Doing a dry run of tagging the release..." -mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true" -DdryRun=true -[ "$?" -ne 0 ] && abort "Tagging dry run failed. Please see above Maven output for details, fix any issues, then try again." -mvn release:clean $MAVEN_ARGS -[ "$?" -ne 0 ] && abort "Failed to cleanup release plugin working files from tagging dry run. Please see above Maven output for details, fix any issues, then try again." -echo -echo "Tagging dry run succeeded!" - - -# If there's an existing remote tag, and we didn't abort earlier, we must be in test mode, so we can safely delete it before we call mvn release:prepare to recreate it. - -if [ -n "$EXISTING_REMOTE_TAG" ]; then - echo "A remote tag named $RELEASE_TAG already exists - deleting it, since we are in test mode..." - git push origin ":refs/tags/$RELEASE_TAG" - [ "$?" -ne 0 ] && abort "Failed to delete remote tag ($RELEASE_TAG)." -fi - - -# See if the specified tag already exists locally - if so, delete it (even if in production mode). -EXISTING_LOCAL_TAG=`git tag -l "$RELEASE_TAG"` -if [ -n "$EXISTING_LOCAL_TAG" ]; then - echo "A local tag named $RELEASE_TAG already exists - deleting it..." - git tag -d "$RELEASE_TAG" - [ "$?" -ne 0 ] && abort "Failed to delete local tag ($RELEASE_TAG)." +if [ "$MODE" = "production" ]; then + echo "Doing a dry run of tagging the release..." + mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true" -DdryRun=true + [ "$?" -ne 0 ] && abort "Tagging dry run failed. Please see above Maven output for details, fix any issues, then try again." + mvn release:clean $MAVEN_ARGS + [ "$?" -ne 0 ] && abort "Failed to cleanup release plugin working files from tagging dry run. Please see above Maven output for details, fix any issues, then try again." + echo + echo "Tagging dry run succeeded!" fi -# If the dry run succeeded, tag it for real. +# If the dry run was skipped or succeeded, tag it for real. echo "Tagging the release..." mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true" -DdryRun=false -Dusername=$GIT_USERNAME commit c90347b67a11980287c0acce0156b4b7e2a93af8 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 29 16:18:41 2010 -0400 more script work IN PROGRESS diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js index 5c8d36a..05f8b79 100644 --- a/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js +++ b/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js @@ -22,10 +22,17 @@ */ /** - * This sample script shows how to create a Bundle by uploading an existing Bundle Distribution file. - * The Bundle uses the Ant Bundle Type provided with RHQ. + * This sample script shows how to create a Bundle by uploading an existing + * Bundle Distribution file. The Bundle uses the Ant Bundle Type provided with + * RHQ. + * <pre> * Prerequisites: - * - The "Ant Bundle Handler Server" resource must be in inventory on the target platforms + * none + * + * Usage: + * 1) start the CLI (can be downloaded from the GUI, Administration->Downloads, RHQ Client) + * 2) login user password serverHost serverPort + * 3) exec <path>/cli-1-createBundle.js */ var bundleName = 'test-bundle-upgrade-ant'; @@ -33,23 +40,17 @@ var bundleDistroV1Path = '../resources/sample-bundle-v1.zip'; // delete the test bundle if it exists var bc = new BundleCriteria(); -bc.addFilterName( bundleName ); -var bundles = BundleManager.findBundlesByCriteria( bc ); -if ( null != bundles && bundles.size() > 0 ) { - print( "\nDeleting sample bundle [" + bundleName + "] to re-run sample scripts...") - BundleManager.deleteBundle( bundles.get(0).getId() ); +bc.addFilterName(bundleName); +var bundles = BundleManager.findBundlesByCriteria(bc); +if (null != bundles && bundles.size() > 0) { + print("\nDeleting sample bundle [" + bundleName + "] to re-run sample scripts...") + BundleManager.deleteBundle(bundles.get(0).getId()); } // create bundleVersion 1.0 for the sample bundle var distributionFile = new java.io.File(bundleDistroV1Path); distributionFile = new java.io.File(distributionFile.getAbsolutePath()); Assert.assertTrue(distributionFile.exists(), "Missing ant bundle distribution file: " + distributionFile); -var bundleVersion1 = BundleManager.createBundleVersionViaFile( distributionFile ); - -print( "\nCreated Bundle [" + bundleVersion1 + "]!") - - - - - +var bundleVersion1 = BundleManager.createBundleVersionViaFile(distributionFile); +print("\nCreated Bundle [" + bundleVersion1 + "]!") commit db911f971bb286fe600c4257b85f917bb3227004 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 15:33:19 2010 -0400 BZ-607898: fix for sending alert notifications with multiple direct email addresses diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java index 02183f6..5a958b1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java @@ -118,9 +118,13 @@ public abstract class AlertSender<T extends ServerPluginComponent> { * where '|' delimits all elements as well as wraps * the entire expression. */ - @SuppressWarnings("unchecked") public static <T> List<T> unfence(String fencedData, Class<T> type) { - String[] elements = fencedData.split("\\|"); + return unfence(fencedData, type, "\\|"); + } + + @SuppressWarnings("unchecked") + public static <T> List<T> unfence(String fencedData, Class<T> type, String delimiter) { + String[] elements = fencedData.split(delimiter); List<T> results = new ArrayList<T>(elements.length); if (Integer.class.equals(type)) { diff --git a/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java b/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java index 773d99a..81b1383 100644 --- a/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java +++ b/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java @@ -40,7 +40,7 @@ public class EmailSender extends AlertSender { return new SenderResult(ResultState.FAILURE, "No email address given"); } - List<String> emails = AlertSender.unfence(emailAddressString, String.class); + List<String> emails = AlertSender.unfence(emailAddressString, String.class, ","); return new SenderResult(ResultState.DEFERRED_EMAIL, "Sending to addresses: " + emails, emails); } commit 23886a27cb17cf2ab0f707ea37c3a2bba2778b91 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 15:12:56 2010 -0400 only display the "experiemtnal features" toggle for community distributions/builds diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp index 068b230..7b91970 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp @@ -101,6 +101,8 @@ </tr> </hq:authorization> +<fmt:message var="productName" key="product.shortName" /> +<c:if test="${productName eq 'RHQ'}"> <hq:authorization permission="superuser"> <tr> <td class="BlockLabel"><fmt:message key="admin.settings.EnableExperimentalFeatures"/></td> @@ -114,5 +116,6 @@ </td> </tr> </hq:authorization> +</c:if> </table> commit ec2e38d1704d1eafd6b3349acfe66f10aff322d7 Merge: 1d53a6b... 533337f... Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jun 29 20:24:15 2010 +0200 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit 1d53a6b65e5d51456c57728c9d07bb36093df7b0 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Tue Jun 29 20:23:00 2010 +0200 BZ 560803 add index on measurement_def.numeric_type BZ 535686 add index on call time value.end_time to speed up purges diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 92ae1d2..d536ce6 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -22,7 +22,7 @@ <properties> <scm.module.path>modules/core/dbutils/</scm.module.path> - <db.schema.version>2.87</db.schema.version> + <db.schema.version>2.88</db.schema.version> </properties> <dependencies> @@ -95,9 +95,9 @@ db = project.properties.db if (db == 'dev') { - database = project.properties['rhq.dev.ds.db-name'] - } - // This is a bit of a temporary hack to work around + database = project.properties['rhq.dev.ds.db-name'] + } + // This is a bit of a temporary hack to work around // https://cvs.codehaus.org/browse/GMAVEN-46 which results in // groovy scripts not being able to get the correct values of // build properties that are overridden on the command line. @@ -105,7 +105,7 @@ // trying to use a database named rhqupgrade. else if (project.properties['upgrade.db']) { database = 'rhqupgrade' - } + } else { database = project.properties['rhq.test.ds.db-name'] } @@ -275,7 +275,7 @@ <goal>run</goal> </goals> </execution> - + <execution>  <schema-alterColumn table="RHQ_ALERT_CONDITION" column="OPTION_STATUS" columnType="VARCHAR2" precision="256" /> </schemaSpec> @@ -1805,7 +1805,7 @@ </schemaSpec> <schemaSpec version="2.61"> - <schema-createSequence name="RHQ_DISTRIBUTION_TYPE_ID_SEQ" initial="10001" /> + <schema-createSequence name="RHQ_DISTRIBUTION_TYPE_ID_SEQ" initial="10001" /> <schema-directSQL> <statement> CREATE TABLE RHQ_DISTRIBUTION_TYPE ( ID INTEGER PRIMARY KEY ) @@ -1829,12 +1829,12 @@ </schema-directSQL> <schema-createSequence name="RHQ_DISTRIBUTION_ID_SEQ" initial="10001" /> - <schema-directSQL> + <schema-directSQL> <statement desc="Creating table RHQ_DISTRIBUTION"> CREATE TABLE RHQ_DISTRIBUTION ( ID INTEGER PRIMARY KEY ) </statement> </schema-directSQL> - <schema-alterColumn table="RHQ_DISTRIBUTION" column="ID" nullable="false" /> + <schema-alterColumn table="RHQ_DISTRIBUTION" column="ID" nullable="false" /> <schema-addColumn table="RHQ_DISTRIBUTION" column="DISTRIBUTION_TYPE_ID" columnType="INTEGER" /> <schema-alterColumn table="RHQ_DISTRIBUTION" column="DISTRIBUTION_TYPE_ID" nullable="false" /> <schema-addColumn table="RHQ_DISTRIBUTION" column="LABEL" precision="64" columnType="VARCHAR2" /> @@ -1897,7 +1897,7 @@ </schemaSpec> <schemaSpec version="2.63"> - <schema-addColumn table="RHQ_REPO" column="IS_CANDIDATE" columnType="BOOLEAN" /> + <schema-addColumn table="RHQ_REPO" column="IS_CANDIDATE" columnType="BOOLEAN" /> <schema-directSQL> <statement targetDBVendor="postgresql"> @@ -1907,7 +1907,7 @@ UPDATE RHQ_REPO SET IS_CANDIDATE = 0 </statement> </schema-directSQL> - <schema-alterColumn table="RHQ_REPO" column="IS_CANDIDATE" nullable="false" /> + <schema-alterColumn table="RHQ_REPO" column="IS_CANDIDATE" nullable="false" /> </schemaSpec>  @@ -1932,7 +1932,7 @@ CREATE TABLE RHQ_DISTRIBUTION_FILE (ID INTEGER PRIMARY KEY) </statement> </schema-directSQL> - <schema-alterColumn table="RHQ_DISTRIBUTION_FILE" column="ID" nullable="false" /> + <schema-alterColumn table="RHQ_DISTRIBUTION_FILE" column="ID" nullable="false" /> <schema-addColumn table="RHQ_DISTRIBUTION_FILE" column="DISTRIBUTION_ID" columnType="INTEGER" /> <schema-alterColumn table="RHQ_DISTRIBUTION_FILE" column="DISTRIBUTION_ID" nullable="false" /> <schema-addColumn table="RHQ_DISTRIBUTION_FILE" column="RELATIVE_FILENAME" precision="256" columnType="VARCHAR2" /> @@ -2358,8 +2358,8 @@ </statement> <statement desc="Creating RHQ_BUNDLE_TYPE unique constraint"> CREATE UNIQUE INDEX RHQ_BUNDLE_TYPE_UNIQUE ON RHQ_BUNDLE_TYPE (name) - </statement> - </schema-directSQL> + </statement> + </schema-directSQL>  <schema-createSequence name="RHQ_BUNDLE_ID_SEQ" initial="10001" /> @@ -2396,12 +2396,12 @@ ADD CONSTRAINT RHQ_B_PACKAGE_TYPE_ID_FK FOREIGN KEY (PACKAGE_TYPE_ID) REFERENCES RHQ_PACKAGE_TYPE (ID) - </statement> + </statement> <statement desc="Creating RHQ_BUNDLE unique constraint"> CREATE UNIQUE INDEX RHQ_BUNDLE_UNIQUE ON RHQ_BUNDLE (bundle_type_id, name) - </statement> + </statement> </schema-directSQL> - +  <schema-createSequence name="RHQ_BUNDLE_VERSION_ID_SEQ" initial="10001" /> <schema-directSQL> @@ -2439,7 +2439,7 @@ CREATE UNIQUE INDEX RHQ_BUNDLE_VERSION_UNIQUE ON RHQ_BUNDLE_VERSION (bundle_id, name, version) </statement> </schema-directSQL> - +  <schema-directSQL> <statement desc="Creating table RHQ_BUNDLE_VERSION_REPO"> @@ -2466,7 +2466,7 @@ REFERENCES RHQ_REPO (ID) </statement> </schema-directSQL> - +  <schema-createSequence name="RHQ_BUNDLE_FILE_ID_SEQ" initial="10001" /> <schema-directSQL> @@ -2479,7 +2479,7 @@ <schema-alterColumn table="RHQ_BUNDLE_FILE" column="BUNDLE_VERSION_ID" nullable="FALSE" /> <schema-addColumn table="RHQ_BUNDLE_FILE" column="PACKAGE_VERSION_ID" columnType="INTEGER" /> <schema-alterColumn table="RHQ_BUNDLE_FILE" column="PACKAGE_VERSION_ID" nullable="FALSE" /> - + <schema-directSQL> <statement desc="Creating RHQ_BUNDLE_FILE foreign key relation to RHQ_BUNDLE_VERSION"> ALTER TABLE RHQ_BUNDLE_FILE @@ -2494,7 +2494,7 @@ REFERENCES RHQ_PACKAGE_VERSION (ID) </statement> </schema-directSQL> - +  <schema-createSequence name="RHQ_BUNDLE_DESTINATION_ID_SEQ" initial="10001" /> <schema-directSQL> @@ -2513,9 +2513,9 @@ <schema-addColumn table="RHQ_BUNDLE_DESTINATION" column="BUNDLE_ID" columnType="INTEGER" /> <schema-alterColumn table="RHQ_BUNDLE_DESTINATION" column="BUNDLE_ID" nullable="FALSE" /> <schema-addColumn table="RHQ_BUNDLE_DESTINATION" column="GROUP_ID" columnType="INTEGER" /> - <schema-alterColumn table="RHQ_BUNDLE_DESTINATION" column="GROUP_ID" nullable="FALSE" /> + <schema-alterColumn table="RHQ_BUNDLE_DESTINATION" column="GROUP_ID" nullable="FALSE" /> <schema-addColumn table="RHQ_BUNDLE_DESTINATION" column="DEPLOY_DIR" columnType="VARCHAR2" precision="256" /> - <schema-alterColumn table="RHQ_BUNDLE_DESTINATION" column="DEPLOY_DIR" nullable="FALSE" /> + <schema-alterColumn table="RHQ_BUNDLE_DESTINATION" column="DEPLOY_DIR" nullable="FALSE" /> <schema-directSQL> <statement desc="Creating RHQ_BUNDLE_DESTINATION foreign key relation to RHQ_BUNDLE"> @@ -2535,7 +2535,7 @@ ON RHQ_BUNDLE_DESTINATION (bundle_id, group_id, deploy_dir) </statement> </schema-directSQL> - +  <schema-createSequence name="RHQ_BUNDLE_DEPLOYMENT_ID_SEQ" initial="10001" /> <schema-directSQL> @@ -2561,8 +2561,8 @@ <schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT" column="ERROR_MESSAGE" columnType="LONGVARCHAR" /> <schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT" column="SUBJECT_NAME" columnType="VARCHAR2" precision="255" /> <schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT" column="IS_LIVE" columnType="BOOLEAN" /> - <schema-alterColumn table="RHQ_BUNDLE_DEPLOYMENT" column="IS_LIVE" nullable="FALSE" /> - <schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT" column="REPLACED_BUNDLE_DEPLOYMENT_ID" columnType="INTEGER" /> + <schema-alterColumn table="RHQ_BUNDLE_DEPLOYMENT" column="IS_LIVE" nullable="FALSE" /> + <schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT" column="REPLACED_BUNDLE_DEPLOYMENT_ID" columnType="INTEGER" /> <schema-directSQL> <statement desc="Creating RHQ_BUNDLE_DEPLOYMENT foreign key relation to RHQ_BUNDLE_VERSION"> @@ -2576,7 +2576,7 @@ ADD CONSTRAINT RHQ_BD_B_DESTINATION_ID_FK FOREIGN KEY (BUNDLE_DESTINATION_ID) REFERENCES RHQ_BUNDLE_DESTINATION (ID) - </statement> + </statement> <statement desc="Creating RHQ_BUNDLE_DEPLOYMENT foreign key relation to RHQ_CONFIG"> ALTER TABLE RHQ_BUNDLE_DEPLOYMENT ADD CONSTRAINT RHQ_BD_CONFIG_ID_FK @@ -2588,9 +2588,9 @@ ADD CONSTRAINT RHQ_BD_B_DEPLOYMENT_ID_FK FOREIGN KEY (REPLACED_BUNDLE_DEPLOYMENT_ID) REFERENCES RHQ_BUNDLE_DEPLOYMENT (ID) - </statement> - </schema-directSQL> - + </statement> + </schema-directSQL> +  <schema-createSequence name="RHQ_BUNDLE_RES_DEPLOY_ID_SEQ" initial="10001" /> <schema-directSQL> @@ -2622,11 +2622,11 @@ REFERENCES RHQ_RESOURCE (ID) </statement> <statement desc="Creating RHQ_BUNDLE_RES_DEPLOY unique constraint on def-resource mapping"> - CREATE UNIQUE INDEX RHQ_BUNDLE_RES_DEPLOY_MAP_IX + CREATE UNIQUE INDEX RHQ_BUNDLE_RES_DEPLOY_MAP_IX ON RHQ_BUNDLE_RES_DEPLOY (BUNDLE_DEPLOYMENT_ID, RESOURCE_ID) </statement> </schema-directSQL> - +  <schema-createSequence name="RHQ_BUNDLE_RES_DEP_HIST_ID_SEQ" initial="10001" /> <schema-directSQL> @@ -2644,7 +2644,7 @@ <schema-alterColumn table="RHQ_BUNDLE_RES_DEP_HIST" column="ACTION" nullable="FALSE" /> <schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST" column="INFO" columnType="VARCHAR2" precision="512" /> <schema-alterColumn table="RHQ_BUNDLE_RES_DEP_HIST" column="INFO" nullable="FALSE" /> - <schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST" column="CATEGORY" columnType="VARCHAR2" precision="32" /> + <schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST" column="CATEGORY" columnType="VARCHAR2" precision="32" /> <schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST" column="STATUS" columnType="VARCHAR2" precision="16" /> <schema-alterColumn table="RHQ_BUNDLE_RES_DEP_HIST" column="STATUS" nullable="FALSE" /> <schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST" column="MESSAGE" columnType="LONGVARCHAR" /> @@ -2656,7 +2656,7 @@ FOREIGN KEY (BUNDLE_RES_DEPLOY_ID) REFERENCES RHQ_BUNDLE_RES_DEPLOY (ID) </statement> - </schema-directSQL> + </schema-directSQL> </schemaSpec> <schemaSpec version="2.79"> @@ -2683,11 +2683,11 @@ ALTER TABLE RHQ_PACKAGE_BITS DROP COLUMN BITS </statement> <statement desc="Change bytea column to oid in postgres."> - ALTER TABLE RHQ_PACKAGE_BITS RENAME COLUMN NEWOID TO BITS + ALTER TABLE RHQ_PACKAGE_BITS RENAME COLUMN NEWOID TO BITS </statement> </schema-directSQL> </schemaSpec> - + <schemaSpec version="2.82"> <schema-directSQL> <statement desc="Creating table RHQ_SAVED_SEARCH"> @@ -2744,8 +2744,8 @@ CREATE TABLE RHQ_SUBJECT_ROLE_LDAP_MAP ( SUBJECT_ID INTEGER, ROLE_ID INTEGER ) </statement> <statement desc="Creating composite PK for RHQ_SUBJECT_ROLE_LDAP_MAP"> - ALTER TABLE RHQ_SUBJECT_ROLE_LDAP_MAP - ADD CONSTRAINT RHQ_SUBJECT_ROLE_LDAP_MAP_PK + ALTER TABLE RHQ_SUBJECT_ROLE_LDAP_MAP + ADD CONSTRAINT RHQ_SUBJECT_ROLE_LDAP_MAP_PK PRIMARY KEY ( SUBJECT_ID, ROLE_ID ) </statement> <statement desc="Creating FK relation to RHQ_SUBJECT table for SUBJECT_ID column"> @@ -2763,7 +2763,7 @@ </schema-directSQL> <schema-alterColumn table="RHQ_SUBJECT_ROLE_LDAP_MAP" column="SUBJECT_ID" nullable="FALSE" /> <schema-alterColumn table="RHQ_SUBJECT_ROLE_LDAP_MAP" column="ROLE_ID" nullable="FALSE" /> - +   <schema-createSequence name="RHQ_ROLE_LDAP_GROUP_ID_SEQ" initial="10001" /> @@ -2771,11 +2771,11 @@ <statement desc="Creating table RHQ_ROLE_LDAP_GROUP"> CREATE TABLE RHQ_ROLE_LDAP_GROUP ( ID INTEGER PRIMARY KEY, ROLE_ID INTEGER ) </statement> - </schema-directSQL> + </schema-directSQL> <schema-alterColumn table="RHQ_ROLE_LDAP_GROUP" column="ID" nullable="FALSE" /> <schema-alterColumn table="RHQ_ROLE_LDAP_GROUP" column="ROLE_ID" nullable="FALSE" /> <schema-addColumn table="RHQ_ROLE_LDAP_GROUP" column="LDAP_GROUP_NAME" columnType="VARCHAR2" precision="128" /> - + <schema-directSQL> <statement> ALTER TABLE RHQ_ROLE_LDAP_GROUP @@ -2787,7 +2787,7 @@ CREATE UNIQUE INDEX RHQ_ROLE_LDAP_GROUP_IDX ON RHQ_ROLE_LDAP_GROUP ( LDAP_GROUP_NAME, ROLE_ID ) </statement> - </schema-directSQL> + </schema-directSQL> </schemaSpec>  @@ -2949,7 +2949,7 @@ REFERENCES RHQ_TAGGING ( ID ) </statement> </schema-directSQL> - + <schema-directSQL> <statement> CREATE TABLE RHQ_TAGGING_BUNDLE_DEST_MAP ( BUNDLE_DESTINATION_ID INTEGER ) @@ -2976,9 +2976,9 @@ FOREIGN KEY ( TAG_ID ) REFERENCES RHQ_TAGGING ( ID ) </statement> - </schema-directSQL> + </schema-directSQL> </schemaSpec> - + <schemaSpec version="2.86"> <schema-directSQL> <statement desc="Adding MANAGE_BUNDLE permission to overlord"> @@ -2989,18 +2989,28 @@ </statement> </schema-directSQL> </schemaSpec> - + <schemaSpec version="2.87"> <schema-directSQL> <statement desc="Drop non-unique RHQ_RES_TYPE_IDX_PLG_NAME index"> DROP INDEX RHQ_RES_TYPE_IDX_PLG_NAME - </statement> - <statement desc="Recreate RHQ_RES_TYPE_IDX_PLG_NAME index as unique"> + </statement> + <statement desc="Recreate RHQ_RES_TYPE_IDX_PLG_NAME index as unique"> CREATE UNIQUE INDEX RHQ_RES_TYPE_IDX_PLG_NAME ON RHQ_RESOURCE_TYPE (name, plugin) </statement> </schema-directSQL> </schemaSpec> - + + <schemaSpec version="2.88"> + <schema-directSQL> + <statement desc="Add end time index on call time data to speed up purges"> + CREATE INDEX RHQ_CT_DA_VA_END_TIM_IDX ON RHQ_CALLTIME_DATA_VALUE (end_time) + </statement> + <statement desc="Add index on measurement definition numeric type"> + CREATE INDEX RHQ_METRIC_DEF_NT_IDX ON RHQ_MEASUREMENT_DEF (numeric_type) + </statement> + </schema-directSQL> + </schemaSpec> </dbupgrade> </target> </project> commit 533337f5538f8fea1d09cf2abf4c458106c306c3 Merge: b2bd54e... 344be2f... Author: Ian Springer <ian.springer(a)redhat.com> Date: Tue Jun 29 13:57:58 2010 -0400 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit b2bd54e4a6ac3475cc66a65ae3e4088d7ee28be3 Author: Ian Springer <ian.springer(a)redhat.com> Date: Tue Jun 29 13:55:12 2010 -0400 fix so vertical scrolling works correctly for content within RichFaces tabPanels on Resource Configuration > Current tab and Admin > Plugins pages when on IE 6/7 (https://bugzilla.redhat.com/show_bug.cgi?id=601744) diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml index aa9f90d..7629fd7 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml @@ -49,7 +49,7 @@ id - the id of the Resource being accessed </div> </div> <div id="centerContent" class="column" style="width: #{100 - UserPreferencesUIBean.leftResourceNavState}%;"> - <div id="centerContentWrapper" class="content-right"> + <div id="centerContentWrapper" class="content-right" style="position: relative"> <div style="left: 0; right: 0; height: 100%;"> <ui:insert name="summary"><p>Default Entity Summary</p></ui:insert> <ui:insert name="tabBar"><p>Default Entity TabBar</p></ui:insert> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main.xhtml index 00666c1..5031f75 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main.xhtml @@ -15,7 +15,7 @@ <ui:composition template="/rhq/layout/main-layout.xhtml"> <ui:define name="body-area"> - <div id="content-full" style="width: 100%; height: 100%; overflow: auto;"> + <div id="content-full" style="width: 100%; height: 100%; overflow: auto; position: relative"> <h:panelGroup id="Breadcrumb" layout="block" rendered="#{empty disableBreadcrumbs}"> <ui:insert name="breadcrumbs">Default Full Screen Breadcrumbs</ui:insert> </h:panelGroup> commit 344be2ff459e13af30832c48d201ac7714fe229b Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 13:47:21 2010 -0400 BZ-609158: hide "alerting on call-time data" and "group-wise call-time data view" behind the "experimental feature" conditional rendering feature diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java index ccf46dd..81648a2 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java @@ -131,7 +131,8 @@ public abstract class DefinitionFormPrepareAction extends TilesAction { if (defForm.getTraits().size() > 0 && triggerNotSet) defForm.getCondition(0).setTrigger("onTrait"); - request.setAttribute("showCalltimeMetrics", defForm.getCalltimeMetrics().size() > 0); + boolean isExperimental = LookupUtil.getSystemManager().isExperimentalFeaturesEnabled(); + request.setAttribute("showCalltimeMetrics", isExperimental && defForm.getCalltimeMetrics().size() > 0); if (defForm.getCalltimeMetrics().size() > 0 && triggerNotSet) defForm.getCondition(0).setTrigger("onCallTime"); diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/layout/main.xhtml index 5a01f31..13d1786 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/layout/main.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/layout/main.xhtml @@ -81,7 +81,9 @@ THIS TEXT WILL BE REMOVED AS WELL. <onc:subtab name="Graphs" url="/rhq/autogroup/monitor/graphs.xhtml" /> <onc:subtab name="Tables" url="/rhq/autogroup/monitor/tables.xhtml" /> <onc:subtab name="Schedules" url="/rhq/autogroup/monitor/schedules.xhtml" /> - <onc:subtab name="Response" url="/rhq/autogroup/monitor/response.xhtml" /> + <c:if test="#{GlobalPermissionsUIBean.experimental}"> + <onc:subtab name="Response" url="/rhq/autogroup/monitor/response.xhtml" /> + </c:if> </onc:tab> <onc:tab name="Events" image="/images/icons/Events_grey_16.png"> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/main.xhtml index ac806e8..08b9d77 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/main.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/main.xhtml @@ -58,7 +58,9 @@ THIS TEXT WILL BE REMOVED AS WELL. <onc:subtab name="Graphs" url="/rhq/group/monitor/graphs.xhtml"/> <onc:subtab name="Tables" url="/rhq/group/monitor/tables.xhtml"/> <onc:subtab name="Schedules" url="/rhq/group/monitor/schedules.xhtml"/> - <onc:subtab name="Response" url="/rhq/group/monitor/response.xhtml"/> + <c:if test="#{GlobalPermissionsUIBean.experimental}"> + <onc:subtab name="Response" url="/rhq/group/monitor/response.xhtml"/> + </c:if> </onc:tab> <onc:tab name="Inventory" image="/images/icons/Inventory_grey_16.png"> commit 332fe9ad8a96d058eee69285cd7960f119b9d6d5 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 13:45:07 2010 -0400 support a GLOBAL bit for toggling on/off experimental features in the product diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/config/SystemConfigForm.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/config/SystemConfigForm.java index 237858d..48694d8 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/config/SystemConfigForm.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/config/SystemConfigForm.java @@ -37,6 +37,7 @@ public class SystemConfigForm extends BaseValidatorForm { private String agentMaxQuietTimeAllowedVal = "0"; private boolean enableAgentAutoUpdate = false; private boolean enableDebugMode = false; + private boolean enableExperimentalFeatures = false; private String helpUserId = ""; private String helpPassword = ""; private String maintIntervalVal = "0"; @@ -75,6 +76,7 @@ public class SystemConfigForm extends BaseValidatorForm { buf.append(" agentMaxQuietTimeAllowed=").append(agentMaxQuietTimeAllowed); buf.append(" enableAgentAutoUpdate=").append(enableAgentAutoUpdate); buf.append(" enableDebugMode=").append(enableDebugMode); + buf.append(" enableExperimentalFeatures=").append(enableExperimentalFeatures); buf.append(" helpUserId=").append(helpUserId); buf.append(" helpPassword=").append(helpPassword); buf.append(" ldapEnabled=").append(ldapEnabled); @@ -103,6 +105,7 @@ public class SystemConfigForm extends BaseValidatorForm { agentMaxQuietTimeAllowedVal = null; enableAgentAutoUpdate = true; enableDebugMode = false; + enableExperimentalFeatures = false; helpUserId = ""; helpPassword = ""; maintInterval = ""; @@ -165,6 +168,16 @@ public class SystemConfigForm extends BaseValidatorForm { } enableDebugMode = Boolean.valueOf(enableDebugModeStr).booleanValue(); + String enableExperimentalFeaturesStr = prop.getProperty(RHQConstants.EnableExperimentalFeatures); + if (enableExperimentalFeaturesStr == null) { + enableExperimentalFeaturesStr = Boolean.FALSE.toString(); + } else if (enableExperimentalFeaturesStr.equals("0")) { + enableExperimentalFeaturesStr = Boolean.FALSE.toString(); + } else if (enableExperimentalFeaturesStr.equals("1")) { + enableExperimentalFeaturesStr = Boolean.TRUE.toString(); + } + enableExperimentalFeatures = Boolean.valueOf(enableExperimentalFeaturesStr).booleanValue(); + String maintIntervalValStr = prop.getProperty(RHQConstants.DataMaintenance); Long maintIntervalLong = new Long(maintIntervalValStr); maintInterval = findTimeUnit(maintIntervalLong.longValue()); @@ -292,6 +305,8 @@ public class SystemConfigForm extends BaseValidatorForm { prop.setProperty(RHQConstants.EnableDebugMode, String.valueOf(enableDebugMode)); + prop.setProperty(RHQConstants.EnableExperimentalFeatures, String.valueOf(enableExperimentalFeatures)); + long maintIntervalLong = convertToMillisecond(Integer.parseInt(maintIntervalVal), maintInterval); prop.setProperty(RHQConstants.DataMaintenance, String.valueOf(maintIntervalLong)); @@ -383,6 +398,14 @@ public class SystemConfigForm extends BaseValidatorForm { this.enableDebugMode = b; } + public boolean getEnableExperimentalFeatures() { + return this.enableExperimentalFeatures; + } + + public void setEnableExperimentalFeatures(boolean b) { + this.enableExperimentalFeatures = b; + } + public String getMaintIntervalVal() { return maintIntervalVal; } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authorization/GlobalPermissionsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authorization/GlobalPermissionsUIBean.java index 9cf263f..9f6ffd0 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authorization/GlobalPermissionsUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authorization/GlobalPermissionsUIBean.java @@ -23,7 +23,6 @@ import java.util.Set; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; -import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.system.SystemManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; @@ -34,6 +33,7 @@ public class GlobalPermissionsUIBean { private boolean settings; private boolean isSuperuser; private boolean isDebugMode; + private boolean isExperimental; public GlobalPermissionsUIBean() { Subject user = EnterpriseFacesContextUtility.getSubject(); @@ -48,7 +48,8 @@ public class GlobalPermissionsUIBean { } SystemManagerLocal systemManager = LookupUtil.getSystemManager(); - isDebugMode = Boolean.valueOf(systemManager.getSystemConfiguration().getProperty(RHQConstants.EnableDebugMode)); + isDebugMode = systemManager.isDebugModeEnabled(); + isExperimental = systemManager.isExperimentalFeaturesEnabled(); } public boolean isSuperuser() { @@ -59,6 +60,10 @@ public class GlobalPermissionsUIBean { return isDebugMode; } + public boolean isExperimental() { + return isExperimental; + } + public boolean isSecurity() { return security; } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java index 2c9104d..efe3dba 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java @@ -18,19 +18,23 @@ */ package org.rhq.enterprise.gui.common.framework; +import java.util.TimeZone; + +import javax.faces.component.UIComponent; + import com.sun.facelets.Facelet; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.jboss.seam.Component; + import org.rhq.core.util.maven.MavenArtifactNotFoundException; import org.rhq.core.util.maven.MavenArtifactProperties; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.system.SystemManagerLocal; import org.rhq.enterprise.server.util.LookupUtil; -import javax.faces.component.UIComponent; -import java.util.TimeZone; - /** * A JSF managed bean that exposes various general server information - RHQ version, timezone, etc. * @@ -50,6 +54,12 @@ public class ServerInfoUIBean { return Boolean.valueOf(systemManager.getSystemConfiguration().getProperty(RHQConstants.EnableDebugMode)); } + public boolean isExperimentalFeaturesEnabled() { + SystemManagerLocal systemManager = LookupUtil.getSystemManager(); + return Boolean.valueOf(systemManager.getSystemConfiguration().getProperty( + RHQConstants.EnableExperimentalFeatures)); + } + public String getFacesVersion() { return getManifestVersion(UIComponent.class); } @@ -81,11 +91,10 @@ public class ServerInfoUIBean { if (pkg != null) { version = pkg.getImplementationVersion(); if (version == null) { - version = pkg.getSpecificationVersion(); + version = pkg.getSpecificationVersion(); } } - } - catch (Exception e) { + } catch (Exception e) { log.error("Error while looking up manifest version for " + clazz + ".", e); } return version; diff --git a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties index 2d93e15..2510400 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties +++ b/modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties @@ -591,6 +591,7 @@ admin.settings.BaseURL=GUI Console URL: admin.settings.AgentMaxQuietTimeAllowed=Agent Max Quiet Time Allowed: admin.settings.EnableAgentAutoUpdate=Enable Agent Auto-Updates: admin.settings.EnableDebugMode=Enable Debug Mode: +admin.settings.EnableExperimentalFeatures=Enable Experimental Features: admin.settings.HttpProxyUrl=HTTP Proxy URL: admin.settings.HttpProxyPort=HTTP Proxy Port: admin.settings.SenderEmailAddressLabel=From Email Address: diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp index 30df9ef..068b230 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp @@ -101,4 +101,18 @@ </tr> </hq:authorization> +<hq:authorization permission="superuser"> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.EnableExperimentalFeatures"/></td> + <td class="BlockContent"> + <table cellpadding="0" cellspacing="4" border="0"> + <tr> + <td align="left"><html:radio property="enableExperimentalFeatures" value="true"/><fmt:message key="yesno.true"/></td> + <td align="left"><html:radio property="enableExperimentalFeatures" value="false"/><fmt:message key="yesno.false"/></td> + </tr> + </table> + </td> + </tr> +</hq:authorization> + </table> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java index 7bb1d72..6712b3d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java @@ -63,10 +63,12 @@ public class RHQConstants { // Are we allowing automatic AgentUpdate binary download public static final String EnableAgentAutoUpdate = "ENABLE_AGENT_AUTO_UPDATE"; - - // Are we rendering a special "debug" menu for administrators? + // Are we rendering a special "debug" menu for administrators? public static final String EnableDebugMode = "ENABLE_DEBUG_MODE"; + // Are we rendering features which are marked as experimental for this installation? + public static final String EnableExperimentalFeatures = "ENABLE_EXPERIMENTAL_FEATURES"; + // How long do we keep data compressed in hourly intervals? public static final String DataPurge1Hour = "CAM_DATA_PURGE_1H"; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java index edb5059..4dc713b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java @@ -267,7 +267,7 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot // to support Oracle (whose booleans may be 1 or 0) transform the boolean settings properly String propName = prop.getPropertyKey(); if (RHQConstants.EnableAgentAutoUpdate.equals(propName) || RHQConstants.EnableDebugMode.equals(propName) - || RHQConstants.DataReindex.equals(propName)) { + || RHQConstants.DataReindex.equals(propName) || RHQConstants.EnableExperimentalFeatures.equals(propName)) { String booleanValue = prop.getPropertyValue(); if ("0".equals(booleanValue)) { prop.setPropertyValue(Boolean.FALSE.toString()); @@ -473,8 +473,8 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot // we need to undeploy it first - on windows the files are locked and can't be renamed until undeployed ObjectName name = ObjectNameFactory.create("jboss.system:service=MainDeployer"); MBeanServerConnection mbs = MBeanServerLocator.locateJBoss(); - MainDeployerMBean mbean = (MainDeployerMBean) MBeanServerInvocationHandler.newProxyInstance(mbs, name, - MainDeployerMBean.class, false); + MainDeployerMBean mbean = (MainDeployerMBean) MBeanServerInvocationHandler.newProxyInstance(mbs, + name, MainDeployerMBean.class, false); URL url = deployedInstallWar.toURI().toURL(); String urlString = url.toString().replace("%20", " "); // bug in undeployer doesn't like %20 - it wants a real space ((MainDeployerMBean) mbean).undeploy(urlString); @@ -542,6 +542,23 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot } } + public boolean isDebugModeEnabled() { + try { + return Boolean.valueOf(getSystemConfiguration().getProperty(RHQConstants.EnableDebugMode, "false")); + } catch (Throwable t) { + return false; // paranoid catch-all + } + } + + public boolean isExperimentalFeaturesEnabled() { + try { + return Boolean.valueOf(getSystemConfiguration().getProperty(RHQConstants.EnableExperimentalFeatures, + "false")); + } catch (Throwable t) { + return false; // paranoid catch-all + } + } + /** * Retrieves the currently active license. Returns null if there is no active license. Otherwise it needs to * propogate the appropriate error back up to the caller, otherwise the error will be masked, and from a UI diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java index 18bb904..e339c8b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java @@ -150,6 +150,10 @@ public interface SystemManagerLocal { */ void loadSystemConfigurationCache(); + boolean isDebugModeEnabled(); + + boolean isExperimentalFeaturesEnabled(); + ////////////////////////////////// // license specific methods follow commit e0d9d1a44ecd4d42fc681eb0be0302578eb9191a Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 12:46:16 2010 -0400 do not update the resource type when importing/creating resources. the group category used to be based off of the explicit membership, but that assumption was changed for 1.2.0 release so we could support a compatible left-nav tree with recursive access to descendant for easy authorization. this method only modifies the implicit resource membership, not the explicit, so setResourceType would be a no-op. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java index 5e7707d..8e33ca1 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java @@ -765,8 +765,13 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso * created, but which initially creates one or more resource groups of size 1; if this happens, the * group will be created as a compatible group, if resources are later added via an inventory sync, and * if this compatible group's membership changes, we need to recalculate the group category + * + * NOTE: this is no longer true. the group category used to be based off of the explicit membership, + * but that assumption was changed for 1.2.0 release so we could support a compatible left-nav + * tree with recursive access to descendant for easy authorization. this method only modifies + * the implicit resource membership, not the explicit, so setResourceType would be a no-op. */ - setResourceType(implicitRecursiveGroupId); + //setResourceType(implicitRecursiveGroupId); } } catch (Exception e) { throw new ResourceGroupUpdateException("Could not add resource[id=" + resource.getId() @@ -923,6 +928,7 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso } @SuppressWarnings("unchecked") + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public void setResourceType(int resourceGroupId) throws ResourceGroupDeleteException { Query query = entityManager.createNamedQuery(ResourceType.QUERY_GET_EXPLICIT_RESOURCE_TYPE_COUNTS_BY_GROUP); query.setParameter("groupId", resourceGroupId); commit 0beacaaa68b779b9677851568ed2e718b5c18d0d Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 12:44:44 2010 -0400 BZ-608898: prevent deadlock during dynagroup recalculation * first add/remove resources to the recalculated group, commit that work * then reset the ResourceType on the group as necessary, based off of new membership diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index 9a11216..5570738 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -303,6 +303,14 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { groupDefinitionId, result); /* + * as a result of recalculation, the membership may have changed such that a group which was previously + * marked as compatible now becomes a mixed group. if that happens, then the GroupCategory needs to be + * updated and any compatible group constructs need to be removed from this group. the following method + * will achieve both of those goals + */ + resourceGroupManager.setResourceType(nextResourceGroupId); + + /* * remove all ids returned from the helper. by the time we're done looping over all * ExpressionEvaluator.Result objects, the remaining objects in managedResourceGroupIds should represent * groups that no longer managed by this definition (either due to an inventory or expression change), and @@ -374,8 +382,6 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { resourceGroupManager.removeResourcesFromGroup(overlord, resourceGroupId, ArrayUtils .unwrapCollection(idsToRemove)); - resourceGroupManager.setResourceType(resourceGroupId); - long endTime = System.currentTimeMillis(); log.debug("calculateGroupMembership_helper took " + (endTime - startTime) + " millis"); commit eaf523492da7127850506e4f5919b4b9ce253e24 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 12:43:15 2010 -0400 BZ-608898: when setting the ResourceGroup on an AlertDefinition, do not load existing AlertDefinitions diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java index a64de62..94ae2fe 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java @@ -518,9 +518,11 @@ public class AlertDefinition implements Serializable { public void setResourceGroup(ResourceGroup resourceGroup) { this.resourceGroup = resourceGroup; + /* if (this.resourceGroup != null) { this.resourceGroup.getAlertDefinitions().add(this); } + */ } public ResourceType getResourceType() { commit 9679c7a712fbeb644d4b01a52e347bba634195b7 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 12:42:21 2010 -0400 BZ-608898: when deleting/purging group alert definitions, only load ids diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java index e553ca8..8eb7efd 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java @@ -50,6 +50,7 @@ public class AlertDefinitionCriteria extends Criteria { private Integer filterAlertTemplateResourceTypeId; // requires overrides private String filterAlertTemplateResourceTypeName; // requires overrides private List<Integer> filterResourceIds; // requires overrides + private List<Integer> filterResourceGroupIds; // requires overrides private Boolean filterEnabled; private String filterOperationName; // requires overrides private Boolean filterDeleted; @@ -66,11 +67,12 @@ public class AlertDefinitionCriteria extends Criteria { filterOverrides.put("alertTemplateResourceTypeId", "resourceType.id = ?"); filterOverrides.put("alertTemplateResourceTypeName", "resourceType.name like ?"); filterOverrides.put("resourceIds", "resource.id IN ( ? )"); + filterOverrides.put("resourceGroupIds", "resourceGroup.id IN ( ? )"); filterOverrides.put("operationName", "operationDefinition.name like ?"); } @Override - public Class getPersistentClass() { + public Class<?> getPersistentClass() { return AlertDefinition.class; } @@ -106,6 +108,10 @@ public class AlertDefinitionCriteria extends Criteria { this.filterResourceIds = Arrays.asList(filterResourceIds); } + public void addFilterResourceGroupIds(Integer... filterResourceGroupIds) { + this.filterResourceGroupIds = Arrays.asList(filterResourceGroupIds); + } + public void addFilterEnabled(Boolean filterEnabled) { this.filterEnabled = filterEnabled; } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java index 57701ce..a2eb45e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java @@ -36,6 +36,7 @@ import org.jboss.annotation.IgnoreDependency; import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.criteria.AlertDefinitionCriteria; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageControl; @@ -45,6 +46,7 @@ import org.rhq.core.server.PersistenceUtility; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; +import org.rhq.enterprise.server.util.CriteriaQueryGenerator; /** * @author Joseph Marques @@ -330,16 +332,23 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public void purgeAllGroupAlertDefinitions(Subject subject, int resourceGroupId) { - List<AlertDefinition> groupAlertDefinitions = findGroupAlertDefinitions(subject, resourceGroupId, PageControl - .getUnlimitedInstance()); - - int i = 0; - Integer[] groupAlertDefinitionIds = new Integer[groupAlertDefinitions.size()]; - for (AlertDefinition groupAlertDefinition : groupAlertDefinitions) { - groupAlertDefinitionIds[i++] = groupAlertDefinition.getId(); - } + Integer[] groupAlertDefinitionIdsForResourceGroup = findGroupAlertDefinitionIds(resourceGroupId); + removeGroupAlertDefinitions(subject, groupAlertDefinitionIdsForResourceGroup); + } - removeGroupAlertDefinitions(subject, groupAlertDefinitionIds); + @SuppressWarnings("unchecked") + private Integer[] findGroupAlertDefinitionIds(int resourceGroupId) { + AlertDefinitionCriteria criteria = new AlertDefinitionCriteria(); + criteria.addFilterResourceGroupIds(resourceGroupId); + criteria.setPageControl(PageControl.getUnlimitedInstance()); + + CriteriaQueryGenerator generator = new CriteriaQueryGenerator(criteria); + generator.alterProjection("alertdefinition.id"); + Query query = generator.getQuery(entityManager); + List<Integer> groupAlertDefinitionIds = query.getResultList(); + + Integer[] results = groupAlertDefinitionIds.toArray(new Integer[groupAlertDefinitionIds.size()]); + return results; } public void removeGroupAlertDefinitions(Subject subject, int resourceGroupId, int[] resourceIdsToRemove) { @@ -347,13 +356,12 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana return; } - List<AlertDefinition> groupAlertDefinitions = findGroupAlertDefinitions(subject, resourceGroupId, PageControl - .getUnlimitedInstance()); + Integer[] groupAlertDefinitionIdsForResourceGroup = findGroupAlertDefinitionIds(resourceGroupId); List<Integer> allChildrenDefinitionIds = new ArrayList<Integer>(); Subject overlord = subjectManager.getOverlord(); - for (AlertDefinition groupAlertDefinition : groupAlertDefinitions) { - List<Integer> childDefinitions = getChildrenAlertDefinitionIds(subject, groupAlertDefinition.getId()); + for (Integer nextGroupAlertDefinitionId : groupAlertDefinitionIdsForResourceGroup) { + List<Integer> childDefinitions = getChildrenAlertDefinitionIds(subject, nextGroupAlertDefinitionId); allChildrenDefinitionIds.addAll(childDefinitions); alertDefinitionManager.removeAlertDefinitions(overlord, childDefinitions .toArray(new Integer[childDefinitions.size()])); commit 72f529c71dc2d472a225d84933108a9c836d2da8 Author: Joseph Marques <joseph(a)redhat.com> Date: Tue Jun 29 12:34:24 2010 -0400 remove unused dependency diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java index 991eb57..a48cd85 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java @@ -32,8 +32,6 @@ import javax.persistence.Query; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.annotation.IgnoreDependency; - import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertConditionCategory; import org.rhq.core.domain.alert.AlertConditionLog; @@ -76,9 +74,6 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal, private AuthorizationManagerLocal authorizationManager; @EJB private AlertDefinitionManagerLocal alertDefinitionManager; - @EJB - @IgnoreDependency - private AlertNotificationManagerLocal alertNotificationManager; @EJB private StatusManagerLocal agentStatusManager; commit 636aaf2c1b4b75e02c905416294384de6660b8dc Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 28 12:19:55 2010 +0200 BZ 602176 - the timeline is auto-scrollable, so that it displays in full even if it doesn't fit the screen. diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp index 85f8696..e964274 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp @@ -33,6 +33,8 @@ .timeline-band-layer-inner { font-size: smaller; } .table-start-label { font-size: smaller; } </style> + <link rel="stylesheet" type="text/css" media="screen" href="/css/win.css"/> + <link rel="stylesheet" type="text/css" media="screen" href="/css/form-style.css"/> </head> <% int eventId = WebUtility.getOptionalIntRequestParameter(request, "eventId", -1); diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline.xhtml index 1dd2c5c..0fe7d0f 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline.xhtml @@ -31,7 +31,7 @@ <h:panelGrid columns="1" width="97%"> <iframe src ="/resource/common/monitor/events/EventsView.jsp?id=#{param.id}" - width="100%" height="550" scrolling="no" frameborder="0" /> + width="100%" height="550" scrolling="auto" frameborder="0" style="min-width: 635px"/> </h:panelGrid> </rich:panel> commit c4b841ac57b3d2cc6c0302184d027d499da2375c Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 23:30:21 2010 -0400 delete obsolete call-time data code * CallTimeData reports already ensure that (schedule_id, begin_time) is unique diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java index 265c0e7..253765d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java @@ -88,12 +88,6 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi + "(schedule_id, call_destination) " + "SELECT ?, ? FROM RHQ_numbers WHERE i = 42 " + "AND NOT EXISTS (SELECT * FROM " + DATA_KEY_TABLE_NAME + " WHERE schedule_id = ? AND call_destination = ?)"; - /* - private static final String CALLTIME_VALUE_DELETE_SUPERCEDED_STATEMENT = "DELETE FROM " + DATA_VALUE_TABLE_NAME - + " WHERE key_id = " + "(SELECT id FROM " + DATA_KEY_TABLE_NAME - + " WHERE schedule_id = ? AND call_destination = ?) AND begin_time = ?"; - */ - private static final String CALLTIME_VALUE_INSERT_STATEMENT = "INSERT /*+ APPEND */ INTO " + DATA_VALUE_TABLE_NAME + "(id, key_id, begin_time, end_time, minimum, maximum, total, count) " + "SELECT %s, key.id, ?, ?, ?, ?, ?, ? FROM RHQ_numbers num, RHQ_calltime_data_key key WHERE num.i = 42 " @@ -135,32 +129,6 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi // First make sure a single row exists in the key table for each reported call destination. callTimeDataManager.insertCallTimeDataKeys(callTimeDataSet); - /* - * TODO: JM - Is this really needed? Under what circumstances are duplicates generated? Are we presuming - * this is a misbehaving plugin, or a problem at the comm-layer where the same piece of data is delivered - * twice? I'm tentatively removing this because it is a big hit to call-time data reporting performance. - * If, however, evidence is presented that implores us to bring this functionality back, it should be - * implemented by getting rid of the duplicate data points that share the same key_id and begin_time. - * These records can be found with: - * - * SELECT key_id, begin_time, count(id) - * FROM rhq_calltime_data_value - * GROUP BY key_id, begin_time - * HAVING count(id) > 1 - * - * This is functionally equivalent to the CALLTIME_VALUE_DELETE_SUPERCEDED_STATEMENT query, but takes - * advantage of the fact that key_id represents the already-computed pair of schedule_id/destination, thus - * allowing the duplicate-search to be implemented against a single table. - * - * Taking this solution one step further, an appropriate delete statement can be crafted which leverages - * the above concept but deletes all but one of the duplicates (perhaps leaving the record with the - * smallest id/pk). This purge routine can either be grouped in with the rest in DataPurgeJob, or it can - * be implemented as its own quartz job that runs more (or less) frequently, depending on our needs - * (i.e., how often we anticipate duplicates) - */ - // Delete any existing rows that have the same key and begin time as the data about to be inserted. - //callTimeDataManager.deleteRedundantCallTimeDataValues(callTimeDataSet); - // Finally, add the stats themselves to the value table. callTimeDataManager.insertCallTimeDataValues(callTimeDataSet); } @@ -373,55 +341,6 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi } /* - @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - public void deleteRedundantCallTimeDataValues(Set<CallTimeData> callTimeDataSet) { - - int[] results; - PreparedStatement ps = null; - Connection conn = null; - - try { - conn = rhqDs.getConnection(); - ps = conn.prepareStatement(CALLTIME_VALUE_DELETE_SUPERCEDED_STATEMENT); - for (CallTimeData callTimeData : callTimeDataSet) { - ps.setInt(1, callTimeData.getScheduleId()); - Set<String> callDestinations = callTimeData.getValues().keySet(); - for (String callDestination : callDestinations) { - ps.setString(2, callDestination); - CallTimeDataValue value = callTimeData.getValues().get(callDestination); - ps.setLong(3, value.getBeginTime()); - ps.addBatch(); - } - } - - results = ps.executeBatch(); - - int deletedRowCount = 0; - for (int i = 0; i < results.length; i++) { - if ((results[i] < 0) && (results[i] != -2)) // oracle returns -2 because it can't count updated rows - { - throw new MeasurementStorageException("Failed to delete redundant call-time data rows - result [" - + results[i] + "] for batch command [" + i + "] is less than 0."); - } - - deletedRowCount += results[i]; - } - - log - .debug("Deleted " - + ((deletedRowCount >= 0) ? deletedRowCount : "?") - + " redundant call-time data value rows that were superceded by data in the measurement report currently being processed."); - } catch (SQLException e) { - logSQLException("Failed to delete redundant call-time data values", e); - } catch (Throwable t) { - log.error("Failed to delete redundant call-time data values", t); - } finally { - JDBCUtil.safeClose(conn, ps, null); - } - } - */ - - /* * internal method, do not expose to the remote API */ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) commit bff7953bd68384a51ae5d9f8c629f42e3d29d9e6 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 23:28:15 2010 -0400 use hints for postgres and oracle to allow faster insertion of call-time data diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java index 5a25f85..265c0e7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.server.measurement; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.sql.Statement; import java.util.Date; import java.util.List; import java.util.Set; @@ -44,6 +45,7 @@ import org.rhq.core.db.DatabaseType; import org.rhq.core.db.DatabaseTypeFactory; import org.rhq.core.db.H2DatabaseType; import org.rhq.core.db.OracleDatabaseType; +import org.rhq.core.db.Postgresql83DatabaseType; import org.rhq.core.db.PostgresqlDatabaseType; import org.rhq.core.db.SQLServerDatabaseType; import org.rhq.core.domain.auth.Subject; @@ -78,7 +80,7 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi private static final String DATA_VALUE_TABLE_NAME = "RHQ_CALLTIME_DATA_VALUE"; private static final String DATA_KEY_TABLE_NAME = "RHQ_CALLTIME_DATA_KEY"; - private static final String CALLTIME_KEY_INSERT_STATEMENT = "INSERT INTO " + DATA_KEY_TABLE_NAME + private static final String CALLTIME_KEY_INSERT_STATEMENT = "INSERT /*+ APPEND */ INTO " + DATA_KEY_TABLE_NAME + "(id, schedule_id, call_destination) " + "SELECT %s, ?, ? FROM RHQ_numbers WHERE i = 42 " + "AND NOT EXISTS (SELECT * FROM " + DATA_KEY_TABLE_NAME + " WHERE schedule_id = ? AND call_destination = ?)"; @@ -92,7 +94,7 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi + " WHERE schedule_id = ? AND call_destination = ?) AND begin_time = ?"; */ - private static final String CALLTIME_VALUE_INSERT_STATEMENT = "INSERT INTO " + DATA_VALUE_TABLE_NAME + private static final String CALLTIME_VALUE_INSERT_STATEMENT = "INSERT /*+ APPEND */ INTO " + DATA_VALUE_TABLE_NAME + "(id, key_id, begin_time, end_time, minimum, maximum, total, count) " + "SELECT %s, key.id, ?, ?, ?, ?, ?, ? FROM RHQ_numbers num, RHQ_calltime_data_key key WHERE num.i = 42 " + "AND key.id = (SELECT id FROM " + DATA_KEY_TABLE_NAME + " WHERE schedule_id = ? AND call_destination = ?)"; @@ -312,6 +314,18 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi try { conn = rhqDs.getConnection(); DatabaseType dbType = DatabaseTypeFactory.getDatabaseType(conn); + + if (dbType instanceof Postgresql83DatabaseType) { + Statement st = null; + try { + // Take advantage of async commit here + st = conn.createStatement(); + st.execute("SET synchronous_commit = off"); + } finally { + JDBCUtil.safeClose(st); + } + } + if (dbType instanceof PostgresqlDatabaseType || dbType instanceof OracleDatabaseType || dbType instanceof H2DatabaseType) { String keyNextvalSql = JDBCUtil.getNextValSql(conn, "RHQ_calltime_data_key"); @@ -420,6 +434,18 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi try { conn = rhqDs.getConnection(); DatabaseType dbType = DatabaseTypeFactory.getDatabaseType(conn); + + if (dbType instanceof Postgresql83DatabaseType) { + Statement st = null; + try { + // Take advantage of async commit here + st = conn.createStatement(); + st.execute("SET synchronous_commit = off"); + } finally { + JDBCUtil.safeClose(st); + } + } + if (dbType instanceof PostgresqlDatabaseType || dbType instanceof OracleDatabaseType || dbType instanceof H2DatabaseType) { String valueNextvalSql = JDBCUtil.getNextValSql(conn, "RHQ_calltime_data_value"); commit 867c5b0107739274ba8ba196a00941d561eb87c5 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 22:05:17 2010 -0400 fix sorting on "total" column for "monitor > response" sub-tab for all entity contexts diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml index b2d9b12..40aabcb 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml @@ -115,7 +115,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="MAX(calltimedatavalue.total)"> + <onc:sortableColumnHeader sort="SUM(calltimedatavalue.total)"> <h:outputText value="Total" /> </onc:sortableColumnHeader> </f:facet> commit d70c9fe43f3f95ba4611b9eabaae52786721ab94 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 22:03:12 2010 -0400 fix JSF navigation rules for sort actions on group "monitor > response" sub-tab diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/measurement-navigation.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/measurement-navigation.xml index 917281b..d7ef174 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/measurement-navigation.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/measurement-navigation.xml @@ -57,14 +57,14 @@ <navigation-case>  <from-outcome>success</from-outcome> - <to-view-id>/rhq/group/monitor/response.xhtml?parent=#{param.parent}&type=#{param.type}</to-view-id> + <to-view-id>/rhq/group/monitor/response.xhtml?groupId=#{param.groupId}&category=COMPATIBLE</to-view-id> <redirect/> </navigation-case> <navigation-case>  <from-outcome>sort</from-outcome> - <to-view-id>/rhq/group/monitor/response.xhtml?parent=#{param.parent}&type=#{param.type}</to-view-id> + <to-view-id>/rhq/group/monitor/response.xhtml?groupId=#{param.groupId}&category=COMPATIBLE</to-view-id> <redirect/> </navigation-case> commit f4c6a3d30b18e70bdbb16391ade3a1e2907745ca Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 18:30:19 2010 -0400 lower some measurement schedule logging statements from INFO to DEBUG diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java index 546a020..dc1395e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java @@ -562,7 +562,9 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage + "SELECT DISTINCT ms.resource.agent.id " // + " FROM MeasurementSchedule ms " // + " WHERE ms.id IN ( " + measurementScheduleSubQuery + " ) "; - log.info("agentsQueryString: " + agentsQueryString); + if (log.isDebugEnabled()) { + log.debug("agentsQueryString: " + agentsQueryString); + } Query agentsQuery = entityManager.createQuery(agentsQueryString); agentIds = agentsQuery.getResultList(); } catch (Throwable t) { @@ -581,7 +583,9 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage + " FROM MeasurementSchedule ms " // + " WHERE ms.id IN ( " + measurementScheduleSubQuery + " ) " // + " AND ms.resource.agent.id = :agentId"; - log.info("scheduleRequestQueryString: " + scheduleRequestQueryString); + if (log.isDebugEnabled()) { + log.debug("scheduleRequestQueryString: " + scheduleRequestQueryString); + } Query scheduleRequestQuery = entityManager.createQuery(scheduleRequestQueryString); Map<Integer, ResourceMeasurementScheduleRequest> agentRequests = new HashMap<Integer, ResourceMeasurementScheduleRequest>(); @@ -654,12 +658,16 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage + "UPDATE Resource res " // + " SET res.mtime = :now " // + " WHERE res.id IN ( " + resourceSubQuery + " ) "; - log.info("markResourceQueryString: " + markResourceQueryString); + if (log.isDebugEnabled()) { + log.debug("markResourceQueryString: " + markResourceQueryString); + } Query markResourceQuery = entityManager.createQuery(markResourceQueryString); markResourceQuery.setParameter("now", System.currentTimeMillis()); int affectedRows = markResourceQuery.executeUpdate(); - log.info("Marked " + affectedRows + " for future measurement scheudle update"); + if (log.isDebugEnabled()) { + log.debug("Marked " + affectedRows + " for future measurement scheudle update"); + } } catch (Throwable t) { log.error("Could not notify agents of updates", t); } @@ -717,7 +725,11 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage updateQuery.setParameter("agentId", agentId); updateQuery.setParameter("definitionIds", measurementDefinitionIds); int updateCount = updateQuery.executeUpdate(); - log.info("" + updateCount + " resources mtime fields were updated as a result of this metric template update"); + + if (log.isDebugEnabled()) { + log.debug("" + updateCount + + " resources mtime fields were updated as a result of this metric template update"); + } } public void updateSchedulesForAutoGroup(Subject subject, int parentResourceId, int childResourceType, @@ -769,7 +781,9 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage try { AgentClient agentClient = LookupUtil.getAgentManager().getAgentClient(agent); if (agentClient.ping(2000) == false) { - log.debug("Won't send MeasurementSchedules to offline Agent[id=" + agent.getId() + "]"); + if (log.isDebugEnabled()) { + log.debug("Won't send MeasurementSchedules to offline Agent[id=" + agent.getId() + "]"); + } return false; } agentClient.getMeasurementAgentService().updateCollection(resourceMeasurementScheduleRequest); commit 77ea6433ec689ce3c58bf88bed4f8662ab7b1443 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 18:29:35 2010 -0400 BZ-608921: group-wise call-time data views * add new CallTimeDataCriteria object ** ability to filter by resource / group / auto-group * write findCallTimeDataForContext, which handles all data view queries now ** have all methods called from the UI delegate to findCallTimeDataForContext * add response.xhtml at the compatible group and auto-group levels ** add "monitor > response" tab definitions in main.xhtml layout files * add JSF navigation rules to measurement-navigation.xml files for group/autogroup enhance call-time data reporting * elide the destination column ** this prevents overflowing the horizontal area of the enclosing layout element ** only show up to the last 50 characters of the destination ** hovering over the destination field will give a tooltip with the full-length destiniation * add the ability to filter call-time data records by destination substring diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/CallTimeDataCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/CallTimeDataCriteria.java new file mode 100644 index 0000000..8156d9a --- /dev/null +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/CallTimeDataCriteria.java @@ -0,0 +1,219 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.core.domain.criteria; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.calltime.CallTimeDataValue; +import org.rhq.core.domain.util.PageOrdering; + +/** + * @author Joseph Marques + */ +@XmlRootElement +(a)XmlAccessorType(XmlAccessType.FIELD) +@SuppressWarnings("unused") +public class CallTimeDataCriteria extends Criteria { + private static final long serialVersionUID = 1L; + + private Integer filterResourceId; // requires overrides + private Integer filterResourceGroupId; // requires overrides + private Integer filterAutoGroupResourceTypeId; // requires overrides + private Integer filterAutoGroupParentResourceId; // requires overrides + private Long filterBeginTime; // requires overrides + private Long filterEndTime; // requires overrides + private Double filterMinimum; + private Double filterMaximum; + private Double filterTotal; + private Long filterCount; + private String filterDestination; // requires overrides + private DataType filterDataType = DataType.CALLTIME; // requires overrides, not user modifiable + + private PageOrdering sortMinimum; // requires overrides + private PageOrdering sortMaximum; // requires overrides + private PageOrdering sortAverage; // requires overrides + private PageOrdering sortTotal; // requires overrides + private PageOrdering sortCount; // requires overrides + + @Override + public Class<?> getPersistentClass() { + return CallTimeDataValue.class; + } + + public CallTimeDataCriteria() { + /* + filterOverrides.put("resourceId", "key.schedule.resource.id = ?"); + filterOverrides.put("resourceGroupId", "key.schedule.resource.id IN " // + + "( SELECT res.id " // + + " FROM Resource res " // + + " JOIN res.implicitGroups ig " // + + " WHERE ig.id = ? )"); + filterOverrides.put("autoGroupResourceTypeId", "key.schedule.resource.id IN " // + + "( SELECT res.id " // + + " FROM Resource res " // + + " JOIN res.resourceType type " // + + " WHERE type.id = ? )"); + filterOverrides.put("autoGroupParentResourceId", "key.schedule.resource.id IN " // + + "( SELECT res.id " // + + " FROM Resource res " // + + " JOIN res.parentResource parent " // + + " WHERE parent.id = ? )"); + */ + filterOverrides.put("resourceId", "id IN " // + + "( SELECT callData.id " // + + " FROM CallTimeDataValue callData " // + + " WHERE callData.key.schedule.resource.id = ? )"); + + filterOverrides.put("resourceGroupId", "id IN " // + + "( SELECT callData.id " // + + " FROM CallTimeDataValue callData, Resource res " // + + " JOIN res.implicitGroups ig " // + + " WHERE callData.key.schedule.resource.id = res.id " // + + " AND ig.id = ? ) "); + + filterOverrides.put("autoGroupResourceTypeId", "id IN " // + + "( SELECT callData.id " // + + " FROM CallTimeDataValue callData, Resource res " // + + " WHERE callData.key.schedule.resource.id = res.id " // + + " AND res.resourceType.id = ? )"); + + filterOverrides.put("autoGroupParentResourceId", "id IN " // + + "( SELECT callData.id " // + + " FROM CallTimeDataValue callData, Resource res " // + + " WHERE callData.key.schedule.resource.id = res.id " // + + " AND res.parentResource.id = ? )"); + + filterOverrides.put("beginTime", "beginTime > ?"); + filterOverrides.put("endTime", "endTime < ?"); + + filterOverrides.put("destination", "key.callDestination like ?"); + /* + filterOverrides.put("destination", "id IN " // + + "( SELECT callData.id " // + + " FROM CallTimeDataValue callData " // + + " WHERE callData.key.callDestination like ? )"); + */ + filterOverrides.put("dataType", "key.schedule.definition.dataType = ?"); + /* + filterOverrides.put("dataType", "id IN " // + + "( SELECT callData.id " // + + " FROM CallTimeDataValue callData " // + + " WHERE callData.key.schedule.definition.dataType = ? )"); + */ + + sortOverrides.put("minimum", "MIN(" + getAlias() + ".minimum)"); + sortOverrides.put("maximum", "MAX(" + getAlias() + ".maximum)"); + sortOverrides.put("average", "(SUM(" + getAlias() + ".total) / SUM(" + getAlias() + ".count))"); + sortOverrides.put("total", "SUM(" + getAlias() + ".total)"); + sortOverrides.put("count", "SUM(" + getAlias() + ".count)"); + + } + + public void addFilterResourceId(Integer filterResourceId) { + this.filterResourceId = filterResourceId; + } + + public void addFilterResourceGroupId(Integer filterResourceGroupId) { + this.filterResourceGroupId = filterResourceGroupId; + } + + public void addFilterAutoGroupResourceTypeId(Integer filterAutoGroupResourceTypeId) { + this.filterAutoGroupResourceTypeId = filterAutoGroupResourceTypeId; + } + + public void addFilterAutoGroupParentResourceId(Integer filterAutoGroupParentResourceId) { + this.filterAutoGroupParentResourceId = filterAutoGroupParentResourceId; + } + + public void addFilterBeginTime(Long filterBeginTime) { + this.filterBeginTime = filterBeginTime; + } + + public void addFilterEndTime(Long filterEndTime) { + this.filterEndTime = filterEndTime; + } + + public void addFilterMinimum(Double filterMinimum) { + this.filterMinimum = filterMinimum; + } + + public void addFilterMaximum(Double filterMaximum) { + this.filterMaximum = filterMaximum; + } + + public void addFilterTotal(Double filterTotal) { + this.filterTotal = filterTotal; + } + + // use basic type not object wrapper because it requires non-null value + public void addFilterCount(long filterCount) { + if (filterCount < 1) { + throw new IllegalArgumentException("Filter 'count' must be greater than 0"); + } + this.filterCount = filterCount; + } + + public void addFilterDestination(String filterDestination) { + this.filterDestination = filterDestination; + } + + public void addFilterDataType(DataType filterDataType) { + if (true) { + throw new IllegalArgumentException( + "Filter 'dataType' is not user modifiable, it must remain DataType.CALLTIME"); + } + //this.filterDataType = filterDataType; + } + + public void addSortMinimum(PageOrdering sortMinimum) { + addSortField("minimum"); + this.sortMinimum = sortMinimum; + } + + public void addSortMaximum(PageOrdering sortMaximum) { + addSortField("maximum"); + this.sortMaximum = sortMaximum; + } + + public void addSortAverage(PageOrdering sortAverage) { + addSortField("average"); + this.sortAverage = sortAverage; + } + + public void addSortTotal(PageOrdering sortTotal) { + addSortField("total"); + this.sortTotal = sortTotal; + } + + public void addSortCount(PageOrdering sortCount) { + addSortField("count"); + this.sortCount = sortCount; + } + + public boolean hasCustomizedSorting() { + return true; + } +} diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/calltime/CallTimeUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/calltime/CallTimeUIBean.java index f591ad6..c93c137 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/calltime/CallTimeUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/calltime/CallTimeUIBean.java @@ -1,16 +1,10 @@ package org.rhq.enterprise.gui.measurement.calltime; -import java.util.List; - -import javax.faces.application.FacesMessage; import javax.faces.model.DataModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.measurement.DataType; -import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; @@ -24,7 +18,6 @@ import org.rhq.enterprise.gui.util.WebUtility; import org.rhq.enterprise.server.common.EntityContext; import org.rhq.enterprise.server.measurement.CallTimeDataManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementPreferences; -import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementPreferences.MetricRangePreferences; import org.rhq.enterprise.server.util.LookupUtil; @@ -33,14 +26,15 @@ import org.rhq.enterprise.server.util.LookupUtil; */ public class CallTimeUIBean extends PagedDataTableUIBean { - private final Log log = LogFactory.getLog(this.getClass()); + private final Log log = LogFactory.getLog(CallTimeUIBean.class); public static final String MANAGED_BEAN_NAME = "CallTimeUIBean"; private CallTimeDataManagerLocal callTimeDataManager = LookupUtil.getCallTimeDataManager(); - private MeasurementScheduleManagerLocal scheduleManager = LookupUtil.getMeasurementScheduleManager(); + //private MeasurementScheduleManagerLocal scheduleManager = LookupUtil.getMeasurementScheduleManager(); private EntityContext context; + private String destinationFilter; public CallTimeUIBean() { context = WebUtility.getEntityContext(); @@ -50,6 +44,17 @@ public class CallTimeUIBean extends PagedDataTableUIBean { return this.context; } + public String getDestinationFilter() { + if (destinationFilter == null) { + destinationFilter = FacesContextUtility.getOptionalRequestParameter("callTimeForm:destinationFilter"); + } + return this.destinationFilter; + } + + public void setDestinationFilter(String destinationFilter) { + this.destinationFilter = destinationFilter; + } + @Override public DataModel getDataModel() { if (dataModel == null) { @@ -66,16 +71,17 @@ public class CallTimeUIBean extends PagedDataTableUIBean { @Override public PageList<CallTimeDataComposite> fetchPage(PageControl pc) { - Subject subject = getSubject(); WebUser user = EnterpriseFacesContextUtility.getWebUser(); MeasurementPreferences preferences = user.getMeasurementPreferences(); MetricRangePreferences rangePreferences = preferences.getMetricRangePreferences(); + /* + Subject subject = getSubject(); PageList<CallTimeDataComposite> results = new PageList<CallTimeDataComposite>(); if (context.category == EntityContext.Category.Resource) { int resourceId = getResource().getId(); - List<MeasurementSchedule> callTimeSchedules = scheduleManager - .findSchedulesForResourceAndType(subject, resourceId, DataType.CALLTIME, null, false); + List<MeasurementSchedule> callTimeSchedules = scheduleManager.findSchedulesForResourceAndType(subject, + resourceId, DataType.CALLTIME, null, false); if (callTimeSchedules.size() == 0) { FacesContextUtility.addMessage(FacesMessage.SEVERITY_WARN, "This resource does not support response time metrics."); @@ -88,15 +94,17 @@ public class CallTimeUIBean extends PagedDataTableUIBean { rangePreferences.begin, rangePreferences.end, pc); } } else if (context.category == EntityContext.Category.ResourceGroup) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_WARN, - "Response time metrics are not yet supported for compatible groups."); + results = callTimeDataManager.findCallTimeDataForCompatibleGroup(subject, context.groupId, + rangePreferences.begin, rangePreferences.end, pc); } else if (context.category == EntityContext.Category.AutoGroup) { - FacesContextUtility.addMessage(FacesMessage.SEVERITY_WARN, - "Response time metrics are not yet supported for auto-groups."); + results = callTimeDataManager.findCallTimeDataForAutoGroup(subject, context.parentResourceId, + context.resourceTypeId, rangePreferences.begin, rangePreferences.end, pc); } else { log.error(context.getUnknownContextMessage()); } - + */ + PageList<CallTimeDataComposite> results = callTimeDataManager.findCallTimeDataForContext(getSubject(), + context, rangePreferences.begin, rangePreferences.end, getDestinationFilter(), pc); return results; } } diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-auto-group/measurement-navigation.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-auto-group/measurement-navigation.xml index a21940f..2daf795 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-auto-group/measurement-navigation.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-auto-group/measurement-navigation.xml @@ -49,6 +49,26 @@ </navigation-case> </navigation-rule> + +  + <navigation-rule> + <from-view-id>/rhq/autogroup/monitor/response.xhtml</from-view-id> + + <navigation-case> +  + <from-outcome>success</from-outcome> + <to-view-id>/rhq/autogroup/monitor/response.xhtml?parent=#{param.parent}&type=#{param.type}</to-view-id> + <redirect/> + </navigation-case> + + <navigation-case> +  + <from-outcome>sort</from-outcome> + <to-view-id>/rhq/autogroup/monitor/response.xhtml?parent=#{param.parent}&type=#{param.type}</to-view-id> + <redirect/> + </navigation-case> + + </navigation-rule>  <navigation-rule> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/measurement-navigation.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/measurement-navigation.xml index fd2378b..917281b 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/measurement-navigation.xml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/measurement-navigation.xml @@ -50,4 +50,24 @@ </navigation-rule> +  + <navigation-rule> + <from-view-id>/rhq/group/monitor/response.xhtml</from-view-id> + + <navigation-case> +  + <from-outcome>success</from-outcome> + <to-view-id>/rhq/group/monitor/response.xhtml?parent=#{param.parent}&type=#{param.type}</to-view-id> + <redirect/> + </navigation-case> + + <navigation-case> +  + <from-outcome>sort</from-outcome> + <to-view-id>/rhq/group/monitor/response.xhtml?parent=#{param.parent}&type=#{param.type}</to-view-id> + <redirect/> + </navigation-case> + + </navigation-rule> + </faces-config> \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/layout/main.xhtml index 28fac3c..5a01f31 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/layout/main.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/layout/main.xhtml @@ -36,98 +36,80 @@ REQUEST PARAMETERS: THIS TEXT WILL BE REMOVED AS WELL. <ui:param name="defaultPageTitle" - value="'#{AutoGroupUIBean.parentResource.name}'.'#{AutoGroupUIBean.childResourceType.name}'" /> + value="'#{AutoGroupUIBean.parentResource.name}'.'#{AutoGroupUIBean.childResourceType.name}'" /> - <ui:define name="summary"> - - <ui:remove> -  - </ui:remove> + <ui:define name="summary"> + <ui:remove> +  + </ui:remove> <h:panelGroup layout="block" style="width: 100%; background-color: #E5E5E5;"> - - <table width="100%" style="padding-right: 20px; padding-top: 5px;" cellpadding="0" cellspacing="0"> + <tr> + <td width="30"> + <h:graphicImage value="/images/icons/Auto_group_#{AutoGroupUIBean.childResourceType.category}_up_24.png"/> + </td> + <td nowrap="nowrap"> + <h:outputText value="#{AutoGroupUIBean.childResourceType.name} AutoGroup" style="font-size: 18px;" /> + <br/> + <onc:resourceLineage resourceId="#{AutoGroupUIBean.parentResource.id}" /> + <h:outputText value=" > " /> + <h:outputLink value="/rhq/autogroup/monitor/graphs.xhtml"> + <f:param name="parent" value="#{AutoGroupUIBean.parentResource.id}" /> + <f:param name="type" value="#{AutoGroupUIBean.childResourceType.id}" /> + <h:outputText value="#{AutoGroupUIBean.childResourceType.name}" /> + </h:outputLink> + </td> + </tr> + </table> + </h:panelGroup> + + <rich:spacer height="10px"/> - <tr> - <td width="30"> - - <h:graphicImage value="/images/icons/Auto_group_#{AutoGroupUIBean.childResourceType.category}_up_24.png"/> - </td> - <td nowrap="nowrap"> - - <h:outputText value="#{AutoGroupUIBean.childResourceType.name} AutoGroup" style="font-size: 18px;" /><br/> - - - <onc:resourceLineage - resourceId="#{AutoGroupUIBean.parentResource.id}" /> - <h:outputText value=" > " /> - <h:outputLink value="/rhq/autogroup/monitor/graphs.xhtml"> - <f:param name="parent" - value="#{AutoGroupUIBean.parentResource.id}" /> - <f:param name="type" - value="#{AutoGroupUIBean.childResourceType.id}" /> - <h:outputText value="#{AutoGroupUIBean.childResourceType.name}" /> - </h:outputLink> - - </td> - </tr> - </table> - -</h:panelGroup> - - <rich:spacer height="10px"/> - - </ui:define> - - <ui:define name="tabBar"> - - <onc:tabBar selectedTabName="#{selectedTabName}"> - - <f:param name="parent" value="#{param.parent}" /> - <f:param name="type" value="#{param.type}" /> - - <onc:tab name="Monitor" image="/images/icons/Monitor_grey_16.png"> - <onc:subtab name="Graphs" - url="/rhq/autogroup/monitor/graphs.xhtml" /> - <onc:subtab name="Tables" - url="/rhq/autogroup/monitor/tables.xhtml" /> - <onc:subtab name="Schedules" - url="/rhq/autogroup/monitor/schedules.xhtml" /> - </onc:tab> - <onc:tab name="Events" image="/images/icons/Events_grey_16.png"> - <onc:subtab name="History" - url="/rhq/autogroup/events/history.xhtml" /> - </onc:tab> - - </onc:tabBar> - -  - <h:messages showSummary="false" showDetail="true" - infoClass="InfoBlock" warnClass="WarnBlock" - errorClass="ErrorBlock" fatalClass="FatalBlock" - globalOnly="true" layout="table" width="100%" /> - - </ui:define> + </ui:define> + <ui:define name="tabBar"> + + <onc:tabBar selectedTabName="#{selectedTabName}"> + <f:param name="parent" value="#{param.parent}" /> + <f:param name="type" value="#{param.type}" /> + + <onc:tab name="Monitor" image="/images/icons/Monitor_grey_16.png"> + <onc:subtab name="Graphs" url="/rhq/autogroup/monitor/graphs.xhtml" /> + <onc:subtab name="Tables" url="/rhq/autogroup/monitor/tables.xhtml" /> + <onc:subtab name="Schedules" url="/rhq/autogroup/monitor/schedules.xhtml" /> + <onc:subtab name="Response" url="/rhq/autogroup/monitor/response.xhtml" /> + </onc:tab> + + <onc:tab name="Events" image="/images/icons/Events_grey_16.png"> + <onc:subtab name="History" url="/rhq/autogroup/events/history.xhtml" /> + </onc:tab> + </onc:tabBar> + +  + <h:messages showSummary="false" + showDetail="true" + infoClass="InfoBlock" + warnClass="WarnBlock" + errorClass="ErrorBlock" + fatalClass="FatalBlock" + globalOnly="true" + layout="table" + width="100%" /> + </ui:define> <ui:define name="nav"> - <ui:include src="/rhq/resource/navigation/ResourcesTree.xhtml" /> - </ui:define> - - <ui:define name="content"> - <p /> - - <h1>Default AutoGroup Content</h1> - - <p /> - </ui:define> + <ui:define name="content"> + <p /> + <h1>Default AutoGroup Content</h1> + <p /> + </ui:define> </ui:composition> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/monitor/response.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/monitor/response.xhtml new file mode 100644 index 0000000..793cdd6 --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/autogroup/monitor/response.xhtml @@ -0,0 +1,21 @@ +<ui:composition template="/rhq/autogroup/layout/main.xhtml" + xmlns="http://www.w3.org/1999/xhtml" + 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:c="http://java.sun.com/jstl/core" + xmlns:onc="http://jboss.org/on/component" + xmlns:onf="http://jboss.org/on/function" + xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> + + <ui:param name="pageTitle" value="AutoGroup '#{AutoGroupUIBean.parentResource.name}'.'#{AutoGroupUIBean.childResourceType.name}' - Metric Response Time" /> + <ui:param name="selectedTabName" value="Monitor.Response" /> + + <ui:define name="content"> + + <ui:include src="/rhq/common/monitor/response.xhtml" /> + + </ui:define> + +</ui:composition> \ No newline at end of file diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml index d38802c..b2d9b12 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml @@ -16,27 +16,37 @@ </f:facet> <h:form id="callTimeForm"> + <a4j:keepAlive beanName="CallTimeUIBean"/> +  <c:if test="#{CallTimeUIBean.context.resourceId != -1}"> - <input type="hidden" name="id" - value="#{CallTimeUIBean.context.resourceId}" /> + <input type="hidden" name="id" value="#{CallTimeUIBean.context.resourceId}" /> </c:if> <c:if test="#{CallTimeUIBean.context.groupId != -1}"> - <input type="hidden" name="groupId" - value="#{CallTimeUIBean.context.groupId}" /> + <input type="hidden" name="groupId" value="#{CallTimeUIBean.context.groupId}" /> </c:if> <c:if test="#{CallTimeUIBean.context.parentResourceId != -1}"> - <input type="hidden" name="parent" - value="#{CallTimeUIBean.context.parentResourceId}" /> + <input type="hidden" name="parent" value="#{CallTimeUIBean.context.parentResourceId}" /> </c:if> <c:if test="#{CallTimeUIBean.context.resourceTypeId != -1}"> - <input type="hidden" name="type" - value="#{CallTimeUIBean.context.resourceTypeId}" /> + <input type="hidden" name="type" value="#{CallTimeUIBean.context.resourceTypeId}" /> </c:if> - <ui:param name="callTimeDataModel" value="#{CallTimeUIBean.dataModel}" /> + <h:panelGrid columns="3" cellspacing="3"> + <h:outputLabel for="destinationFilter" value="Destination Filter: " /> + <h:inputText id="destinationFilter" value="#{CallTimeUIBean.destinationFilter}" + onkeypress="return ignoreEnterKey(event);" + style="width: 300px;" /> + <a4j:commandButton value="GO" reRender="callTimeDataTable, callTimeDataTableScroller" + status="commonStatus" + actionListener="#{CallTimeUIBean.clearDataModel}" + styleClass="buttonmed"> + <s:defaultAction/> + </a4j:commandButton> + </h:panelGrid> + <ui:param name="callTimeDataModel" value="#{CallTimeUIBean.dataModel}" /> <rich:dataTable id="callTimeDataTable" value="#{callTimeDataModel}" rows="#{PageControl.CallTimeHistory.pageSize}" @@ -54,7 +64,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="key.callDestination"> + <onc:sortableColumnHeader sort="calltimedatavalue.key.callDestination"> <h:outputText value="Destination" /> </onc:sortableColumnHeader> </f:facet> @@ -63,7 +73,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="SUM(value.count)"> + <onc:sortableColumnHeader sort="SUM(calltimedatavalue.count)"> <h:outputText value="Request Count" /> </onc:sortableColumnHeader> </f:facet> @@ -72,7 +82,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="MIN(value.minimum)"> + <onc:sortableColumnHeader sort="MIN(calltimedatavalue.minimum)"> <h:outputText value="Minimum" /> </onc:sortableColumnHeader> </f:facet> @@ -83,7 +93,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="(SUM(value.total)/SUM(value.count))"> + <onc:sortableColumnHeader sort="SUM(calltimedatavalue.total)/SUM(calltimedatavalue.count)"> <h:outputText value="Average" /> </onc:sortableColumnHeader> </f:facet> @@ -94,7 +104,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="MAX(value.maximum)"> + <onc:sortableColumnHeader sort="MAX(calltimedatavalue.maximum)"> <h:outputText value="Maximum" /> </onc:sortableColumnHeader> </f:facet> @@ -102,10 +112,21 @@ <f:converter converterId="ShortDurationConverter"/> </h:outputText> </rich:column> + + <rich:column> + <f:facet name="header"> + <onc:sortableColumnHeader sort="MAX(calltimedatavalue.total)"> + <h:outputText value="Total" /> + </onc:sortableColumnHeader> + </f:facet> + <h:outputText value="#{item.total}"> + <f:converter converterId="ShortDurationConverter"/> + </h:outputText> + </rich:column> <f:facet name="footer"> <rich:columnGroup> - <rich:column colspan="5" width="100%"> + <rich:column colspan="6" width="100%"> <ui:param name="paginationDataTableName" value="callTimeDataTable" /> <ui:param name="paginationDataModel" value="#{callTimeDataModel}" /> <ui:param name="paginationPageControl" value="#{PageControl.CallTimeHistory}" /> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/main.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/main.xhtml index 51b9a88..ac806e8 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/main.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/main.xhtml @@ -58,6 +58,7 @@ THIS TEXT WILL BE REMOVED AS WELL. <onc:subtab name="Graphs" url="/rhq/group/monitor/graphs.xhtml"/> <onc:subtab name="Tables" url="/rhq/group/monitor/tables.xhtml"/> <onc:subtab name="Schedules" url="/rhq/group/monitor/schedules.xhtml"/> + <onc:subtab name="Response" url="/rhq/group/monitor/response.xhtml"/> </onc:tab> <onc:tab name="Inventory" image="/images/icons/Inventory_grey_16.png"> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/monitor/response.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/monitor/response.xhtml new file mode 100644 index 0000000..44cbcfa --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/monitor/response.xhtml @@ -0,0 +1,21 @@ +<ui:composition template="/rhq/group/layout/main.xhtml" + xmlns="http://www.w3.org/1999/xhtml" + 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:c="http://java.sun.com/jstl/core" + xmlns:onc="http://jboss.org/on/component" + xmlns:onf="http://jboss.org/on/function" + xmlns:a4j="https://ajax4jsf.dev.java.net/ajax" + xmlns:rich="http://richfaces.ajax4jsf.org/rich"> + + <ui:param name="pageTitle" value="#{ResourceGroupUIBean.groupCategoryName} '#{ResourceGroupUIBean.name}' - Metric Response Time" /> + <ui:param name="selectedTabName" value="Monitor.Response" /> + + <ui:define name="content"> + + <ui:include src="/rhq/common/monitor/response.xhtml" /> + + </ui:define> + +</ui:composition> \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java index c6a43b8..5a25f85 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java @@ -47,6 +47,7 @@ import org.rhq.core.db.OracleDatabaseType; import org.rhq.core.db.PostgresqlDatabaseType; import org.rhq.core.db.SQLServerDatabaseType; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.criteria.CallTimeDataCriteria; import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.calltime.CallTimeData; import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite; @@ -61,7 +62,10 @@ import org.rhq.enterprise.server.alert.engine.AlertConditionCacheManagerLocal; import org.rhq.enterprise.server.alert.engine.AlertConditionCacheStats; import org.rhq.enterprise.server.authz.AuthorizationManagerLocal; import org.rhq.enterprise.server.authz.PermissionException; +import org.rhq.enterprise.server.common.EntityContext; import org.rhq.enterprise.server.measurement.instrumentation.MeasurementMonitor; +import org.rhq.enterprise.server.util.CriteriaQueryGenerator; +import org.rhq.enterprise.server.util.CriteriaQueryRunner; /** * The manager for call-time metric data. @@ -149,7 +153,7 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi * Taking this solution one step further, an appropriate delete statement can be crafted which leverages * the above concept but deletes all but one of the duplicates (perhaps leaving the record with the * smallest id/pk). This purge routine can either be grouped in with the rest in DataPurgeJob, or it can - * be implemented as its own quartz job that runs more (or less) frequently, depending on how needs + * be implemented as its own quartz job that runs more (or less) frequently, depending on our needs * (i.e., how often we anticipate duplicates) */ // Delete any existing rows that have the same key and begin time as the data about to be inserted. @@ -196,15 +200,69 @@ public class CallTimeDataManagerBean implements CallTimeDataManagerLocal, CallTi } public PageList<CallTimeDataComposite> findCallTimeDataForCompatibleGroup(Subject subject, int groupId, - int measurementDefinitionId, long beginTime, long endTime, PageControl pageControl) { - // TODO - return null; + long beginTime, long endTime, PageControl pageControl) { + return findCallTimeDataForContext(subject, EntityContext.forGroup(groupId), beginTime, endTime, null, + pageControl); } public PageList<CallTimeDataComposite> findCallTimeDataForAutoGroup(Subject subject, int parentResourceId, - int childResourceTypeId, int measurementDefinitionId, long beginTime, long endTime, PageControl pageControl) { - // TODO - return null; + int childResourceTypeId, long beginTime, long endTime, PageControl pageControl) { + return findCallTimeDataForContext(subject, EntityContext.forAutoGroup(parentResourceId, childResourceTypeId), + beginTime, endTime, null, pageControl); + } + + public PageList<CallTimeDataComposite> findCallTimeDataForContext(Subject subject, EntityContext context, + long beginTime, long endTime, String destination, PageControl pageControl) { + + // lookup measurement definition id + + CallTimeDataCriteria criteria = new CallTimeDataCriteria(); + criteria.addFilterBeginTime(beginTime); + criteria.addFilterEndTime(endTime); + if (destination != null && !destination.trim().equals("")) { + criteria.addFilterDestination(destination); + } + + pageControl.initDefaultOrderingField("SUM(calltimedatavalue.total)/SUM(calltimedatavalue.count)", + PageOrdering.DESC); // only set if no ordering yet specified + pageControl.addDefaultOrderingField("calltimedatavalue.key.callDestination", PageOrdering.ASC); // add this to sort, if not already specified + criteria.setPageControl(pageControl); + + //criteria.addSortAverage(PageOrdering.DESC); + + if (context.category == EntityContext.Category.Resource) { + criteria.addFilterResourceId(context.resourceId); + } else if (context.category == EntityContext.Category.ResourceGroup) { + criteria.addFilterResourceGroupId(context.groupId); + } else if (context.category == EntityContext.Category.AutoGroup) { + criteria.addFilterAutoGroupParentResourceId(context.parentResourceId); + criteria.addFilterAutoGroupResourceTypeId(context.resourceTypeId); + } + + CriteriaQueryGenerator generator = new CriteriaQueryGenerator(criteria); + String replacementSelectList = "" // + + " new org.rhq.core.domain.measurement.calltime.CallTimeDataComposite( " // + + " calltimedatavalue.key.callDestination, " // + + " MIN(calltimedatavalue.minimum), " // + + " MAX(calltimedatavalue.maximum), " // + + " SUM(calltimedatavalue.total), " // + + " SUM(calltimedatavalue.count), " // + + " SUM(calltimedatavalue.total) / SUM(calltimedatavalue.count) ) "; + generator.alterProjection(replacementSelectList); + generator.setGroupByClause("calltimedatavalue.key.callDestination"); + + if (authorizationManager.isInventoryManager(subject) == false) { + generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.RESOURCE, + "key.schedule.resource", subject.getId()); + } + + //log.info(generator.getParameterReplacedQuery(false)); + //log.info(generator.getParameterReplacedQuery(true)); + + CriteriaQueryRunner<CallTimeDataComposite> queryRunner = new CriteriaQueryRunner<CallTimeDataComposite>( + criteria, generator, entityManager); + PageList<CallTimeDataComposite> results = queryRunner.execute(); + return results; } /** diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerLocal.java index ce2615c..6c0180b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerLocal.java @@ -29,6 +29,7 @@ import org.rhq.core.domain.measurement.calltime.CallTimeData; import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.server.common.EntityContext; /** * The manager for call-time metric data. @@ -40,11 +41,14 @@ public interface CallTimeDataManagerLocal { PageList<CallTimeDataComposite> findCallTimeDataForResource(Subject subject, int scheduleId, long beginTime, long endTime, PageControl pageControl);; - PageList<CallTimeDataComposite> findCallTimeDataForCompatibleGroup(Subject subject, int groupId, - int measurementDefinitionId, long beginTime, long endTime, PageControl pageControl); + PageList<CallTimeDataComposite> findCallTimeDataForCompatibleGroup(Subject subject, int groupId, long beginTime, + long endTime, PageControl pageControl); PageList<CallTimeDataComposite> findCallTimeDataForAutoGroup(Subject subject, int parentResourceId, - int childResourceTypeId, int measurementDefinitionId, long beginTime, long endTime, PageControl pageControl); + int childResourceTypeId, long beginTime, long endTime, PageControl pageControl); + + PageList<CallTimeDataComposite> findCallTimeDataForContext(Subject subject, EntityContext context, long beginTime, + long endTime, String destination, PageControl pageControl); int purgeCallTimeData(Date deleteUpToTime) throws SQLException; commit 635f40e0c8d5320535ae76a3460f6f90a3032b25 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 18:23:12 2010 -0400 enhance CriteriaQueryGenerator for queries with groupBy clauses * be able to generate count-queries for statements containing groupBy clauses diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java index 9680e43..459d7d4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java @@ -281,7 +281,13 @@ public final class CriteriaQueryGenerator { StringBuilder results = new StringBuilder(); results.append("SELECT "); if (countQuery) { - results.append("COUNT(").append(alias).append(")").append(NL); + if (groupByClause == null) { // non-grouped method + results.append("COUNT(").append(alias).append(")").append(NL); + } else { + // gets the count of the number of aggregate/grouped rows + // NOTE: this only works when the gorupBy is a single element, as opposed to a list of elements + results.append("COUNT(DISTINCT ").append(groupByClause).append(")").append(NL); + } } else { if (projection == null) { results.append(alias).append(NL); commit ed2e74b6d29dc707ad401874fdb0a48d386b86a8 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 18:21:29 2010 -0400 BZ-608920 - fix pagination/sorting for event>history * pagination was failed because empty "details" filter wasn't being interpreted as null * sorting was broken becauset the native SQL solutio nwas replaced by criteria API, use uses as a different alias scheme diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml index 65ae270..a6b25a7 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history.xhtml @@ -105,7 +105,7 @@ <rich:column style="white-space: nowrap;"> <f:facet name="header"> - <onc:sortableColumnHeader sort="ev.severity"> + <onc:sortableColumnHeader sort="severity"> <h:outputText styleClass="headerText" value="Severity" /> </onc:sortableColumnHeader> </f:facet> @@ -121,7 +121,7 @@ <rich:column rendered="#{EventHistoryUIBean.context.resourceId == -1}"> <f:facet name="header"> - <onc:sortableColumnHeader sort="res.name"> + <onc:sortableColumnHeader sort="resource.name"> <h:outputText styleClass="headerText" value="Resource" /> </onc:sortableColumnHeader> </f:facet> @@ -130,7 +130,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="evs.location"> + <onc:sortableColumnHeader sort="location"> <h:outputText styleClass="headerText" value="Source" /> </onc:sortableColumnHeader> </f:facet> @@ -152,7 +152,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="ev.timestamp"> + <onc:sortableColumnHeader sort="timestamp"> <h:outputText styleClass="headerText" value="Time occurred" /> </onc:sortableColumnHeader> </f:facet> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java index ebbe99b..8f89095 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java @@ -373,8 +373,12 @@ public class EventManagerBean implements EventManagerLocal, EventManagerRemote { criteria.addFilterStartTime(begin); criteria.addFilterEndTime(end); criteria.addFilterSeverities(severities); - criteria.addFilterSourceName(source); - criteria.addFilterDetail(detail); + if (source != null && !source.trim().equals("")) { + criteria.addFilterSourceName(source); + } + if (detail != null && !detail.trim().equals("")) { + criteria.addFilterDetail(detail); + } criteria.setPageControl(pc); @@ -408,6 +412,9 @@ public class EventManagerBean implements EventManagerLocal, EventManagerRemote { "source.resource", subject.getId()); } + //log.info(generator.getParameterReplacedQuery(false)); + //log.info(generator.getParameterReplacedQuery(true)); + CriteriaQueryRunner<EventComposite> queryRunner = new CriteriaQueryRunner<EventComposite>(criteria, generator, entityManager); return queryRunner.execute(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java index 8d6e518..9680e43 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java @@ -397,12 +397,7 @@ public final class CriteriaQueryGenerator { } // order by clause - boolean overridden = true; - PageControl pc = criteria.getPageControlOverrides(); - if (pc == null) { - overridden = false; - pc = getPageControl(criteria); - } + PageControl pc = getPageControl(criteria); boolean first = true; for (OrderingField orderingField : pc.getOrderingFields()) { commit be48faf5f78f6f5ba33f3ab63c96a48e156fd6f7 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 18:14:47 2010 -0400 add more trace statements so that future pagination/sorting bugs are easier to discover diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PagedListDataModel.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PagedListDataModel.java index ca3f353..0b1614f 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PagedListDataModel.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PagedListDataModel.java @@ -119,9 +119,11 @@ public abstract class PagedListDataModel<T> extends DataModel { private PageList<T> getPage() { // ensure page exists - first time going to this view if (pageList == null) { + log.trace("pageList was null, will get PageControl then load the page"); PageControl pageControl = getPageControl(); PageList<T> results = getDataPage(pageControl); pageList = results; + log.trace("pageList was loaded, found " + (pageList == null ? "null" : pageList.size() + " result items")); } return pageList; @@ -153,14 +155,21 @@ public abstract class PagedListDataModel<T> extends DataModel { endRow = startRow + nRows - 1; } + if (log.isTraceEnabled()) { + log.trace("getRowData(" + currentRowIndex + "): startRow=" + startRow + ", endRow=" + endRow); + } // paging backwards - will we ever get in this if-statement if pageControl.getPageSize == SIZE_UNLIMITED? if (currentRowIndex < startRow) { int rowsBack = startRow - currentRowIndex; int pagesBack = (int) Math.ceil(rowsBack / (double) pageControl.getPageSize()); int newPage = pageControl.getPageNumber() - pagesBack; + if (log.isTraceEnabled()) { + log.trace("paging down by " + rowsBack + " rows / " + pagesBack + " pages, new page is " + newPage); + } if (newPage < 0) { newPage = 0; + log.trace("newPage was negative, setting page to 0"); } pageControl.setPageNumber(newPage); @@ -173,6 +182,9 @@ public abstract class PagedListDataModel<T> extends DataModel { int rowsForward = currentRowIndex - endRow; int pagesForward = (int) Math.ceil(rowsForward / (double) pageControl.getPageSize()); int newPage = pageControl.getPageNumber() + pagesForward; + if (log.isTraceEnabled()) { + log.trace("paging up by " + rowsForward + " rows / " + pagesForward + " pages, new page is " + newPage); + } pageControl.setPageNumber(newPage); pageList = getDataPage(pageControl); @@ -187,7 +199,12 @@ public abstract class PagedListDataModel<T> extends DataModel { * a default PageControl object for this PageControlView */ int getIndex = currentRowIndex - startRow; + if (log.isTraceEnabled()) { + log.trace("currentRowIndex=" + currentRowIndex + ", startRow=" + startRow + ", getIndex=" + getIndex + + ", pageListSize=" + pageList.size()); + } if (getIndex < 0 || getIndex >= pageList.size()) { + log.trace("getIndex is out of pageList's bounds, getting default page control"); // getting the default will repersist the new PageControl too pageControl = getDefaultPageControl(); pageList = getDataPage(pageControl); @@ -195,8 +212,16 @@ public abstract class PagedListDataModel<T> extends DataModel { // pageControl startRow should now be zero this.currentRowIndex = 0; // and tell the framework to start back at 0 getIndex = 0; // now the getIndex should be 0 + + if (log.isTraceEnabled()) { + log.trace("currentRowIndex=" + currentRowIndex + ", startRow=" + startRow + ", getIndex=" + getIndex + + ", pageListSize=" + pageList.size()); + } } + if (log.isTraceEnabled() && pageList.get(getIndex) == null) { + log.trace("Data item at position " + getIndex + " was null"); + } return pageList.get(getIndex); } @@ -242,7 +267,11 @@ public abstract class PagedListDataModel<T> extends DataModel { public PageControl getPageControl() { WebUser user = EnterpriseFacesContextUtility.getWebUser(); - return getPagedDataTableUIBean().getPageControl(user, pageControlView); + PageControl pageControl = getPagedDataTableUIBean().getPageControl(user, pageControlView); + if (log.isTraceEnabled()) { + log.trace("getPageControl() -->" + pageControl); + } + return pageControl; } public PageControl getDefaultPageControl() { @@ -251,6 +280,9 @@ public abstract class PagedListDataModel<T> extends DataModel { } public void setPageControl(PageControl pageControl) { + if (log.isTraceEnabled()) { + log.trace("setPageControl(" + pageControl + ")"); + } WebUser user = EnterpriseFacesContextUtility.getWebUser(); getPagedDataTableUIBean().setPageControl(user, pageControlView, pageControl); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java index d2c712e..202084c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java @@ -29,11 +29,17 @@ import java.util.List; import javax.persistence.EntityManager; import javax.persistence.Query; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.rhq.core.domain.criteria.Criteria; +import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; public class CriteriaQueryRunner<T> { + private static final Log LOG = LogFactory.getLog(CriteriaQueryRunner.class); + private Criteria criteria; private CriteriaQueryGenerator queryGenerator; private EntityManager entityManager; @@ -59,13 +65,19 @@ public class CriteriaQueryRunner<T> { long count = (Long) countQuery.getSingleResult(); List<T> results = query.getResultList(); + if (LOG.isDebugEnabled()) { + LOG.debug("resultSize=" + results.size() + ", count=" + count); + } + if (autoInitializeBags && (!queryGenerator.getPersistentBagFields().isEmpty())) { for (T entity : results) { initPersistentBags(entity); } } - return new PageList<T>(results, (int) count, CriteriaQueryGenerator.getPageControl(criteria)); + PageControl pageControl = CriteriaQueryGenerator.getPageControl(criteria); + PageList<T> pagedResults = new PageList<T>(results, (int) count, pageControl); + return pagedResults; } public void initPersistentBags(Object entity) { commit b915bdd6ccedda48d32ac968c774761a1db4b470 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 01:39:03 2010 -0400 elide call-time destination so the data does not overflow horizontal borders diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml index 7ba5f44..d38802c 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response.xhtml @@ -58,7 +58,7 @@ <h:outputText value="Destination" /> </onc:sortableColumnHeader> </f:facet> - <h:outputText value="#{item.callDestination}" /> + <h:outputText value="#{onf:elideString(item.callDestination, 50, 'left')}" title="#{item.callDestination}"/> </rich:column> <rich:column> commit b33f05dc1fa3f3dd403b192ffec6a319799c216b Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 01:35:09 2010 -0400 cosmetic - use generics properly to get rid of warning suppression diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java index 5ceec84..ebbe99b 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java @@ -304,7 +304,6 @@ public class EventManagerBean implements EventManagerLocal, EventManagerRemote { return results; } - @SuppressWarnings("unchecked") public EventSeverity[] getSeverityBucketsByContext(Subject subject, EntityContext context, long begin, long end, int bucketCount) { @@ -327,7 +326,8 @@ public class EventManagerBean implements EventManagerLocal, EventManagerRemote { "source.resource", subject.getId()); } - CriteriaQueryRunner<Object[]> queryRunner = new CriteriaQueryRunner(criteria, generator, entityManager); + CriteriaQueryRunner<Object[]> queryRunner = new CriteriaQueryRunner<Object[]>(criteria, generator, + entityManager); PageList<Object[]> flyWeights = queryRunner.execute(); EventSeverity[] buckets = new EventSeverity[bucketCount]; @@ -390,7 +390,6 @@ public class EventManagerBean implements EventManagerLocal, EventManagerRemote { return findEventCompositesByCriteria(subject, criteria); } - @SuppressWarnings("unchecked") public PageList<EventComposite> findEventCompositesByCriteria(Subject subject, EventCriteria criteria) { CriteriaQueryGenerator generator = new CriteriaQueryGenerator(criteria); String replacementSelectList = "" // @@ -409,7 +408,8 @@ public class EventManagerBean implements EventManagerLocal, EventManagerRemote { "source.resource", subject.getId()); } - CriteriaQueryRunner<EventComposite> queryRunner = new CriteriaQueryRunner(criteria, generator, entityManager); + CriteriaQueryRunner<EventComposite> queryRunner = new CriteriaQueryRunner<EventComposite>(criteria, generator, + entityManager); return queryRunner.execute(); } commit e677753f9e98f966b75bf0dccfc4fb9125f0acda Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 01:34:37 2010 -0400 add the ability to give the criteria class author full control over sorting * if hasCustomizedSorting () returns true, CriteriaQueryGenenerator will not prepend auto-generated entity alias to sort fields diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java index c08aa5d..d4e3fcb 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java @@ -122,6 +122,16 @@ public abstract class Criteria implements Serializable { this.pageControlOverrides = pageControl; } + /* + * By default, the ordering fields are automatically prepend with the alias of entity that this criteria object + * wraps. However, some authors of criteria objects want full control of this alias during sort operations. if + * this method returns true, then the alias will not be prepend to the generated "order by" clause, which makes + * author responsible for constructing the fully-qualified ordering token for each sort override. + */ + public boolean hasCustomizedSorting() { + return false; + } + public void clearPaging() { PageControl unlimited = PageControl.getUnlimitedInstance(); this.pageNumber = unlimited.getPageNumber(); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java index cb10f56..8d6e518 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java @@ -417,9 +417,14 @@ public final class CriteriaQueryGenerator { String override = criteria.getJPQLSortOverride(fieldName); String suffix = (override == null) ? fieldName : override; - // if the suffix is numerical, do not prefix the alias - // this allows us to sort by column ordinal, which is required for availability on the group browser - String sortFragment = (isNumber(suffix)) ? suffix : (alias + "." + suffix); + /* + * do not prefix the alias when: + * + * 1) if the suffix is numerical, which allows usto sort by column ordinal + * 2) if the user wants full control and has explicitly chosen to disable alias prepending + */ + boolean doNotPrefixAlias = isNumber(suffix) || criteria.hasCustomizedSorting(); + String sortFragment = doNotPrefixAlias ? suffix : (alias + "." + suffix); PageOrdering ordering = orderingField.getOrdering(); commit d57176a120c5089d00e9b97a7d5eb88453e76912 Author: Joseph Marques <joseph(a)redhat.com> Date: Mon Jun 28 01:33:16 2010 -0400 criteria objects should use numeric wrappers not basic types * using numberic wrappers allows users to unset the item by passing null. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java index 9912c1c..f7dbb6a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java @@ -27,6 +27,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; import org.rhq.core.domain.event.Event; import org.rhq.core.domain.event.EventSeverity; @@ -35,6 +36,7 @@ import org.rhq.core.domain.util.PageOrdering; /** * @author Joseph Marques */ +@XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) @SuppressWarnings("unused") public class EventCriteria extends Criteria { @@ -96,11 +98,11 @@ public class EventCriteria extends Criteria { this.filterSourceName = filterSourceName; } - public void addFilterStartTime(long filterStartTime) { + public void addFilterStartTime(Long filterStartTime) { this.filterStartTime = filterStartTime; } - public void addFilterEndTime(long filterEndTime) { + public void addFilterEndTime(Long filterEndTime) { this.filterEndTime = filterEndTime; } commit 8ee84404d4128c9ac14db267214c658c6d062a55 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jun 28 16:30:27 2010 -0400 Move etc/samples/sample-bundle to etc/samples/provisioning/sample-bundle diff --git a/etc/samples/provisioning/sample-bundle/pom.xml b/etc/samples/provisioning/sample-bundle/pom.xml new file mode 100644 index 0000000..6bd4a88 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/pom.xml @@ -0,0 +1,92 @@ +<?xml version="1.0"?> + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.rhq.sample</groupId> + <artifactId>rhq-sample-bundle</artifactId> + <version>2.0</version> + <packaging>pom</packaging> + + <name>RHQ Sample Bundle</name> + <description>a sample bundle consisting of JBossAS 6.0 running the Java Petstore application</description> + + <scm> + <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/etc/modules/sample-bundle/</connection> + <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/etc/modules/sample-bundle/</developerConnection> + </scm> + + <properties> +  + <derbyclient.version>10.5.3.0_1</derbyclient.version> + </properties> + + <dependencies> + +  + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbyclient</artifactId> + <version>${derbyclient.version}</version> + </dependency> + + </dependencies> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-bundle</id> + <phase>process-resources</phase> + <configuration> + <tasks> + <echo>settings.localRepository=${settings.localRepository}</echo> + <echo>project.build.outputDirectory=${project.build.outputDirectory}</echo> + <ant antfile="src/main/scripts/build.xml"> + <property name="settings.localRepository" value="${settings.localRepository}"/> + <property name="project.version" value="${project.version}"/> + <property name="project.build.outputDirectory" value="${project.build.outputDirectory}"/> + <property name="derbyclient.version" value="${derbyclient.version}"/> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/scripts/assembly.xml</descriptor> + </descriptors> + <finalName>${project.build.finalName}</finalName> + </configuration> + <executions> + <execution> + <id>assemble-bundle</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/bundle/deploy.xml b/etc/samples/provisioning/sample-bundle/src/main/bundle/deploy.xml new file mode 100644 index 0000000..8bfec17 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/bundle/deploy.xml @@ -0,0 +1,57 @@ +<?xml version="1.0"?> + +<project name="petstore" default="main" + xmlns:rhq="antlib:org.rhq.bundle"> + + <rhq:bundle name="Java Petstore" version="2.0" + description="a sample bundle consisting of JBossAS 6.0 running the Java Petstore application"> + + <rhq:input-property + name="jboss.bind.address" + description="the IP address the JBoss AS server should bind to" + required="true"/> + + <rhq:input-property + name="http.port" + description="the HTTP port the JBoss AS server should listen on" + required="true" + type="integer"/> + + <rhq:input-property + name="https.port" + description="the HTTPS port the JBoss AS server should listen on" + required="true" + type="integer"/> + + <rhq:deployment-unit name="appserver" + preinstallTarget="appserver-preinstall" postinstallTarget="appserver-postinstall"> + <rhq:system-service name="jbossas-petstore" scriptFile="jbossas-init-script" + configFile="jbossas-init-config" overwriteScript="true" + startLevels="3,4,5" startPriority="80" stopPriority="20"/> + + <rhq:archive name="jbossas-petstore.zip"/> + +  + <rhq:ignore> + <rhq:fileset> + <include name="server/default/data/**"/> + <include name="server/default/logs/**"/> + <include name="server/default/tmp/**"/> + <include name="server/default/work/**"/> + </rhq:fileset> + </rhq:ignore> + </rhq:deployment-unit> + + </rhq:bundle> + + <target name="main"/> + + <target name="appserver-preinstall"> + <echo>Installing Java Petstore App Server to ${rhq.deploy.dir}...</echo> + </target> + + <target name="appserver-postinstall"> + <echo>Done installing Java Petstore App Server to ${rhq.deploy.dir}.</echo> + </target> + +</project> diff --git a/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-config b/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-config new file mode 100644 index 0000000..a2fc4c1 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-config @@ -0,0 +1,69 @@ +# Configuration file for jbossas init script that configures the +# settings needed to start a particular JBoss AS instance. + +# +# the JBoss AS installation directory (e.g. /opt/jboss-6.0.0.M1) +# (*REQUIRED*) +# +JBOSS_HOME="@@rhq.deploy.dir@@" + +# +# the args that will be passed to run.sh +# (i.e. org.jboss.Main). +# +JBOSS_OPTS="-b @@jboss.bind.address@@" + +# What UNIX user the JBoss AS java process will run as. +# (The shutdown client is always run as the invoker of the +# init script). JBoss AS will be run as root by default, but, for +# the sake of security, it is recommended that you chown the JBoss +# AS installation files to a non-root user and use that use here. +# Note, you do need to run as root if your server will listen on one +# or more privileged (< 1024) ports. If you really do want to run as +# root, comment out the JBOSS_USER variable completely (i.e. do not +# set it to root). This will run the server process without "su". +#JBOSS_USER=jboss + +# +# Specify the maximum file descriptor limit, use "max" or "maximum" to use +# the default, as queried by the system. +# +# Defaults to "maximum" +# +#MAX_FD="maximum" + +# +# Specify the profiler configuration file to load. +# +# Default is to not load profiler configuration file. +# +#PROFILER= + +# +# Specify the location of the Java Rntime Environment (JRE) or +# Java Development Kit (JDK) installation directory. If not set, +# "/usr/java/default" will be used. +# +#JAVA_HOME="/usr/java/default" + +# +# Specify options to pass to the Java VM (if unset, a default +# set of options will be used). +# +# Note, if you want to pass the default options but some of +# your own additional options in, then set the +# ADDITIONAL_JAVA_OPTS variable (see below), rather than JAVA_OPTS. +# +#JAVA_OPTS="-Xms128M -Xmx512M -XX:MaxPermSize=256M -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djava.net.preferIPv4Stack=true" + +# +# Specify additional options to pass to the Java VM. These are passed +# in addition to the default set of options, +# i.e. java $JAVA_OPTS $ADDITIONAL_JAVA_OPTS ... org.jboss.Main ... +# +# Sample JPDA settings (uncomment either a) or b)) +# a) remote socket debugging +#ADDITIONAL_JAVA_OPTS="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" +# b) shared memory debugging +#ADDITIONAL_JAVA_OPTS="-Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss" + diff --git a/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-script b/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-script new file mode 100644 index 0000000..58eb98e --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-script @@ -0,0 +1,328 @@ +#!/bin/bash +# +# jbossas - This shell script takes care of starting and stopping +# a JBoss Application Server (AS) instance on a Red Hat +# Linux system. It can be run as a system service (init +# script) and/or run manually. +# +# chkconfig: 345 84 16 +# description: JBoss AS server +# processname: java +# pidfile: /var/run/jbossas.pid + +# Source init-script function library. +FUNCTIONS=/etc/rc.d/init.d/functions +if [ ! -f "$FUNCTIONS" ]; then + echo "Functions library ($FUNCTIONS) not found." >&2 + exit 1 +fi +. $FUNCTIONS + +# Find the name of this service (e.g. "jbossas"). +NAME=`basename $0` +if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]; then + NAME=${NAME:3} +fi + +# Set names of pid, lock, and log files - all based on the service name. +PIDFILE="/var/run/$NAME.pid" +LOCKFILE="/var/lock/subsys/$NAME" +LOGFILE="/var/log/$NAME.log" + +# Set defaults for optional configuration variables. +JAVA_HOME="/usr/java/default" +JAVA_OPTS="-Xms128M -Xmx512M -XX:MaxPermSize=256M" +JAVA_OPTS="$JAVA_OPTS -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" +# (Prefer IPv4 stack as as temporary workaround to avoid 'all' config startup +# issues from IPv4 multicast addresses. See JBAS-7936.) +JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true" + +# Source the service's config file, potentially overriding the defaults set +# above. +CONFIG="/etc/sysconfig/${NAME}" +if [ ! -f "$CONFIG" ]; then + echo "Required configuration file $CONFIG not found." >&2 + exit 1 +fi +. "$CONFIG" + +# Bail out if required variables were not set in the config file. +if [ -z "$JBOSS_HOME" ]; then + echo "Required variable JBOSS_HOME was not set in $CONFIG." >&2 + exit 1 +fi + + +start() +{ + # See if the service is already running, and, if so, exit with an error. + PID=`pidfileofproc "$NAME"` + if [ -n "$PID" ]; then + # pid file exists - see if process is actually running. + kill -0 $PID 2>/dev/null + if [ $? -eq 0 ]; then + echo "$NAME service is already running (pid=$PID)." >&2 + exit 1 + else + echo "Removing bogus pid file $PIDFILE..." + rm -f "$PIDFILE" + if [ -f "$LOCKFILE" ]; then + echo "Removing bogus lock file $LOCKFILE..." + rm -f "$LOCKFILE" + fi + fi + fi + + # Check that JAVA_HOME is valid. + JAVA="$JAVA_HOME/bin/java" + if [ ! -f "$JAVA" ]; then + echo "Java not found at $JAVA - please set JAVA_HOME in $CONFIG." >&2 + exit 1 + fi + if [ ! -x "$JAVA" ]; then + echo "$JAVA is not executable." >&2 + exit 5 + fi + + # Setup the classpath + JBOSS_BOOT_CLASSPATH="$JBOSS_HOME/bin/run.jar" + if [ ! -f "$JBOSS_BOOT_CLASSPATH" ]; then + echo "Missing required file: $JBOSS_BOOT_CLASSPATH" >&2 + exit 1 + fi + + # By default, Tomcat uses the JDT Compiler for compiling JSPs. However, + # include tools.jar in the classpath if we can find it under JAVA_HOME + # or if the user specified it via the JAVAC_JAR variable. + JAVAC_JAR_FILE="${JAVAC_JAR:-$JAVA_HOME/lib/tools.jar}" + if [ ! -f "$JAVAC_JAR_FILE" ]; then + [ -n "$JAVAC_JAR" ] && echo "Missing javac jar file $JAVAC_JAR as defined by the JAVAC_JAR variable. Unexpected results may occur." + unset JAVAC_JAR_FILE + fi + + # If -server not set in JAVA_OPTS, set it, if supported. + SERVER_SET=`echo $JAVA_OPTS | grep "\-server"` + if [ -z "$SERVER_SET" ]; then + # Check for Sun JVM w/ HotSpot support. + HAS_HOTSPOT=`"$JAVA" -version 2>&1 | grep -i HotSpot` + + # Check for OpenJDK JVM w/ server support. + HAS_OPENJDK=`"$JAVA" -version 2>&1 | grep -i OpenJDK` + + # Enable -server if we have Hotspot or OpenJDK, unless we can't + if [ -n "$HAS_HOTSPOT" ] || [ -n "$HAS_OPENJDK" ]; then + JAVA_OPTS="-server $JAVA_OPTS" + fi + fi + + # Setup JBoss-specific properties. + JAVA_OPTS="-Dprogram.name=$NAME $JAVA_OPTS" + + # Setup JBoss Native library path. + unset JBOSS_NATIVE_DIR + for DIR in "$JBOSS_HOME/../native/lib" "$JBOSS_HOME/../native" "$JBOSS_HOME/../native/lib64" "$JBOSS_HOME/native/lib64" "$JBOSS_HOME/native/bin" "$JBOSS_HOME/bin/native"; do + if [ -d "$DIR" ]; then + JBOSS_NATIVE_DIR=`cd "$DIR/.." && pwd` + break + fi + done + if [ -d "$JBOSS_NATIVE_DIR" ]; then + IS_64_BIT_JVM=`"$JAVA" $JAVA_OPTS -version 2>&1 | grep -i 64-bit` + if [ -n "$IS_64_BIT_JVM" ]; then + JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64" + else + JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib" + fi + LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH + JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$LD_LIBRARY_PATH" + fi + + # Setup the Java endorsed dirs. + JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=\"$JBOSS_ENDORSED_DIRS\"" + + # Setup the Java classpath. + JBOSS_CLASSPATH="${JBOSS_CLASSPATH:+$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH}" + JBOSS_CLASSPATH="${JBOSS_CLASSPATH:-$JBOSS_BOOT_CLASSPATH}" + JBOSS_CLASSPATH="$JBOSS_CLASSPATH${JAVAC_JAR_FILE:+:$JAVAC_JAR_FILE}" + JAVA_OPTS="$JAVA_OPTS -classpath \"$JBOSS_CLASSPATH\"" + + # Display a summary of our environment if we're associated with a terminal. + if tty -s; then + echo "========================================================================="; echo + echo " JBoss AS Bootstrap Environment" ; echo + echo " JBOSS_HOME: $JBOSS_HOME" ; echo + echo " JAVA: $JAVA" ; echo + echo " JAVA_OPTS: $JAVA_OPTS" ; echo + echo " JBOSS_OPTS: $JBOSS_OPTS" ; echo + echo "========================================================================="; echo + fi + + # JBoss AS expects its current working dir to be $JBOSS_HOME/bin + cd "$JBOSS_HOME/bin" + + # JBoss AS expects JBOSS_HOME to be set in its environment. + export JBOSS_HOME + + # We only need to bother with nohup if we're associated with a terminal. + if tty -s; then + NOHUP=nohup + else + unset NOHUP + fi + + # If they set NICELEVEL in the config file, honor it. + [ -n "${NICELEVEL:-}" ] && NICE="nice -n $NICELEVEL" + + # If JBOSS_USER was specified in the config and current user is root, we + # want to setuid the JBoss AS process to JBOSS_USER. + if [ -n "$JBOSS_USER" ] && [ "$EUID" -eq 0 ]; then + # For SELinux we need to use 'runuser', not 'su'. + if [ -x /sbin/runuser ]; then + SU=runuser + else + SU=su + fi + else + unset SU + fi + + if [ -n "$SU" ]; then + WRAPPER="$NOHUP $NICE $SU -s /bin/bash - $JBOSS_USER -c" + else + WRAPPER="$NOHUP $NICE bash -c" + fi + + # Make sure log file exists and has correct ownership and permissions. + if [ "$EUID" -eq 0 ]; then + touch -a "$LOGFILE" || exit 4 + [ -n "$JBOSS_USER" ] && chown $JBOSS_USER "$LOGFILE" + [ -n "$JBOSS_GROUP" ] && chgrp $JBOSS_GROUP "$LOGFILE" + chmod u=rw "$LOGFILE" + [ -n "$JBOSS_GROUP" ] && chmod g+r "$LOGFILE" + [ -x /sbin/restorecon ] && /sbin/restorecon "$LOGFILE" + fi + + # Make sure pid file has correct ownership and permissions. + if [ "$EUID" -eq 0 ] && [ -f "$PIDFILE" ]; then + [ -n "$JBOSS_USER" ] && chown $JBOSS_USER "$PIDFILE" + [ -n "$JBOSS_GROUP" ] && chgrp $JBOSS_GROUP "$PIDFILE" + chmod u=rw "$PIDFILE" + [ -n "$JBOSS_GROUP" ] && chmod g+r + [ -x /sbin/restorecon ] && /sbin/restorecon "$PIDFILE" + fi + + echo -n "Starting $NAME service: " + + # Make sure to escape the $$'s within the subshell to prevent our own shell + # from evaluating them and writing our own pid to the pid file. + $WRAPPER "echo \$\$ >\"$PIDFILE\" || ( echo \"Failed to write pid (\$\$) to $PIDFILE.\" >&2; exit 4 ); exec \"$JAVA\" $JAVA_OPTS org.jboss.Main $JBOSS_OPTS" >>"$LOGFILE" 2>&1 & + if [ $? -ne 0 ]; then + failure "$NAME startup" + echo + EXIT_STATUS=$? + fi + + # Wait a few seconds and then check that the process is running. Note, this + # will *not* verify that JBoss AS started properly without any configuration + # or deployment errors. + sleep 3 + + if pidfileofproc "$NAME"; then + success "$NAME startup" + echo + touch "$LOCKFILE" + EXIT_STATUS=0 + else + failure "$NAME startup" + echo + EXIT_STATUS=1 + fi +} + +stop() +{ + # See if service is running, and, if not, exit without any error. + PID=`pidfileofproc "$NAME"` + unset NOT_RUNNING + if [ -z "$PID" ]; then + NOT_RUNNING=1 + else + # pid file exists - see if process is actually running. + kill -0 $PID 2>/dev/null + if [ $? -ne 0 ]; then + NOT_RUNNING=1 + if [ -f "$PIDFILE" ]; then + echo "Removing bogus pid file $PIDFILE..." + rm -f "$PIDFILE" + fi + if [ -f "$LOCKFILE" ]; then + echo "Removing bogus lock file $LOCKFILE..." + rm -f "$LOCKFILE" + fi + fi + fi + if [ -n "$NOT_RUNNING" ]; then + echo "$NAME service is not running." + exit 0 + fi + + echo -n "Stopping $NAME service: " + killproc -d 30 "$NAME" + EXIT_STATUS=$? + if [ $EXIT_STATUS -eq 0 ]; then + rm -f "$LOCKFILE" + fi + echo +} + +# NOTE: We don't name this function 'status', since that would override the +# 'status function defined in /etc/init.d/functions. +_status() +{ + status "$NAME" + EXIT_CODE=$? +} + +restart() +{ + stop || exit $? + start +} + +condrestart() +{ + [ -f "$PIDFILE" ] && restart +} + +usage() +{ + echo "Usage: $NAME {start|stop|status|restart|condrestart}" >&2 + EXIT_CODE=2 +} + +# The +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + _status + ;; + restart) + restart + ;; + condrestart) + condrestart + ;; + *) + usage + ;; +esac + +exit $EXIT_STATUS + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/petstore-db.changelog.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/petstore-db.changelog.xml new file mode 100644 index 0000000..42ced88 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/petstore-db.changelog.xml @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd"> + <changeSet author="ips (generated)" id="1272025063915-1"> + <createTable schemaName="APP" tableName="ADDRESS"> + <column name="ADDRESSID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635960"/> + </column> + <column name="STREET1" type="VARCHAR(55)"> + <constraints nullable="false"/> + </column> + <column name="STREET2" type="VARCHAR(55)"/> + <column name="CITY" type="VARCHAR(55)"> + <constraints nullable="false"/> + </column> + <column name="STATE" type="VARCHAR(25)"> + <constraints nullable="false"/> + </column> + <column name="ZIP" type="VARCHAR(5)"> + <constraints nullable="false"/> + </column> + <column name="LATITUDE" type="DECIMAL(14,10)"> + <constraints nullable="false"/> + </column> + <column name="LONGITUDE" type="DECIMAL(14,10)"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-2"> + <createTable schemaName="APP" tableName="CATEGORY"> + <column name="CATEGORYID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635550"/> + </column> + <column name="NAME" type="VARCHAR(25)"> + <constraints nullable="false"/> + </column> + <column name="DESCRIPTION" type="VARCHAR(255)"> + <constraints nullable="false"/> + </column> + <column name="IMAGEURL" type="VARCHAR(55)"/> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-3"> + <createTable schemaName="APP" tableName="ID_GEN"> + <column name="GEN_KEY" type="VARCHAR(20)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636590"/> + </column> + <column name="GEN_VALUE" type="INT"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-4"> + <createTable schemaName="APP" tableName="ITEM"> + <column name="ITEMID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636230"/> + </column> + <column name="PRODUCTID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + <column name="NAME" type="VARCHAR(30)"> + <constraints nullable="false"/> + </column> + <column name="DESCRIPTION" type="VARCHAR(500)"> + <constraints nullable="false"/> + </column> + <column name="IMAGEURL" type="VARCHAR(55)"/> + <column name="IMAGETHUMBURL" type="VARCHAR(55)"/> + <column name="PRICE" type="DECIMAL(14,2)"> + <constraints nullable="false"/> + </column> + <column name="ADDRESS_ADDRESSID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + <column name="CONTACTINFO_CONTACTINFOID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + <column name="TOTALSCORE" type="INT"> + <constraints nullable="false"/> + </column> + <column name="NUMBEROFVOTES" type="INT"> + <constraints nullable="false"/> + </column> + <column name="DISABLED" type="INT"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-5"> + <createTable schemaName="APP" tableName="PRODUCT"> + <column name="PRODUCTID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635740"/> + </column> + <column name="CATEGORYID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + <column name="NAME" type="VARCHAR(25)"> + <constraints nullable="false"/> + </column> + <column name="DESCRIPTION" type="VARCHAR(255)"> + <constraints nullable="false"/> + </column> + <column name="IMAGEURL" type="VARCHAR(55)"/> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-6"> + <createTable schemaName="APP" tableName="SELLERCONTACTINFO"> + <column name="CONTACTINFOID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636080"/> + </column> + <column name="LASTNAME" type="VARCHAR(24)"> + <constraints nullable="false"/> + </column> + <column name="FIRSTNAME" type="VARCHAR(24)"> + <constraints nullable="false"/> + </column> + <column name="EMAIL" type="VARCHAR(24)"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-7"> + <createTable schemaName="APP" tableName="TAG"> + <column name="TAGID" type="INT"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636830"/> + </column> + <column name="TAG" type="VARCHAR(30)"> + <constraints nullable="false"/> + </column> + <column name="REFCOUNT" type="INT"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-8"> + <createTable schemaName="APP" tableName="TAG_ITEM"> + <column name="TAGID" type="INT"> + <constraints nullable="false"/> + </column> + <column name="ITEMID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-9"> + <createTable schemaName="APP" tableName="ZIPLOCATION"> + <column name="ZIPCODE" type="INT"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636710"/> + </column> + <column name="CITY" type="VARCHAR(30)"> + <constraints nullable="false"/> + </column> + <column name="STATE" type="VARCHAR(2)"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-10"> + <createIndex indexName="SQL100422173636831" schemaName="APP" tableName="TAG" unique="true"> + <column name="TAG"/> + </createIndex> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-11"> + <createIndex indexName="SQL100422173637010" schemaName="APP" tableName="TAG_ITEM" unique="true"> + <column name="TAGID"/> + <column name="ITEMID"/> + </createIndex> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-12"> + <addForeignKeyConstraint baseColumnNames="ADDRESS_ADDRESSID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636231" deferrable="false" initiallyDeferred="false" referencedColumnNames="ADDRESSID" referencedTableName="ADDRESS" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-13"> + <addForeignKeyConstraint baseColumnNames="CONTACTINFO_CONTACTINFOID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636233" deferrable="false" initiallyDeferred="false" referencedColumnNames="CONTACTINFOID" referencedTableName="SELLERCONTACTINFO" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-14"> + <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636232" deferrable="false" initiallyDeferred="false" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-15"> + <addForeignKeyConstraint baseColumnNames="CATEGORYID" baseTableName="PRODUCT" baseTableSchemaName="APP" constraintName="SQL100422173635741" deferrable="false" initiallyDeferred="false" referencedColumnNames="CATEGORYID" referencedTableName="CATEGORY" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-16"> + <addForeignKeyConstraint baseColumnNames="ITEMID" baseTableName="TAG_ITEM" baseTableSchemaName="APP" constraintName="SQL100422173637011" deferrable="false" initiallyDeferred="false" referencedColumnNames="ITEMID" referencedTableName="ITEM" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-17"> + <addForeignKeyConstraint baseColumnNames="TAGID" baseTableName="TAG_ITEM" baseTableSchemaName="APP" constraintName="SQL100422173637012" deferrable="false" initiallyDeferred="false" referencedColumnNames="TAGID" referencedTableName="TAG" referencedTableSchemaName="APP"/> + </changeSet> +</databaseChangeLog> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml new file mode 100644 index 0000000..ae5ea7c --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<datasources> + + <local-tx-datasource> + +  +  + <jndi-name>jdbc/PetstoreDB</jndi-name> + +  + <connection-url>jdbc:derby://localhost:1527/petstore;create=true</connection-url> + +  + <driver-class>org.apache.derby.jdbc.ClientDriver</driver-class> + +  + <user-name>APP</user-name> + <password>APP</password> + +  + <min-pool-size>5</min-pool-size> + +  + <max-pool-size>20</max-pool-size> + +  + <idle-timeout-minutes>5</idle-timeout-minutes> + +  + <track-statements/> + + </local-tx-datasource> + +</datasources> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml new file mode 100644 index 0000000..eadc0f4 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4"> + + <display-name>Java Pet Store</display-name> + + <module> + <web> + <web-uri>petstore.war</web-uri> + <context-root>/petstore</context-root> + </web> + </module> + + <module> + <ejb>petstore-ejb.jar</ejb> + </module> + +</application> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml new file mode 100644 index 0000000..76e0703 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> + + <persistence-unit name="PetstorePu"> + <description>Petstore Persistence Unit</description> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>java:jdbc/PetstoreDB</jta-data-source> + <non-jta-data-source>java:jdbc/PetstoreDB</non-jta-data-source> + <properties> + <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/> + <property name="hibernate.connection.username" value="APP"/> + <property name="hibernate.connection.password" value="APP"/> + <property name="hibernate.format_sql" value="true"/> + </properties> + </persistence-unit> + +</persistence> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class new file mode 100644 index 0000000..c9dc392 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class new file mode 100644 index 0000000..be2275b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class new file mode 100644 index 0000000..8842106 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class new file mode 100644 index 0000000..dda3feb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class new file mode 100644 index 0000000..b5dbe74 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class new file mode 100644 index 0000000..1b5785b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class new file mode 100644 index 0000000..591af10 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF new file mode 100644 index 0000000..7a679c4 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.7.1 +Created-By: 16.0-b13 (Sun Microsystems Inc.) + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class new file mode 100644 index 0000000..abac5a6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class new file mode 100644 index 0000000..7d7af77 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class new file mode 100644 index 0000000..b8bfa4d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class new file mode 100644 index 0000000..8c469f4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class new file mode 100644 index 0000000..e2b4ca5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class new file mode 100644 index 0000000..223289e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class new file mode 100644 index 0000000..61f3863 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class new file mode 100644 index 0000000..7c149e3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class new file mode 100644 index 0000000..c5fb59a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class new file mode 100644 index 0000000..65d4cdb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class new file mode 100644 index 0000000..1ee72ad Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class new file mode 100644 index 0000000..f56c35e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class new file mode 100644 index 0000000..56fc53d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class new file mode 100644 index 0000000..ee55705 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class new file mode 100644 index 0000000..30e70ab Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class new file mode 100644 index 0000000..dd5b7c1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class new file mode 100644 index 0000000..03400b2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class new file mode 100644 index 0000000..23a204c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class new file mode 100644 index 0000000..18f8102 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class new file mode 100644 index 0000000..b6e2b0d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class new file mode 100644 index 0000000..be21196 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class new file mode 100644 index 0000000..185dc01 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class new file mode 100644 index 0000000..18b3463 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class new file mode 100644 index 0000000..0c448bf Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class new file mode 100644 index 0000000..4a19fad Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class new file mode 100644 index 0000000..a8b6521 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class new file mode 100644 index 0000000..2b42389 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class new file mode 100644 index 0000000..8ab0084 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class new file mode 100644 index 0000000..a4cc2bf Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class new file mode 100644 index 0000000..50007c4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class new file mode 100644 index 0000000..1ef9761 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class new file mode 100644 index 0000000..5570fac Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties new file mode 100644 index 0000000..112905d --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties @@ -0,0 +1,10 @@ +index.exception=An exception was encountered while indexing the data. Please checked to make sure there indexes are not locked by another user. +index.sql.statement=Select statement used for retrieving database data "{0}" +search.string=Searching indexes for string "{0}" +search.results=Search String returned "{0}" hits +search.exception=An exception was encountered while performing the search. Please check to make sure the indexes exist. +fileupload.persist.exception=Error persisting seller data +fileupload.rollback.exception=Persisting seller data, rollback failed +geocoder.lookup.exception=The GeoCode address lookup from Yahoo has returned and Exception +image_does_not_exist=The image doesn't exist in the default image directory or in the upload directory "{0}" +resource_bundle_does_not_exist=The MessageStrings.properties file does not exist!. diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties new file mode 100644 index 0000000..7ca2d9d --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties @@ -0,0 +1,10 @@ +invalid_contact_firstname=First Name is required. +invalid_contact_lastname=Last Name is required. +invalid_address_street1=Street is required. +invalid_address_city=City is required. +invalid_address_state=State is required. +invalid_address_zip=Zip Code is required. +invalid_item_name=Pet Name is required. +invalid_item_description=The Description should exist and the field can't have a '<script>' and/or a '<link>' tag in it. +invalid_item_price=Price should should exist and be a number greater or equal to 0. +invalid_item_imageurl=The image upload file must exist and be of type '.jpg', '.gif' or '.png'. diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class new file mode 100644 index 0000000..5aa4b42 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class new file mode 100644 index 0000000..a521d71 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml new file mode 100644 index 0000000..22f03df --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml @@ -0,0 +1,94 @@ +<?xml version='1.0' encoding='UTF-8'?> + + + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" + version="1.2"> +  + +  + <managed-bean> + <managed-bean-name>SearchBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.search.SearchBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>RatingBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.model.RatingBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>itemId</property-name> + <value>#{param.itemIdBinding}</value> + </managed-property> + </managed-bean> + + <managed-bean> + <managed-bean-name>PayPalBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.model.PayPalBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>FileUploadBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.FileUploadBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>MapBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.mapviewer.MapBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>AutocompleteBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.AutocompleteBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>AddressBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.AddressBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + +  + <navigation-rule> + <from-view-id>/mapLocation.jsp</from-view-id> + <navigation-case> + <from-outcome>map</from-outcome> + <to-view-id>/map.jsp</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/mapAll.jsp</from-view-id> + <navigation-case> + <from-outcome>map</from-outcome> + <to-view-id>/map.jsp</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/map.jsp</from-view-id> + <navigation-case> + <to-view-id>/mapLocation.jsp</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/search.jsp</from-view-id> + <navigation-case> + <from-outcome>displayResults</from-outcome> + <to-view-id>/search.jsp</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>map</from-outcome> + <to-view-id>/map.jsp</to-view-id> + </navigation-case> + </navigation-rule> + +</faces-config> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml new file mode 100644 index 0000000..0862993 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-web> + <resource-ref> + <res-ref-name>jdbc/PetstoreDB</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <jndi-name>java:jdbc/PetstoreDB</jndi-name> + </resource-ref> +</jboss-web> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar new file mode 100644 index 0000000..f6bd6d2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar new file mode 100644 index 0000000..fc5763d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar new file mode 100644 index 0000000..b2867cd Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar new file mode 100644 index 0000000..2ff9bbd Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar new file mode 100644 index 0000000..288e64c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar new file mode 100644 index 0000000..db6456f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar new file mode 100644 index 0000000..27d2ad3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar new file mode 100644 index 0000000..c2a26da Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar new file mode 100644 index 0000000..128045d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml new file mode 100644 index 0000000..a9c411b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd"> +<sun-web-app error-url=""> + <context-root>/petstore</context-root> + <class-loader delegate="true"/> + <jsp-config> + <property name="classdebuginfo" value="true"> + <description>Enable debug info compilation in the generated servlet class</description> + </property> + <property name="mappedfile" value="true"> + <description>Maintain a one-to-one correspondence between static content and the generated servlet class' java code</description> + </property> + </jsp-config> +</sun-web-app> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml new file mode 100644 index 0000000..6c65069 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>Petstore</display-name> + <filter> + <filter-name>CaptchaValidateFilter</filter-name> + <filter-class>com.sun.javaee.blueprints.petstore.controller.CaptchaValidateFilter</filter-class> + </filter> + <filter> + <filter-name>EntryFilter</filter-name> + <filter-class>com.sun.javaee.blueprints.petstore.controller.EntryFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>EntryFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>CaptchaValidateFilter</filter-name> + <url-pattern>/faces/dynamic/bpui_fileupload_handler/handleFileUpload</url-pattern> + </filter-mapping> + <listener> + <listener-class>com.sun.javaee.blueprints.petstore.model.CatalogFacade</listener-class> + </listener> + + <servlet> + <display-name>ControllerServlet</display-name> + <servlet-name>ControllerServlet</servlet-name> + <servlet-class>com.sun.javaee.blueprints.petstore.controller.ControllerServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/catalog</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/controller</url-pattern> + </servlet-mapping> + + <context-param> + <description> + Google Maps authorization key for "http://localhost:8080/" + To use a another URL a new map key will have to be generated from http://www.google.com/apis/maps/ + </description> + <param-name>com.sun.j2ee.blueprints.ui.mapviewer.KEY</param-name> + <param-value>ABQIAAAAyQYKk4__l80DyIsqLPvvuxTwM0brOpm-All5BF6PoaKBxRWWERSt2NPUufvDhWGdrb-pCzTZQ2vi2A</param-value> + </context-param> + + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>false</param-value> + </context-param> + + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>false</param-value> + </context-param> + + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + </context-param> + +  + <context-param> + <param-name>proxyHost</param-name> + <param-value></param-value> + </context-param> + <context-param> + <param-name>proxyPort</param-name> + <param-value></param-value> + </context-param> +  + <context-param> + <param-name>entryPages</param-name> + <param-value>.jpg|.gif|index.html|index.jsp|fileupload.jsp|search.jsp|catalog.jsp|mapAll.jsp|tag.jsp|news.jsp</param-value> + </context-param> + + +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + +  + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/faces/CaptchaServlet</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/ImageServlet/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/TagServlet/*</url-pattern> + </servlet-mapping> + <error-page> + <exception-type>java.lang.RuntimeException</exception-type> + <location>/systemerror.jsp</location> + </error-page> + <resource-ref> + <res-ref-name>jdbc/PetstoreDB</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + <res-sharing-scope>Shareable</res-sharing-scope> + </resource-ref> +</web-app> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css new file mode 100644 index 0000000..14c6ed0 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css @@ -0,0 +1 @@ +.accordion { width:150px; height:400px; border-width:1px; border-style:solid; border-color:black; background:#404040; } .accordionBody { width:160px; height:400px; border-width:1px; border-style:solid; border-color:black; background:#404040; } .accordionTitle { vertical-align: top; padding-top: 10px; text-align: center; width:150px; height:90px; color:white; font-size:22px; font-weight: bold; background:black; opacity: .99; } .accordionRow { color:white; cursor: pointer; font-size:18px; font-weight: bold; vertical-align: middle; padding-top: 5px; text-align: center; width:150px; height:40px; background:#104E8B; opacity: .99; } .accordionProduct { text-align: center; width:150px; color:white; font-size:12px; font-weight: bold; background:#104E8B; opacity: .99; } .accordionLink { cursor: pointer; text-decoration: none; color:white; } .accordionLinkSelected { text-align: center; width:150px; color:red; font-size:12px; font-weight: bold; background:black; opacity: .99; } .accordionLinkHover { text-decoration: underline; color:white; } \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js new file mode 100644 index 0000000..1c1ee6b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js @@ -0,0 +1,249 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: accordion.js,v 1.22 2006/05/03 22:00:32 inder Exp $ */ + +function AccordionMenu () { + + dojo.event.topic.subscribe("/accordion", this, this.handleEvent); + + var displayPortWidth = 100; + var HEIGHT = 400; + + var EXPANDED_HEIGHT = 125; + var ITEM_HEIGHT = 55; + var INCREMENT = 10; + + var timeout = 5; // in ms + + var accordion = document.getElementById("accordionBody"); + var divs = []; + var oExpandedIndex = -1; + var nExpandedIndex = -1; + var oHeight = ITEM_HEIGHT; + var nHeight = ITEM_HEIGHT; + var tHeight = 165; + var expanding = false; + var categories; + + // while control the inline debug statements + var debug = false; + var status = document.getElementById("status"); + + function Row(id, div, defaultHeight) { + this.id = id; + this.div = div; + //this.height = height; + this.h = defaultHeight; + this.div.style.height = defaultHeight + "px" + } + + Row.prototype.setHeight = function(nH) { + this.h = nH; + this.div.style.height = nH + "px"; + // re-adjust for ie in that it does not follow the boxmodel + if (this.div.offsetHeight > nH) { + this.div.style.height = (nH - (this.div.offsetHeight - nH)) + 'px'; + } + } + + Row.prototype.getTotalHeight = function() { + return this.div.offsetHeight; + } + + Row.prototype.getHeight = function() { + return this.h; + } + + this.handleEvent = function(args) { + if (args.type) { + if (args.type == 'expand') { + var targetRow = args.targetRow; + initiateExpansion(targetRow); + } + } + } + + this.load = function(lcategories) { + categories = lcategories; + // create all the rows + for (var l=0; l < categories.length; l++) { + var row = createRow(l,"accordionRow", ITEM_HEIGHT); + createLinks(row.div, categories[l].name, l, "accordionLink"); + divs.push(row); + } + } + + function showStatus() { + if (debug) { + var stat = "oExpandedIndex=" + oExpandedIndex + " " ; + for (var i=0; i < divs.length; i++) { + stat = stat + i + "=" + divs[i].getTotalHeight() + " "; + } + status.innerHTML = stat + " total height=" + accordion.offsetHeight; + var totalH = 0; + var tH = 0; + for (var i=0; i < divs.length; i++) { + totalH = totalH + divs[i].getHeight(); + tH = tH + divs[i].getTotalHeight(); + } + } + } + + this.showCategory = function(catid) { + for (var l=0; l < categories.length; l++) { + if (catid == categories[l].name) { + // now tell the scroller to load the first product + initiateExpansion(l); + if (categories[l].products[0]) { + dojo.event.topic.publish("/catalog", {type:"showProducts", productId:categories[l].products[0].id}); + } + break; + } + } + } + + this.showFirstCategory = function() { + initiateExpansion(0); + if (categories[0].products[0]) { + dojo.event.topic.publish("/catalog", {type:"showProducts", productId:categories[0].products[0].id}); + } + } + + this.loadCategoryItem = function(pid, itemId) { + // find the right product and expand the accordion + for (var l=0; l < categories.length; l++) { + // now tell the scroller to load the first product + for (var il=0; il < categories[l].products.length; il++) { + if (categories[l].products[il].id == pid ) { + initiateExpansion(l); + break; + } + } + } + dojo.event.topic.publish("/catalog", {type:"showItemDetails", productId: pid , itemId: itemId}); + } + + function initiateExpansion(id) { + // jump out if we are in progress + if (!expanding && oExpandedIndex != Number(id)) { + expanding = true; + nExpandedIndex = Number(id); + if (oExpandedIndex != -1) { + var targetDiv = divs[oExpandedIndex].div; + if (targetDiv && targetDiv.childNodes) { + for (var l = targetDiv.childNodes.length -1; l >= 0 ; l--) { + targetDiv.removeChild(targetDiv.childNodes[l]); + } + } + createLinks(divs[oExpandedIndex].div, categories[oExpandedIndex].name, oExpandedIndex, "accordionLink"); + } + expandRow(id); + } + } + + function expandRow() { + if (expanding) { + showStatus(); + // + if (nHeight < EXPANDED_HEIGHT) { + nHeight = nHeight + INCREMENT; + divs[nExpandedIndex].setHeight(nHeight); + if (oExpandedIndex != -1) { + if (tHeight >= ITEM_HEIGHT) { + oHeight = oHeight - INCREMENT; + // take all out of the old expanded + } else { + oHeight = oHeight - INCREMENT; + } + divs[oExpandedIndex].setHeight(oHeight); + } + // default exapnd here + } else if (oExpandedIndex != -1 && oHeight > ITEM_HEIGHT) { + oHeight = oHeight - INCREMENT; + divs[oExpandedIndex].setHeight(oHeight); + } else { + // set the contents of the new menu + var targetDiv = divs[nExpandedIndex].div; + if (targetDiv && targetDiv.childNodes) { + for (var l = targetDiv.childNodes.length -1; l >= 0 ; l--) { + targetDiv.removeChild(targetDiv.childNodes[l]); + } + } + divs[nExpandedIndex].div.appendChild(document.createTextNode(categories[nExpandedIndex].name)); + divs[nExpandedIndex].div.appendChild(document.createElement("p")); + for (var l= 0; l < categories[nExpandedIndex].products.length; l++) { + var span = document.createElement("span"); + span.className = "accordionProduct"; + var link = document.createElement("a"); + var target = categories[nExpandedIndex].products[l].id; + link.id = target; + link.className = "accordionLink"; + // some browsers aren't setting the styles for hovers so forcing them + link.setAttribute("onmouseover", "this.className='accordionLinkHover';"); + link.setAttribute("onmouseout", "this.className='accordionLink';"); + dojo.event.connect(link, "onclick", function(evt) { + this._target = target + var src; + if (evt.target) { + src = evt.target; + } else if (evt.srcElement) { + src = evt.srcElement; + } + //src.parentNode.className = "accordionLinkSelected"; + // set this so the next time around it can be removed; + dojo.event.topic.publish("/catalog", {type:"showProducts", productId:src.id}); + }); + link.appendChild(document.createTextNode(categories[nExpandedIndex].products[l].name)); + span.appendChild(link); + divs[nExpandedIndex].div.appendChild(span); + if (l < categories[nExpandedIndex].products.length - 1) { + divs[nExpandedIndex].div.appendChild(document.createElement("p")); + } + link = null; + } + expanding = false; + oExpandedIndex = nExpandedIndex; + nExpandedIndex = -1; + oHeight = nHeight; + nHeight = ITEM_HEIGHT; + return; + } + + setTimeout(expandRow, timeout); + } + } + + function createLinks(tDiv, text, id, linkStyle) { + var link = document.createElement("a"); + link.className = linkStyle; + link.appendChild(document.createTextNode(text)); + link.setAttribute("id", id); + if (link.attachEvent) { + link.attachEvent('onmouseover',function(e){initiateExpansion(e.srcElement.getAttribute("id"));}); + } else if (link.addEventListener) { + link.addEventListener('mouseover',function(e){initiateExpansion(e.currentTarget.getAttribute("id"));}, true); + } + tDiv.appendChild(link); + } + + function createRow(id, rowStyle, height) { + var nDiv = document.createElement("div"); + nDiv.className = rowStyle; + var row; + var cell; + if (accordion.insertRow) { + row = accordion.insertRow(accordion.rows.length); + + } else { + row = document.createElement("tr"); + accordion.appendChild(row); + } + if (row.inserCell) { + cell = row.insertCell(0); + } else { + cell = document.createElement("td"); + row.appendChild(cell); + } + cell.appendChild(nDiv); + return new Row(id, nDiv, height); + } +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp new file mode 100644 index 0000000..c43dd98 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp @@ -0,0 +1,80 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: banner.jsp,v 1.28 2006/12/19 20:23:53 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> +<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/styles.css"></link> +<script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> +<script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/rss/rssbar.js"></script> +<link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}/faces/static/META-INF/rss/rssbar.css" /> +<style type="text/css"> + +#rss-bar { + margin: 0 auto 0px; +} + +#rss-bar table td#rss-channel { + background-repeat: no-repeat; + background-position: top left; + font-size: 14px; + font-weight: bold; + vertical-align: top; + text-align: center; + width: 254px; +} + +#rss-bar table td#rss-item { + background-repeat: no-repeat; + font-size: 14px; + width: 534px; + text-align: left; +} + +#rss-bar table a { + color: white; + text-decoration: none; +} +#rss-bar table a:hover { color: #ffff00;} + +</style> +<script type="text/javascript"> + var rss = new bpui.RSS(); + dojo.addOnLoad(function(){rss.getRssInJson('${pageContext.request.contextPath}/faces/dynamic/bpui_rssfeedhandler/getRssfeed', 'https://blueprints.dev.java.net/servlets/ProjectRSS?type=news', '4', '4000', 'News from BluePrints', 'news.jsp');}); +</script> + +<table border="0" bordercolor="gray" cellpadding="0" cellspacing="0" bgcolor="white" width="100%"> + <tr id="injectionPoint"> + <td width="100"><a class="menuLink" href="${pageContext.request.contextPath}/faces/index.jsp""><img src="${pageContext.request.contextPath}/images/banner_logo.gif" border="0" width="70" height="70"></a></td> + <td align="left"> + <div class="banner">Java Pet Store</div> + </td> + <td id="bannerRight" align="right"> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/fileupload.jsp">Seller</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/search.jsp">Search</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/catalog.jsp">Catalog</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/mapAll.jsp">Map</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/tag.jsp">Tags</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/index.jsp">Home</a> + </td> + </tr> + </tr> + <tr bgcolor="gray"> + <td id="menubar" align="left" colspan="3" height="25" > + <div id="rss-bar"> + <table border="0" cellpadding="0" cellspacing="0"> + <tr> + <td id="rss-channel" nowrap="true"></td> + <td id="rss-item" nowrap="true"></td> + </tr> + </table> + </div> + </td> + </tr> + </table> + + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css new file mode 100644 index 0000000..5c906b5 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css @@ -0,0 +1,48 @@ +.bpui_petstorelist_dataDiv { + border-style: groove; + overflow: auto; + width: 600px; + height: 500px; + padding: 10px; +} + +.bpui_petstorelist_pageDiv { +} + + +.bpui_petstorelist_table { +} + +.bpui_petstorelist_cell { + padding: 5px; + vertical-align: top; +} + +.bpui_petstorelist_row { + border-bottom: dotted; +} + +.bpui_petstorelist_hr { + width: 90%; +} + +.bpui_petstorelist_image { +} + +.bpui_petstorelist_link{ +} + +.bpui_petstorelist_name{ +} + +.bpui_petstorelist_description{ +} + +.bpui_petstorelist_price { +} + +.bpui_petstorelist_previous { +} + +.bpui_petstorelist_next { +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js new file mode 100644 index 0000000..4df46fb --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js @@ -0,0 +1,269 @@ +var bpui; +if(typeof bpui == "undefined") { + bpui=new Object(); +} +bpui.petstoreList=new Object(); + +bpui.petstoreList.divName=""; +bpui.petstoreList.currentCount=0; +bpui.petstoreList.numberPerPage=5; +bpui.petstoreList.category="feline01"; +bpui.petstoreList.cachedData=new Object(); +bpui.petstoreList.debug=false; +bpui.petstoreList.timer; + +bpui.petstoreList.initialSetup=function() { + // get outerdiv + var targetDiv=document.getElementById(bpui.petstoreList.divName); + + // containier div + tablex="<table><tr><td align=\"center\">"; + tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; + tablex += "<option value=\"loading\">Loading Data...</option>"; + tablex += "</select>"; + tablex += "</td></tr><tr><td><div id=\"bpui.petstoreList.dataDiv\" class=\"bpui_petstorelist_dataDiv\">"; + tablex += "</div>"; + + // add product previous and next + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; + tablex += "<div id=\"bpui.petstoreList.pageDiv\" class=\"bpui_petstorelist_pageDiv\">"; + tablex += "</div>"; + tablex += "</td></tr>"; + // add in debug div, if debugging + if(bpui.petstoreList.debug) { + tablex += "<tr><td colspan=\"3\">"; + tablex += "<div id=\"bpui.petstoreList.debugDiv\">"; + tablex += "</div>"; + tablex += "</td></tr>"; + } + tablex += "</table>"; + targetDiv.innerHTML=tablex; + bpui.petstoreList.setSelectedCategory(); +} + + +bpui.petstoreList.populateData=function(datax) { + // clear response timer + clearTimeout(bpui.petstoreList.timer); + + if(typeof datax != "undefined") { + // check to see if at last page and no data is returned + if(datax.length < 1) { + alert("At last page for category!"); + // keep currentCount correct by removing the increment that was added + bpui.petstoreList.currentCount -= bpui.petstoreList.numberPerPage; + } else { + // add data to cache if it doesn't already exist + // if a full set isn't returned don't cache it, so the data will be retrieved again from the server. + // This is optional, you have to weigh the performance hit with the consiquences of not doing an update + key=bpui.petstoreList.category + "|" + bpui.petstoreList.currentCount; + cachedSet=bpui.petstoreList.cachedData[key]; + if(typeof cachedSet == "undefined" && datax.length >= bpui.petstoreList.numberPerPage) { + // need to cache data + if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Adding cache data by key: " + key); + bpui.petstoreList.cachedData[key]=datax; + } + + // get outerdiv + var targetDiv=document.getElementById("bpui.petstoreList.dataDiv"); + + // containier div + tablex="<table class=\"bpui_petstorelist_table\">"; + tablex += "<tr class=\"bpui_petstorelist_row\">"; + tablex += "<th class=\"bpui_petstorelist_cell\">Pet Image</td>"; + tablex += "<th class=\"bpui_petstorelist_cell\">Name & Description</td>"; + tablex += "<th class=\"bpui_petstorelist_cell\">Price ($)</td>"; + tablex += "</tr>"; + + // loop through product results + for(ii=0; ii < datax.length; ii++) { + // add row + tablex += "<tr class=\"bpui_petstorelist_row\"><td class=\"bpui_petstorelist_cell\">"; + tablex += "<a class=\"bpui_petstorelist_image\" target=\"_blank\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + + datax[ii].productID + "," + datax[ii].itemID + "\">"; + + tablex += "<img src=\"http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL + "\"/>"; + + tablex += "</a>"; + tablex += "</td><td class=\"bpui_petstorelist_cell\">"; + tablex += "<a class=\"bpui_petstorelist_link\" target=\"_blank\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + + datax[ii].productID + "," + datax[ii].itemID + "\">"; + tablex += "<span class=\"bpui_petstorelist_name\">" + datax[ii].name + "</span><br/>"; + tablex += "</a>"; + tablex += "<span class=\"bpui_petstorelist_description\">" + datax[ii].description + "</span>"; + tablex += "</td><td class=\"bpui_petstorelist_cell\">"; + + // add product price + tablex += "<span class=\"bpui_petstorelist_price\">\$" + datax[ii].price + "</span><br/>"; + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\"><hr class=\"bpui_petstorelist_hr\" /></td></tr>"; + } + + tablex += "</table>"; + targetDiv.innerHTML=tablex; + } + + // setup previous next buttons + pagex=""; + var targetDiv=document.getElementById("bpui.petstoreList.pageDiv"); + if(bpui.petstoreList.currentCount >= bpui.petstoreList.numberPerPage) { + // add previous + pagex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; + } + if(datax.length == bpui.petstoreList.numberPerPage) { + // add next only if full page has been returned. Need to change when add cache ??? + pagex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; + } + targetDiv.innerHTML=pagex; + } +} + +bpui.petstoreList.setSelectedCategory=function() { + catx=document.getElementById("bpui.petstoreList.categoryList"); + for(ii=0; ii < catx.length; ii++) { + if(catx.options[ii].value == bpui.petstoreList.category) { + catx.options[ii].selected=true; + } + } +} + +bpui.petstoreList.selectCategory=function() { + catx=document.getElementById("bpui.petstoreList.categoryList"); + bpui.petstoreList.category=catx.value; + + bpui.petstoreList.currentCount=0; + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.nextProducts=function() { + // load data from service + bpui.petstoreList.currentCount += bpui.petstoreList.numberPerPage; + bpui.petstoreList.updateProducts(); +} + +bpui.petstoreList.previousProducts=function() { + bpui.petstoreList.currentCount -= bpui.petstoreList.numberPerPage; + if(bpui.petstoreList.currentCount < 0) { + bpui.petstoreList.currentCount=0; + } + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.updateProducts=function() { + // check to see if in cache + key=bpui.petstoreList.category + "|" + bpui.petstoreList.currentCount; + cachedSet=bpui.petstoreList.cachedData[key]; + // see if data in cache + if(typeof cachedSet != "undefined") { + // get data from cache + if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Pulling data from cache using: " + key + " with " + cachedSet.length + " items."); + bpui.petstoreList.populateData(cachedSet); + } else { + // load data from service + if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Retrieving data from service for : " + bpui.petstoreList.category + " starting at item " + bpui.petstoreList.currentCount); + + // set degradation timeout + bpui.petstoreList.timer=setTimeout('bpui.petstoreList.requestTimedOut()', 20000); + + // create dynamic script + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=" + bpui.petstoreList.currentCount + "&length=" + bpui.petstoreList.numberPerPage + "&format=jsonp&callback=bpui.petstoreList.populateData"); + bodyTag.appendChild(scriptx); + } +} + + +bpui.petstoreList.createPetstoreList=function(divName, numberPerPage) { + // keep divName for later references + bpui.petstoreList.divName=divName; + + // see if numberPerPage defined + if(typeof numberPerPage != "undefined") { + bpui.petstoreList.numberPerPage=numberPerPage; + } + + // setup static elements + bpui.petstoreList.initialSetup(); + + // set timer to make sure service look up returns. Eventhough the Javascript library was able to be fetched, the database could be down or the + // service could be responding very slowly and the request timeout. Wait for 30 seconds and then set data div to service may not be responding message. + // Since both calls hit the database, if one returns propertly the other should also. + bpui.petstoreList.timer=setTimeout('bpui.petstoreList.requestTimedOut()', 20000); + + // load categories from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=categories&format=jsonp&call…"); + bodyTag.appendChild(scriptx); + + // load pet data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=0&length=" + bpui.petstoreList.numberPerPage + "&format=jsonp&callback=bpui.petstoreList.populateData"); + bodyTag.appendChild(scriptx); +} + + +bpui.petstoreList.requestTimedOut=function() { + document.getElementById("bpui.petstoreList.dataDiv").innerHTML="<b><font color=\"#0000FF\">The Java BluePrint's Pet Store JSONP Service is either responding very slowly or not responding at all! Please check with the service provider for more information.</font></b>"; +} + + + +bpui.petstoreList.debugMessage=function(messx) { + targetDiv=document.getElementById("bpui.petstoreList.debugDiv"); + targetDiv.innerHTML=messx + "<br/>" + targetDiv.innerHTML; +} + + +bpui.petstoreList.populateCategory=function(datax) { + // clear response timer + clearTimeout(bpui.petstoreList.timer); + + if(typeof datax != "undefined") { + catx=document.getElementById("bpui.petstoreList.categoryList"); + countx=0; + // loop through top level categories + for(ii=0; ii < datax.length; ii++) { + // loop through individual categories + for(yy=0; yy < datax[ii].products.length; yy++) { + // set default value for select list + bCurrentSelect=false + if(datax[ii].products[yy].id == bpui.petstoreList.category) { + bCurrentSelect=true; + } + catx.options[countx]=new Option(datax[ii].products[yy].name, datax[ii].products[yy].id, false, bCurrentSelect); + countx++; + } + } + } +} + + +bpui.petstoreList.hackerExample=function() { + /* + bodyTag=document.getElementsByTagName("body")[0]; + iframex=document.createElement("iframe"); + iframex.setAttribute("src", "http://localhost:8080/bp-clientside-mashup/show.jsp?cookies=" + escape(document.cookie)); + bodyTag.appendChild(iframex); + */ + // load pet data from service + + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/bp-clientside-mashup/show.jsp?cookies=" + escape(document.cookie)); + bodyTag.appendChild(scriptx); + + +} + + + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js new file mode 100644 index 0000000..d00e427 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js @@ -0,0 +1,136 @@ +var bpui; +if(typeof bpui == "undefined") { + bpui=new Object(); +} +bpui.petstoreList=new Object(); + +bpui.petstoreList.divName=""; +bpui.petstoreList.currentCount=0; + +bpui.petstoreList.populateData=function(datax) { + if(typeof datax != "undefined") { + + // get outerdiv + var targetDiv=document.getElementById(bpui.petstoreList.divName); + + // make sure div is clear + targetDiv.innerHTML=""; + + // add class to containing div + targetDiv.setAttribute("class", "bpui_petstorelist_div") + + // add table + tablex=document.createElement("table"); + tablex.setAttribute("class", "bpui_petstorelist_table") + targetDiv.appendChild(tablex); + + // loop through product results + for(ii=0; ii < datax.length; ii++) { + // add row + rowx=document.createElement("tr"); + + // add product image with hyperlink + colx=document.createElement("td"); + ax=document.createElement("a"); + ax.setAttribute("href", "http://localhost:8080/petstore/faces/catalog.jsp#" + datax[ii].productID + "," + datax[ii].itemID) + ax.setAttribute("target", "bppetstore") + ax.setAttribute("class", "bpui_petstorelist_image") + imgx=document.createElement("img"); + imgx.setAttribute("src", "http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL); + ax.appendChild(imgx); + colx.appendChild(ax); + rowx.appendChild(colx); + + // add product name with hyperlink + colx=document.createElement("td"); + ax=document.createElement("a"); + ax.setAttribute("href", "http://localhost:8080/petstore/faces/catalog.jsp#" + datax[ii].productID + "," + datax[ii].itemID) + ax.setAttribute("target", "bppetstore") + ax.setAttribute("class", "bpui_petstorelist_name_link") + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_name") + spanx.appendChild(document.createTextNode(datax[ii].name)); + ax.appendChild(spanx); + colx.appendChild(ax); + colx.appendChild(document.createElement("br")); + // add product description + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_description"); + spanx.appendChild(document.createTextNode(datax[ii].description)); + colx.appendChild(spanx); + rowx.appendChild(colx); + + // add product price + colx=document.createElement("td"); + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_price"); + spanx.appendChild(document.createTextNode("\$" + datax[ii].price)); + colx.appendChild(spanx); + rowx.appendChild(colx); + + // add row to table + tablex.appendChild(rowx); + } + + // add product previous and next + rowx=document.createElement("tr"); + colx=document.createElement("td"); + colx.setAttribute("colspan", "3"); + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_previous"); + spanx.setAttribute("onclick", "bpui.petstoreList.previousProducts();"); + spanx.appendChild(document.createTextNode("<< PREVIOUS")); + colx.appendChild(spanx); + + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_next"); + spanx.setAttribute("onclick", "bpui.petstoreList.nextProducts();"); + spanx.appendChild(document.createTextNode("NEXT >>")); + colx.appendChild(spanx); + rowx.appendChild(colx); + + // add row to table + tablex.appendChild(rowx); + } +} + + +bpui.petstoreList.nextProducts=function() { + // load data from service + bpui.petstoreList.currentCount += 5; + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.previousProducts=function() { + bpui.petstoreList.currentCount -= 5; + if(bpui.petstoreList.currentCount < 0) { + bpui.petstoreList.currentCount=0; + } + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.updateProducts=function() { + // load data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=feline01&start=" + bpui.petstoreList.currentCount + "&length=5&format=jsonp"); + bodyTag.appendChild(scriptx); +} + + + +bpui.petstoreList.createPetstoreList=function(divName) { + // keep divName for later references + bpui.petstoreList.divName=divName; + + // load data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=feline01&start=0&l…"); + bodyTag.appendChild(scriptx); +} + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js new file mode 100644 index 0000000..9b18cb4 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js @@ -0,0 +1,159 @@ +var bpui; +if(typeof bpui == "undefined") { + bpui=new Object(); +} +bpui.petstoreList=new Object(); + +bpui.petstoreList.divName=""; +bpui.petstoreList.currentCount=0; +bpui.petstoreList.category="feline01"; + + +bpui.petstoreList.initialSetup=function() { + // get outerdiv + var targetDiv=document.getElementById(bpui.petstoreList.divName); + + // containier div + tablex="<table><tr><td align=\"center\">"; + tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; + tablex += "<option value=\"feline01\">Hairy Cat</option>"; + tablex += "<option value=\"feline02\">Groomed Cat</option>"; + tablex += "<option value=\"canine01\">Medium Dogs</option>"; + tablex += "<option value=\"canine02\">Small Dogs</option>"; + tablex += "<option value=\"avian01\">Parrot</option>"; + tablex += "<option value=\"avian02\">Exotic</option>"; + tablex += "<option value=\"fish01\">Small Fish</option>"; + tablex += "<option value=\"fish02\">Large Fish</option>"; + tablex += "<option value=\"reptile01\">Slithering Reptiles</option>"; + tablex += "<option value=\"reptile02\">Crawling Reptiles</option>"; + tablex += "</select>"; + tablex += "</td></tr><tr><td><div class=\"bpui_petstorelist_div\">"; + tablex += "</div>"; + + // add product previous and next + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; + tablex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; + tablex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; + tablex += "</td></tr>"; + tablex += "</table>"; + targetDiv.innerHTML=tablex; + bpui.petstoreList.setSelectedCategory(); +} + +bpui.petstoreList.populateData=function(datax) { + if(typeof datax != "undefined") { + + // get outerdiv + var targetDiv=document.getElementById(bpui.petstoreList.divName); + + // containier div + tablex="<table><tr><td align=\"center\">"; + tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; + tablex += "<option value=\"feline01\">Hairy Cat</option>"; + tablex += "<option value=\"feline02\">Groomed Cat</option>"; + tablex += "<option value=\"canine01\">Medium Dogs</option>"; + tablex += "<option value=\"canine02\">Small Dogs</option>"; + tablex += "<option value=\"avian01\">Parrot</option>"; + tablex += "<option value=\"avian02\">Exotic</option>"; + tablex += "<option value=\"fish01\">Small Fish</option>"; + tablex += "<option value=\"fish02\">Large Fish</option>"; + tablex += "<option value=\"reptile01\">Slithering Reptiles</option>"; + tablex += "<option value=\"reptile02\">Crawling Reptiles</option>"; + tablex += "</select>"; + tablex += "</td></tr><tr><td><div class=\"bpui_petstorelist_div\">"; + + tablex += "<table class=\"bpui_petstorelist_table\">"; + + // loop through product results + for(ii=0; ii < datax.length; ii++) { + // add row + tablex += "<tr class=\"bpui_petstorelist_row\"><td class=\"bpui_petstorelist_cell\">"; + tablex += "<a class=\"bpui_petstorelist_image\" target=\"bppetstore\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + + datax[ii].productID + "," + datax[ii].itemID + "\">"; + + tablex += "<img src=\"http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL + "\"/>"; + + tablex += "</a>"; + tablex += "</td><td class=\"bpui_petstorelist_cell\">"; + tablex += "<a class=\"bpui_petstorelist_link\" target=\"bppetstore\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + + datax[ii].productID + "," + datax[ii].itemID + "\">"; + tablex += "<span class=\"bpui_petstorelist_name\">" + datax[ii].name + "</span><br/>"; + tablex += "</a>"; + tablex += "<span class=\"bpui_petstorelist_description\">" + datax[ii].description + "</span>"; + tablex += "</td><td class=\"bpui_petstorelist_cell\">"; + + // add product price + tablex += "<span class=\"bpui_petstorelist_price\">\$" + datax[ii].price + "</span><br/>"; + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\"><hr class=\"bpui_petstorelist_hr\" /></td></tr>"; + } + + tablex += "</table></div>"; + + // add product previous and next + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; + tablex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; + tablex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; + tablex += "</td></tr>"; + tablex += "</table>"; + targetDiv.innerHTML=tablex; + bpui.petstoreList.setSelectedCategory(); + } +} + +bpui.petstoreList.setSelectedCategory=function() { + catx=document.getElementById("bpui.petstoreList.categoryList"); + for(ii=0; ii < catx.length; ii++) { + if(catx.options[ii].value == bpui.petstoreList.category) { + catx.options[ii].selected=true; + } + } +} + + +bpui.petstoreList.selectCategory=function() { + catx=document.getElementById("bpui.petstoreList.categoryList"); + bpui.petstoreList.category=catx.value; + + bpui.petstoreList.currentCount=0; + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.nextProducts=function() { + // load data from service + bpui.petstoreList.currentCount += 5; + bpui.petstoreList.updateProducts(); +} + +bpui.petstoreList.previousProducts=function() { + bpui.petstoreList.currentCount -= 5; + if(bpui.petstoreList.currentCount < 0) { + bpui.petstoreList.currentCount=0; + } + bpui.petstoreList.updateProducts(); +} + +bpui.petstoreList.updateProducts=function() { + // load data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=" + bpui.petstoreList.currentCount + "&length=5&format=jsonp"); + bodyTag.appendChild(scriptx); +} + +bpui.petstoreList.createPetstoreList=function(divName) { + // keep divName for later references + bpui.petstoreList.divName=divName; + + // load data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=0&length=5&format=jsonp"); + bodyTag.appendChild(scriptx); + +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp new file mode 100644 index 0000000..60ef953 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp @@ -0,0 +1,23 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: captchaerror.jsp,v 1.1 2006/02/17 03:04:22 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Captcha Error</title> + </head> + <body> + + <h1>Please input the right captcha string -- <a href="./">Try again</a> + + + + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js new file mode 100644 index 0000000..4bdfc69 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js @@ -0,0 +1,329 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: catalog.js,v 1.21 2007/01/17 22:16:44 basler Exp $ */ + +var ac; +var is; +var controller; +//var debug=true; + +function getApplicationContextRoot() { + var urlArray=window.location.toString().split("/", 4); + return "/" + urlArray[3]; +} + +var applicationContextRoot=getApplicationContextRoot(); + +function initCatalog() { + ac = new AccordionMenu(); + is = new ImageScroller(); + is.load(); + controller = new CatalogController(); + // wire in a listener for the rating component + dojo.event.connect("before", bpui.rating, "doClick", controller, "modifyState"); + controller.initialize(); +} + +function CatalogController() { + dojo.event.topic.subscribe("/catalog", this, handleEvent); + + // this object structure contains a list of the products and chunks that have been loaded + var pList = new ProductList(); + + var CHUNK_SIZE=7; + var initalRating; + var initalItem; + var originalURL; + + // using this for some browsers that do not support innerHTML + var useDOMInjection = false; + + var infoName = document.getElementById("infopaneName"); + var infoRating = document.getElementById("infopaneRating"); + var infoPrice = document.getElementById("infopanePrice"); + var infoBuyNow = document.getElementById("infopaneBuyNow"); + var infoShortDescription = document.getElementById("infopaneShortDescription"); + var infoDescription = document.getElementById("infopaneDescription"); + // for paypal + var buyNowAmount = document.getElementById("buyNow1_amount"); + var buyNowItemName = document.getElementById("buyNow1_item_name"); + + function handleEvent(args) { + if (args.type == "showingItem") { + // update the id on the ratring component + if (typeof bpui != 'undefined') { + var groupId = is.getGroupId(); + window.location.href= originalURL + "#" + groupId + "," + args.id; + if (typeof bpui.rating != 'undefined') { + // update the rating + bpui.rating.state["rating"].bindings["itemId"]=args.id; + bpui.rating.modifyDisplay("rating", args.rating, true); + // get the currrent item + showItemDetails(args.id); + } else { + initalItem = args.id; + initalRating = args.rating; + } + } else { + // things haven't been loaded to set the inital rating + initalItem = args.id; + initalRating = args.rating; + } + } else if (args.type == "getChunk") { + populateItems(args.id, args.index, args.currentChunk, false); + + } else if (args.type == "showItemDetails") { + showProductDetails(args.productId, args.itemId); + + } else if (args.type == "showProducts") { + is.reset(); + populateItems(args.productId, 0, 0, true); + } + } + + function showItemDetails(id) { + var i = is.getItems().get(id); + setNodeText(infoName, i.name + "<br/><a href='javascript:controller.disableItem("" + id + "","" + i.name + "")'><font size='-1' color='white'><i>Flag as inappropriate</i></font></a>"); + setNodeText(infoPrice, i.price); + setNodeText(infoShortDescription, i.shortDescription); + setNodeText(infoDescription, i.description); + // update the paypal + buyNowAmount.value = i.price; + buyNowItemName.value = i.name; + } + + function setNodeText(t, text) { + if (useDOMInjection) { + t.lastChild.nodeValue = text; + } else { + t.innerHTML = text; + } + } + + this.initialize = function() { + // check whether the innerHTML changes can be used in the infopane + infoName.innerHTML = " "; + if (!useDOMInjection && infoName.innerHTML != " ") { + useDOMInjection = true; + + infoName.appendChild(document.createTextNode("Name")); + infoPrice.appendChild(document.createTextNode("$0.00")); + infoShortDescription.appendChild(document.createTextNode("<description>")); + infoDescription.appendChild(document.createTextNode("<description>")); + } + + var ratingInstance = bpui.rating.state["rating"]; + ratingInstance.grade = initalRating; + bpui.rating.state["rating"].bindings["itemId"]=initalItem; + bpui.rating.modifyDisplay("rating", initalRating, true); + loadAccordion(); + } + + + this.modifyState = function(arg, rating) { + var itemId = initalItem; + if (typeof bpui.rating.state["rating"].bindings["itemId"] != 'undefined') { + itemId = bpui.rating.state["rating"].bindings["itemId"]; + } + // set the cached rating to the new rating that was set. + is.getItems().get(itemId).rating = rating; + } + + + function loadAccordion () { + // go out and get the categories + // this should be made more geric + var bindArgs = { + url: applicationContextRoot + "/catalog?command=categories&format=json", + mimetype: "text/json", + load: function(type,json) { + ac.load(json); + processURLParameters(); + }, + error: ajaxBindError + }; + dojo.io.bind(bindArgs); + } + + // this needs to happen after we have loaded the accordion data + function processURLParameters() { + originalURL = decodeURIComponent(window.location.href); + var params = {}; + // look for the params + if (originalURL.indexOf("#") != -1) { + var qString = originalURL.split('#')[1]; + var args = qString.split(','); + originalURL = originalURL.split('#')[0]; + ac.loadCategoryItem(args[0], args[1]); + return; + } else if (originalURL.indexOf("?") != -1) { + var qString = originalURL.split('?')[1]; + // get rid of any bookmarking stuff + if (qString.indexOf("#") != -1) { + qString = qString.split('#')[0]; + originalURL = originalURL.split('#')[0]; + window.location.href = originalURL; + } + ps = qString.split('&'); + // now go through and create the params map as an object literal + for (var i in ps) { + var t = ps[i].split('='); + params[t[0]] = t[1]; + } + // first check for the item in product + if (typeof params.itemId != 'undefined' && typeof params.pid != 'undefined') { + ac.loadCategoryItem(params.pid, params.itemId); + // next if there is a catid definition then do it + } else if (typeof params.catid != 'undefined') { + ac.showCategory(params.catid); + } + } else { + // nothing is selected + ac.showFirstCategory(); + } + } + + + + function showProductDetails(pid, itemId) { + is.reset(); + is.showProgressIndicator(); + var bindArgs = { + url: applicationContextRoot + "/catalog?command=itemInChunk&pid=" + pid + "&itemId=" + itemId + "&length=" + CHUNK_SIZE, + mimetype: "text/xml", + load: function(type,data,postProcessHandler) { + processProductData(data,true, pid, itemId); + showItemDetails(itemId); + is.doMaximize(); + }, + error: ajaxBindError + }; + dojo.io.bind(bindArgs); + } + + + + function populateItems(pid, index, neededChunk, showImage) { + is.showProgressIndicator(); + is.setGroupId(pid); + printDebug("populateItems - need to make sure displaying - pid=" + pid + " Chunk=" + neededChunk); + + // check to see if relevant scroller page is already loaded + if(!is.containsChunk(pid + "_" + neededChunk)) { + + // not loaded, so see if it is in the cache + if (pList.hasChunk(pid, neededChunk)) { + // in cache, so add chunk to scroller + printDebug("**** adding chunk from cache - pid=" + pid + " Chunk=" + neededChunk); + is.addChunk(pid + "_" + neededChunk); + is.addItems(pList.getChunk(pid, neededChunk)); + + // show first image if you have it + if(showImage && is.getScrollerItems().length > 0) { + is.showImage(is.getScrollerItems()[0].id); + } + + } else { + // not in cache so load it + startRetIndex=(neededChunk * CHUNK_SIZE); + + printDebug("**** retrieving chunk from server - pid=" + pid + " currentIndex=" + index + " startIndex=" + startRetIndex + " Chunk=" + neededChunk); + var bindArgs = { + url: applicationContextRoot + "/catalog?command=items&pid=" + pid + "&start=" + startRetIndex + "&length=" + CHUNK_SIZE, + mimetype: "text/xml", + load: function(type,data,postProcessHandler) { + processProductData(data, showImage, pid, null, neededChunk); + }, + error: ajaxBindError + }; + dojo.io.bind(bindArgs); + } + } else { + printDebug("*** items already showing"); + } + + } + + + function processProductData(responseXML, showImage, pid, iId, chunkId) { + var items = []; + var count = responseXML.getElementsByTagName("item").length; + for (var loop=0; loop < count ; loop++) { + + var item = responseXML.getElementsByTagName("item")[loop]; + var itemId = item.getElementsByTagName("id")[0].firstChild.nodeValue; + var name = item.getElementsByTagName("name")[0].firstChild.nodeValue; + var thumbURL = item.getElementsByTagName("image-tb-url")[0].firstChild.nodeValue; + var imageURL = item.getElementsByTagName("image-url")[0].firstChild.nodeValue; + var description = item.getElementsByTagName("description")[0].firstChild.nodeValue; + var price = item.getElementsByTagName("price")[0].firstChild.nodeValue; + var rating = item.getElementsByTagName("rating")[0].firstChild.nodeValue; + var shortDescription; + if (description.length > 71) { + shortDescription = description.substring(0,71) + "..."; + } else { + shortDescription = description; + } + var i = {id: itemId, name: name, image: imageURL, thumbnail: thumbURL, shortDescription: shortDescription, description: description, price:price, rating: rating}; + items.push(i); + } + + // cache the chunks + pList.addChunk(pid, chunkId, items); + is.addItems(items); + is.addChunk(pid + "_" + chunkId); + + if (showImage && iId == null) { + is.setGroupId(pid); + is.showImage(items[0].id); + } else { + is.setGroupId(pid); + is.showImage(iId); + } + is.hideProgressIndicator(); + } + + function ProductList() { + var _plist = this; + var map = new Map(); + + this.addChunk = function(pid, chunkNumber, items) { + map.put(pid + "_" + chunkNumber, items, true); + } + + this.getChunk = function(pid, chunkNumber) { + return map.get(pid + "_" + chunkNumber); + } + + this.hasChunk = function(pid, chunkNumber) { + return (map.get(pid + "_" + chunkNumber) != null); + } + + this.contents = function() { + return map.contents(); + } + } + + + this.disableItem=function(itemId, itemName) { + // go out and get the categories + // this should be made more geric + if (confirm("Are you sure you want to effectively remove this item from Petstore?")) { + var bindArgs = { + url: applicationContextRoot + "/catalog?command=disable&id=" + itemId, + mimetype: "text/xml", + load: function(type,json) { + //alert("The item named '" + itemName + "' has been disabled!"); + pList = new ProductList(); + is.reset(); + populateItems(is.getGroupId(), 0, 0, true); + }, + error: ajaxBindError + }; + dojo.io.bind(bindArgs); + } + } + + +} + + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp new file mode 100644 index 0000000..443857b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp @@ -0,0 +1,95 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: catalog.jsp,v 1.22 2007/03/16 21:42:03 basler Exp $ --%> +<script type="text/javascript" src="common.js"></script> +<script type="text/javascript" src="scroller.js"></script> +<link rel="stylesheet" type="text/css" href="scroller.css"></link> +<script type="text/javascript" src="accordion.js"></script> +<link rel="stylesheet" type="text/css" href="accordion.css"></link> +<script type="text/javascript" src="catalog.js"></script> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> +<body> +<jsp:include page="banner.jsp" /> +<script type="text/javascript"> + dojo.event.connect(window, "onload", function(){initCatalog();}); +</script> +<center> + <table border="0"> + <tr> + <td> + <table id="accordion"> + <tr id="accordionTitle" class="accordionTitle"><td>Pets</td></tr> + <tr><td> + <table id="accordionBody" border="0" class="accordionBody"> + </table> + </td></tr> + </table> + </td> + <td> + <div id="CatalogBrowser"> + <table border="0" class="slider" width="500px" > + <tr height="415" valign="top"> + <td id="bodySpace" border="0" align="center"></td> + </tr> + <tr id="targetRow"> + <td width="500" height="70 align="top"> + <div class="nav" id="right_button"> + <img src="${pageContext.request.contextPath}/images/right.gif" name="nextRoll" title="Show More Items" border="0"> + </div> + <div class="nav" id="left_button"> + <img src="${pageContext.request.contextPath}/images/left.gif" name="previousRoll" title="Show Previous Items" border="0"> + </div> + <div id="infopane" class="infopane"> + <table class="infopaneTable"> + <tr> + <td id="infopaneName" class="infopaneTitle"> + </td> + <td id="infopaneRating" class="infopaneRating"> + <f:view> + <ui:rating id="rating" maxGrade="5" includeNotInterested="false" includeClear="false" + hoverTexts="#{RatingBean.ratingText}" notInterestedHoverText="Not Interested" clearHoverText="Clear Rating" + grade="#{RatingBean.grade}"/> + <f:verbatim></td><td id="infopanePrice" class="infopanePrice"></td><td id="infopanePayPal" class="infopanePayPal"></f:verbatim> + <ui:buyNow business="donate(a)animalfoundation.com" id="buyNow1" itemName="Buy Item One" + amount="100.00" quantity="1" type="BuyNow" postData="#{PayPalBean.postData}" target="paypal"/> + </f:view> + </td> + <td id="infopaneIndicator" class="infopaneIndicator"> + </td> + <td id="infopaneDetailsIcon"> + </td> + </tr> + <tr> + <td id="infopaneShortDescription" colspan="7" class="infopaneShortDescription"> + </td> + </tr> + <tr style="height:20px"> + <td></td> + </tr> + <tr> + <td id="infopaneDescription" colspan="6" class="infopaneDescription"> + </td> + </tr> + </table> + </div> + </td> + </tr> + </table> + </td> + <td style="vertical-align:top; width:300px; text-align:right;"> + <div id="downloadAds"> + <jsp:include page="download.jsp" /> + </div> + </td> + </tr> + </table> + </div> + <div id="status" style="text-align:left"></div> <div id="status_2"></div> + <div id="dstatus"></div> + <div id="injection_point"></div> +</center> +<jsp:include page="footer.jsp" /> +</body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old new file mode 100644 index 0000000..13914ed --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old @@ -0,0 +1,95 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: catalog.jsp,v 1.20 2006/12/01 21:38:40 basler Exp $ --%> +<script type="text/javascript" src="common.js"></script> +<script type="text/javascript" src="scroller.js"></script> +<link rel="stylesheet" type="text/css" href="scroller.css"></link> +<script type="text/javascript" src="accordion.js"></script> +<link rel="stylesheet" type="text/css" href="accordion.css"></link> +<script type="text/javascript" src="catalog.js"></script> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> +<body> +<jsp:include page="banner.jsp" /> +<script type="text/javascript"> + dojo.event.connect(window, "onload", function(){initCatalog();}); +</script> +<center> + <table border="0"> + <tr> + <td> + <table id="accordion"> + <tr id="accordionTitle" class="accordionTitle"><td>Pets</td></tr> + <tr><td> + <table id="accordionBody" border="0" class="accordionBody"> + </table> + </td></tr> + </table> + </td> + <td style="min-width:500px;"> + <div id="CatalogBrowser"> + <table width="500px"border="1" class="slider" > + <tr height="415" valign="top"> + <td id="bodySpace" border="0" align="center"></td> + </tr> + <tr id="targetRow"> + <td width="500px" height="70px" align="top"> + <div class="nav" id="right_button"> + <img src="${pageContext.request.contextPath}/images/right.gif" name="nextRoll" title="Show More Items" border="0"> + </div> + <div class="nav" id="left_button"> + <img src="${pageContext.request.contextPath}/images/left.gif" name="previousRoll" title="Show Previous Items" border="0"> + </div> + <div id="infopane" class="infopane"> + <table class="infopaneTable"> + <tr> + <td id="infopaneName" class="infopaneTitle"> + </td> + <td id="infopaneRating" class="infopaneRating"> + <f:view> + <ui:rating id="rating" maxGrade="5" includeNotInterested="false" includeClear="false" + hoverTexts="#{RatingBean.ratingText}" notInterestedHoverText="Not Interested" clearHoverText="Clear Rating" + grade="#{RatingBean.grade}"/> + <f:verbatim></td><td id="infopanePrice" class="infopanePrice"></td><td id="infopanePayPal" class="infopanePayPal"></f:verbatim> + <ui:buyNow business="donate(a)animalfoundation.com" id="buyNow1" itemName="Buy Item One" + amount="100.00" quantity="1" type="BuyNow" postData="#{PayPalBean.postData}" target="paypal"/> + </f:view> + </td> + <td id="infopaneIndicator" class="infopaneIndicator"> + </td> + <td id="infopaneDetailsIcon"> + </td> + </tr> + <tr> + <td id="infopaneShortDescription" colspan="7" class="infopaneShortDescription"> + </td> + </tr> + <tr style="height:20px"> + <td></td> + </tr> + <tr> + <td id="infopaneDescription" colspan="6" class="infopaneDescription"> + </td> + </tr> + </table> + </div> + </td> + </tr> + </table> + </td> + <td style="vertical-align:top; width:300px; text-align:right;"> + <div id="downloadAds"> + <jsp:include page="download.jsp" /> + </div> + </td> + </tr> + </table> + </div> + <div id="status" style="text-align:left"></div> <div id="status_2"></div> + <div id="dstatus"></div> + <div id="injection_point"></div> +</center> +<jsp:include page="footer.jsp" /> +</body> +</html> \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js new file mode 100644 index 0000000..03a3ba2 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js @@ -0,0 +1,77 @@ + + function ajaxBindError(type, errObj) { + // can't use the error page, because unless and exception in the internal servlet container + // nullpointer exceptions will be thrown + //window.location="./systemerror.jsp?message=" + errObj.message; + + alert("An Exception has been encountered on the server side during an Ajax request. Please see the server logs for more information " + errObj.message); + } + + + function debugProperties(namex) { + var listx=""; + var ob=namex; + for(xx in ob) { + listx += xx + " = " + ob[xx] + "<br/>" + } + //document.write(listx); + alert(listx); + } + + + function printDebug(argx) { + if (typeof debug != 'undefined') { + document.getElementById("status").innerHTML = argx + "<br\>" + document.getElementById("status").innerHTML; + } + } + + + function Map() { + var size = 0; + var keys = []; + var values = []; + + this.put = function(key, value, replace) { + if (this.get(key) == null) { + keys[size] = key; + values[size] = value; + size++; + } else if (replace) { + for (i=0; i < size; i++) { + if (keys[i] == key) { + values[i] = value; + } + } + } + } + + this.get = function(key) { + for (i=0; i < size; i++) { + if (keys[i] == key) { + return values[i]; + } + } + return null; + } + + this.clear = function() { + size = 0; + keys = []; + values = []; + } + + // return keys show can show main image + this.getKeys = function() { + return keys; + } + + // dump contents of map keys as string + this.contents = function() { + var retx=""; + for(ii=0; ii < size; ii++) { + retx += keys[ii] + ", "; + } + return retx; + } + + } \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp new file mode 100644 index 0000000..20ef584 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp @@ -0,0 +1,22 @@ +<div id="downloadAds" style="text-align:center; border-style:none; width:100%;"> + <table style="width:100%;"> + <tr> + <td style="text-align:center;"> + <a href="http://java.sun.com/javaee/downloads/index.jsp" target="downloads"><img style="border:none" src="./images/ad-sdk.jpg" alt="Download Java EE 5 SDK"/></a> + <br/> + </td> + </tr> + <tr> + <td style="text-align:center;"> + <a href="http://www.netbeans.org/downloads/index.html" target="downloads"><img style="border:none" src="./images/ad-netbeans.jpg" alt="Download Netbeans IDE"/></a> + <br/> + </td> + </tr> + <tr> + <td style="text-align:center;"> + <a href="http://java.com/en/download/index.jsp" target="downloads"><img style="border:none" src="./images/ad-jre.jpg" alt="Download Java SE"/></a> + <br/> + </td> + </tr> + </table> +</div> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js new file mode 100644 index 0000000..65855c2 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js @@ -0,0 +1,54 @@ +dojo.require("dojo.io"); +function checkAdPage() { + var bindArgs = { + // check to see if an updated page is available + URL: "http://localhost:8080/petstore/downloadAd.txt", + mimetype: "text/plain", + load: returnFunctionx, + error: ajaxBindError}; + + // dispatch the request + dojo.io.bind(bindArgs); +} + +function returnFunctionx(type, data, evt) { + // statically setup popup for simple case + // check return of the dojo call to make sure it is valid + if (evt.readyState == 4) { + if (evt.status == 200) { + alert("data = " + data); + document.getElementById("downloadAds").innerHTML=data; + } + } +} + + +var req; + +function checkAdPageMark() { + // calculate arrow and border image location + req=initRequest(); + + url="http://blueprints.dev.java.net/petstore/downloadAd.txt", + req.onreadystatechange = returnFunctionxMark; + req.open("GET", url, true); + req.send(null); +} + + +function returnFunctionxMark() { + if (req.readyState == 4) { + if (req.status == 200) { + alert("data = " + req.responseText); + document.getElementById("downloadAds").innerHTML=req.responseText; + } + } +} + +initRequest=function() { + if (window.XMLHttpRequest) { + return new XMLHttpRequest(); + } else if (window.ActiveXObject) { + return new ActiveXObject("Microsoft.XMLHTTP"); + } +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json new file mode 100644 index 0000000..3bbf564 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json @@ -0,0 +1,7 @@ +jsonpTest({"keyId":"TestData"}); + +function testexample() { + alert("testexample!!"); +} + +testexample(); \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt new file mode 100644 index 0000000..e9a0944 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt @@ -0,0 +1 @@ +<div id='downloadAds' style='text-align:center; border-style:double; width:100%;'> <table style='width:100%'> <tr> <th style='text-align:center; border-bottom:thin solid black;'>DOWNLOADS Blueprints</th> </tr> <tr> <td style='text-align:center;'> <a href='http://java.sun.com/javaee/downloads/index.jsp' target='downloads'><img style='border:none' src='./images/ad-sdk.jpg' alt='Download Java EE 5 SDK'/></a> </td> </tr> <tr> <td style='text-align:center;'> <a href='http://www.netbeans.org/downloads/index.html' target='downloads'><img style='border:none' src='./images/ad-netbeans.jpg' alt='Download Netbeans IDE'/></a> </td> </tr> <tr> <td style='text-align:center;'> <a href='http://java.com/en/download/index.jsp' target='downloads'><img style='border:none' src='./images/ad-jre.jpg' alt='Download Java SE'/></a> </td> </tr> </table></div> \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js new file mode 100644 index 0000000..0e5b14e --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js @@ -0,0 +1,241 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: engine.js,v 1.10 2006/05/03 22:00:32 inder Exp $ */ + +function Engine () { + + /** + * + * Load template text aloing with an associated script + * + * Argument p properties are as follows: + * + * url : Not required but used if you want to get the template from + * something other than the injection serlvet. For example if + * you want to load content directly from a a JSP or HTML file. + * + * p.template : Not required if you specficy a url property Otherewise this + * is the name of the template file. + * + * p.initFunction: Not required. This function or function pointer will be called + * after the template text and script are loaded. The result of + * the evaluated script will be accessible in the context of + * this function. + * + * p.injectionPoint: Not required. This is the id of an element into. If this is + * not specfied a div will be created under the roon node of + * the document and the template will be injected into it. + * Content is injected by setting the innerHTML property + * of an element to the template text. + */ + this.inject = function (p) { + var targetUrl; + if (!p.url) targetUrl = "controller?command=content&target=/" + p.template; + else targetUrl = p.url; + var templateArgs = { + url: targetUrl, + mimetype: "text/html", + load: function(type, data) { + //if no parent is given append to the document root + var nData = includeEmbeddedResources(data, p.initFunction ); + if (!p.injectionPoint) { + var injectionPoint = document.createElement("div"); + injectionPoint.innerHTML = nData; + document.firstChild.appendChild(injectionPoint); + } else { + p.injectionPoint.innerHTML = nData; + } + if (p.script) { + // now load the associated JavaScript + loadScript(p.script,p.initFunction); + } + } + }; + dojo.io.bind(templateArgs); + } + + function loadScript(targetURL,callback) { + var templateArgs = { + url: targetURL, + mimetype: "text/plain", + load: callback + }; + dojo.io.bind(templateArgs); + } + + /** + * If were returning an text document remove any script in the + * the document and add it to the global scope using a time out. + */ + function includeEmbeddedResources(target, initFunction) { + var bodyText = ""; + var embeddedScripts = []; + var embeddedStyles = []; + var scriptReferences = []; + var styleReferences = []; + var styles = []; + // recursively go through and weed out the scripts + // TODO: Use some better REGEX processing + // TODO: Also support single quotes + while (target.indexOf("<script") != -1) { + var realStart = target.indexOf("<script"); + var scriptSourceStart = target.indexOf("src=", (realStart)); + var scriptElementEnd = target.indexOf(">", realStart); + var end = target.indexOf("</script>", (realStart)) + "</script>".length; + if (realStart != -1 && scriptSourceStart != -1) { + var scriptSourceName; + var scriptSourceLinkStart= scriptSourceStart + 5; + var scriptSourceLinkEnd= target.indexOf("\"", (scriptSourceLinkStart + 1)); + if (scriptSourceStart < scriptElementEnd) { + scriptSourceName = target.substring(scriptSourceLinkStart, scriptSourceLinkEnd); + // prevent multiple inclusions of dojo.js. + // there is no way you would get to this point without dojo being included + if (scriptSourceName.indexOf("dojo.js") == -1) { + scriptReferences.push(scriptSourceName); + } + } + } + // now remove the script body + var scriptBodyStart = scriptElementEnd + 1; + var sBody = target.substring(scriptBodyStart, end - "</script>".length); + if (sBody.length > 0) { + embeddedScripts.push(sBody); + } + //remove script + target = target.substring(0, realStart) + target.substring(end, target.length); + } + + while (target.indexOf("<style") != -1) { + var realStart = target.indexOf("<style"); + var styleElementEnd = target.indexOf(">", realStart); + var end = target.indexOf("</style>", (realStart)) ; + var styleBodyStart = styleElementEnd + 1; + var sBody = target.substring(styleBodyStart, end); + if (sBody.length > 0) { + embeddedStyles.push(sBody); + } + //remove style + target = target.substring(0, realStart) + target.substring(end + "</style>".length, target.length); + } + // get the links + while (target.indexOf("<link") != -1) { + var realStart = target.indexOf("<link"); + var styleSourceStart = target.indexOf("href=", (realStart)); + var styleElementEnd = target.indexOf(">", realStart) +1; + if (realStart != -1 && styleSourceStart != -1) { + var styletSourceName; + var styleSourceLinkStart= styleSourceStart + 6; + var styleSourceLinkEnd= target.indexOf("\"", (styleSourceLinkStart + 1)); + if (styleSourceStart < styleElementEnd) { + styleSourceName = target.substring(styleSourceLinkStart, styleSourceLinkEnd); + styleReferences.push(styleSourceName); + } + //remove style + target = target.substring(0, realStart) + target.substring(styleElementEnd, target.length); + } + } + + var head = document.getElementsByTagName("head")[0]; + + // inject the links + for(var loop = 0; loop < styleReferences.length; loop++) { + var link = document.createElement("link"); + link.href = styleReferences[loop]; + link.type = "text/css"; + link.rel = "stylesheet"; + head.appendChild(link); + } + + var stylesElement; + if (embeddedStyles.length > 0) { + stylesElement = document.createElement("style"); + stylesElement.type="text/css"; + var stylesText; + for(var loop = 0; loop < embeddedStyles.length; loop++) { + stylesText = stylesText + embeddedStyles[loop]; + } + if (document.styleSheets[0].cssText) { + document.styleSheets[0].cssText = document.styleSheets[0].cssText + stylesText; + } else { + stylesElement.appendChild(document.createTextNode(stylesText)); + head.appendChild(stylesElement); + } + } + + scriptLoader(scriptReferences, 0, function() { + this.embeddedScripts = embeddedScripts; + // evaluate the embedded javascripts in the order they were added + // consider using an onload handler + for(var loop = 0; loop < embeddedScripts.length; loop++) { + //alert("evaluating " + embeddedScripts[loop]); + var script = embeddedScripts[loop]; + // append to the script a method to call the scriptLoaderCallback + eval(script); + if (loop == (embeddedScripts.length -1)) { + initFunction(); + } + } + }); + + return target; + } + + + /** + * Load the scripts in order and load them one after on another + */ + function scriptLoader(scripts, index, callbackFunction) { + var head = document.getElementsByTagName("head").item(0); + var scriptElement = document.createElement("script"); + scriptElement.id = "c_script_" + index; + scriptElement.type = "text/javascript"; + + var loadHandler = function () { + if (index < scripts.length && index != scripts.length -1) { + scriptLoader(scripts, ++index, callbackFunction); + } else { + callbackFunction(); + } + } + if (typeof scriptElement.onreadystatechange != 'undefined') { + scriptElement.onreadystatechange = function () { + if (this.readyState == 'loaded') { + loadHandler(); + } + }; + } + scriptElement.onload = loadHandler; + + // Safari not seeing the onload event and does not support the onreadystate + if (navigator.userAgent.toLowerCase().indexOf("safari") != -1) { + scriptElement.src = scripts[index]; + setTimeout(loadHandler, 0); + } + head.appendChild(scriptElement); + setTimeout("document.getElementById('c_script_" + index + "').src ='" + scripts[index] + "'", 0); + + scriptElement = null; + head = null; + } + + /** + * If were returning an XML document remove any script in the + * the document and add it to the global scope using a time out. + */ + function includeEmbeddedScripts(xmlDocument) { + var items = new Array(); + var xmlDocument = document.getElementsByTagName("script"); + + for(var loop = 0; loop < targets.length; loop++) { + var children = targets[loop].childNodes; + var iScript = ""; + for(var innerLoop = 0; innerLoop < children.length; innerLoop++) { + iScript += children[innerLoop].data; + } + items.add(iScript); + children[loop].parentNode.removeChild(children[loop]); + } + for(var loop = 0; loop < items.length; loop++) { + setTimeout(items[loop],0); + } + } +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp new file mode 100644 index 0000000..bb8fb85 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp @@ -0,0 +1,266 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: fileupload.jsp,v 1.57 2007/03/08 21:58:48 inder Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="com.sun.javaee.blueprints.petstore.util.PetstoreConstants"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <title>Petstore Seller page</title> + <script type="text/javascript"> + var submittingForm=false; + + function testRetFunction(type, data, evt){ + if (evt.readyState == 4) { + if(evt.status == 200) { + // check for error + submittingForm=false; + var resultx=data.getElementsByTagName("response")[0]; + var message=resultx.getElementsByTagName("message")[0].childNodes[0].nodeValue; + if(message == "Captchas Filter Error") { + // captcha error + alert("Authorization failed : please enter the correct captcha string"); + } else if(message == "Validation Error") { + alert("Validation failed on the Server :\n" + resultx.getElementsByTagName("detail")[0].childNodes[0].nodeValue); + } else if(message == "Upload Size Error") { + alert("The size of the uploaded image must not be more than 100 KB"); + } else { + // fileupload complete + var thumbpath=resultx.getElementsByTagName("thumbnail")[0].childNodes[0].nodeValue; + var productId=resultx.getElementsByTagName("productId")[0].childNodes[0].nodeValue; + var itemid=resultx.getElementsByTagName("itemId")[0].childNodes[0].nodeValue; + // forward to status page + location.href="fileuploadstatus.jsp?message=" + message + "&id=" + itemid + "&productId=" + productId + "&thumb=" + thumbpath; + } + } else { + // server error, send to error page + // can't forward to errorpage because null pointer gets thrown on lookup of status code ("javax.servlet.error.status_code") + //ajaxBindError(type, data.message); + alert("Persistence failed : Please check if the server logs for more information!") + } + } + } + + + function storeCookie() { + currentcap = "j_captcha_response="+document.getElementById("TestFileuploadForm:captcharesponse").value; + document.cookie = currentcap; + } + + function extractCity(citystatezip) { + var index = citystatezip.indexOf(','); + var nextcity = citystatezip.substring(0, index+4); + return nextcity; + } + + function chooseCity(city) { + var index = city.indexOf(','); + var state = city.substring(index+2, index+4); + var zip = city.substring(index+5); + city = city.substring(0, index); + + document.getElementById('TestFileuploadForm:cityField').value = city; + document.getElementById('TestFileuploadForm:stateField').value = state; + document.getElementById('TestFileuploadForm:zipField').value = zip; + } + + function fileuploadOnsubmit() { + if(!submittingForm) { + var valMess=""; + + // save rich text editor text to element + var descx=dojo.widget.byId('rtEditor').getEditorContent() + var lowDescx=descx.toLowerCase(); + + // START: check validation + if(dojo.byId("TestFileuploadForm:name").value == "") { + valMess += "Error: Pet Name is required.\n"; + } + + // make sure there isn't a script/link tag in the description + if(lowDescx == "" || lowDescx.indexOf("<script") > -1 || lowDescx.indexOf("<link") > -1) { + valMess += "Error: The Description must exist and the field can't have a '<script>' and/or a '<link>' tag in it\n"; + } + + // make sure price is a number + var pricex=dojo.byId("TestFileuploadForm:price").value; + if(pricex == "" || isNaN(parseInt(pricex))) { + // price should be a number + valMess += "Error: Price should should exist and be a number in American Dollars in the format '*.00'.\n"; + } + + // make sure the upload file ends in an suffix + var filex=dojo.byId("fileToUploadId").value; + var lengthx=filex.length; + var suffix=filex.substr(lengthx-4).toLowerCase(); + if(lengthx < 1 || (suffix != ".jpg" && suffix != ".gif" && suffix != ".png")) { + // not a proper upload so error + valMess += "Error: The image upload file must exist and be of type .jpg, .gif or .png\n"; + } + + + // make sure make and address is entered + if(dojo.byId("TestFileuploadForm:firstName").value == "") { + // price should be a number + valMess += "Error: First Name is required.\n"; + } + if(dojo.byId("TestFileuploadForm:lastName").value == "") { + valMess += "Error: Last Name is required.\n"; + } + if(dojo.byId("TestFileuploadForm:street1").value == "") { + valMess += "Error: Street is required.\n"; + } + if(dojo.byId("TestFileuploadForm:cityField").value == "") { + valMess += "Error: City is required.\n"; + } + if(dojo.byId("TestFileuploadForm:stateField").value == "") { + valMess += "Error: State is required.\n"; + } + if(dojo.byId("TestFileuploadForm:zipField").value == "") { + valMess += "Error: Zip Code is required.\n"; + } + + if(valMess != "") { + // error, show message + alert(valMess + "\nPlease addresses the error(s) and re-submit your entry!"); + } else { + // no validation errors, so submit form + submittingForm=true; + // set description + dojo.byId('description').value=descx; + + storeCookie() + document.forms['TestFileuploadForm'].onsubmit(); + } + } + } + + function showFU() { + document.getElementById("fucomponent").style.visibility = "visible"; + } + + function switchPanes(fromDivId, toDivId) { + // show pane + var divx=document.getElementById(fromDivId); + divx.style.visibility='hidden'; + divx=document.getElementById(toDivId); + divx.style.visibility='visible'; + } +</script> +<style> +span.button { + background-color: #6699CC; + color: white; + cursor:pointer; + border: thin outset black; + padding: 1px 5px; +} +div.pane { + width: 90%; + background-color: #EEEEEE; + border: thin double blue; + padding: .5cm; + font: 12px arial; +} + +.nameCol { + width: 45%; +} +.dataCol { + width: 55%; +} + +</style> + </head> + <body onload="showFU()"> + <jsp:include page="banner.jsp"/> + <script>dojo.require("dojo.widget.Editor2");</script> + <br/> + <div id="fucomponent" style="visibility:hidden;"> + <f:view> + + <ui:fileUploadTag id="TestFileuploadForm" serverLocationDir="#{FileUploadBean.uploadImageDirectory}" + postProcessingMethod="#{FileUploadBean.postProcessingMethod}" + retMimeType="text/xml" retFunction="testRetFunction" + progressBarDivId="progress" progressBarSize="40"> + <div id="pane2" class="pane" style="visibility: hidden;"> + <h:panelGrid border="0" columns="2" style="width: 100%" columnClasses="nameCol, dataCol"> + <f:facet name="header"> + <h:outputText value="Information about yourself"/> + </f:facet> + <h:outputText value="*First Name"/> + <h:inputText size="20" id="firstName"></h:inputText> + <h:outputText value="*Last Name"/> + <h:inputText size="20" id="lastName"></h:inputText> + <h:outputText value="Seller Email"/> + <h:inputText size="20" id="email"></h:inputText> + <h:outputText value="*Street"/> + <h:inputText size="20" id="street1"></h:inputText> + <h:outputText value="*City"/> + <ui:autoComplete size="20" maxlength="10" id="cityField" + completionMethod="#{AutocompleteBean.completeCity}" + value="#{AddressBean.city}" required="true" + ondisplay="function(item) { return extractCity(item); }" + onchoose="function(item) { return chooseCity(item); }" /> + <h:outputText value="*State"/> + <ui:autoComplete size="2" maxlength="10" id="stateField" + completionMethod="#{AutocompleteBean.completeState}" + value="#{AddressBean.state}" required="true" /> + <h:outputText value="*Zip Code"/> + <h:inputText size="5" id="zipField" value="#{AddressBean.zip}" required="true" /> + + <h:outputText value="Enter the text as it is shown below (case insensitive)"/> + <h:outputText /> + <h:graphicImage id="captchaImg" url="CaptchaServlet"/> + <h:inputText id="captcharesponse"></h:inputText> + <br/><span class="button" onclick="switchPanes('pane2', 'pane1');"><< Previous</span> +    <span class="button" onclick="fileuploadOnsubmit()">Submit</span> + <br/><div id="progress"></div><br/> + + </h:panelGrid> + </div> + <div class="pane"style="position:absolute; top:125px;" id="pane1"> + <h:panelGrid border="0" columns="2" style="width: 100%" columnClasses="nameCol, dataCol"> + <f:facet name="header"> + <h:outputText value="Information about your pet"/> + </f:facet> + + <h:outputText value="Category"/> + <h:selectOneMenu id="product"> + <f:selectItems value="#{FileUploadBean.products}"/> + </h:selectOneMenu> + + <h:outputText value="*Pet's Name"/> + <h:inputText size="20" id="name"></h:inputText> + + <h:outputText value="*Description (3 lines max display in catalog)"/> + + <div style="border-style:inset; border-width:thin; background-color:white"> + <textarea wrap="soft" dojoType="Editor2" widgetId="rtEditor" id="description" name="TestFileuploadForm:description" + toolbarTemplatePath="${pageContext.request.contextPath}/rteToolBar.html"></textarea> + </div> + + <h:outputText value="*Price (is US dollars)"/> + <h:inputText size="20" id="price"></h:inputText> + + <h:outputText value="*Image File"/> + <input type="file" size="20" name="fileToUpload" id="fileToUploadId"/> + + <h:outputText value="Custom Tag Keywords (separated by spaces)"/> + <h:inputText size="20" id="tags"></h:inputText> + </h:panelGrid> + <br/><span class="button" onclick="switchPanes('pane1', 'pane2');">Next >></span> + </div> + Required fields are designated by a * + </ui:fileUploadTag> + </f:view> + </div> + + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp new file mode 100644 index 0000000..50e3730 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp @@ -0,0 +1,134 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: fileuploadstatus.jsp,v 1.8 2006/05/05 21:05:47 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Seller Photo Submit Status</title> + <style type="text/css"> + #status { background-color : #E0FFFF; + border : none; + width : 50%; + } + </style> + <script type="text/javascript"> + window.onload = function() { + var thumbfile = "${param.thumb}"; + if (thumbfile == "") { + thumbfile = "${sessionScope['fileuploadResponse'].thumbnail}"; + } + thumbpath = "http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.servletContext.contextPath}/ImageServlet/"; + thumbpath += thumbfile; + var divNode = document.getElementById("thumb"); + var imgNode = document.createElement("img"); + imgNode.setAttribute("src", thumbpath); + divNode.appendChild(imgNode); + + // initialize buttons + initButtonImage(); + } + + var imageLayerId = new Array(); + var imageLayerG = new Array(); + var imageLayerC = new Array(); + var imageText = new Array(); + function initButtonImage(){ + imageLayerId[1] ="seller" + imageLayerG[1] = "../images/seller-thumb-g.jpg"; + imageLayerC[1] = "../images/seller-thumb.jpg"; + imageLayerId[2] ="catalog" + imageLayerG[2] = "../images/catalog-thumb-g.jpg"; + imageLayerC[2] = "../images/catalog-thumb.jpg"; + imageLayerId[3] ="home" + imageLayerG[3] = "../images/index-thumb-g.jpg"; + imageLayerC[3] = "../images/index-thumb.jpg"; + + imageText[1] = "Submit another pet"; + imageText[2] = "Go to your pet page"; + imageText[3] = "Go back to PetStore home"; + } + + function highlightButton(n) { + switchButton(true, n); + } + function darkenButton(n) { + switchButton(false, n); + } + + function switchButton(highlight, n){ + var id = imageLayerId[n]; + var btn = document.getElementById(id); + if (highlight) { + btn.src = imageLayerC[n]; + popupText(imageText[n]); + } else { + btn.src = imageLayerG[n]; + popupText(null); + } + } + var Mx; + var My; + function popupText(txt) { + var pNode = document.getElementById("popupText"); + var rx; + var ry; + if (document.all) { + rx = event.clientX + document.body.scrollLeft +10; + ry = event.clientY + document.body.scrollTop -20; + } else { + rx = Mx + 10; + ry = My -20; + } + if (txt) { + pNode.style.display = "block"; + pNode.style.left = rx + "px"; + pNode.style.top = ry + "px"; + pNode.innerHTML = txt; + } else { + pNode.style.display = "none"; + pNode.innerHTML = ""; + } + } + function getMouseXY(mEvent) { + Mx = mEvent.pageX; + My = mEvent.pageY; + } + window.onmousemove = getMouseXY; + </script> + </head> + <body> + <jsp:include page="banner.jsp"/> + <center> + <div id="status"> + <h4>${param.message}</h4> + Here's the uploaded photo of your pet<br/><br/> + <div id="thumb"></div> + <br/><br/> + Would you like to :-<br/><br/> + + <div id="popupText" style="position:absolute;z-index:2;border:1px solid;padding:5px; + border-color:blue;font-size:10pt;background-color:#00ffff;color:blue;display:none"></div> + <table border="0" cellpadding="4" cellspacing="4"> + <tr> + <td><a href="fileupload.jsp" onmouseover="highlightButton(1)" onmouseout="darkenButton(1)"> + <img name="seller" id="seller" src="../images/seller-thumb-g.jpg" alt="seller" width="105" height="60" border="0"> + </a> + </td> + <td><a href="catalog.jsp?pid=${param.productId}&itemId=${param.id}" onmouseover="highlightButton(2)" onmouseout="darkenButton(2)"> + <img name="catalog" id="catalog" src="../images/catalog-thumb-g.jpg" alt="catalog" width="105" height="60" border="0"> + </a> + </td> + <td><a href="http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.servletContext.contextPath}/index.jsp" onmouseover="highlightButton(3)" onmouseout="darkenButton(3)"> + <img name="home" id="home" src="../images/index-thumb-g.jpg" alt="index" width="105" height="60" border="0"> + </a> + </td> + </tr> + </table> + </div> + </center> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp new file mode 100644 index 0000000..8fda523 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp @@ -0,0 +1,15 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: footer.jsp,v 1.10 2007/01/31 19:40:34 basler Exp $ --%> + +<hr/> +<center> + If you have any questions or suggestions, please use the <a + href="https://blueprints.dev.java.net/feedback.html" target="petstore">feedback page</a>. + <br/> + To access the latest versions of any of the BluePrints projects, please use the <a + href="https://blueprints.dev.java.net/downloads.html" target="petstore">download page</a>. + <br/> + <a href="http://blueprints.dev.java.net/" target="petstore">Java BluePrints</a> | + <a href="http://sun.com/" target="petstore">Sun Microsystems</a> © 2007 Sun Microsystems Inc. All rights reserved. Use is subject to license terms. +</center> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg new file mode 100644 index 0000000..734f0ba Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg new file mode 100644 index 0000000..1d6b615 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg new file mode 100644 index 0000000..d50fc6f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg new file mode 100644 index 0000000..77fb082 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg new file mode 100644 index 0000000..93a3832 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg new file mode 100644 index 0000000..b7c7c3b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg new file mode 100644 index 0000000..0c9ce17 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg new file mode 100644 index 0000000..caaf6a7 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg new file mode 100644 index 0000000..6c7d06e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg new file mode 100644 index 0000000..f7daf7a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg new file mode 100644 index 0000000..2794a4b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg new file mode 100644 index 0000000..57175e3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg new file mode 100644 index 0000000..d1b3610 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg new file mode 100644 index 0000000..dd57db1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg new file mode 100644 index 0000000..2f14c53 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg new file mode 100644 index 0000000..334a0f8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg new file mode 100644 index 0000000..6bec9fa Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg new file mode 100644 index 0000000..6219a97 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg new file mode 100644 index 0000000..61b9b59 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg new file mode 100644 index 0000000..d4a91e0 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg new file mode 100644 index 0000000..9c7c4ab Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg new file mode 100644 index 0000000..93eb9da Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg new file mode 100644 index 0000000..cacb8f6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg new file mode 100644 index 0000000..f1da9d8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg new file mode 100644 index 0000000..a999838 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg new file mode 100644 index 0000000..e3eeb3e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg new file mode 100644 index 0000000..bf3aa59 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg new file mode 100644 index 0000000..990e44b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg new file mode 100644 index 0000000..873beb5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg new file mode 100644 index 0000000..e9f2fbb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg new file mode 100644 index 0000000..4119ae3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg new file mode 100644 index 0000000..efa8fa8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg new file mode 100644 index 0000000..6ac0c46 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg new file mode 100644 index 0000000..1ab033b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg new file mode 100644 index 0000000..4b75817 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg new file mode 100644 index 0000000..0bbad05 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg new file mode 100644 index 0000000..f63f01a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg new file mode 100644 index 0000000..10f22cc Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg new file mode 100644 index 0000000..e18660f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg new file mode 100644 index 0000000..e651619 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg new file mode 100644 index 0000000..3f93502 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg new file mode 100644 index 0000000..d33f856 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg new file mode 100644 index 0000000..43cd251 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg new file mode 100644 index 0000000..aa0820c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg new file mode 100644 index 0000000..8b73de1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg new file mode 100644 index 0000000..248ca28 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg new file mode 100644 index 0000000..0c3fb87 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg new file mode 100644 index 0000000..ff93f90 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg new file mode 100644 index 0000000..4571a4b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg new file mode 100644 index 0000000..647323b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg new file mode 100644 index 0000000..e870f66 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg new file mode 100644 index 0000000..23dd110 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg new file mode 100644 index 0000000..3355eaa Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg new file mode 100644 index 0000000..531ec1e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg new file mode 100644 index 0000000..9cd85f5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg new file mode 100644 index 0000000..72377b5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg new file mode 100644 index 0000000..2788d06 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg new file mode 100644 index 0000000..2b836df Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg new file mode 100644 index 0000000..9ef87c3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg new file mode 100644 index 0000000..753d1e9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg new file mode 100644 index 0000000..29953c4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg new file mode 100644 index 0000000..a4a0247 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg new file mode 100644 index 0000000..7caf368 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg new file mode 100644 index 0000000..9f18ed6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg new file mode 100644 index 0000000..65bc52f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg new file mode 100644 index 0000000..b0f299d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg new file mode 100644 index 0000000..d1e9cc3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg new file mode 100644 index 0000000..862c6f8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg new file mode 100644 index 0000000..5c7b519 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg new file mode 100644 index 0000000..079b2fa Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg new file mode 100644 index 0000000..2a1a88a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg new file mode 100644 index 0000000..4d1ed42 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg new file mode 100644 index 0000000..87ea286 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg new file mode 100644 index 0000000..7b76088 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg new file mode 100644 index 0000000..8005ff3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg new file mode 100644 index 0000000..4b21f49 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg new file mode 100644 index 0000000..88a889c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg new file mode 100644 index 0000000..8adf561 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg new file mode 100644 index 0000000..c262965 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif new file mode 100644 index 0000000..85de81a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif new file mode 100644 index 0000000..06f1abe Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif new file mode 100644 index 0000000..9601f1c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif new file mode 100644 index 0000000..f48a7ec Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif new file mode 100644 index 0000000..eaaa3e5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif new file mode 100644 index 0000000..9f440f1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif new file mode 100644 index 0000000..affd8e0 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif new file mode 100644 index 0000000..8b14629 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg new file mode 100644 index 0000000..8c54af1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg new file mode 100644 index 0000000..ccdea14 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg new file mode 100644 index 0000000..b3f1d09 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg new file mode 100644 index 0000000..d3dcfd7 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg new file mode 100644 index 0000000..a4b48da Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg new file mode 100644 index 0000000..5a172c5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg new file mode 100644 index 0000000..40303af Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg new file mode 100644 index 0000000..83d74d2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg new file mode 100644 index 0000000..004dfe3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg new file mode 100644 index 0000000..3e77142 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg new file mode 100644 index 0000000..4c260e8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg new file mode 100644 index 0000000..b146396 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg new file mode 100644 index 0000000..742336f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg new file mode 100644 index 0000000..e5bbc24 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif new file mode 100644 index 0000000..1fd4d1c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif new file mode 100644 index 0000000..8bc7f6c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif new file mode 100644 index 0000000..a51bc96 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif new file mode 100644 index 0000000..e594c67 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif new file mode 100644 index 0000000..6ac8718 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif new file mode 100644 index 0000000..4716f5d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif new file mode 100644 index 0000000..0793e3f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif new file mode 100644 index 0000000..2d289ba Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif new file mode 100644 index 0000000..2ea6132 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif new file mode 100644 index 0000000..159ba6a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif new file mode 100644 index 0000000..a9ed7c9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif new file mode 100644 index 0000000..02faffb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg new file mode 100644 index 0000000..1a13b11 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg new file mode 100644 index 0000000..d6148de Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif new file mode 100644 index 0000000..db70d7d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif new file mode 100644 index 0000000..83b8761 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg new file mode 100644 index 0000000..84e4e89 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg new file mode 100644 index 0000000..5830e57 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg new file mode 100644 index 0000000..bb91e94 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg new file mode 100644 index 0000000..9e8d17d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif new file mode 100644 index 0000000..3c517f3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg new file mode 100644 index 0000000..575a854 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg new file mode 100644 index 0000000..9c2dc57 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif new file mode 100644 index 0000000..92e71b5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif new file mode 100644 index 0000000..e581980 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif new file mode 100644 index 0000000..9baa503 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif new file mode 100644 index 0000000..9124427 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif new file mode 100644 index 0000000..3f1690e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif new file mode 100644 index 0000000..2bf1380 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif new file mode 100644 index 0000000..b13e5b9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg new file mode 100644 index 0000000..ff83a16 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg new file mode 100644 index 0000000..814dab1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg new file mode 100644 index 0000000..2623f3c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg new file mode 100644 index 0000000..ccf10a2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg new file mode 100644 index 0000000..7a7a59e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg new file mode 100644 index 0000000..1f65136 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg new file mode 100644 index 0000000..4709e19 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg new file mode 100644 index 0000000..76a7ff1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg new file mode 100644 index 0000000..13194bd Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg new file mode 100644 index 0000000..cd8ad6e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif new file mode 100644 index 0000000..4d9916c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif new file mode 100644 index 0000000..258489d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif new file mode 100644 index 0000000..d3e39e1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif new file mode 100644 index 0000000..730c813 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg new file mode 100644 index 0000000..cbe5030 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg new file mode 100644 index 0000000..11954df Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif new file mode 100644 index 0000000..4bf637f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg new file mode 100644 index 0000000..097b144 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg new file mode 100644 index 0000000..ec5d64b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg new file mode 100644 index 0000000..31bb43c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg new file mode 100644 index 0000000..70cdc2a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg new file mode 100644 index 0000000..a6646c7 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg new file mode 100644 index 0000000..262659a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg new file mode 100644 index 0000000..ea0c069 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg new file mode 100644 index 0000000..828bba2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg new file mode 100644 index 0000000..5b28bd0 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg new file mode 100644 index 0000000..3c4d322 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg new file mode 100644 index 0000000..c7c1486 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg new file mode 100644 index 0000000..6003c8c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg new file mode 100644 index 0000000..a538759 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg new file mode 100644 index 0000000..2369c90 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg new file mode 100644 index 0000000..13c3f9b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg new file mode 100644 index 0000000..61d877b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg new file mode 100644 index 0000000..4303498 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg new file mode 100644 index 0000000..37ebbe9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg new file mode 100644 index 0000000..a42ddb4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg new file mode 100644 index 0000000..571475a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif new file mode 100644 index 0000000..6da716a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif new file mode 100644 index 0000000..31d0ada Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg new file mode 100644 index 0000000..d4144da Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg new file mode 100644 index 0000000..fe37700 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg new file mode 100644 index 0000000..d83d3f9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg new file mode 100644 index 0000000..ba460be Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg new file mode 100644 index 0000000..7afa021 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg new file mode 100644 index 0000000..f7fa2b2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg new file mode 100644 index 0000000..8c06c3d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg new file mode 100644 index 0000000..84e82f5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg new file mode 100644 index 0000000..72a724f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg new file mode 100644 index 0000000..ae9054e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif new file mode 100644 index 0000000..46b3630 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif new file mode 100644 index 0000000..f50cbed Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg new file mode 100644 index 0000000..620c826 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg new file mode 100644 index 0000000..2a52e80 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg new file mode 100644 index 0000000..7b77428 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg new file mode 100644 index 0000000..b3748ae Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif new file mode 100644 index 0000000..665c4d6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif new file mode 100644 index 0000000..2e59d89 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif new file mode 100644 index 0000000..6dca58f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg new file mode 100644 index 0000000..cef3163 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg new file mode 100644 index 0000000..7e97d51 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg new file mode 100644 index 0000000..a95ff80 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg new file mode 100644 index 0000000..b7ae026 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg new file mode 100644 index 0000000..7acf48e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg new file mode 100644 index 0000000..140a325 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg new file mode 100644 index 0000000..4b96d8d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg new file mode 100644 index 0000000..5e3b381 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg new file mode 100644 index 0000000..f2f1848 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg new file mode 100644 index 0000000..a68cd9e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif new file mode 100644 index 0000000..da05f30 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg new file mode 100644 index 0000000..35387ca Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg new file mode 100644 index 0000000..7365af9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg new file mode 100644 index 0000000..0e6a1a5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg new file mode 100644 index 0000000..950c84e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif new file mode 100644 index 0000000..8408264 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg new file mode 100644 index 0000000..dea6b6d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg new file mode 100644 index 0000000..0f0ac10 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg new file mode 100644 index 0000000..3c7618a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg new file mode 100644 index 0000000..e765076 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg new file mode 100644 index 0000000..7c7d897 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg new file mode 100644 index 0000000..4cdb8bb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg new file mode 100644 index 0000000..f38af83 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg new file mode 100644 index 0000000..bec9ee6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg new file mode 100644 index 0000000..9bb9a17 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg new file mode 100644 index 0000000..c91be8e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg new file mode 100644 index 0000000..f4ce9ec Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg new file mode 100644 index 0000000..b599c76 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg new file mode 100644 index 0000000..cae1408 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg new file mode 100644 index 0000000..57e02ff Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg new file mode 100644 index 0000000..758ed35 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg new file mode 100644 index 0000000..3aec8c4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg new file mode 100644 index 0000000..13164b8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg new file mode 100644 index 0000000..fbd5412 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg new file mode 100644 index 0000000..148006d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg new file mode 100644 index 0000000..f25a814 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg new file mode 100644 index 0000000..2d9c2b1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg new file mode 100644 index 0000000..3573943 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg new file mode 100644 index 0000000..9be6e41 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg new file mode 100644 index 0000000..0559845 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg new file mode 100644 index 0000000..d4521a3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg new file mode 100644 index 0000000..370e4fd Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg new file mode 100644 index 0000000..5b89061 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg new file mode 100644 index 0000000..efff187 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg new file mode 100644 index 0000000..93af55f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg new file mode 100644 index 0000000..d751856 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg new file mode 100644 index 0000000..9c72270 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg new file mode 100644 index 0000000..9003e0c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif new file mode 100644 index 0000000..0ee4c52 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif new file mode 100644 index 0000000..89e7ba1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg new file mode 100644 index 0000000..16d1692 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg new file mode 100644 index 0000000..f183f1c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg new file mode 100644 index 0000000..005d708 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg new file mode 100644 index 0000000..e82c87d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg new file mode 100644 index 0000000..508edb1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg new file mode 100644 index 0000000..870c2f3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg new file mode 100644 index 0000000..a18e30a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg new file mode 100644 index 0000000..febadd3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg new file mode 100644 index 0000000..c7329f4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg new file mode 100644 index 0000000..3753577 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg new file mode 100644 index 0000000..a9c45e8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg new file mode 100644 index 0000000..2b7adf1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg new file mode 100644 index 0000000..93e78ee Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg new file mode 100644 index 0000000..cdbb5fb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif new file mode 100644 index 0000000..cdae47c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg new file mode 100644 index 0000000..6c1e407 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg new file mode 100644 index 0000000..991392d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg new file mode 100644 index 0000000..49898fb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg new file mode 100644 index 0000000..eb43a52 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg new file mode 100644 index 0000000..c918e36 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg new file mode 100644 index 0000000..f5063e3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif new file mode 100644 index 0000000..39fa7ba Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif new file mode 100644 index 0000000..52bc595 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif new file mode 100644 index 0000000..0393bc1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp new file mode 100644 index 0000000..9ce0b8d --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp @@ -0,0 +1,239 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: index.jsp,v 1.17 2007/03/15 23:19:46 basler Exp $ --%> +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> + +<% +try { + CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); + List<Tag> tags=cf.getTagsInChunk(0, 12); + // since top 20 come from database or desending refCount order, need to reorder by tag name + Collections.sort(tags, new Comparator() { + public int compare(Object one, Object two) { + int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); + return (cc < 0 ? 1 : cc > 0 ? -1 : 0); + } + }); +%> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > + <title>Java Pet Store Reference Application</title> + <script type="text/javascript" src="./common.js"></script> + <link type="text/css" rel="stylesheet" href="./tag.css"/> + <script type="text/javascript"> + //var djConfig = {isDebug: true }; + </script> + </head> + <body> + + <jsp:include page="banner.jsp" /> + <script> + dojo.require("dojo.widget.FisheyeList"); + dojo.require("dojo.io.*"); + dojo.require("dojo.io.ScriptSrcIO"); + //transport: "ScriptSrcTransport", + //url: "http://localhost:8080/petstore/downloadAd.json", + + function browse(category) { + window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; + + } + + + function debugProperties(namex) { + var listx=""; + var ob=namex; + for(xx in ob) { + listx += xx + " = " + ob[xx] + "<br/>" + } + //document.write(listx); + alert(listx); + } + + function checkAdPage() { + var bindArgs = { + //url: "https://blueprints.dev.java.net/petstore/downloadAd.json", + //url: "http://localhost:8080/petstore/downloadAd.json", + url: "http://search.yahooapis.com/ImageSearchService/V1/imageSearch?appid=YahooDe…", + transport: "ScriptSrcTransport", + jsonParamName: "callback", + mimetype: "text/json", + load: function(type, data, event, kwArgs) { + /* type will be "load", data will be response data, event will null, and kwArgs are the keyword arguments used in the dojo.io.bind call. */ + alert("load = " + data.ResultSet.totalResultsAvailable); + //debugProperties(data); + //document.getElementById("downloadAds").innerHTML=data.downloadxx; + + + }, + error: function(type, data, event, kwArgs) { + /* type will be "error", data will be response data, event will null, and kwArgs are the keyword arguments used in the dojo.io.bind call. */ + alert("error"); + }, + timeout: function() { + /* Called if there is a timeout */ + alert("timeout"); + }, + timeoutSeconds: 10}; + // dispatch the request + dojo.io.bind(bindArgs); + } + + function callback() { + alert("callback"); + } + + function returnFunctionx(type, data, evt) { + // statically setup popup for simple case + // check return of the dojo call to make sure it is valid + if (evt.readyState == 4) { + if (evt.status == 200) { + alert("data = " + data.downloadxx); + //document.getElementById("downloadAds").innerHTML=data; + document.getElementById("downloadAds").innerHTML=data.downloadxx; + } + } + } + + function testit() { + testx={download:"test", textx:"it"}; + alert("test = " + testx.download); + } + + + </script> + <span onclick="checkAdPage();">test it</span> + + + <table bgcolor="white"> + <tr> + <td valign="top"> + <div class="outerbar" style="width: 200px"> + + <div dojoType="FisheyeList" + itemWidth="170" itemHeight="50" + itemMaxWidth="340" itemMaxHeight="100" + orientation="vertical" + effectUnits="2" + itemPadding="10" + attachEdge="top" + labelEdge="bottom" + enableCrappySvgSupport="false"> + + <div dojoType="FisheyeListItem" onClick="browse('Dogs');" + iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Cats');" + iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Birds');" + iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Fish');" + iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" + iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> + </div> + </div> + + </div> + </td> + <td valign="top" style="width: 400px"> + <div id="bodyCenter"> + <table valign="top" id="bodyTable" border="0"> + <tr> + <td> + <map name="petmap"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="72,2,280,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" + alt="Fish" + coords="2,180,72,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" + alt="Dogs" + coords="60,250,130,320"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" + alt="Reptiles" + coords="140,270,210,340"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" + alt="Cats" + coords="225,240,295,310"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="280,180,350,250"> + </map> + + <img src="${pageContext.request.contextPath}/images/splash.gif" + alt="Pet Selection Map" + usemap="#petmap" + width="350" + height="355" + border="0"> + </td> + </tr> + </table> + + </div> + </td> + <td style="vertical-align:top;"> + <div style="border-style: double; width:100%;"> + <table border="0"> + <tr> + <th colspan="2" style="text-align:center">Most Popular Tags</th> + </tr> + <tr> +<% + String style=null; + int refx=0, ii=0; + for(Tag tag : tags) { + refx=tag.getRefCount() / 5; + if(refx >= 3) { + style="xxlarge"; + } else if(refx == 2) { + style="xlarge"; + } else if(refx == 1) { + style="large"; + } else { + style="medium"; + } + + if((ii % 2) == 0) out.println("</tr>\n<tr>"); + out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + + tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); + ii++; + } +%> + </tr> + </table> + </div> + </td> + <td valign="top" style="vertical-align:top; width:250px;"> + <div id="downloadAds"> + <jsp:include page="download.jsp" /> + </div> + </td> + </tr> + </table> + + <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> + <table id="completeTable" class="popupTable" ></table> + </div> + + <br/><br/> + <jsp:include page="footer.jsp" /> + </body> +</html> +<% + } catch(Exception e) { + e.printStackTrace(); + } +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html new file mode 100644 index 0000000..8c5ca1b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html @@ -0,0 +1,117 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> + <title>Java Pet Store Reference Application, 2.0 Early Access</title> +</head> +<body> +<hr> +<h1>Java Pet Store Reference Application, 2.0 Early Access</h1> +<h2><a href="./faces/index.jsp">Enter the Store</a></h2> +The Java Pet Store Reference Application is a sample application +brought to +you by the <a href="http://blueprints.dev.java.net/">Java BluePrints</a> +program at <a href="http://sun.com">Sun Microsystems</a>. +This application is designed to illustrate how the Java EE 5 Platform +can be used to develop an AJAX-enabled Web 2.0 application. The +application comes with full source-code available under a  +BSD-style license, so you can experiment with it and use it in your own +applications. <br> +<br> +<a href="#try">Try the Petstore Demo</a><br> +<a href="#learn">Learn more about features in Java Petstore</a><br> +<a href="#contributors">Show appreciation for Pet Store image +contributors</a><br> +<a href="#about">About BluePrints</a> +<h2><a name="try"></a>Try the Pet Store Demo</h2> +Now that you have the application deployed, you can use it and try out +the features. You can browse the catalog of pets for sale, sell your +own pets on the store, search for pets by location using Google maps, +view the RSS news bar for BluePrints news, and more.<a + href="./faces/index.jsp">Enter the Store</a> +<h2><a name="features"></a>Learn More About Features in Java Petstore</h2> +<p>Here are some of the features of this application. For a detailed +description of  the features in the Java Pet +Store Reference application, please  refer to the article at <a + href="http://java.sun.com/developer/technicalArticles/J2EE/petstore/">http://java.sun.com/developer/technicalArticles/J2EE/petstore/</a><a + href="http://java.sun.com/developer/technicalArticles/J2EE/petstore/"></a><b> +</b></p> +<ol> + <li>Using AJAX for single-page interactive Web applications: The +application is designed to be a single-page application where the user +never leaves the page. Different sections of the page are dynamically +loaded based on the user actions. These sections are loaded +asynchronously to avoid any browser refreshes, and to give a richer +interactive user-experience. </li> + <li>Mash-ups with Google maps: The petstore uses a mashup with +Google's Map service, alongwith Yahoo's Geo-coder service to allow +users to see the available pets in a neighborhood. </li> + <li>Community-created content: The application allows a user to add a +pet for sale or adoption on the Website. The seller uploads </li> + <ol> + <li>Using Captchas to discourage spam in the community created +content: Whenever a website allows its users to add content, it needs +to build mechanisms to discourage placement of spurious content on its +Website through automated mechanisms. We demonstrate how captchas can +be used for this purpose. </li> + <li>Community rated content: Each item in the petstore website can +be rated by the users </li> + <li>Payments through PayPal: The application provides a meeting +ground for +buyers and sellers of pets. The application uses the PayPal service to +allow sellers to accept payments.</li> + </ol> + <li>Integration of an RSS feed: The website integrates an RSS feed of +news items coming out the Java BluePrints website. The </li> + <li>Integration of  a search engine: The application integrates +Apache Lucene search engine to handle all website searches. </li> +</ol> +This application also demonstrate the use of various features of  +the Java EE 5 platform such as: <br> +<ol> + <li>JavaServer Faces: Many of the AJAX features are implemented as +reusable JavaServer Faces components. </li> + <li>Java Persistence API: The application uses Java Persistence APIs +to create an object/relational mapping layer. </li> + <li>Dependency Injection: The application uses dependency injection +instead of deployment descriptors.</li> +</ol> +See the <a + href="https://blueprints.dev.java.net/petstore/architecture.html">Pet +Store Architecure document</a> for more detail. +<h2><a name="contributors"></a>Show Appreciation for Pet Store Image +Contributors</h2> +<p>For many images in the Java Petstore, some organizations and people +were kind enough to give us permission to photograph their animals or +even give us photos to use in the Java Petstore. See the <a + href="https://blueprints.dev.java.net/petstore/imagecontributors.html"> +image contributors </a> page for a more detail on these friends of the +animals.  +</p> +<h2><a name="about"></a>About Java BluePrints</h2> +<p>The Java BluePrints program defines the application programming +model for the Java EE™ platform. It provides best practice guidelines +and +architectural recommendations for real-world application scenarios to +enable developers to build portable, scalable, and robust applications +using the Java EE technologies.<br> +<br> +Some other popular projects from Java BluePrints are <a + href="http://blueprints.dev.java.net/bpcatalog/">Java BluePrints +Solutions Catalog</a>,  <a target="_blank" + href="https://blueprints.dev.java.net/adventurebuilder/">Java +Adventure Builder Reference</a> application, <a target="_blank" + href="http://java.sun.com/blueprints/guidelines/designing_webservices/">Designing +Web Services with the J2EE(TM) 1.4 Platform : JAX-RPC, SOAP, and XML +Technologies</a> book, and the <a target="_blank" + href="http://java.sun.com/blueprints/guidelines/designing_enterprise_applications…"><span + class="body"><span class="title">Designing +Enterprise Applications with the J2EE Platform, Second Edition</span></span></a> +book. You can access these projects and other content from Java +BluePrints by visiting the <a target="_blank" + href="http://java.sun.com/reference/blueprints/index.html">Java +BluePrints website</a>. </p> +<hr noshade="noshade">Copyright © 2007 Sun Microsystems, +Inc. All Rights Reserved. +</body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp new file mode 100644 index 0000000..ab59139 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp @@ -0,0 +1,164 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: index.jsp,v 1.20 2007/03/16 20:18:59 basler Exp $ --%> +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> + +<% +try { + CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); + List<Tag> tags=cf.getTagsInChunk(0, 12); + // since top 20 come from database or desending refCount order, need to reorder by tag name + Collections.sort(tags, new Comparator() { + public int compare(Object one, Object two) { + int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); + return (cc < 0 ? 1 : cc > 0 ? -1 : 0); + } + }); +%> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > + <title>Java Pet Store Reference Application</title> + <link type="text/css" rel="stylesheet" href="./tag.css"/> + </head> + <body> + + <jsp:include page="banner.jsp" /> + <script> + dojo.require("dojo.widget.FisheyeList"); + function browse(category) { + window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; + } + </script> + <table bgcolor="white"> + <tr> + <td valign="top"> + <div class="outerbar" style="width: 200px"> + + <div dojoType="FisheyeList" + itemWidth="170" itemHeight="50" + itemMaxWidth="340" itemMaxHeight="100" + orientation="vertical" + effectUnits="2" + itemPadding="10" + attachEdge="top" + labelEdge="bottom" + enableCrappySvgSupport="false"> + + <div dojoType="FisheyeListItem" onClick="browse('Dogs');" + iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Cats');" + iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Birds');" + iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Fish');" + iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" + iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> + </div> + </div> + + </div> + </td> + <td valign="top" style="width: 400px"> + <div id="bodyCenter"> + <table valign="top" id="bodyTable" border="0"> + <tr> + <td> + <map name="petmap"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="72,2,280,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" + alt="Fish" + coords="2,180,72,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" + alt="Dogs" + coords="60,250,130,320"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" + alt="Reptiles" + coords="140,270,210,340"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" + alt="Cats" + coords="225,240,295,310"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="280,180,350,250"> + </map> + + <img src="${pageContext.request.contextPath}/images/splash.gif" + alt="Pet Selection Map" + usemap="#petmap" + width="350" + height="355" + border="0"> + </td> + </tr> + </table> + + </div> + </td> + <td style="vertical-align:top;"> + <div style="border-style: double; width:100%;"> + <table border="0"> + <tr> + <th colspan="2" style="text-align:center">Most Popular Tags</th> + </tr> + <tr> +<% + String style=null; + int refx=0, ii=0; + for(Tag tag : tags) { + refx=tag.getRefCount() / 5; + if(refx >= 3) { + style="xxlarge"; + } else if(refx == 2) { + style="xlarge"; + } else if(refx == 1) { + style="large"; + } else { + style="medium"; + } + + if((ii % 2) == 0) out.println("</tr>\n<tr>"); + out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + + tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); + ii++; + } +%> + </tr> + </table> + </div> + </td> + <td style="vertical-align:top; width:300px; text-align:right;"> + <div id="downloadAds"> + <jsp:include page="download.jsp" /> + </div> + </td> + </tr> + </table> + + <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> + <table id="completeTable" class="popupTable" ></table> + </div> + + <br/><br/> + <jsp:include page="footer.jsp" /> + + </body> +</html> +<% + } catch(Exception e) { + e.printStackTrace(); + } +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp new file mode 100644 index 0000000..54f30ce --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp @@ -0,0 +1,194 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: index.jsp,v 1.18 2007/03/16 15:29:15 basler Exp $ --%> +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> + +<% +try { + CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); + List<Tag> tags=cf.getTagsInChunk(0, 12); + // since top 20 come from database or desending refCount order, need to reorder by tag name + Collections.sort(tags, new Comparator() { + public int compare(Object one, Object two) { + int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); + return (cc < 0 ? 1 : cc > 0 ? -1 : 0); + } + }); +%> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > + <title>Java Pet Store Reference Application</title> + <link type="text/css" rel="stylesheet" href="./tag.css"/> + <script type="text/javascript" src="https://blueprints.dev.java.net/petstore/downloadAd.js"></script> + </head> + <body onload="alterDownloadAd()"> + + <jsp:include page="banner.jsp" /> + <script> + dojo.require("dojo.widget.FisheyeList"); + function browse(category) { + window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; + } + + function alterDownloadAd() { + if(typeof checkAdPage != "undefined") { + var textx=checkAdPage(); + if(typeof textx != "undefined") { + document.getElementById("downloadAds").innerHTML=textx; + } + } + } + + + </script> + <table bgcolor="white"> + <tr> + <td valign="top"> + <div class="outerbar" style="width: 200px"> + + <div dojoType="FisheyeList" + itemWidth="170" itemHeight="50" + itemMaxWidth="340" itemMaxHeight="100" + orientation="vertical" + effectUnits="2" + itemPadding="10" + attachEdge="top" + labelEdge="bottom" + enableCrappySvgSupport="false"> + + <div dojoType="FisheyeListItem" onClick="browse('Dogs');" + iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Cats');" + iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Birds');" + iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Fish');" + iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" + iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> + </div> + </div> + + </div> + </td> + <td valign="top" style="width: 400px"> + <div id="bodyCenter"> + <table valign="top" id="bodyTable" border="0"> + <tr> + <td> + <map name="petmap"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="72,2,280,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" + alt="Fish" + coords="2,180,72,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" + alt="Dogs" + coords="60,250,130,320"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" + alt="Reptiles" + coords="140,270,210,340"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" + alt="Cats" + coords="225,240,295,310"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="280,180,350,250"> + </map> + + <img src="${pageContext.request.contextPath}/images/splash.gif" + alt="Pet Selection Map" + usemap="#petmap" + width="350" + height="355" + border="0"> + </td> + </tr> + </table> + + </div> + </td> + <td style="vertical-align:top;"> + <div style="border-style: double; width:100%;"> + <table border="0"> + <tr> + <th colspan="2" style="text-align:center">Most Popular Tags</th> + </tr> + <tr> +<% + String style=null; + int refx=0, ii=0; + for(Tag tag : tags) { + refx=tag.getRefCount() / 5; + if(refx >= 3) { + style="xxlarge"; + } else if(refx == 2) { + style="xlarge"; + } else if(refx == 1) { + style="large"; + } else { + style="medium"; + } + + if((ii % 2) == 0) out.println("</tr>\n<tr>"); + out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + + tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); + ii++; + } +%> + </tr> + </table> + </div> + </td> + <td style="vertical-align:top; width:250px; text-align:right;"> + <div id="downloadAds"> + <div id="downloadAds" style="text-align:center; border-style:none; width:100%;"> + <table style="width:100%"> + <tr> + <td style="text-align:center;"> + <a href="http://java.sun.com/javaee/downloads/index.jsp" target="downloads"><img style="border:none" src="./images/ad-sdk.jpg" alt="Download Java EE 5 SDK"/></a> + </td> + </tr> + <tr> + <td style="text-align:center;"> + <a href="http://www.netbeans.org/downloads/index.html" target="downloads"><img style="border:none" src="./images/ad-netbeans.jpg" alt="Download Netbeans IDE"/></a> + </td> + </tr> + <tr> + <td style="text-align:center;"> + <a href="http://java.com/en/download/index.jsp" target="downloads"><img style="border:none" src="./images/ad-jre.jpg" alt="Download Java SE"/></a> + </td> + </tr> + </table> + </div> + </div> + </td> + </tr> + </table> + + <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> + <table id="completeTable" class="popupTable" ></table> + </div> + + <br/><br/> + <jsp:include page="footer.jsp" /> + + </body> +</html> +<% + } catch(Exception e) { + e.printStackTrace(); + } +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp new file mode 100644 index 0000000..d2fd4c5 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp @@ -0,0 +1,53 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>JSON Test Page</title> + <script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> + + <script type="text/javascript"> + function getJSON() { + // get data and send to controller servlet + var bindArgs = { + url: "${pageContext.request.contextPath}/catalog?command=items&pid=feline01&start=0&length=2&format=json", + mimetype: "text/json", + error: function(){ alert("error")}, + load: callbackx + }; + + dojo.io.bind(bindArgs); + } + + function callbackx(type, data, evt) { + // check successful response + if (evt.readyState == 4) { + if (evt.status == 200) { + var prodsx=data.products; + rep="Products:<br\>"; + for(ii=0; ii < prodsx.length; ii++) { + rep += prodsx[ii].name + "<br/>"; + } + rep+="<br\>"; + document.getElementById("testResult").innerHTML=rep; + } + } + } + + </script> + + </head> + <body> + + <h1>JSON Test Page</h1> + <span onclick="getJSON();"> GET DATA </span><br/><br/> + + <div id="testResult"> + This should be populated with result. If not, look at the error console for errors. + </div> + + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp new file mode 100644 index 0000000..b634b42 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp @@ -0,0 +1,36 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: lookup.jsp,v 1.7 2007/01/19 21:47:31 basler Exp $ --%> + +<%@page contentType="text/xml"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item"%> + +<% + String itemId=request.getParameter("itemId"); + String popupView=request.getParameter("popupView"); + + try { + ServletContext context=config.getServletContext(); + CatalogFacade cf=(CatalogFacade)context.getAttribute("CatalogFacade"); + Item item=cf.getItem(itemId); + + if(itemId != null) { + out.println("<response>"); + out.println("<name>" + item.getName() + "</name>"); + String tmp=null; + if(popupView != null && popupView.equals("2")) { + tmp=item.getAddress().addressToString(); + } else { + tmp=item.getDescription(); + } + out.println("<description><![CDATA[" + tmp + "]]></description>"); + out.println("<price>" + java.text.NumberFormat.getCurrencyInstance(java.util.Locale.US).format(item.getPrice()) + "</price>"); + out.println("<image>" + request.getContextPath() + "/ImageServlet/" + item.getImageThumbURL() + "</image>"); + out.println("</response>"); + out.flush(); + } + } catch(Exception ee) { + ee.printStackTrace(); + } + +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf new file mode 100644 index 0000000..b207a5a --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf @@ -0,0 +1,36 @@ + + + <table valign="top" id="bodyTable" border="0"> + <tr> + <td> + <map name="petmap"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('BIRDS')" + alt="Birds" + coords="72,2,280,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('FISH')" + alt="Fish" + coords="2,180,72,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('DOGS')" + alt="Dogs" + coords="60,250,130,320"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('REPTILES')" + alt="Reptiles" + coords="140,270,210,340"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('CATS')" + alt="Cats" + coords="225,240,295,310"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('BIRDS')" + alt="Birds" + coords="280,180,350,250"> + </map> + + <img src="images/splash.gif" + alt="Pet Selection Map" + usemap="#petmap" + width="350" + height="355" + border="0"> + </td> + </tr> + </table> \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js new file mode 100644 index 0000000..b8de8fc --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js @@ -0,0 +1,21 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: main.js,v 1.9 2006/05/03 22:00:33 inder Exp $ */ + +var isIE; +var bodyRowText; + +dojo.require("dojo.widget.FisheyeList"); +init(); + +function browse(category) { + window.location.href="catalog.jsp?catid=" + category; +} + +function loadPetstore() { + init(); + showMain(); +} + +function init() { + if (navigator.userAgent.indexOf("IE") != -1) isIE = true; +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp new file mode 100644 index 0000000..c2673c9 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp @@ -0,0 +1,143 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: map.jsp,v 1.20 2006/11/02 00:34:49 basler Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item, com.sun.javaee.blueprints.petstore.mapviewer.MapBean, com.sun.javaee.blueprints.components.ui.mapviewer.MapMarker"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Map Display</title> + </head> + <body> + <jsp:include page="banner.jsp" /> + <br> + <center> + <table border="1" cellspacing="5px" cellpadding="5px" + style="border-style:double; border-color:darkgreen; padding:5px"> + <tr> + <td valign="top" align="center" width="200px"> + <table border="0"> + <c:if test="${!empty sessionScope.MapBean.locations}"> + <tr> + <th> + <u>${sessionScope.MapBean.locationCount} Items Displayed</u> + </th> + </tr> + <tr> + <td> + <ul> +<% + try { + // need to use scriptlet to preform the reconciliation of items to map coords + // this way I don't have to create a new wrapper object + MapBean mapBean=(MapBean)session.getAttribute("MapBean"); + MapMarker[] mapMarkers=(MapMarker[])mapBean.getLocations(); + java.util.List<Item> items=mapBean.getItems(); + Item itemxx=null; + String popupOptions=null; + for(int ii=0; ii < mapMarkers.length; ii++) { + + //System.out.println("loop - " + ii + " - " + mapBean.getCenterAddress()); + if(mapBean.getCenterAddress() != null && !mapBean.getCenterAddress().equals("")) { + // center point is set to the first mapMarker, items are off by one + if(ii > 0) { + // reconcile correct mapMarkers with items list + itemxx=items.get(ii - 1); + popupOptions="onmouseover=\"bpui.popup.show('pop1', event, '" + itemxx.getItemID() + "')\" onmouseout=\"bpui.popup.hide('pop1')\""; + } else { + // first item of mapMarker is centerpoint, so no corresponding item, also no popup on mouseover + itemxx=null; + popupOptions=""; + } + } else { + // no center point items should be 1-to-1 with mappedMarkers + itemxx=items.get(ii); + popupOptions="onmouseover=\"bpui.popup.show('pop1', event, '" + itemxx.getItemID() + "')\" onmouseout=\"bpui.popup.hide('pop1')\""; + } +%> + <li> + <a href="javascript:mapViewerx.openInfoWindowHtml(new GPoint(<%= mapMarkers[ii].getLongitude() %>,<%= mapMarkers[ii].getLatitude() %>), '<%= mapMarkers[ii].getMarkup() %>');" <%= popupOptions %>> + <%= mapBean.changeSpaces((itemxx == null) ? mapMarkers[ii].getMarkup() : "<b>" + itemxx.getName() + "</b>") %> + </a> +<% + if(itemxx != null) { + // remove these links for center point entry +%> + <a href="${pageContext.request.contextPath}/faces/catalog.jsp?pid=<%= itemxx.getProductID() %>&itemId=<%= itemxx.getItemID() %>" alt="Go to Detailed Catalog Page"> + <i>(detail)</i> + </a> + + <br/> + <a href="javascript:mapViewerx.openInfoWindowHtml(new GPoint(<%= mapMarkers[ii].getLongitude() %>, <%= mapMarkers[ii].getLatitude() %>), '<%= mapMarkers[ii].getMarkup() %>');" <%= popupOptions %>> + <font size="-1"><%= mapBean.changeSpaces((itemxx == null) ? mapMarkers[ii].getMarkup() : itemxx.getAddress().addressToString()) %></font> + </a> +<% + } +%> + </li> + <% + } + } catch(Exception ee) { + ee.printStackTrace(); + + } + %> + </ul> + <td> + </tr> + </c:if> + </table> + </td> + <td valign="top"> + <f:view> + <ui:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?itemId=" + elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> +  + <img id="spaceImage" height="10px" width="12px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> + <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> + <tr> + <td align="left" valign="top"><b>Name:</b> + <span id="value1">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Description:</b> + <span id="value2">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Price:</b> + <span id="value3">Loading Data...</span></td> + </tr> + <tr> + <td colspan="2" align="center"><img name="image" id="imageId" src="" + alt="[Loading Image...]" border="2"/><br/><br/></td> + </tr> + </table> + </ui:popupTag> + + + <ui:mapViewer id="mapViewerx" center="#{MapBean.mapPoint}" info="#{MapBean.mapMarker}" + markers="#{MapBean.locations}" zoomLevel="#{MapBean.zoomLevel}" style="height: 500px; width: 700px"/> + + </f:view> + </td> + </tr> + </table> + <script type="text/javascript"> + bpui.mapviewer.createMapControl = function() { + return new GLargeMapControl(); + } + + </script> + <br/><br/> + </center> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp new file mode 100644 index 0000000..a3ae6dc --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp @@ -0,0 +1,65 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: mapAll.jsp,v 1.14 2006/12/06 22:44:37 basler Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Map Viewer Page</title> + </head> + <body> + <jsp:include page="banner.jsp" /> + <center> + <f:view> + + <h:form id="form1"> + <table border="1" cellpadding="5" cellspacing="5" style="border-style:double; width:600px; border-color:darkgreen; padding:5px"> + <tr> + <td colspan=3> + <i>Select the category whose items will be displayed in a Google map based on the Seller's address. + Optionally, enter a "Center Point Address" and "Area" to limit the search to a specific + area around the center point.</i> + </td> + </tr> + <tr> + <th align="right">Select Category to Map:</th> + <td align="center" colspan=2> + <h:selectOneRadio value="#{MapBean.category}" required="true"> + <f:selectItems value="#{MapBean.categories}"/> + </h:selectOneRadio> + </td> + </tr> + <tr> + <th align="right">Center Point Address:</th> + <td> + <h:inputText id="centerAddress" value="#{MapBean.centerAddress}" size="70"/> + <br/><small><i>For example: 4140 Network Circle, Santa Clara, CA, 95054</i></small> + </td> + </tr> + <tr> + <th align="right">Area (in Miles):</th> + <td> + <h:inputText id="radius" value="#{MapBean.radius}" size="5"/> + </td> + </tr> + <tr> + <td colspan="2" align="center"> + <h:commandButton action="#{MapBean.findAllByCategory}" id="submitCat" type="submit" value="Map Category"/> + </td> + </tr> + + </table> + <h:messages/> + </h:form> + </f:view> +     + </center> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js new file mode 100644 index 0000000..5bcac34 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js @@ -0,0 +1,190 @@ + +dojo.require("dojo.io.*"); +dojo.require("dojo.event.*"); + +var bpuinews; +if (typeof bpuinews == "undefined") { + bpuinews = new Object(); +} + +bpuinews.RSS = function() { + var currentItem = 0; + var limitCharNum = 75; + var itemNum=0; + var rssData = null; + var prev; + var next; + var prevHit=false; + + this.getRssInJson = function (method, uri) { + prev = document.getElementById("previous"); + next = document.getElementById("next"); + dojo.event.connect(prev, "onclick", function(evt) {showPrevious();}); + dojo.event.connect(next, "onclick", function (evt) {showNext();}); + prev.disabled=true; + + var encodedURI = encodeURI(method + "?style=json&itemCount=0&url="+uri); + var bindArgs = { + url: encodedURI, + mimetype: "text/json", + load: function (type, data, http) { + handleJsonRss(data); + }, + error: function (t, e) { + dojo.debug("ERROR : " + e.message); + } + } + dojo.io.bind(bindArgs); + return false; + } + + function handleJsonRss(json) { + rssData = json; + itemNum = json.channel.item.length; + showNext(); + } + + function createUl(skip) { + var i; + var cp="<ul>\n"; + for (i = currentItem; i<currentItem + skip; i++) { + cp += "<li><b>"+decodeURL(rssData.channel.item[i].title)+"</b>\n"; + cp += "<p>" + decodeURL(rssData.channel.item[i].description) + "</p>\n</li>\n"; + } + cp += "</ul>\n"; + return cp; + } + + // Following funcs(showNext, showPrevious) should be connected to the button + // by dojo.event.connect. + function showNext() { + var skip = 5; + if (prevHit) { + currentItem = currentItem + skip; + prevHit = false; + } + var nextCurrentItem = currentItem + skip; + if (nextCurrentItem >= itemNum) { + skip = itemNum - currentItem; + // deactivate "next" button + next.disabled=true; + nextCurrentItem = currentItem; + } + // activate "previous" button + if (currentItem != 0) { + prev.disabled=false; + } + var cp = createUl(skip); + var elm = document.getElementById("news"); + elm.innerHTML = cp; + currentItem = nextCurrentItem; + } + + function showPrevious() { + prevHit = true; + var skip = 5; + currentItem = currentItem - skip; + if (currentItem <= 0) { + currentItem = 0; + // deactivate "previous" button + prev.disabled=true; + } + next.disabled=false; + var cp = createUl(skip); + var elm = document.getElementById("news"); + elm.innerHTML = cp; + } + + + /* Compatible function to java.net.URLDecoder.decode(). + * (decodeURI() is not compatible) + */ + function decodeURL(str){ + var targetStr=""; + var s, tmpStr, unicode, f; + // take a look at every char in the source str + var i, j; + for (i = 0; i < str.length; i++) { + s = str.charAt(i); + // handle WS, which is the most common char + if (s == "+") { + targetStr += " "; + } else { + if (s != "%") { + // Non-encoded char + targetStr += s; + } else{ + // encoding begin + unicode = 0; // uncode representation + f = 1; // flag to specify the escape sequence + while (true) { + tmpStr = ""; + // get the two HEX chars and put that in the temp string. If no char, that is not a HEX. + for (j = 0; j < 2; j++ ) { + tmptmpStr = str.charAt(++i); + if (((tmptmpStr >= "0") && (tmptmpStr <= "9")) || + ((tmptmpStr >= "a") && (tmptmpStr <= "f")) || + ((tmptmpStr >= "A") && (tmptmpStr <= "F"))) { + tmpStr += tmptmpStr; + } else { + --i; + break; + } + } + /* parse the HEX + * <= 0x7f : Single byte + * >=0xc0 && <=0xdf : Two bytes + * >=0xe0 && <=0xef : Three bytes + * >=0xf0 && <=0xf7 : Four bytes + * >=0x80 && <=0xbf : may not occur - just shift it + * <=1 : sequence terminated + */ + var byte = parseInt(tmpStr, 16); + if (byte <= 0x7f) {unicode = byte; f = 1;} + if ((byte >= 0xc0) && (byte <= 0xdf)) {unicode = byte & 0x1f; f = 2;} + if ((byte >= 0xe0) && (byte <= 0xef)) {unicode = byte & 0x0f; f = 3;} + if ((byte >= 0xf0) && (byte <= 0xf7)) {unicode = byte & 0x07; f = 4;} + if ((byte >= 0x80) && (byte <= 0xbf)) {unicode = (unicode << 6) + (byte & 0x3f); --f;} + if (f <= 1) { + break; + } + if (str.charAt(i + 1) == "%") { + i++ ; + } else { + // Error. should not occur + break; + } + } + targetStr += String.fromCharCode(unicode); + } + } + } + return targetStr; + } + + /* Cut the string at the WS so that it's shorter than the limitCharNum. + */ + function cutStringatWs(str, limitCharNum) { + var tmpStr = str; + var cnum = 0; + while (true) { + cnum = tmpStr.lastIndexOf(" "); + // no occurance of WS + if (cnum < 0) { + // if str is still longer than limit + if (tmpStr.length >= limitCharNum) { + tmpStr = tmpStr.substring(0, limitCharNum); + } + break; + } else { + tmpStr = tmpStr.substring(0, cnum); + if (cnum <= limitCharNum) { + break; + } + } + } + return tmpStr; + } + +} + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp new file mode 100644 index 0000000..b57de0b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp @@ -0,0 +1,51 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. +All rights reserved. You may not modify, use, reproduce, or distribute +this software except in compliance with the terms of the License at: +http://developer.sun.com/berkeley_license.html +$Id: news.jsp,v 1.2 2006/12/14 01:04:50 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>BluePrints News Page</title> + <script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> + <script type="text/javascript" src="${pageContext.request.contextPath}/news.js"></script> + + <style> + p { + width : 70%; + background-color : #FFEFD5; + font-size : 80% + } + </style> + + </head> + <script type="text/javascript"> + var news = new bpuinews.RSS(); + dojo.addOnLoad(function(){news.getRssInJson('${pageContext.request.contextPath}/faces/dynamic/bpui_rssfeedhandler/getRssfeed', 'https://blueprints.dev.java.net/servlets/ProjectRSS?type=news');}); + </script> + <body> + <jsp:include page="banner.jsp" /> + <h2><a href="http://blueprints.dev.java.net">BluePrints News</a></h2> + <center> + <table border="0" width="95%"> + <tr> + <td> + <button id="previous" type="button"><< Previous</button> + </td> + <td> + <button id="next" type="button">Next &gt&gt</button> + </td> + </tr> + </table> + </center> + <div id="news"></div> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp new file mode 100644 index 0000000..923739b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp @@ -0,0 +1,21 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>jsonp test page</title> + <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/bp_petstorelist.css"></link> + <script type="text/javascript" src="${pageContext.request.contextPath}/bp_petstorelist.js"></script> + <script type="text/javascript"> + var petstoreList; + function init() { + petstoreList=new bpui.petstoreList.createPetstoreList("petstoreListDiv"); + } + </script> + </head> + <body onload="init()"> + <h1>jsonp test page</h1> + + <div id="petstoreListDiv"></div> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js new file mode 100644 index 0000000..66700d3 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js @@ -0,0 +1,110 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: rss.js,v 1.3 2006/05/31 19:13:03 basler Exp $ */ + +dojo.require("dojo.io.*"); + +if (bpui = 'undefined') { + bpui = new Object(); +} + +bpui.RSS = function() { + var jsonData = null; + var rssItemNum = 0; + var currentItem = 0; + var rssTimeout = null; + var itemIntervalMsec = 2000; + var rssFadeoutCounter = 110; + var rssFadeinCounter = 110; + var itemIntervalId = 0; + + this.getRssInJson = function (uri, number) { + rssItemNum = number; + var encodedURI = encodeURI(bpui.contextRoot + "/faces/dynamic/bpui_rssfeedhandler/getRssfeed?style=json&itemNumber="+number+"&url="+uri); + //alert("encoded url=" + encodedURI); + var bindArgs = { + url: encodedURI, + mimetype: "text/json", + load: function (type, data, http) { + handleJsonRss(data); + for (var key in data.channel.item) { + dojo.debug("ITEM Title ", key, ":", data.channel.item[key].title); + dojo.debug("ITEM LInk ", key, ":", data.channel.item[key].link); + } + }, + error: function (t, e) { + dj_debug("ERROR : " + e.message); + } + } + dojo.io.bind(bindArgs); + return false; + } + + function handleJsonRss(json) { + jsonData = json; + // setting top title and link + generateHref(json.channel.title, json.channel.link, "rss-channel"); + // setting items + generateHref(json.channel.item[0].title, json.channel.item[0].link, "rss-item"); + var aNodes = document.getElementById("rss-item").getElementsByTagName("a"); + dojo.event.connect(aNodes[0], "onmouseover", "pauseCycle"); + dojo.event.connect(aNodes[0], "onmouseout", "resumeCycle"); + cycleRss(); + } + + function generateHref (title, link, nodeId) { + var node = document.getElementById(nodeId); + var aNode = document.createElement("a"); + aNode.setAttribute("href", link); + aNode.appendChild(document.createTextNode(title)); + if (node.hasChildNodes()) { + node.removeChild(node.firstChild); + } + node.appendChild(aNode); + } + + function cycleRss () { + itemIntervalId = setTimeout(replaceItem, itemIntervalMsec); + } + + + function replaceItem() { + if (itemIntervalId) { + clearTimeout(itemIntervalId); + } + // fadeout the current item and pop the next one in. + var cItem = document.getElementById("rss-item"); + dojo.fx.html.fadeOut(cItem.getElementsByTagName('a')[0], 500); + var waitId = setTimeout(function(waitId) { + clearTimeout(waitId); + //cItem.removeChild(cItem.firstChild); + if (currentItem < (rssItemNum -1)) { + currentItem += 1; + } else { + currentItem = 0; + } + generateHref(jsonData.channel.item[currentItem].title, jsonData.channel.item[currentItem].link, "rss-item"); + // attach event for onmouseover(pause) and onmouseout(resume) + var aNodes = cItem.getElementsByTagName("a"); + dojo.event.connect(aNodes[0], "onmouseover", "pauseCycle"); + dojo.event.connect(aNodes[0], "onmouseout", "resumeCycle"); + cycleRss();}, 500); + } + + function pauseCycle(evt) { + if (itemIntervalId) { + clearTimeout(itemIntervalId); + } + } + + function resumeCycle (evt) { + cycleRss(); + } + + bpui.getContextRoot = function() { + var urlArray=window.location.toString().split("/", 4); + return "/" + urlArray[3]; + } + + bpui.contextRoot = bpui.getContextRoot(); +} + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp new file mode 100644 index 0000000..e57e4dc --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp @@ -0,0 +1,33 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: rss.jsp,v 1.2 2006/05/03 22:00:34 inder Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> +<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>RSS</title> + </head> + <body> + + <h1>RSS test</h1> + <f:view> + <ui:rssreader> + <ui:rsscategory title="JavaEE 5"> + <ui:rssfeed title="BluePrints" url="https://blueprints.dev.java.net/servlets/ProjectRSS?type=news"></ui:rssfeed> + <ui:rssfeed title="GlassFish" url="http://blogs.sun.com/roller/rss/theaquarium"></ui:rssfeed> + </ui:rsscategory> + <ui:rsscategory title="Yahoo!"> + <ui:rssfeed title="World" url="http://rss.news.yahoo.com/rss/world"></ui:rssfeed> + <ui:rssfeed title="US" url="http://rss.news.yahoo.com/rss/us"></ui:rssfeed> + </ui:rsscategory> + </ui:rssreader> + + </f:view> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp new file mode 100644 index 0000000..6f9c2f9 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp @@ -0,0 +1,20 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: rssbar.jsp,v 1.7 2006/05/06 01:44:59 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> +<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + + + + <f:view> + <ui:rssBar url="https://blueprints.dev.java.net/servlets/ProjectRSS?type=news" + itemCount="4" + title="News from BluePrints" + speed="6000" + backgroundImage="no" + color="#00ffff" hoverColor="#ff00ff"></ui:rssBar> + </f:view> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html new file mode 100644 index 0000000..9cc8c0a --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html @@ -0,0 +1,60 @@ +<div class="EditorToolbarDomNode EditorToolbarSmallBg"> + <table cellpadding="1" cellspacing="0" border="0"> + <tbody> + <tr valign="top" align="left"> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="bold"> + <span title="Toggle Bold (Ctrl-B)" class="dojoE2TBIcon dojoE2TBIcon_Bold"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="italic"> + <span title="Toggle Italic (Ctrl-I)" class="dojoE2TBIcon dojoE2TBIcon_Italic"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="underline"> + <span title="Toggle Underline (Ctrl-U)" class="dojoE2TBIcon dojoE2TBIcon_Underline"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="strikethrough"> + <span title="Toggle Strike-Through" +class="dojoE2TBIcon dojoE2TBIcon_StrikeThrough"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="inserthorizontalrule"> + <span title="Insert Horizontal Rule" class="dojoE2TBIcon dojoE2TBIcon_HorizontalLine "> </span> + </span> + </td> + <td isSpacer="true"> +  + <span class="iconContainer"> + <span class="dojoE2TBIcon dojoE2TBIcon_Sep" style="width: 5px; min-width: 5px;"></span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="forecolor"> + <span title="Change Text Color" class="dojoE2TBIcon dojoE2TBIcon_TextColor" +unselectable="on"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="hilitecolor"> + <span title="Change Background Color" class="dojoE2TBIcon dojoE2TBIcon_BackgroundColor" +unselectable="on"> </span> + </span> + </td> + <td width="*"> </td> + </tr> + </tbody> + </table> +</div> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css new file mode 100644 index 0000000..151df6d --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css @@ -0,0 +1 @@ +.slider { border-width:1px; border-style:solid; border-color:black; background:#404040; } .tile { position: absolute; top:0px; left:0px; cursor:pointer; border-width:1px; border-style:solid; border-color:black; visibility:hidden; z-index:1; background:white; opacity: .99; } .tileImage { width: 94; height: 70; } .nav { cursor:pointer; position: absolute; vertical-align:bottom; z-index:11; opacity: .85; } .infopane { z-index:0; width:475px; position: absolute; border-width:1px; border-style:solid; border-color:black; background:black; opacity: .65; } .infopaneDescription { color:white; font-size:12px; } .infopaneShortDescription { color:white; font-size:16px; } .infopanePrice { color:white; text-align: center; height:20px; } .infopanePayPal{ vertical-valign: bottom; text-align: right; height:20px; } .infopaneRating{ vertical-valign: top; text-align: center; width:125px; height:15px; color:white; opacity: .95; } .infopaneTitle { width:255px; height:15px; color:white; font-size:18px; } \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js new file mode 100644 index 0000000..1f72578 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js @@ -0,0 +1,643 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: scroller.js,v 1.32 2007/01/17 18:00:09 basler Exp $ */ + +/** +* ImageScroller - A multipurpose item brower +* @ Author: Greg Murray +* +*/ + +function getApplicationContextRoot() { + var urlArray=window.location.toString().split("/", 4); + return "/" + urlArray[3]; +} + +var applicationContextRoot=getApplicationContextRoot(); + + +function ImageScroller() { + var _this = this; + var initialized = false; + // default sizes + + var VIEWPORT_WIDTH = 500; + // all sizes are realitive the the viewport width + var IMAGEPANE_WIDTH = VIEWPORT_WIDTH; + var IMAGEPANE_HEIGHT = Math.round(VIEWPORT_WIDTH / 1.49); + var INFOPANE_DEFAULT_HEIGHT = Math.round(VIEWPORT_WIDTH / 6.67); + var INFOPANE_EXPAND_HEIGHT = Math.round(VIEWPORT_WIDTH / 2.86); + var THUMB_WIDTH = Math.round(VIEWPORT_WIDTH / 5);; + var THUMB_HEIGHT = Math.round(VIEWPORT_WIDTH / 6.67); + + var CHUNK_SIZE = 7; + var PREFETCH_THRESHHOLD = 5; + + var IMAGE_PANE_ID = "imagePane"; + var IMAGE_PANE_BUFFER_ID = "imageBufferPane"; + + var PADDING = 3; + + var MINIMIZE_IMG_URI = applicationContextRoot + "/images/minimize.gif"; + var MAXIMIZE_IMG_URI = applicationContextRoot + "/images/maximize.gif"; + var INDICATOR_IMG_URI = applicationContextRoot + "/images/indicator-black.gif"; + var MAXIMIZE_IMG_TOOLTIP = "Show Details"; + var MINIMIZE_IMG_TOOLTIP = "Show Less Details"; + + // this is an array of the tiles which are divs for each thumb + var tiles = []; + + var injectionPoint; + + // for scrolling + + var SCROLL_INCREMENT = 5; + var INFOPANE_INCREMENT = 3; + var tileY; + var tileX; + // this is the index of the image tile on the far left + var index = 0; + // keeps track how for the scroll has gone + var offset = 0; + + var timeout = 30; // in ms + var isScrollingRight = false; + var isScrollingLeft = false; + + // large image pane + var imagePane; + var imageLoadingPane; + var loadingPane; + // images + var minimizeImage; + + var indicatorImage; + var leftButton; + var rightButton; + + // infopane + var infoPane; + var infoTableMinimize; + var indicatorCell; + var minimizeLink; + var infoPaneLoop = 0; + var maximizing = false; + var minimizing = false; + var maximized = false; + + // prefetch thresh-hold + var prefetchThreshold = 2; + + // a growing list of items; + var items = []; + // cached chunks that are already in the items array + var loadedChunks = []; + + // used for debugging when debug is true + var debug = false; + var statusDiv; + var status2Div; + + var showingBuffer = false; + var imageBuffer; + var imageReloadTries = 0; + var IMG_RELOAD_RETRY_MAX = 30; + // used for url book marking + + + var pid; + var currentChunk; + // this map contains all the items + var map; + // this is the main container div + var containerDiv; + + this.getItems = function() { + return map; + } + + this.getScrollerItems = function() { + return items; + } + + + this.getGroupId = function() { + return pid; + } + + this.reset = function() { + resetTitles() + tiles = []; + index = 0; + offset = 0; + currentChunk = 0; + items = []; + loadedChunks = []; + } + + function resetTitles() { + for (var l = 0; l < tiles.length; l++) { + tiles[l].parentNode.removeChild(tiles[l]); + } + } + + // event bound to the mouseOut event of both scroll buttons + function scrollDone() { + isScrollingLeft = false; + isScrollingRight = false; + } + + // looping method for time out + function scroll() { + if (isScrollingRight) scrollRight(); + else if (isScrollingLeft) scrollLeft(); + } + + + // do the value list pre-emptive fetching + function prefetch() { + //printDebug("** scoller index = " + index); + if (isScrollingRight && (index + PREFETCH_THRESHHOLD) % CHUNK_SIZE == 0) { + + if ((Math.round(index / CHUNK_SIZE)) >= currentChunk) { + currentChunk = Math.round(index / CHUNK_SIZE) + 1; + // fire an event + dojo.event.topic.publish("/catalog", {type:"getChunk", id: pid, index: index, currentChunk: currentChunk}); + } + } + } + + this.setGroupId = function(id) { + pid = id; + } + + this.containsChunk = function(chunkId) { + printDebug("containsChunk = " + loadedChunks); + ret=false; + for(ii=0; ii < loadedChunks.length; ii++) { + if(chunkId == loadedChunks[ii]) { + ret=true; + break; + } + } + return ret; + } + + this.addChunk = function(chunkId) { + loadedChunks.push(chunkId); + } + + this.addItems = function(inItems) { + for (var loop=0; loop < inItems.length ; loop++) { + items.push(inItems[loop]); + map.put(inItems[loop].id, inItems[loop]); + createTile(inItems[loop]); + if (loop == 0 && !loadImage) { + showImage(inItems[loop].id); + } + + } + drawTiles(); + rightButton.style.visibility="visible"; + _this.hideProgressIndicator(); + } + + this.showProgressIndicator = function() { + if (indicatorImage) { + indicatorImage.style.visibility = "visible"; + } + } + + this.hideProgressIndicator = function() { + indicatorImage.style.visibility = "hidden"; + } + + function postImageLoad(loadIntoBuffer) { + if (debug) { + status2Div.innerHTML = "Try " + imageReloadTries + " " + url + " image.complete=" + imageBuffer.complete; + } + // keep calling this funtion until imageReloadTries < IMG_RELOAD_RETRY_MAX + if (!imageBuffer.complete) { + if (imageReloadTries < IMG_RELOAD_RETRY_MAX) { + setTimeout(function(){this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer);},500); + } else { + this.hideProgressIndicator(); + } + imageReloadTries = imageReloadTries + 1; + return; + } + var id; + + _this.hideProgressIndicator(); + if (loadIntoBuffer) { + imageLoadingPane.src = imageBuffer.src; + } else { + imagePane.src = imageBuffer.src; + + } + // do a cross fade as long as the images aren't the same + if (imageLoadingPane.src != imagePane.src) { + crossFade(0,loadIntoBuffer ); + } + } + + + this.showImage = function(itemId) { + + _this.showProgressIndicator(); + //setTimeout(this.showProgressIndicator,0); + var i = map.get(itemId); + + if (!i) { + return; + } + dojo.event.topic.publish("/catalog", {type:"showingItem", id: itemId, rating: i.rating}); + // create the image pane and append the description nodes + // asumption is that if the imagePane is not set neigher are the info children + if (typeof imagePane == 'undefined') { + imagePane = document.createElement("img"); + imagePane.style.width = IMAGEPANE_WIDTH + "px"; + imagePane.style.height = IMAGEPANE_HEIGHT + "px"; + imagePane.id = IMAGE_PANE_ID; + + var targetElement = document.getElementById("bodySpace"); + imageLoadingPane = document.createElement("img"); + imageLoadingPane.style.position = "absolute"; + imageLoadingPane.style.visibility = "hidden"; + imageLoadingPane.style.width = IMAGEPANE_WIDTH + "px"; + imageLoadingPane.style.height = IMAGEPANE_HEIGHT + "px"; + imageLoadingPane.id = IMAGE_PANE_BUFFER_ID; + targetElement.appendChild(imagePane); + targetElement.appendChild(imageLoadingPane); + imageLoadingPane.style.left = tileX + "px"; + + loadImage(i.image, false); + } else { + imageLoadingPane.style.visibility = "visible"; + if (showingBuffer) { + showingBuffer = false; + } else { + showingBuffer = true; + } + loadImage(i.image, showingBuffer); + } + } + + function loadImage(url, loadIntoBuffer) { + imageReloadTries = 0; + imageBuffer = new Image(); + if (loadIntoBuffer) { + imageBuffer.src = url; + imageLoadingPane.onLoad = setTimeout(function(){this.url=url;this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer,url);},0); + } else { + imageBuffer.src = url; + imageBuffer.onLoad = setTimeout(function(){this.url = url;this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer,url);},0); + } + } + + function setOpacity(opacity, id) { + var target = document.getElementById(id); + if (typeof target.style.filter != 'undefined') { + target.style.filter = "alpha(opacity:" + opacity + ")"; + } else { + target.style.opacity = opacity/100; + } + } + + function crossFade(count,loadIntoBuffer) { + var percentage = Number(count); + if (loadIntoBuffer) { + setOpacity(100 - percentage, IMAGE_PANE_ID); + setOpacity(percentage, IMAGE_PANE_BUFFER_ID); + } else { + setOpacity(100 - percentage, IMAGE_PANE_BUFFER_ID); + setOpacity(percentage, IMAGE_PANE_ID); + + } + if (percentage < 100) { + percentage = percentage + 10; + setTimeout(function(){this.loadIntoBuffer = loadIntoBuffer;this.percentage = percentage;crossFade(percentage,loadIntoBuffer);}, 25); + } + } + + + // calling this function will result in the maximizing event being fired + // if the pane is maximized it will asume the event want to minimize + this.doMaximize = function() { + if (!maximizing && !minimizing && !maximized) { + infoPaneLoop = INFOPANE_DEFAULT_HEIGHT; + maximizing = true; + minimizing = false; + } else if (!maximizing && !minimizing) { + minimizing = true; + maximizing = false; + } + setTimeout(changeInfoPane, 0); + } + + // will handle either minimizing or maximing but not both + // this method is called recursively until the maximinging + // or minimizing is done. + function changeInfoPane() { + if (maximizing) { + maxmizeInfoPane(); + } else if (minimizing) { + minimizeInfoPane(); + } + } + + function maxmizeInfoPane() { + if (infoPaneLoop < INFOPANE_EXPAND_HEIGHT) { + infoPaneLoop = infoPaneLoop + INFOPANE_INCREMENT; + var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ infoPaneLoop +'px,' + 0 + 'px)'; + infoPane.style.clip = clipMe; + infoPane.style.height = infoPaneLoop; + infoPane.style.top = (tileY + (PADDING *2) + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT) - infoPaneLoop; + setTimeout(changeInfoPane, 5); + } else { + minimizeImage.src= MINIMIZE_IMG_URI; + minimizeLink.title = MINIMIZE_IMG_TOOLTIP; + maximized = true; + maximizing = false; + minimizing = false; + } + } + + function minimizeInfoPane() { + if (infoPaneLoop > INFOPANE_DEFAULT_HEIGHT) { + infoPaneLoop = infoPaneLoop - INFOPANE_INCREMENT; + var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ infoPaneLoop +'px,' + 0 + 'px)'; + infoPane.style.clip = clipMe; + infoPane.style.height = infoPaneLoop; + infoPane.style.top = (tileY + (PADDING *2) + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT) - infoPaneLoop; + if (debug) { + status2Div.innerHTML = "minimize infoPaneLoop =" + infoPaneLoop + " infopane.top=" + infoPane.style.top; + } + setTimeout(changeInfoPane, 5); + } else { + minimizeImage.src= MAXIMIZE_IMG_URI; + minimizeLink.title = MAXIMIZE_IMG_TOOLTIP; + maximizing = false; + minimizing = false; + maximized = false; + } + } + + function scrollRight() { + isScrollingRight = true; + if ( (index + 4) >= tiles.length) { + // hide the rightButton + rightButton.style.visibility="hidden"; + return; + } else { + leftButton.style.visibility="visible"; + } + offset = offset - SCROLL_INCREMENT; + drawTiles(); + setTimeout(scroll, timeout); + } + + function getNext() { + isScrollingRight = true; + setTimeout(scroll, timeout); + } + + + function getPrevious () { + isScrollingLeft = true; + setTimeout(scroll, timeout); + } + + function scrollLeft() { + if (offset >= 0) { + leftButton.style.visibility="hidden"; + return; + } else { + leftButton.style.visibility="visible"; + } + offset = offset + SCROLL_INCREMENT; + drawTiles(); + setTimeout(scroll, timeout); + } + + function drawTiles() { + // draw the first one if its off the screen + // check if the far right image is out view + var overHang; + var temp = offset; + index = Math.floor((offset)/THUMB_WIDTH); + overHang = offset % THUMB_WIDTH; + if (overHang < 0) { + overHang = overHang * -1; + } + if (index < 0) { + index = index * -1; + } + // check for next set of images + prefetch(); + var startIndex = index; + if (overHang > 0 && index >0) { + startIndex = index -1; + } + var stopIndex = index + Math.round(VIEWPORT_WIDTH / THUMB_WIDTH); + if (stopIndex > tiles.length) { + stopIndex = tiles.length; + } + var displayX = 0; + for (var tl=startIndex; tl < stopIndex; tl++) { + if (debug) { + statusDiv.innerHTML = "overhang=" + overHang + " startIndex=" + startIndex + " stopIndex=" + stopIndex + " offset=" + offset + " displayX=" + displayX; + } + if (overHang > 0 && tl == startIndex) { + rightButton.style.visibility="visible"; + // clip: rect(top right bottom left) - borders of the clipped area + // clip the left + var clipMe = 'rect(' + '0px,' + THUMB_WIDTH + 'px,'+ THUMB_HEIGHT +'px,' + overHang + 'px)'; + tiles[tl].style.clip = clipMe; + tiles[tl].style.left = (tileX - overHang) + "px"; + displayX = displayX + (THUMB_WIDTH - overHang); + } else if (tl == stopIndex -1) { + var underHang = VIEWPORT_WIDTH - displayX ; + if (underHang > 0 && underHang) { + var clipMe = 'rect(' + '0px,' + (underHang) + "px," + THUMB_HEIGHT +'px,' + 0 + 'px)'; + tiles[tl].style.clip = clipMe; + tiles[tl].style.left = tileX + (offset + (tl * THUMB_WIDTH)) + 'px'; + tiles[tl].style.visibility = "visible"; + // resize the previous one to its real length + } else if (underHang < 0 && tl > 0) { + var clipMe = 'rect(' + '0px,' + (THUMB_WIDTH + underHang) + "px," + THUMB_HEIGHT +'px,' + 0 + 'px)'; + tiles[tl-1].style.clip = clipMe; + tiles[tl-1].style.visibility = "visible"; + tiles[tl-1].style.left = tileX + (offset + ((tl -1) * THUMB_WIDTH)) + 'px'; + } else { + tiles[tl].style.left = '0px'; + tiles[tl].style.visibility = "hidden"; + } + } else { + displayX = displayX + THUMB_WIDTH; + tiles[tl].style.left = tileX + (offset + (tl * THUMB_WIDTH)) + 'px'; + tiles[tl].style.visibility = "visible"; + } + } + if (stopIndex < tiles.length) { + tiles[stopIndex].style.visibility = "hidden"; + tiles[stopIndex].style.left = "0px"; + } + } + + + this.load = function () { + map = new Map(); + dojo.event.connect(window, "onresize", layout); + var loadImage; + + var targetRow = document.getElementById("targetRow"); + injectionPoint = document.getElementById("injection_point"); + + // for status output + statusDiv = document.getElementById("status"); + status2Div = document.getElementById("status_2"); + + initLayout(); + initialized = true; + } + + function initLayout() { + containerDiv = document.getElementById("CatalogBrowser"); + rightButton = document.getElementById("right_button"); + leftButton = document.getElementById("left_button"); + layout(); + leftButton.style.visibility="hidden"; + if (typeof rightButton.attachEvent != 'undefined') { + rightButton.attachEvent('onmouseover',function(e){scrollDone();getNext();}); + rightButton.attachEvent('onmouseout',function(e){scrollDone();}); + leftButton.attachEvent('onmouseover',function(e){scrollDone();getPrevious();}); + leftButton.attachEvent('onmouseout',function(e){scrollDone();}); + } else if (typeof rightButton.addEventListener != 'undefined') { + rightButton.addEventListener('mouseover',function(e){scrollDone();getNext();}, false); + rightButton.addEventListener('mouseout',function(e){scrollDone();}, false); + leftButton.addEventListener('mouseover',function(e){scrollDone();getPrevious();}, false); + leftButton.addEventListener('mouseout',function(e){scrollDone();}, false); + } + createInfoPane(); + } + + function layout() { + var ua = navigator.userAgent.toLowerCase(); + + // this will need to be made generic depending on the thumb height + tileY = findY(containerDiv); + tileX = findX(containerDiv) + 4; + var rightX = tileX + VIEWPORT_WIDTH - 20; + rightButton.style.left = rightX + "px"; + var buttonY = tileY + IMAGEPANE_HEIGHT + INFOPANE_DEFAULT_HEIGHT + 12; + rightButton.style.top = buttonY + "px"; + leftButton.style.top = buttonY + "px"; + + if (ua.indexOf('ie') != -1) { + isIE = true; + } else if (ua.indexOf('safari') != -1) { + tileX = tileX + 8; + timeout = 20; + } + drawTiles(); + if (infoPane) { + infoPane.style.left = tileX + "px"; + if (maximized) { + + infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2) - infoPane.style.height) + "px"; + } else { + infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2)) + "px"; + } + if (maximized) { + infoPaneLoop = infoPane.style.height; + } else { + infoPaneLoop = INFOPANE_DEFAULT_HEIGHT; + } + } + if (typeof imageLoadingPane != 'undefined') { + imageLoadingPane.style.left = tileX; + imageLoadingPane.style.top = tileY; + } + } + + function createInfoPane() { + infoPane = document.getElementById("infopane"); + infoPane.style.width = VIEWPORT_WIDTH + "px"; + // give room for 4 pixels above and below + infoPane.style.height = (INFOPANE_DEFAULT_HEIGHT) + "px"; + // give 3px padding for a border + infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2)) + "px"; + infoPane.style.left = tileX + "px"; + infoTableMinimize = document.getElementById("infopaneDetailsIcon"); + indicatorCell = document.getElementById("infopaneIndicator"); + indicatorCell.style.width = (10) + "px"; + indicatorImage = document.createElement("img"); + indicatorImage.className = "infopaneIndicator"; + indicatorImage.src = INDICATOR_IMG_URI; + indicatorImage.style.visibility = "hidden"; + indicatorCell.appendChild(indicatorImage); + minimizeLink = document.createElement("a"); + minimizeLink.className = "infopaneLink"; + minimizeLink.title = MAXIMIZE_IMG_TOOLTIP; + minimizeImage = document.createElement("img"); + minimizeImage.src= MAXIMIZE_IMG_URI; + minimizeLink.appendChild(minimizeImage); + infoTableMinimize.appendChild(minimizeLink); + + if (typeof minimizeLink.attachEvent != 'undefined') { + minimizeLink.attachEvent("onclick",function(e){_this.doMaximize();}); + } else { + minimizeLink.addEventListener("click",function(e){_this.doMaximize();}, true); + } + var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ INFOPANE_DEFAULT_HEIGHT +'px,' + 0 + 'px)'; + infoPane.style.clip = clipMe; + } + + function createTile(i) { + var div = document.createElement("div"); + div.className = "tile"; + div.id = i.id; + var link = document.createElement("a"); + var img = document.createElement("img"); + img.title = i.name; + img.src = i.thumbnail; + img.className = "tileImage"; + link.appendChild(img); + link.setAttribute("id", i.id); + if (typeof div.attachEvent != 'undefined') { + div.attachEvent('onclick',function(e){this.id = div.id; _this.showImage(this.id, false);}); + } else { + link.addEventListener('click',function(e){this.id = div.id; _this.showImage(this.id, false);}, true); + } + div.appendChild(link); + injectionPoint.appendChild(div); + div.style.top = tileY + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT + (PADDING * 3) + "px"; + tiles.push(div); + } + + + function findY(element) { + var t = 0; + if (element.offsetParent) { + while (element.offsetParent) { + t += element.offsetTop + element = element.offsetParent; + } + } else if (element.y) { + t += element.y; + } + return t; + } + + function findX(element) { + var l = 0; + if (element.offsetParent) { + while (element.offsetParent) { + l += element.offsetLeft + element = element.offsetParent; + } + } else if (element.x) + l += element.x; + return l; + } +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp new file mode 100644 index 0000000..e12d666 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp @@ -0,0 +1,290 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: search.jsp,v 1.28 2006/12/04 21:34:10 basler Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.search.*"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui5" uri="http://java.sun.com/blueprints/ui" %> + + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Search Page</title> + <style> + .itemTable { + padding: 0.3cm; + width: 800px; + border-style: double; + border-color: darkgreen; + } + .itemCell { + border-style: solid; + border-color: darkgreen; + border-width: thin; + padding: 5px + } + .tagDiv { + border-style: groove; + border-color: darkgreen; + background-color: white; + border-width: thick; + padding: 5px; + visibility: hidden; + position:absolute; + left:0px; + top:0px; + z-index: 3; + } + </style> + <script type="text/javascript" src="common.js"></script> + </head> + <body> + <jsp:include page="banner.jsp" /> + <center> + + <script type="text/javascript"> + function checkAll() { + var elems=dojo.byId("resultsForm").elements; + for(ii=0; ii < elems.length; ii++) { + if(elems[ii].name.indexOf("mapSelectedItems") >= 0) { + elems[ii].checked=true; + } + } + return false; + } + + function uncheckAll() { + var elems=dojo.byId("resultsForm").elements; + for(ii=0; ii < elems.length; ii++) { + if(elems[ii].name.indexOf("mapSelectedItems") >= 0) { + elems[ii].checked=false; + } + } + return false; + } + + function addTags(eventx, namex, itemIdx) { + var xx=0; + var yy=0; + if (!eventx) var eventx=window.event; + if (eventx.pageX || eventx.pageY){ + xx=eventx.pageX; + yy=eventx.pageY; + } else if (eventx.clientX || eventx.clientY) { + xx=eventx.clientX + document.body.scrollLeft; + yy=eventx.clientY + document.body.scrollTop; + } + divId="addTags"; + document.getElementById("addTagsItemId").value=itemIdx; + document.getElementById("addTagsTags").value=""; + document.getElementById("addTagsTitle").innerHTML="<b>Add Tags to '" + namex + "'</b>"; + document.getElementById(divId).style.left=(xx - 170) + "px"; + document.getElementById(divId).style.top=(yy - 140) + "px"; + document.getElementById(divId).style.visibility='visible'; + document.getElementById("addTagsTags").focus(); + } + + function saveAddTags() { + // get data and send to controller servlet + itemIdx=document.getElementById("addTagsItemId").value; + tagsx=document.getElementById("addTagsTags").value; + var bindArgs = { + url: "../TagServlet?itemId=" + escape(itemIdx) + "&tags=" + escape(tagsx), + mimetype: "text/xml", + error: ajaxBindError, + load: function(type, data, evt){ + // check successful response + if (evt.readyState == 4) { + if (evt.status == 200) { + // get results and replace dom elements + var resultx=data.getElementsByTagName("response")[0]; + itemIdx=resultx.getElementsByTagName("itemId")[0].childNodes[0].nodeValue; + + // change DOM data + document.getElementById("ITEMID_TAGS_" + itemIdx).innerHTML=resultx.getElementsByTagName("tags")[0].childNodes[0].nodeValue; + + } else if (evt.status == 204){ + alert("204 return"); + } + } + } + }; + + dojo.io.bind(bindArgs); + // make sure it was updated + + // show messages if error + + // hide popup + document.getElementById(divId).style.visibility='hidden'; + } + + function cancelAddTags() { + // hide popup + document.getElementById(divId).style.visibility='hidden'; + } + + </script> + + <f:view> + + <ui5:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?popupView=2&itemId=" + elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> +  + <img id="spaceImage" height="10px" width="3px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> + <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> + <tr> + <td align="left" valign="top"><b>Name:</b> + <span id="value1">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Seller Address:</b> + <span id="value2">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Price:</b> + <span id="value3">Loading Data...</span></td> + </tr> + <tr> + <td colspan="2" align="center"><img name="image" id="imageId" src="" + alt="[Loading Image...]" border="2"/><br/><br/></td> + </tr> + </table> + </ui5:popupTag> + + <h1>Search Page</h1> + <h:form id="searchForm"> + <table class="itemTable" style="width: 700px"> + <tr> + <th class="itemCell">Search String</th> + <td class="itemCell"> + <h:inputText size="50" id="searchString" value="#{SearchBean.searchString}"/> +    Also Search Tags:<h:selectBooleanCheckbox id="searchTags" value="#{SearchBean.searchTags}"/> + </td> + </tr> + <tr> + <td class="itemCell" align="center" colspan="2"> + <h:commandButton action="#{SearchBean.searchAction}" id="searchSubmit" type="submit" value="Submit"/> + <h:commandButton id="searchReset" type="reset" value="Reset"/> + </td> + </tr> + </table> + <h:messages/> + </h:form> + <br/> + + + + <h:form id="resultsForm" rendered="#{SearchBean.showResults}"> + <table class="itemTable"> + <tr> + <th class="itemCell"> + Map + <br/> + <img src="../images/check_all.gif" onclick="return checkAll()"/><img src="../images/uncheck_all.gif" onclick="return uncheckAll()"/> + </th> + <th class="itemCell">Name</th> + <th class="itemCell">Description</th> + <th class="itemCell">Tags</th> + <th class="itemCell">Price</th> + </tr> +<% +SearchBean searchBean=(SearchBean)session.getAttribute("SearchBean"); +if(searchBean != null) { + List<IndexDocument> hits=searchBean.getHits(); + if(hits != null) { + for(IndexDocument indexDoc : hits) { +%> + <tr> + <td class="itemCell"> + <input type="checkbox" name="mapSelectedItems" value="<%= indexDoc.getUID() %>"/> + </td> + <td class="itemCell"> + <a href="${pageContext.request.contextPath}/faces/catalog.jsp?pid=<%= indexDoc.getProduct() %>&itemId=<%= indexDoc.getUID() %>" + onmouseover="bpui.popup.show('pop1', event, '<%= indexDoc.getUID() %>')" onmouseout="bpui.popup.hide('pop1')"> + <%= indexDoc.getTitle() %> + </a> + </td> + <td class="itemCell"> + <%= indexDoc.getSummary() %> + </td> + <td class="itemCell"> + <span id="ITEMID_TAGS_<%= indexDoc.getUID() %>"><%= (indexDoc.getTag().equals("") ? " " : indexDoc.getTag()) %></span> + <br/><input type="button" value="Add Tags" onclick="addTags(event, '<%= indexDoc.getTitle() %>', '<%= indexDoc.getUID() %>')"/> + </td> + <td class="itemCell"> + <%= indexDoc.getPriceDisplay() %> + </td> + </tr> +<% + } + } +} +%> + <tr> + <td colspan="5"> + <br/> + <center> + <table class="itemTable"> + <tr> + <th align="right">Center Point Address:</th> + <td> + <h:inputText id="centerAddress" value="#{MapBean.centerAddress}" size="50"/> + <br/><small><i>For example: 4140 Network Circle, Santa Clara, CA, 95054</i></small> + </td> + </tr> + <tr> + <th align="right">Area (in Miles):</th> + <td> + <h:inputText id="radius" value="#{MapBean.radius}" size="5"/> + </td> + </tr> + <tr> + <td align="center" colspan="2"> + <h:commandButton action="#{MapBean.findAllByIDs}" id="mapSubmit" type="submit" + value="Map Checked Item(s)" rendered="#{SearchBean.showResults}"/> + </td> + </tr> + </table> + </center> + <br/> + </td> + </tr> + </table> + + <h:messages/> + </h:form> + <br/><br/><br/> + <div class="tagDiv" id="addTags"> + <form> + <table> + <tr> + <td align="center"> + <span id="addTagsTitle"><b>Tag Title</b></span><br/><i>(seperated by spaces)</i> + </td> + </tr> + <tr> + <td align="center"> + <input id="addTagsTags" type="text" size="50"/> + </td> + </tr> + <tr> + <td align="center"> + <input type="button" value="Save" onclick="saveAddTags()"/>  <input type="button" value="Cancel" onclick="cancelAddTags()"/> + </td> + </tr> + </table> + <input type="hidden" id="addTagsItemId"/> + </form> + </div> + </f:view> + </center> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css new file mode 100644 index 0000000..24ffbf9 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css @@ -0,0 +1,130 @@ + +.dojoHtmlFisheyeListBar { + cursor:pointer; + margin: 0; + width: 300px; + text-align: right; +} + +.outerbar { + background-color: white; + text-align: left; + width: 300px; +} + +.editText { + height:25; + font-size:18px; + font-weight: bold; + font-family: Arial; +} + +.plainText { + height:25; + font-size:20px; + font-weight: bold; + font-family: Arial +} + +.plainTextSelect { + height:25; + font-size:20px; + font-weight: bold; + font-family: Arial; + background: red +} + +.smallText { + height:15; + font-size:13px; + font-weight: bold; + font-family: Arial +} + +.banner { + height:35; + font-size:35; + font-weight: bold; + font-family: Arial +} + + +.menuItem { + background: white; + color: black; + text-decoration: none; + font-size: 1.4em; +} + +.menuLink { + cursor:pointer; + color: black; + text-decoration: none; + font-size: 1.3em; +} + +.menuLinkHover { + cursor:pointer; + color: black; + font-size: 1.3em; + text-decoration: underline; +} + +.autocomplete { + position:absolute; +} + +.autocompleteTable { + padding:0; + visibility: hidden; + border-spacing: 0; + border-width:1px; + border-style:solid; + border-color:black; +} + +.popupRowHover { + color: #FFFAFA; + cursor:pointer; + padding-left:3; + padding-right:3; + border-spacing: 0; + border-width:0px; + background: #7A8AFF; +} + +.popupRow { + padding-left:3; + padding-right:3; + border-spacing: 0; + border-width:0px; + background: #FFFAFA; +} + +.popupRowEven { + padding-left:3; + padding-right:3; + border-spacing: 0; + border-width:0px; + background: #FFFADA; +} + +.popupItem { + background: #FFFAFA; + color: #000000; + text-decoration: none; + font-size: 1.2em; +} + +.shadow { + top:0px; + left:0px; + position: absolute; + visibility: hidden; + width:0; + height:0; + z-index:0; + background:gray; + opacity: .5; +} + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp new file mode 100644 index 0000000..c7a5309 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp @@ -0,0 +1,28 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: systemerror.jsp,v 1.3 2007/01/09 19:02:12 basler Exp $ --%> +<%@ page isErrorPage="true" %> +<%@ page import="com.sun.javaee.blueprints.petstore.util.PetstoreUtil, java.util.logging.Level" %> +<% +PetstoreUtil.getLogger().log(Level.INFO, "Encountered a Runtime Exception and being transferred the the systemerror page", exception); +%> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > + <title>Java Pet Store Reference Application: System Error Page</title> + </head> + <body> + + <jsp:include page="banner.jsp" /> + + <h2>System Error !</h2> + <p>We had problems processing your request. An exception has been caught, + so perhaps your application was not set up or deployed properly.</p> + + The Exception that was thrown is:<b> <%= exception.toString() %></b>. The server log will contain the stack trace of the exception. + + <p><a href="${pageContext.request.contextPath}/faces/index.jsp">Go back to sample application home</a></p> + <br/><br/> + <jsp:include page="footer.jsp" /> + + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css new file mode 100644 index 0000000..bfbab6e --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css @@ -0,0 +1,47 @@ + .itemTable { + padding: 0.3cm; + border-style: double; + width: 800px; + border-color: darkgreen; + } + .itemCell { + border-style: solid; + border-color: darkgreen; + border-width: thin; + padding: 5px + } + .tagCell { + padding: 0.3cm; + } + .xxlarge + { + font-size: xx-large; + color: red; + cursor: pointer; + text-decoration: underline; + } + .xlarge + { + font-size: x-large; + color: blue; + cursor: pointer; + text-decoration: underline; + } + .large + { + font-size: large; + color: green; + cursor: pointer; + text-decoration: underline; + } + .medium + { + font-size: medium; + cursor: pointer; + color: black; + text-decoration: underline; + } + .items + { + visibility: hidden; + } diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp new file mode 100644 index 0000000..f9c74f3 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp @@ -0,0 +1,158 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: tag.jsp,v 1.11 2007/01/17 18:00:09 basler Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui5" uri="http://java.sun.com/blueprints/ui" %> + + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Tag Page</title> + <script type="text/javascript" src="./common.js"></script> + <link type="text/css" rel="stylesheet" href="./tag.css"/> +<% +try { + CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); + List<Tag> tags=cf.getTagsInChunk(0, 90); + // since top 20 come from database or desending refCount order, need to reorder by tag name + Collections.sort(tags, new Comparator() { + public int compare(Object one, Object two) { + return ((Tag)one).getTag().compareTo(((Tag)two).getTag()); + } + }); +%> + <script language="javascript"> + function retrieveItems(tag) { + var bindArgs = { + // url when using the jsp to serve the ajax request + url: "../tagItemLookup.jsp?tag=" + escape(tag), + mimetype: "text/xml", + load: returnFunctionx, + error: ajaxBindError}; + + // dispatch the request + dojo.io.bind(bindArgs); + } + + + function returnFunctionx(type, data, evt) { + // statically setup popup for simple case + var componentId="displayItems"; + // check return of the dojo call to make sure it is valid + if (evt.readyState == 4) { + if (evt.status == 200) { + // get results and replace dom elements + var itemsx=data.getElementsByTagName("item"); + display="<table class='itemTable'><tr><td class='itemCell' align='center' colspan='4'><h2>Tag: " + + data.getElementsByTagName("tag")[0].childNodes[0].nodeValue + + "</h2></td></tr><tr><th class='itemCell'>Name</th><th class='itemCell'>Description</th><th class='itemCell'>Tags</th><th class='itemCell'>Price</th></tr>" + for(ii=0; ii < itemsx.length; ii++) { + display += "<tr>"; + display +="<td class='itemCell'><a href='./catalog.jsp?pid="+ itemsx[ii].getElementsByTagName("productID")[0].childNodes[0].nodeValue +"&itemId=" + + itemsx[ii].getElementsByTagName("itemID")[0].childNodes[0].nodeValue + "' onmouseover='bpui.popup.show("pop1", event, "" + + itemsx[ii].getElementsByTagName("itemID")[0].childNodes[0].nodeValue + "")' onmouseout='bpui.popup.hide("pop1")'>" + + itemsx[ii].getElementsByTagName("name")[0].childNodes[0].nodeValue +"</a></td>"; + display +="<td class='itemCell'>" + itemsx[ii].getElementsByTagName("description")[0].childNodes[0].nodeValue +"</td>"; + display +="<td class='itemCell'>" + itemsx[ii].getElementsByTagName("tags")[0].childNodes[0].nodeValue +"</td>"; + display +="<td class='itemCell' style='text-align: right'>" + itemsx[ii].getElementsByTagName("price")[0].childNodes[0].nodeValue +"</td>"; + display +="</tr>"; + } + display += "</table>"; + document.getElementById(componentId).innerHTML=display; + document.getElementById(componentId).style.visibility='visible'; + } else if (evt.status == 204){ + alert("204 return"); + } + } + } + + + function checkQueryString() { +  + var iPos=window.location.href.indexOf("?tag="); + if(iPos > -1) { + // have tag so retrieve items + retrieveItems(window.location.href.substr(iPos + 5)); + } + } + + </script> + </head> + <body onload="checkQueryString();"> + <jsp:include page="banner.jsp" /> + <f:view> + + <ui5:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?popupView=2&itemId=" + elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> +  + <img id="spaceImage" height="10px" width="10px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> + <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> + <tr> + <td align="left" valign="top"><b>Name:</b> + <span id="value1">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Seller Address:</b> + <span id="value2">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Price:</b> + <span id="value3">Loading Data...</span></td> + </tr> + <tr> + <td colspan="2" align="center"><img name="image" id="imageId" src="" + alt="[Loading Image...]" border="2"/><br/><br/></td> + </tr> + </table> + </ui5:popupTag> + <center> + <h1>Tag Page</h1> + <table border="0"> + <tr> +<% + String style=null; + int refx=0, ii=0; + for(Tag tag : tags) { + refx=tag.getRefCount() / 5; + if(refx >= 3) { + style="xxlarge"; + } else if(refx == 2) { + style="xlarge"; + } else if(refx == 1) { + style="large"; + } else { + style="medium"; + } + + if((ii % 6) == 0) out.println("</tr>\n<tr>"); + //out.println("<td class='tagCell'><span onclick=\"retrieveItems('" + tag.getTag() + "')\" class='" + style +"'>" + tag.getTag() + "</span> (" + tag.getRefCount() + ")</td>"); + out.println("<td class='tagCell'><span onclick=\"retrieveItems('" + tag.getTag() + "')\" class='" + style +"'>" + tag.getTag() + "</span></td>"); + ii++; + } +%> + </tr> + </table> + <div id="displayItems" class="items"> + + </div> + </center> + </f:view> + <br/><br/><br/><br/> + <jsp:include page="footer.jsp" /> + + </body> +</html> + +<% + } catch(Exception e) { + e.printStackTrace(); + } +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp new file mode 100644 index 0000000..05ef352 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp @@ -0,0 +1,45 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: tagItemLookup.jsp,v 1.4 2007/01/19 21:47:31 basler Exp $ --%> + +<%@page contentType="text/xml"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, java.text.NumberFormat, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item, com.sun.javaee.blueprints.petstore.model.Tag"%> + +<% + String sxTag=request.getParameter("tag"); + + try { + response.setHeader("Pragma", "No-Cache"); + response.setHeader("Cache-Control", "no-cache,no-store,max-age=0"); + response.setDateHeader("Expires", 1); + + ServletContext context=config.getServletContext(); + CatalogFacade cf=(CatalogFacade)context.getAttribute("CatalogFacade"); + Tag tag=cf.getTagWithPersistentItems(sxTag); + out.println("<response>"); + + if(tag != null) { + out.println("<tag>" + tag.getTag() + "</tag>"); + out.println("<items>"); + Collection<Item> items=tag.getItems(); + for(Item item : items) { + if(item.getDisabled() == 0) { + out.println("<item>"); + out.println("<itemID>" + item.getItemID() + "</itemID>"); + out.println("<productID>" + item.getProductID() + "</productID>"); + out.println("<name><![CDATA[" + item.getName() + "]]></name>"); + out.println("<description><![CDATA[" + item.getDescription() + "]]></description>"); + out.println("<tags><![CDATA[" + item.tagsAsString() + "]]></tags>"); + out.println("<price><![CDATA[" + NumberFormat.getCurrencyInstance(java.util.Locale.US).format(item.getPrice()) + "]]></price>"); + out.println("</item>"); + } + } + out.println("</items>"); + } + out.println("</response>"); + out.flush(); + } catch(Exception ee) { + ee.printStackTrace(); + } + +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp new file mode 100644 index 0000000..e5dd68a --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp @@ -0,0 +1,36 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%-- +The taglib directive below imports the JSTL library. If you uncomment it, +you must also add the JSTL library to the project. The Add Library... action +on Libraries node in Projects view can be used to add the JSTL 1.1 library. +--%> +<%-- +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +--%> + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>JSP Page</title> + </head> + <body> + + <h1>JSP Page</h1> + + <%-- + This example uses JSTL, uncomment the taglib directive above. + To test, display the page like this: index.jsp?sayHello=true&name=Murphy + --%> + <%-- + <c:if test="${param.sayHello}"> +  + Hello ${param.name}! + </c:if> + --%> + + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/scripts/assembly.xml b/etc/samples/provisioning/sample-bundle/src/main/scripts/assembly.xml new file mode 100644 index 0000000..942e5f9 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/scripts/assembly.xml @@ -0,0 +1,41 @@ +<?xml version="1.0"?> + + + +<assembly> +  + <id></id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <baseDirectory>target/bundle</baseDirectory> + <fileSets> + <fileSet> + <directory>target/bundle</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/*.sh</exclude> + <exclude>**/*.so</exclude> + <exclude>**/*.sl</exclude> + <exclude>**/*.dylib</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>target/bundle</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>**/*.sh</include> + <include>**/*.so</include> + <include>**/*.sl</include> + <include>**/*.dylib</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + </fileSets> +</assembly> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/scripts/build.xml b/etc/samples/provisioning/sample-bundle/src/main/scripts/build.xml new file mode 100644 index 0000000..fed3f16 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/scripts/build.xml @@ -0,0 +1,63 @@ +<?xml version="1.0"?> + + + +<project name="sample-bundle" basedir="." default="build"> + + <target name="build"> + +  + <property name="tmp.dir" location="${java.io.tmpdir}/${user.name}"/> + <echo>tmp.dir="${tmp.dir}"</echo> + <mkdir dir="${tmp.dir}"/> + + <get src="http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-6.0.0.M3/jboss-a…" + dest="${tmp.dir}/jbossas.zip" + usetimestamp="true"/> + <property name="jboss.home" location="target/jbossas-petstore"/> + <echo>jboss.home="${jboss.home}"</echo> + <mkdir dir="${jboss.home}"/> + <unzip src="${tmp.dir}/jbossas.zip" dest="${jboss.home}"> + <mapper> + <globmapper from="jboss-6.0.0.20100429-M3/*" to="*"/> + </mapper> + </unzip> + +  + <delete includeemptydirs="true"> + <fileset dir="${jboss.home}/server"> + <exclude name="default/**"/> + </fileset> + </delete> + +  + <delete dir="${jboss.home}/docs"/> + <delete> + <fileset dir="${jboss.home}" includes="*.*" /> + </delete> + + <property name="jboss.config.dir" location="${jboss.home}/server/default"/> + + <echo>Copying Derby JDBC driver jar to $${jboss.home}/server/default/lib/...</echo> + <copy file="${settings.localRepository}/org/apache/derby/derbyclient/${derbyclient.version}/derbyclient-${derbyclient.version}.jar" + toDir="${jboss.config.dir}/lib" failonerror="false" verbose="true" /> + +  + <copy todir="${jboss.home}"> + <fileset dir="src/main/petstore"/> + </copy> + + <mkdir dir="target/bundle"/> + +  + <zip destfile="target/bundle/jbossas-petstore.zip" basedir="${jboss.home}"/> + +  + <copy todir="target/bundle"> + <fileset dir="src/main/bundle"/> + </copy> + + </target> + +</project> + diff --git a/etc/samples/sample-bundle/pom.xml b/etc/samples/sample-bundle/pom.xml deleted file mode 100644 index 6bd4a88..0000000 --- a/etc/samples/sample-bundle/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0"?> - - - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.rhq.sample</groupId> - <artifactId>rhq-sample-bundle</artifactId> - <version>2.0</version> - <packaging>pom</packaging> - - <name>RHQ Sample Bundle</name> - <description>a sample bundle consisting of JBossAS 6.0 running the Java Petstore application</description> - - <scm> - <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/etc/modules/sample-bundle/</connection> - <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/etc/modules/sample-bundle/</developerConnection> - </scm> - - <properties> -  - <derbyclient.version>10.5.3.0_1</derbyclient.version> - </properties> - - <dependencies> - -  - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</artifactId> - <version>${derbyclient.version}</version> - </dependency> - - </dependencies> - - <build> - - <plugins> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-bundle</id> - <phase>process-resources</phase> - <configuration> - <tasks> - <echo>settings.localRepository=${settings.localRepository}</echo> - <echo>project.build.outputDirectory=${project.build.outputDirectory}</echo> - <ant antfile="src/main/scripts/build.xml"> - <property name="settings.localRepository" value="${settings.localRepository}"/> - <property name="project.version" value="${project.version}"/> - <property name="project.build.outputDirectory" value="${project.build.outputDirectory}"/> - <property name="derbyclient.version" value="${derbyclient.version}"/> - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/scripts/assembly.xml</descriptor> - </descriptors> - <finalName>${project.build.finalName}</finalName> - </configuration> - <executions> - <execution> - <id>assemble-bundle</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - -</project> - diff --git a/etc/samples/sample-bundle/src/main/bundle/deploy.xml b/etc/samples/sample-bundle/src/main/bundle/deploy.xml deleted file mode 100644 index 8bfec17..0000000 --- a/etc/samples/sample-bundle/src/main/bundle/deploy.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0"?> - -<project name="petstore" default="main" - xmlns:rhq="antlib:org.rhq.bundle"> - - <rhq:bundle name="Java Petstore" version="2.0" - description="a sample bundle consisting of JBossAS 6.0 running the Java Petstore application"> - - <rhq:input-property - name="jboss.bind.address" - description="the IP address the JBoss AS server should bind to" - required="true"/> - - <rhq:input-property - name="http.port" - description="the HTTP port the JBoss AS server should listen on" - required="true" - type="integer"/> - - <rhq:input-property - name="https.port" - description="the HTTPS port the JBoss AS server should listen on" - required="true" - type="integer"/> - - <rhq:deployment-unit name="appserver" - preinstallTarget="appserver-preinstall" postinstallTarget="appserver-postinstall"> - <rhq:system-service name="jbossas-petstore" scriptFile="jbossas-init-script" - configFile="jbossas-init-config" overwriteScript="true" - startLevels="3,4,5" startPriority="80" stopPriority="20"/> - - <rhq:archive name="jbossas-petstore.zip"/> - -  - <rhq:ignore> - <rhq:fileset> - <include name="server/default/data/**"/> - <include name="server/default/logs/**"/> - <include name="server/default/tmp/**"/> - <include name="server/default/work/**"/> - </rhq:fileset> - </rhq:ignore> - </rhq:deployment-unit> - - </rhq:bundle> - - <target name="main"/> - - <target name="appserver-preinstall"> - <echo>Installing Java Petstore App Server to ${rhq.deploy.dir}...</echo> - </target> - - <target name="appserver-postinstall"> - <echo>Done installing Java Petstore App Server to ${rhq.deploy.dir}.</echo> - </target> - -</project> diff --git a/etc/samples/sample-bundle/src/main/bundle/jbossas-init-config b/etc/samples/sample-bundle/src/main/bundle/jbossas-init-config deleted file mode 100644 index a2fc4c1..0000000 --- a/etc/samples/sample-bundle/src/main/bundle/jbossas-init-config +++ /dev/null @@ -1,69 +0,0 @@ -# Configuration file for jbossas init script that configures the -# settings needed to start a particular JBoss AS instance. - -# -# the JBoss AS installation directory (e.g. /opt/jboss-6.0.0.M1) -# (*REQUIRED*) -# -JBOSS_HOME="@@rhq.deploy.dir@@" - -# -# the args that will be passed to run.sh -# (i.e. org.jboss.Main). -# -JBOSS_OPTS="-b @@jboss.bind.address@@" - -# What UNIX user the JBoss AS java process will run as. -# (The shutdown client is always run as the invoker of the -# init script). JBoss AS will be run as root by default, but, for -# the sake of security, it is recommended that you chown the JBoss -# AS installation files to a non-root user and use that use here. -# Note, you do need to run as root if your server will listen on one -# or more privileged (< 1024) ports. If you really do want to run as -# root, comment out the JBOSS_USER variable completely (i.e. do not -# set it to root). This will run the server process without "su". -#JBOSS_USER=jboss - -# -# Specify the maximum file descriptor limit, use "max" or "maximum" to use -# the default, as queried by the system. -# -# Defaults to "maximum" -# -#MAX_FD="maximum" - -# -# Specify the profiler configuration file to load. -# -# Default is to not load profiler configuration file. -# -#PROFILER= - -# -# Specify the location of the Java Rntime Environment (JRE) or -# Java Development Kit (JDK) installation directory. If not set, -# "/usr/java/default" will be used. -# -#JAVA_HOME="/usr/java/default" - -# -# Specify options to pass to the Java VM (if unset, a default -# set of options will be used). -# -# Note, if you want to pass the default options but some of -# your own additional options in, then set the -# ADDITIONAL_JAVA_OPTS variable (see below), rather than JAVA_OPTS. -# -#JAVA_OPTS="-Xms128M -Xmx512M -XX:MaxPermSize=256M -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djava.net.preferIPv4Stack=true" - -# -# Specify additional options to pass to the Java VM. These are passed -# in addition to the default set of options, -# i.e. java $JAVA_OPTS $ADDITIONAL_JAVA_OPTS ... org.jboss.Main ... -# -# Sample JPDA settings (uncomment either a) or b)) -# a) remote socket debugging -#ADDITIONAL_JAVA_OPTS="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" -# b) shared memory debugging -#ADDITIONAL_JAVA_OPTS="-Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss" - diff --git a/etc/samples/sample-bundle/src/main/bundle/jbossas-init-script b/etc/samples/sample-bundle/src/main/bundle/jbossas-init-script deleted file mode 100755 index 58eb98e..0000000 --- a/etc/samples/sample-bundle/src/main/bundle/jbossas-init-script +++ /dev/null @@ -1,328 +0,0 @@ -#!/bin/bash -# -# jbossas - This shell script takes care of starting and stopping -# a JBoss Application Server (AS) instance on a Red Hat -# Linux system. It can be run as a system service (init -# script) and/or run manually. -# -# chkconfig: 345 84 16 -# description: JBoss AS server -# processname: java -# pidfile: /var/run/jbossas.pid - -# Source init-script function library. -FUNCTIONS=/etc/rc.d/init.d/functions -if [ ! -f "$FUNCTIONS" ]; then - echo "Functions library ($FUNCTIONS) not found." >&2 - exit 1 -fi -. $FUNCTIONS - -# Find the name of this service (e.g. "jbossas"). -NAME=`basename $0` -if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]; then - NAME=${NAME:3} -fi - -# Set names of pid, lock, and log files - all based on the service name. -PIDFILE="/var/run/$NAME.pid" -LOCKFILE="/var/lock/subsys/$NAME" -LOGFILE="/var/log/$NAME.log" - -# Set defaults for optional configuration variables. -JAVA_HOME="/usr/java/default" -JAVA_OPTS="-Xms128M -Xmx512M -XX:MaxPermSize=256M" -JAVA_OPTS="$JAVA_OPTS -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" -# (Prefer IPv4 stack as as temporary workaround to avoid 'all' config startup -# issues from IPv4 multicast addresses. See JBAS-7936.) -JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true" - -# Source the service's config file, potentially overriding the defaults set -# above. -CONFIG="/etc/sysconfig/${NAME}" -if [ ! -f "$CONFIG" ]; then - echo "Required configuration file $CONFIG not found." >&2 - exit 1 -fi -. "$CONFIG" - -# Bail out if required variables were not set in the config file. -if [ -z "$JBOSS_HOME" ]; then - echo "Required variable JBOSS_HOME was not set in $CONFIG." >&2 - exit 1 -fi - - -start() -{ - # See if the service is already running, and, if so, exit with an error. - PID=`pidfileofproc "$NAME"` - if [ -n "$PID" ]; then - # pid file exists - see if process is actually running. - kill -0 $PID 2>/dev/null - if [ $? -eq 0 ]; then - echo "$NAME service is already running (pid=$PID)." >&2 - exit 1 - else - echo "Removing bogus pid file $PIDFILE..." - rm -f "$PIDFILE" - if [ -f "$LOCKFILE" ]; then - echo "Removing bogus lock file $LOCKFILE..." - rm -f "$LOCKFILE" - fi - fi - fi - - # Check that JAVA_HOME is valid. - JAVA="$JAVA_HOME/bin/java" - if [ ! -f "$JAVA" ]; then - echo "Java not found at $JAVA - please set JAVA_HOME in $CONFIG." >&2 - exit 1 - fi - if [ ! -x "$JAVA" ]; then - echo "$JAVA is not executable." >&2 - exit 5 - fi - - # Setup the classpath - JBOSS_BOOT_CLASSPATH="$JBOSS_HOME/bin/run.jar" - if [ ! -f "$JBOSS_BOOT_CLASSPATH" ]; then - echo "Missing required file: $JBOSS_BOOT_CLASSPATH" >&2 - exit 1 - fi - - # By default, Tomcat uses the JDT Compiler for compiling JSPs. However, - # include tools.jar in the classpath if we can find it under JAVA_HOME - # or if the user specified it via the JAVAC_JAR variable. - JAVAC_JAR_FILE="${JAVAC_JAR:-$JAVA_HOME/lib/tools.jar}" - if [ ! -f "$JAVAC_JAR_FILE" ]; then - [ -n "$JAVAC_JAR" ] && echo "Missing javac jar file $JAVAC_JAR as defined by the JAVAC_JAR variable. Unexpected results may occur." - unset JAVAC_JAR_FILE - fi - - # If -server not set in JAVA_OPTS, set it, if supported. - SERVER_SET=`echo $JAVA_OPTS | grep "\-server"` - if [ -z "$SERVER_SET" ]; then - # Check for Sun JVM w/ HotSpot support. - HAS_HOTSPOT=`"$JAVA" -version 2>&1 | grep -i HotSpot` - - # Check for OpenJDK JVM w/ server support. - HAS_OPENJDK=`"$JAVA" -version 2>&1 | grep -i OpenJDK` - - # Enable -server if we have Hotspot or OpenJDK, unless we can't - if [ -n "$HAS_HOTSPOT" ] || [ -n "$HAS_OPENJDK" ]; then - JAVA_OPTS="-server $JAVA_OPTS" - fi - fi - - # Setup JBoss-specific properties. - JAVA_OPTS="-Dprogram.name=$NAME $JAVA_OPTS" - - # Setup JBoss Native library path. - unset JBOSS_NATIVE_DIR - for DIR in "$JBOSS_HOME/../native/lib" "$JBOSS_HOME/../native" "$JBOSS_HOME/../native/lib64" "$JBOSS_HOME/native/lib64" "$JBOSS_HOME/native/bin" "$JBOSS_HOME/bin/native"; do - if [ -d "$DIR" ]; then - JBOSS_NATIVE_DIR=`cd "$DIR/.." && pwd` - break - fi - done - if [ -d "$JBOSS_NATIVE_DIR" ]; then - IS_64_BIT_JVM=`"$JAVA" $JAVA_OPTS -version 2>&1 | grep -i 64-bit` - if [ -n "$IS_64_BIT_JVM" ]; then - JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64" - else - JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib" - fi - LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - export LD_LIBRARY_PATH - JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$LD_LIBRARY_PATH" - fi - - # Setup the Java endorsed dirs. - JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=\"$JBOSS_ENDORSED_DIRS\"" - - # Setup the Java classpath. - JBOSS_CLASSPATH="${JBOSS_CLASSPATH:+$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH}" - JBOSS_CLASSPATH="${JBOSS_CLASSPATH:-$JBOSS_BOOT_CLASSPATH}" - JBOSS_CLASSPATH="$JBOSS_CLASSPATH${JAVAC_JAR_FILE:+:$JAVAC_JAR_FILE}" - JAVA_OPTS="$JAVA_OPTS -classpath \"$JBOSS_CLASSPATH\"" - - # Display a summary of our environment if we're associated with a terminal. - if tty -s; then - echo "========================================================================="; echo - echo " JBoss AS Bootstrap Environment" ; echo - echo " JBOSS_HOME: $JBOSS_HOME" ; echo - echo " JAVA: $JAVA" ; echo - echo " JAVA_OPTS: $JAVA_OPTS" ; echo - echo " JBOSS_OPTS: $JBOSS_OPTS" ; echo - echo "========================================================================="; echo - fi - - # JBoss AS expects its current working dir to be $JBOSS_HOME/bin - cd "$JBOSS_HOME/bin" - - # JBoss AS expects JBOSS_HOME to be set in its environment. - export JBOSS_HOME - - # We only need to bother with nohup if we're associated with a terminal. - if tty -s; then - NOHUP=nohup - else - unset NOHUP - fi - - # If they set NICELEVEL in the config file, honor it. - [ -n "${NICELEVEL:-}" ] && NICE="nice -n $NICELEVEL" - - # If JBOSS_USER was specified in the config and current user is root, we - # want to setuid the JBoss AS process to JBOSS_USER. - if [ -n "$JBOSS_USER" ] && [ "$EUID" -eq 0 ]; then - # For SELinux we need to use 'runuser', not 'su'. - if [ -x /sbin/runuser ]; then - SU=runuser - else - SU=su - fi - else - unset SU - fi - - if [ -n "$SU" ]; then - WRAPPER="$NOHUP $NICE $SU -s /bin/bash - $JBOSS_USER -c" - else - WRAPPER="$NOHUP $NICE bash -c" - fi - - # Make sure log file exists and has correct ownership and permissions. - if [ "$EUID" -eq 0 ]; then - touch -a "$LOGFILE" || exit 4 - [ -n "$JBOSS_USER" ] && chown $JBOSS_USER "$LOGFILE" - [ -n "$JBOSS_GROUP" ] && chgrp $JBOSS_GROUP "$LOGFILE" - chmod u=rw "$LOGFILE" - [ -n "$JBOSS_GROUP" ] && chmod g+r "$LOGFILE" - [ -x /sbin/restorecon ] && /sbin/restorecon "$LOGFILE" - fi - - # Make sure pid file has correct ownership and permissions. - if [ "$EUID" -eq 0 ] && [ -f "$PIDFILE" ]; then - [ -n "$JBOSS_USER" ] && chown $JBOSS_USER "$PIDFILE" - [ -n "$JBOSS_GROUP" ] && chgrp $JBOSS_GROUP "$PIDFILE" - chmod u=rw "$PIDFILE" - [ -n "$JBOSS_GROUP" ] && chmod g+r - [ -x /sbin/restorecon ] && /sbin/restorecon "$PIDFILE" - fi - - echo -n "Starting $NAME service: " - - # Make sure to escape the $$'s within the subshell to prevent our own shell - # from evaluating them and writing our own pid to the pid file. - $WRAPPER "echo \$\$ >\"$PIDFILE\" || ( echo \"Failed to write pid (\$\$) to $PIDFILE.\" >&2; exit 4 ); exec \"$JAVA\" $JAVA_OPTS org.jboss.Main $JBOSS_OPTS" >>"$LOGFILE" 2>&1 & - if [ $? -ne 0 ]; then - failure "$NAME startup" - echo - EXIT_STATUS=$? - fi - - # Wait a few seconds and then check that the process is running. Note, this - # will *not* verify that JBoss AS started properly without any configuration - # or deployment errors. - sleep 3 - - if pidfileofproc "$NAME"; then - success "$NAME startup" - echo - touch "$LOCKFILE" - EXIT_STATUS=0 - else - failure "$NAME startup" - echo - EXIT_STATUS=1 - fi -} - -stop() -{ - # See if service is running, and, if not, exit without any error. - PID=`pidfileofproc "$NAME"` - unset NOT_RUNNING - if [ -z "$PID" ]; then - NOT_RUNNING=1 - else - # pid file exists - see if process is actually running. - kill -0 $PID 2>/dev/null - if [ $? -ne 0 ]; then - NOT_RUNNING=1 - if [ -f "$PIDFILE" ]; then - echo "Removing bogus pid file $PIDFILE..." - rm -f "$PIDFILE" - fi - if [ -f "$LOCKFILE" ]; then - echo "Removing bogus lock file $LOCKFILE..." - rm -f "$LOCKFILE" - fi - fi - fi - if [ -n "$NOT_RUNNING" ]; then - echo "$NAME service is not running." - exit 0 - fi - - echo -n "Stopping $NAME service: " - killproc -d 30 "$NAME" - EXIT_STATUS=$? - if [ $EXIT_STATUS -eq 0 ]; then - rm -f "$LOCKFILE" - fi - echo -} - -# NOTE: We don't name this function 'status', since that would override the -# 'status function defined in /etc/init.d/functions. -_status() -{ - status "$NAME" - EXIT_CODE=$? -} - -restart() -{ - stop || exit $? - start -} - -condrestart() -{ - [ -f "$PIDFILE" ] && restart -} - -usage() -{ - echo "Usage: $NAME {start|stop|status|restart|condrestart}" >&2 - EXIT_CODE=2 -} - -# The -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - _status - ;; - restart) - restart - ;; - condrestart) - condrestart - ;; - *) - usage - ;; -esac - -exit $EXIT_STATUS - diff --git a/etc/samples/sample-bundle/src/main/petstore/petstore-db.changelog.xml b/etc/samples/sample-bundle/src/main/petstore/petstore-db.changelog.xml deleted file mode 100644 index 42ced88..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/petstore-db.changelog.xml +++ /dev/null @@ -1,187 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd"> - <changeSet author="ips (generated)" id="1272025063915-1"> - <createTable schemaName="APP" tableName="ADDRESS"> - <column name="ADDRESSID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635960"/> - </column> - <column name="STREET1" type="VARCHAR(55)"> - <constraints nullable="false"/> - </column> - <column name="STREET2" type="VARCHAR(55)"/> - <column name="CITY" type="VARCHAR(55)"> - <constraints nullable="false"/> - </column> - <column name="STATE" type="VARCHAR(25)"> - <constraints nullable="false"/> - </column> - <column name="ZIP" type="VARCHAR(5)"> - <constraints nullable="false"/> - </column> - <column name="LATITUDE" type="DECIMAL(14,10)"> - <constraints nullable="false"/> - </column> - <column name="LONGITUDE" type="DECIMAL(14,10)"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-2"> - <createTable schemaName="APP" tableName="CATEGORY"> - <column name="CATEGORYID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635550"/> - </column> - <column name="NAME" type="VARCHAR(25)"> - <constraints nullable="false"/> - </column> - <column name="DESCRIPTION" type="VARCHAR(255)"> - <constraints nullable="false"/> - </column> - <column name="IMAGEURL" type="VARCHAR(55)"/> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-3"> - <createTable schemaName="APP" tableName="ID_GEN"> - <column name="GEN_KEY" type="VARCHAR(20)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636590"/> - </column> - <column name="GEN_VALUE" type="INT"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-4"> - <createTable schemaName="APP" tableName="ITEM"> - <column name="ITEMID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636230"/> - </column> - <column name="PRODUCTID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - <column name="NAME" type="VARCHAR(30)"> - <constraints nullable="false"/> - </column> - <column name="DESCRIPTION" type="VARCHAR(500)"> - <constraints nullable="false"/> - </column> - <column name="IMAGEURL" type="VARCHAR(55)"/> - <column name="IMAGETHUMBURL" type="VARCHAR(55)"/> - <column name="PRICE" type="DECIMAL(14,2)"> - <constraints nullable="false"/> - </column> - <column name="ADDRESS_ADDRESSID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - <column name="CONTACTINFO_CONTACTINFOID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - <column name="TOTALSCORE" type="INT"> - <constraints nullable="false"/> - </column> - <column name="NUMBEROFVOTES" type="INT"> - <constraints nullable="false"/> - </column> - <column name="DISABLED" type="INT"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-5"> - <createTable schemaName="APP" tableName="PRODUCT"> - <column name="PRODUCTID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635740"/> - </column> - <column name="CATEGORYID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - <column name="NAME" type="VARCHAR(25)"> - <constraints nullable="false"/> - </column> - <column name="DESCRIPTION" type="VARCHAR(255)"> - <constraints nullable="false"/> - </column> - <column name="IMAGEURL" type="VARCHAR(55)"/> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-6"> - <createTable schemaName="APP" tableName="SELLERCONTACTINFO"> - <column name="CONTACTINFOID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636080"/> - </column> - <column name="LASTNAME" type="VARCHAR(24)"> - <constraints nullable="false"/> - </column> - <column name="FIRSTNAME" type="VARCHAR(24)"> - <constraints nullable="false"/> - </column> - <column name="EMAIL" type="VARCHAR(24)"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-7"> - <createTable schemaName="APP" tableName="TAG"> - <column name="TAGID" type="INT"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636830"/> - </column> - <column name="TAG" type="VARCHAR(30)"> - <constraints nullable="false"/> - </column> - <column name="REFCOUNT" type="INT"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-8"> - <createTable schemaName="APP" tableName="TAG_ITEM"> - <column name="TAGID" type="INT"> - <constraints nullable="false"/> - </column> - <column name="ITEMID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-9"> - <createTable schemaName="APP" tableName="ZIPLOCATION"> - <column name="ZIPCODE" type="INT"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636710"/> - </column> - <column name="CITY" type="VARCHAR(30)"> - <constraints nullable="false"/> - </column> - <column name="STATE" type="VARCHAR(2)"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-10"> - <createIndex indexName="SQL100422173636831" schemaName="APP" tableName="TAG" unique="true"> - <column name="TAG"/> - </createIndex> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-11"> - <createIndex indexName="SQL100422173637010" schemaName="APP" tableName="TAG_ITEM" unique="true"> - <column name="TAGID"/> - <column name="ITEMID"/> - </createIndex> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-12"> - <addForeignKeyConstraint baseColumnNames="ADDRESS_ADDRESSID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636231" deferrable="false" initiallyDeferred="false" referencedColumnNames="ADDRESSID" referencedTableName="ADDRESS" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-13"> - <addForeignKeyConstraint baseColumnNames="CONTACTINFO_CONTACTINFOID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636233" deferrable="false" initiallyDeferred="false" referencedColumnNames="CONTACTINFOID" referencedTableName="SELLERCONTACTINFO" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-14"> - <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636232" deferrable="false" initiallyDeferred="false" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-15"> - <addForeignKeyConstraint baseColumnNames="CATEGORYID" baseTableName="PRODUCT" baseTableSchemaName="APP" constraintName="SQL100422173635741" deferrable="false" initiallyDeferred="false" referencedColumnNames="CATEGORYID" referencedTableName="CATEGORY" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-16"> - <addForeignKeyConstraint baseColumnNames="ITEMID" baseTableName="TAG_ITEM" baseTableSchemaName="APP" constraintName="SQL100422173637011" deferrable="false" initiallyDeferred="false" referencedColumnNames="ITEMID" referencedTableName="ITEM" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-17"> - <addForeignKeyConstraint baseColumnNames="TAGID" baseTableName="TAG_ITEM" baseTableSchemaName="APP" constraintName="SQL100422173637012" deferrable="false" initiallyDeferred="false" referencedColumnNames="TAGID" referencedTableName="TAG" referencedTableSchemaName="APP"/> - </changeSet> -</databaseChangeLog> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml deleted file mode 100644 index ae5ea7c..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<datasources> - - <local-tx-datasource> - -  -  - <jndi-name>jdbc/PetstoreDB</jndi-name> - -  - <connection-url>jdbc:derby://localhost:1527/petstore;create=true</connection-url> - -  - <driver-class>org.apache.derby.jdbc.ClientDriver</driver-class> - -  - <user-name>APP</user-name> - <password>APP</password> - -  - <min-pool-size>5</min-pool-size> - -  - <max-pool-size>20</max-pool-size> - -  - <idle-timeout-minutes>5</idle-timeout-minutes> - -  - <track-statements/> - - </local-tx-datasource> - -</datasources> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml deleted file mode 100644 index eadc0f4..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4"> - - <display-name>Java Pet Store</display-name> - - <module> - <web> - <web-uri>petstore.war</web-uri> - <context-root>/petstore</context-root> - </web> - </module> - - <module> - <ejb>petstore-ejb.jar</ejb> - </module> - -</application> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml deleted file mode 100644 index 76e0703..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> - - <persistence-unit name="PetstorePu"> - <description>Petstore Persistence Unit</description> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:jdbc/PetstoreDB</jta-data-source> - <non-jta-data-source>java:jdbc/PetstoreDB</non-jta-data-source> - <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/> - <property name="hibernate.connection.username" value="APP"/> - <property name="hibernate.connection.password" value="APP"/> - <property name="hibernate.format_sql" value="true"/> - </properties> - </persistence-unit> - -</persistence> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class deleted file mode 100644 index c9dc392..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class deleted file mode 100644 index be2275b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class deleted file mode 100644 index 8842106..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class deleted file mode 100644 index dda3feb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class deleted file mode 100644 index b5dbe74..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class deleted file mode 100644 index 1b5785b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class deleted file mode 100644 index 591af10..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF deleted file mode 100644 index 7a679c4..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.7.1 -Created-By: 16.0-b13 (Sun Microsystems Inc.) - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class deleted file mode 100644 index abac5a6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class deleted file mode 100644 index 7d7af77..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class deleted file mode 100644 index b8bfa4d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class deleted file mode 100644 index 8c469f4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class deleted file mode 100644 index e2b4ca5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class deleted file mode 100644 index 223289e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class deleted file mode 100644 index 61f3863..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class deleted file mode 100644 index 7c149e3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class deleted file mode 100644 index c5fb59a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class deleted file mode 100644 index 65d4cdb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class deleted file mode 100644 index 1ee72ad..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class deleted file mode 100644 index f56c35e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class deleted file mode 100644 index 56fc53d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class deleted file mode 100644 index ee55705..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class deleted file mode 100644 index 30e70ab..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class deleted file mode 100644 index dd5b7c1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class deleted file mode 100644 index 03400b2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class deleted file mode 100644 index 23a204c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class deleted file mode 100644 index 18f8102..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class deleted file mode 100644 index b6e2b0d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class deleted file mode 100644 index be21196..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class deleted file mode 100644 index 185dc01..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class deleted file mode 100644 index 18b3463..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class deleted file mode 100644 index 0c448bf..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class deleted file mode 100644 index 4a19fad..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class deleted file mode 100644 index a8b6521..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class deleted file mode 100644 index 2b42389..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class deleted file mode 100644 index 8ab0084..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class deleted file mode 100644 index a4cc2bf..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class deleted file mode 100644 index 50007c4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class deleted file mode 100644 index 1ef9761..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class deleted file mode 100644 index 5570fac..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties deleted file mode 100644 index 112905d..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties +++ /dev/null @@ -1,10 +0,0 @@ -index.exception=An exception was encountered while indexing the data. Please checked to make sure there indexes are not locked by another user. -index.sql.statement=Select statement used for retrieving database data "{0}" -search.string=Searching indexes for string "{0}" -search.results=Search String returned "{0}" hits -search.exception=An exception was encountered while performing the search. Please check to make sure the indexes exist. -fileupload.persist.exception=Error persisting seller data -fileupload.rollback.exception=Persisting seller data, rollback failed -geocoder.lookup.exception=The GeoCode address lookup from Yahoo has returned and Exception -image_does_not_exist=The image doesn't exist in the default image directory or in the upload directory "{0}" -resource_bundle_does_not_exist=The MessageStrings.properties file does not exist!. diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties deleted file mode 100644 index 7ca2d9d..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties +++ /dev/null @@ -1,10 +0,0 @@ -invalid_contact_firstname=First Name is required. -invalid_contact_lastname=Last Name is required. -invalid_address_street1=Street is required. -invalid_address_city=City is required. -invalid_address_state=State is required. -invalid_address_zip=Zip Code is required. -invalid_item_name=Pet Name is required. -invalid_item_description=The Description should exist and the field can't have a '<script>' and/or a '<link>' tag in it. -invalid_item_price=Price should should exist and be a number greater or equal to 0. -invalid_item_imageurl=The image upload file must exist and be of type '.jpg', '.gif' or '.png'. diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class deleted file mode 100644 index 5aa4b42..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class deleted file mode 100644 index a521d71..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml deleted file mode 100644 index 22f03df..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - - - -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" - version="1.2"> -  - -  - <managed-bean> - <managed-bean-name>SearchBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.search.SearchBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>RatingBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.model.RatingBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>itemId</property-name> - <value>#{param.itemIdBinding}</value> - </managed-property> - </managed-bean> - - <managed-bean> - <managed-bean-name>PayPalBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.model.PayPalBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>FileUploadBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.FileUploadBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>MapBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.mapviewer.MapBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>AutocompleteBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.AutocompleteBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>AddressBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.AddressBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - -  - <navigation-rule> - <from-view-id>/mapLocation.jsp</from-view-id> - <navigation-case> - <from-outcome>map</from-outcome> - <to-view-id>/map.jsp</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/mapAll.jsp</from-view-id> - <navigation-case> - <from-outcome>map</from-outcome> - <to-view-id>/map.jsp</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/map.jsp</from-view-id> - <navigation-case> - <to-view-id>/mapLocation.jsp</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/search.jsp</from-view-id> - <navigation-case> - <from-outcome>displayResults</from-outcome> - <to-view-id>/search.jsp</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>map</from-outcome> - <to-view-id>/map.jsp</to-view-id> - </navigation-case> - </navigation-rule> - -</faces-config> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml deleted file mode 100644 index 0862993..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-web> - <resource-ref> - <res-ref-name>jdbc/PetstoreDB</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <jndi-name>java:jdbc/PetstoreDB</jndi-name> - </resource-ref> -</jboss-web> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar deleted file mode 100644 index f6bd6d2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar deleted file mode 100644 index fc5763d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar deleted file mode 100644 index b2867cd..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar deleted file mode 100644 index 2ff9bbd..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar deleted file mode 100644 index 288e64c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar deleted file mode 100644 index db6456f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar deleted file mode 100644 index 27d2ad3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar deleted file mode 100644 index c2a26da..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar deleted file mode 100644 index 128045d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml deleted file mode 100644 index a9c411b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd"> -<sun-web-app error-url=""> - <context-root>/petstore</context-root> - <class-loader delegate="true"/> - <jsp-config> - <property name="classdebuginfo" value="true"> - <description>Enable debug info compilation in the generated servlet class</description> - </property> - <property name="mappedfile" value="true"> - <description>Maintain a one-to-one correspondence between static content and the generated servlet class' java code</description> - </property> - </jsp-config> -</sun-web-app> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml deleted file mode 100644 index 6c65069..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml +++ /dev/null @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - - <display-name>Petstore</display-name> - <filter> - <filter-name>CaptchaValidateFilter</filter-name> - <filter-class>com.sun.javaee.blueprints.petstore.controller.CaptchaValidateFilter</filter-class> - </filter> - <filter> - <filter-name>EntryFilter</filter-name> - <filter-class>com.sun.javaee.blueprints.petstore.controller.EntryFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>EntryFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>CaptchaValidateFilter</filter-name> - <url-pattern>/faces/dynamic/bpui_fileupload_handler/handleFileUpload</url-pattern> - </filter-mapping> - <listener> - <listener-class>com.sun.javaee.blueprints.petstore.model.CatalogFacade</listener-class> - </listener> - - <servlet> - <display-name>ControllerServlet</display-name> - <servlet-name>ControllerServlet</servlet-name> - <servlet-class>com.sun.javaee.blueprints.petstore.controller.ControllerServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/catalog</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/controller</url-pattern> - </servlet-mapping> - - <context-param> - <description> - Google Maps authorization key for "http://localhost:8080/" - To use a another URL a new map key will have to be generated from http://www.google.com/apis/maps/ - </description> - <param-name>com.sun.j2ee.blueprints.ui.mapviewer.KEY</param-name> - <param-value>ABQIAAAAyQYKk4__l80DyIsqLPvvuxTwM0brOpm-All5BF6PoaKBxRWWERSt2NPUufvDhWGdrb-pCzTZQ2vi2A</param-value> - </context-param> - - <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> - </context-param> - - <context-param> - <param-name>com.sun.faces.validateXml</param-name> - <param-value>false</param-value> - </context-param> - - <context-param> - <param-name>com.sun.faces.verifyObjects</param-name> - <param-value>false</param-value> - </context-param> - - <context-param> - <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config.xml</param-value> - </context-param> - -  - <context-param> - <param-name>proxyHost</param-name> - <param-value></param-value> - </context-param> - <context-param> - <param-name>proxyPort</param-name> - <param-value></param-value> - </context-param> -  - <context-param> - <param-name>entryPages</param-name> - <param-value>.jpg|.gif|index.html|index.jsp|fileupload.jsp|search.jsp|catalog.jsp|mapAll.jsp|tag.jsp|news.jsp</param-value> - </context-param> - - -  - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - -  - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>/faces/*</url-pattern> - </servlet-mapping> - -  - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/faces/CaptchaServlet</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/ImageServlet/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/TagServlet/*</url-pattern> - </servlet-mapping> - <error-page> - <exception-type>java.lang.RuntimeException</exception-type> - <location>/systemerror.jsp</location> - </error-page> - <resource-ref> - <res-ref-name>jdbc/PetstoreDB</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - <res-sharing-scope>Shareable</res-sharing-scope> - </resource-ref> -</web-app> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css deleted file mode 100644 index 14c6ed0..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css +++ /dev/null @@ -1 +0,0 @@ -.accordion { width:150px; height:400px; border-width:1px; border-style:solid; border-color:black; background:#404040; } .accordionBody { width:160px; height:400px; border-width:1px; border-style:solid; border-color:black; background:#404040; } .accordionTitle { vertical-align: top; padding-top: 10px; text-align: center; width:150px; height:90px; color:white; font-size:22px; font-weight: bold; background:black; opacity: .99; } .accordionRow { color:white; cursor: pointer; font-size:18px; font-weight: bold; vertical-align: middle; padding-top: 5px; text-align: center; width:150px; height:40px; background:#104E8B; opacity: .99; } .accordionProduct { text-align: center; width:150px; color:white; font-size:12px; font-weight: bold; background:#104E8B; opacity: .99; } .accordionLink { cursor: pointer; text-decoration: none; color:white; } .accordionLinkSelected { text-align: center; width:150px; color:red; font-size:12px; font-weight: bold; background:black; opacity: .99; } .accordionLinkHover { text-decoration: underline; color:white; } \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js deleted file mode 100644 index 1c1ee6b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js +++ /dev/null @@ -1,249 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: accordion.js,v 1.22 2006/05/03 22:00:32 inder Exp $ */ - -function AccordionMenu () { - - dojo.event.topic.subscribe("/accordion", this, this.handleEvent); - - var displayPortWidth = 100; - var HEIGHT = 400; - - var EXPANDED_HEIGHT = 125; - var ITEM_HEIGHT = 55; - var INCREMENT = 10; - - var timeout = 5; // in ms - - var accordion = document.getElementById("accordionBody"); - var divs = []; - var oExpandedIndex = -1; - var nExpandedIndex = -1; - var oHeight = ITEM_HEIGHT; - var nHeight = ITEM_HEIGHT; - var tHeight = 165; - var expanding = false; - var categories; - - // while control the inline debug statements - var debug = false; - var status = document.getElementById("status"); - - function Row(id, div, defaultHeight) { - this.id = id; - this.div = div; - //this.height = height; - this.h = defaultHeight; - this.div.style.height = defaultHeight + "px" - } - - Row.prototype.setHeight = function(nH) { - this.h = nH; - this.div.style.height = nH + "px"; - // re-adjust for ie in that it does not follow the boxmodel - if (this.div.offsetHeight > nH) { - this.div.style.height = (nH - (this.div.offsetHeight - nH)) + 'px'; - } - } - - Row.prototype.getTotalHeight = function() { - return this.div.offsetHeight; - } - - Row.prototype.getHeight = function() { - return this.h; - } - - this.handleEvent = function(args) { - if (args.type) { - if (args.type == 'expand') { - var targetRow = args.targetRow; - initiateExpansion(targetRow); - } - } - } - - this.load = function(lcategories) { - categories = lcategories; - // create all the rows - for (var l=0; l < categories.length; l++) { - var row = createRow(l,"accordionRow", ITEM_HEIGHT); - createLinks(row.div, categories[l].name, l, "accordionLink"); - divs.push(row); - } - } - - function showStatus() { - if (debug) { - var stat = "oExpandedIndex=" + oExpandedIndex + " " ; - for (var i=0; i < divs.length; i++) { - stat = stat + i + "=" + divs[i].getTotalHeight() + " "; - } - status.innerHTML = stat + " total height=" + accordion.offsetHeight; - var totalH = 0; - var tH = 0; - for (var i=0; i < divs.length; i++) { - totalH = totalH + divs[i].getHeight(); - tH = tH + divs[i].getTotalHeight(); - } - } - } - - this.showCategory = function(catid) { - for (var l=0; l < categories.length; l++) { - if (catid == categories[l].name) { - // now tell the scroller to load the first product - initiateExpansion(l); - if (categories[l].products[0]) { - dojo.event.topic.publish("/catalog", {type:"showProducts", productId:categories[l].products[0].id}); - } - break; - } - } - } - - this.showFirstCategory = function() { - initiateExpansion(0); - if (categories[0].products[0]) { - dojo.event.topic.publish("/catalog", {type:"showProducts", productId:categories[0].products[0].id}); - } - } - - this.loadCategoryItem = function(pid, itemId) { - // find the right product and expand the accordion - for (var l=0; l < categories.length; l++) { - // now tell the scroller to load the first product - for (var il=0; il < categories[l].products.length; il++) { - if (categories[l].products[il].id == pid ) { - initiateExpansion(l); - break; - } - } - } - dojo.event.topic.publish("/catalog", {type:"showItemDetails", productId: pid , itemId: itemId}); - } - - function initiateExpansion(id) { - // jump out if we are in progress - if (!expanding && oExpandedIndex != Number(id)) { - expanding = true; - nExpandedIndex = Number(id); - if (oExpandedIndex != -1) { - var targetDiv = divs[oExpandedIndex].div; - if (targetDiv && targetDiv.childNodes) { - for (var l = targetDiv.childNodes.length -1; l >= 0 ; l--) { - targetDiv.removeChild(targetDiv.childNodes[l]); - } - } - createLinks(divs[oExpandedIndex].div, categories[oExpandedIndex].name, oExpandedIndex, "accordionLink"); - } - expandRow(id); - } - } - - function expandRow() { - if (expanding) { - showStatus(); - // - if (nHeight < EXPANDED_HEIGHT) { - nHeight = nHeight + INCREMENT; - divs[nExpandedIndex].setHeight(nHeight); - if (oExpandedIndex != -1) { - if (tHeight >= ITEM_HEIGHT) { - oHeight = oHeight - INCREMENT; - // take all out of the old expanded - } else { - oHeight = oHeight - INCREMENT; - } - divs[oExpandedIndex].setHeight(oHeight); - } - // default exapnd here - } else if (oExpandedIndex != -1 && oHeight > ITEM_HEIGHT) { - oHeight = oHeight - INCREMENT; - divs[oExpandedIndex].setHeight(oHeight); - } else { - // set the contents of the new menu - var targetDiv = divs[nExpandedIndex].div; - if (targetDiv && targetDiv.childNodes) { - for (var l = targetDiv.childNodes.length -1; l >= 0 ; l--) { - targetDiv.removeChild(targetDiv.childNodes[l]); - } - } - divs[nExpandedIndex].div.appendChild(document.createTextNode(categories[nExpandedIndex].name)); - divs[nExpandedIndex].div.appendChild(document.createElement("p")); - for (var l= 0; l < categories[nExpandedIndex].products.length; l++) { - var span = document.createElement("span"); - span.className = "accordionProduct"; - var link = document.createElement("a"); - var target = categories[nExpandedIndex].products[l].id; - link.id = target; - link.className = "accordionLink"; - // some browsers aren't setting the styles for hovers so forcing them - link.setAttribute("onmouseover", "this.className='accordionLinkHover';"); - link.setAttribute("onmouseout", "this.className='accordionLink';"); - dojo.event.connect(link, "onclick", function(evt) { - this._target = target - var src; - if (evt.target) { - src = evt.target; - } else if (evt.srcElement) { - src = evt.srcElement; - } - //src.parentNode.className = "accordionLinkSelected"; - // set this so the next time around it can be removed; - dojo.event.topic.publish("/catalog", {type:"showProducts", productId:src.id}); - }); - link.appendChild(document.createTextNode(categories[nExpandedIndex].products[l].name)); - span.appendChild(link); - divs[nExpandedIndex].div.appendChild(span); - if (l < categories[nExpandedIndex].products.length - 1) { - divs[nExpandedIndex].div.appendChild(document.createElement("p")); - } - link = null; - } - expanding = false; - oExpandedIndex = nExpandedIndex; - nExpandedIndex = -1; - oHeight = nHeight; - nHeight = ITEM_HEIGHT; - return; - } - - setTimeout(expandRow, timeout); - } - } - - function createLinks(tDiv, text, id, linkStyle) { - var link = document.createElement("a"); - link.className = linkStyle; - link.appendChild(document.createTextNode(text)); - link.setAttribute("id", id); - if (link.attachEvent) { - link.attachEvent('onmouseover',function(e){initiateExpansion(e.srcElement.getAttribute("id"));}); - } else if (link.addEventListener) { - link.addEventListener('mouseover',function(e){initiateExpansion(e.currentTarget.getAttribute("id"));}, true); - } - tDiv.appendChild(link); - } - - function createRow(id, rowStyle, height) { - var nDiv = document.createElement("div"); - nDiv.className = rowStyle; - var row; - var cell; - if (accordion.insertRow) { - row = accordion.insertRow(accordion.rows.length); - - } else { - row = document.createElement("tr"); - accordion.appendChild(row); - } - if (row.inserCell) { - cell = row.insertCell(0); - } else { - cell = document.createElement("td"); - row.appendChild(cell); - } - cell.appendChild(nDiv); - return new Row(id, nDiv, height); - } -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp deleted file mode 100644 index c43dd98..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp +++ /dev/null @@ -1,80 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: banner.jsp,v 1.28 2006/12/19 20:23:53 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - -<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> -<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/styles.css"></link> -<script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> -<script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/rss/rssbar.js"></script> -<link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}/faces/static/META-INF/rss/rssbar.css" /> -<style type="text/css"> - -#rss-bar { - margin: 0 auto 0px; -} - -#rss-bar table td#rss-channel { - background-repeat: no-repeat; - background-position: top left; - font-size: 14px; - font-weight: bold; - vertical-align: top; - text-align: center; - width: 254px; -} - -#rss-bar table td#rss-item { - background-repeat: no-repeat; - font-size: 14px; - width: 534px; - text-align: left; -} - -#rss-bar table a { - color: white; - text-decoration: none; -} -#rss-bar table a:hover { color: #ffff00;} - -</style> -<script type="text/javascript"> - var rss = new bpui.RSS(); - dojo.addOnLoad(function(){rss.getRssInJson('${pageContext.request.contextPath}/faces/dynamic/bpui_rssfeedhandler/getRssfeed', 'https://blueprints.dev.java.net/servlets/ProjectRSS?type=news', '4', '4000', 'News from BluePrints', 'news.jsp');}); -</script> - -<table border="0" bordercolor="gray" cellpadding="0" cellspacing="0" bgcolor="white" width="100%"> - <tr id="injectionPoint"> - <td width="100"><a class="menuLink" href="${pageContext.request.contextPath}/faces/index.jsp""><img src="${pageContext.request.contextPath}/images/banner_logo.gif" border="0" width="70" height="70"></a></td> - <td align="left"> - <div class="banner">Java Pet Store</div> - </td> - <td id="bannerRight" align="right"> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/fileupload.jsp">Seller</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/search.jsp">Search</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/catalog.jsp">Catalog</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/mapAll.jsp">Map</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/tag.jsp">Tags</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/index.jsp">Home</a> - </td> - </tr> - </tr> - <tr bgcolor="gray"> - <td id="menubar" align="left" colspan="3" height="25" > - <div id="rss-bar"> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> - <td id="rss-channel" nowrap="true"></td> - <td id="rss-item" nowrap="true"></td> - </tr> - </table> - </div> - </td> - </tr> - </table> - - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css deleted file mode 100644 index 5c906b5..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css +++ /dev/null @@ -1,48 +0,0 @@ -.bpui_petstorelist_dataDiv { - border-style: groove; - overflow: auto; - width: 600px; - height: 500px; - padding: 10px; -} - -.bpui_petstorelist_pageDiv { -} - - -.bpui_petstorelist_table { -} - -.bpui_petstorelist_cell { - padding: 5px; - vertical-align: top; -} - -.bpui_petstorelist_row { - border-bottom: dotted; -} - -.bpui_petstorelist_hr { - width: 90%; -} - -.bpui_petstorelist_image { -} - -.bpui_petstorelist_link{ -} - -.bpui_petstorelist_name{ -} - -.bpui_petstorelist_description{ -} - -.bpui_petstorelist_price { -} - -.bpui_petstorelist_previous { -} - -.bpui_petstorelist_next { -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js deleted file mode 100644 index 4df46fb..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js +++ /dev/null @@ -1,269 +0,0 @@ -var bpui; -if(typeof bpui == "undefined") { - bpui=new Object(); -} -bpui.petstoreList=new Object(); - -bpui.petstoreList.divName=""; -bpui.petstoreList.currentCount=0; -bpui.petstoreList.numberPerPage=5; -bpui.petstoreList.category="feline01"; -bpui.petstoreList.cachedData=new Object(); -bpui.petstoreList.debug=false; -bpui.petstoreList.timer; - -bpui.petstoreList.initialSetup=function() { - // get outerdiv - var targetDiv=document.getElementById(bpui.petstoreList.divName); - - // containier div - tablex="<table><tr><td align=\"center\">"; - tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; - tablex += "<option value=\"loading\">Loading Data...</option>"; - tablex += "</select>"; - tablex += "</td></tr><tr><td><div id=\"bpui.petstoreList.dataDiv\" class=\"bpui_petstorelist_dataDiv\">"; - tablex += "</div>"; - - // add product previous and next - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; - tablex += "<div id=\"bpui.petstoreList.pageDiv\" class=\"bpui_petstorelist_pageDiv\">"; - tablex += "</div>"; - tablex += "</td></tr>"; - // add in debug div, if debugging - if(bpui.petstoreList.debug) { - tablex += "<tr><td colspan=\"3\">"; - tablex += "<div id=\"bpui.petstoreList.debugDiv\">"; - tablex += "</div>"; - tablex += "</td></tr>"; - } - tablex += "</table>"; - targetDiv.innerHTML=tablex; - bpui.petstoreList.setSelectedCategory(); -} - - -bpui.petstoreList.populateData=function(datax) { - // clear response timer - clearTimeout(bpui.petstoreList.timer); - - if(typeof datax != "undefined") { - // check to see if at last page and no data is returned - if(datax.length < 1) { - alert("At last page for category!"); - // keep currentCount correct by removing the increment that was added - bpui.petstoreList.currentCount -= bpui.petstoreList.numberPerPage; - } else { - // add data to cache if it doesn't already exist - // if a full set isn't returned don't cache it, so the data will be retrieved again from the server. - // This is optional, you have to weigh the performance hit with the consiquences of not doing an update - key=bpui.petstoreList.category + "|" + bpui.petstoreList.currentCount; - cachedSet=bpui.petstoreList.cachedData[key]; - if(typeof cachedSet == "undefined" && datax.length >= bpui.petstoreList.numberPerPage) { - // need to cache data - if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Adding cache data by key: " + key); - bpui.petstoreList.cachedData[key]=datax; - } - - // get outerdiv - var targetDiv=document.getElementById("bpui.petstoreList.dataDiv"); - - // containier div - tablex="<table class=\"bpui_petstorelist_table\">"; - tablex += "<tr class=\"bpui_petstorelist_row\">"; - tablex += "<th class=\"bpui_petstorelist_cell\">Pet Image</td>"; - tablex += "<th class=\"bpui_petstorelist_cell\">Name & Description</td>"; - tablex += "<th class=\"bpui_petstorelist_cell\">Price ($)</td>"; - tablex += "</tr>"; - - // loop through product results - for(ii=0; ii < datax.length; ii++) { - // add row - tablex += "<tr class=\"bpui_petstorelist_row\"><td class=\"bpui_petstorelist_cell\">"; - tablex += "<a class=\"bpui_petstorelist_image\" target=\"_blank\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + - datax[ii].productID + "," + datax[ii].itemID + "\">"; - - tablex += "<img src=\"http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL + "\"/>"; - - tablex += "</a>"; - tablex += "</td><td class=\"bpui_petstorelist_cell\">"; - tablex += "<a class=\"bpui_petstorelist_link\" target=\"_blank\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + - datax[ii].productID + "," + datax[ii].itemID + "\">"; - tablex += "<span class=\"bpui_petstorelist_name\">" + datax[ii].name + "</span><br/>"; - tablex += "</a>"; - tablex += "<span class=\"bpui_petstorelist_description\">" + datax[ii].description + "</span>"; - tablex += "</td><td class=\"bpui_petstorelist_cell\">"; - - // add product price - tablex += "<span class=\"bpui_petstorelist_price\">\$" + datax[ii].price + "</span><br/>"; - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\"><hr class=\"bpui_petstorelist_hr\" /></td></tr>"; - } - - tablex += "</table>"; - targetDiv.innerHTML=tablex; - } - - // setup previous next buttons - pagex=""; - var targetDiv=document.getElementById("bpui.petstoreList.pageDiv"); - if(bpui.petstoreList.currentCount >= bpui.petstoreList.numberPerPage) { - // add previous - pagex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; - } - if(datax.length == bpui.petstoreList.numberPerPage) { - // add next only if full page has been returned. Need to change when add cache ??? - pagex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; - } - targetDiv.innerHTML=pagex; - } -} - -bpui.petstoreList.setSelectedCategory=function() { - catx=document.getElementById("bpui.petstoreList.categoryList"); - for(ii=0; ii < catx.length; ii++) { - if(catx.options[ii].value == bpui.petstoreList.category) { - catx.options[ii].selected=true; - } - } -} - -bpui.petstoreList.selectCategory=function() { - catx=document.getElementById("bpui.petstoreList.categoryList"); - bpui.petstoreList.category=catx.value; - - bpui.petstoreList.currentCount=0; - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.nextProducts=function() { - // load data from service - bpui.petstoreList.currentCount += bpui.petstoreList.numberPerPage; - bpui.petstoreList.updateProducts(); -} - -bpui.petstoreList.previousProducts=function() { - bpui.petstoreList.currentCount -= bpui.petstoreList.numberPerPage; - if(bpui.petstoreList.currentCount < 0) { - bpui.petstoreList.currentCount=0; - } - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.updateProducts=function() { - // check to see if in cache - key=bpui.petstoreList.category + "|" + bpui.petstoreList.currentCount; - cachedSet=bpui.petstoreList.cachedData[key]; - // see if data in cache - if(typeof cachedSet != "undefined") { - // get data from cache - if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Pulling data from cache using: " + key + " with " + cachedSet.length + " items."); - bpui.petstoreList.populateData(cachedSet); - } else { - // load data from service - if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Retrieving data from service for : " + bpui.petstoreList.category + " starting at item " + bpui.petstoreList.currentCount); - - // set degradation timeout - bpui.petstoreList.timer=setTimeout('bpui.petstoreList.requestTimedOut()', 20000); - - // create dynamic script - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=" + bpui.petstoreList.currentCount + "&length=" + bpui.petstoreList.numberPerPage + "&format=jsonp&callback=bpui.petstoreList.populateData"); - bodyTag.appendChild(scriptx); - } -} - - -bpui.petstoreList.createPetstoreList=function(divName, numberPerPage) { - // keep divName for later references - bpui.petstoreList.divName=divName; - - // see if numberPerPage defined - if(typeof numberPerPage != "undefined") { - bpui.petstoreList.numberPerPage=numberPerPage; - } - - // setup static elements - bpui.petstoreList.initialSetup(); - - // set timer to make sure service look up returns. Eventhough the Javascript library was able to be fetched, the database could be down or the - // service could be responding very slowly and the request timeout. Wait for 30 seconds and then set data div to service may not be responding message. - // Since both calls hit the database, if one returns propertly the other should also. - bpui.petstoreList.timer=setTimeout('bpui.petstoreList.requestTimedOut()', 20000); - - // load categories from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=categories&format=jsonp&call…"); - bodyTag.appendChild(scriptx); - - // load pet data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=0&length=" + bpui.petstoreList.numberPerPage + "&format=jsonp&callback=bpui.petstoreList.populateData"); - bodyTag.appendChild(scriptx); -} - - -bpui.petstoreList.requestTimedOut=function() { - document.getElementById("bpui.petstoreList.dataDiv").innerHTML="<b><font color=\"#0000FF\">The Java BluePrint's Pet Store JSONP Service is either responding very slowly or not responding at all! Please check with the service provider for more information.</font></b>"; -} - - - -bpui.petstoreList.debugMessage=function(messx) { - targetDiv=document.getElementById("bpui.petstoreList.debugDiv"); - targetDiv.innerHTML=messx + "<br/>" + targetDiv.innerHTML; -} - - -bpui.petstoreList.populateCategory=function(datax) { - // clear response timer - clearTimeout(bpui.petstoreList.timer); - - if(typeof datax != "undefined") { - catx=document.getElementById("bpui.petstoreList.categoryList"); - countx=0; - // loop through top level categories - for(ii=0; ii < datax.length; ii++) { - // loop through individual categories - for(yy=0; yy < datax[ii].products.length; yy++) { - // set default value for select list - bCurrentSelect=false - if(datax[ii].products[yy].id == bpui.petstoreList.category) { - bCurrentSelect=true; - } - catx.options[countx]=new Option(datax[ii].products[yy].name, datax[ii].products[yy].id, false, bCurrentSelect); - countx++; - } - } - } -} - - -bpui.petstoreList.hackerExample=function() { - /* - bodyTag=document.getElementsByTagName("body")[0]; - iframex=document.createElement("iframe"); - iframex.setAttribute("src", "http://localhost:8080/bp-clientside-mashup/show.jsp?cookies=" + escape(document.cookie)); - bodyTag.appendChild(iframex); - */ - // load pet data from service - - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/bp-clientside-mashup/show.jsp?cookies=" + escape(document.cookie)); - bodyTag.appendChild(scriptx); - - -} - - - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js deleted file mode 100644 index d00e427..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js +++ /dev/null @@ -1,136 +0,0 @@ -var bpui; -if(typeof bpui == "undefined") { - bpui=new Object(); -} -bpui.petstoreList=new Object(); - -bpui.petstoreList.divName=""; -bpui.petstoreList.currentCount=0; - -bpui.petstoreList.populateData=function(datax) { - if(typeof datax != "undefined") { - - // get outerdiv - var targetDiv=document.getElementById(bpui.petstoreList.divName); - - // make sure div is clear - targetDiv.innerHTML=""; - - // add class to containing div - targetDiv.setAttribute("class", "bpui_petstorelist_div") - - // add table - tablex=document.createElement("table"); - tablex.setAttribute("class", "bpui_petstorelist_table") - targetDiv.appendChild(tablex); - - // loop through product results - for(ii=0; ii < datax.length; ii++) { - // add row - rowx=document.createElement("tr"); - - // add product image with hyperlink - colx=document.createElement("td"); - ax=document.createElement("a"); - ax.setAttribute("href", "http://localhost:8080/petstore/faces/catalog.jsp#" + datax[ii].productID + "," + datax[ii].itemID) - ax.setAttribute("target", "bppetstore") - ax.setAttribute("class", "bpui_petstorelist_image") - imgx=document.createElement("img"); - imgx.setAttribute("src", "http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL); - ax.appendChild(imgx); - colx.appendChild(ax); - rowx.appendChild(colx); - - // add product name with hyperlink - colx=document.createElement("td"); - ax=document.createElement("a"); - ax.setAttribute("href", "http://localhost:8080/petstore/faces/catalog.jsp#" + datax[ii].productID + "," + datax[ii].itemID) - ax.setAttribute("target", "bppetstore") - ax.setAttribute("class", "bpui_petstorelist_name_link") - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_name") - spanx.appendChild(document.createTextNode(datax[ii].name)); - ax.appendChild(spanx); - colx.appendChild(ax); - colx.appendChild(document.createElement("br")); - // add product description - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_description"); - spanx.appendChild(document.createTextNode(datax[ii].description)); - colx.appendChild(spanx); - rowx.appendChild(colx); - - // add product price - colx=document.createElement("td"); - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_price"); - spanx.appendChild(document.createTextNode("\$" + datax[ii].price)); - colx.appendChild(spanx); - rowx.appendChild(colx); - - // add row to table - tablex.appendChild(rowx); - } - - // add product previous and next - rowx=document.createElement("tr"); - colx=document.createElement("td"); - colx.setAttribute("colspan", "3"); - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_previous"); - spanx.setAttribute("onclick", "bpui.petstoreList.previousProducts();"); - spanx.appendChild(document.createTextNode("<< PREVIOUS")); - colx.appendChild(spanx); - - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_next"); - spanx.setAttribute("onclick", "bpui.petstoreList.nextProducts();"); - spanx.appendChild(document.createTextNode("NEXT >>")); - colx.appendChild(spanx); - rowx.appendChild(colx); - - // add row to table - tablex.appendChild(rowx); - } -} - - -bpui.petstoreList.nextProducts=function() { - // load data from service - bpui.petstoreList.currentCount += 5; - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.previousProducts=function() { - bpui.petstoreList.currentCount -= 5; - if(bpui.petstoreList.currentCount < 0) { - bpui.petstoreList.currentCount=0; - } - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.updateProducts=function() { - // load data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=feline01&start=" + bpui.petstoreList.currentCount + "&length=5&format=jsonp"); - bodyTag.appendChild(scriptx); -} - - - -bpui.petstoreList.createPetstoreList=function(divName) { - // keep divName for later references - bpui.petstoreList.divName=divName; - - // load data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=feline01&start=0&l…"); - bodyTag.appendChild(scriptx); -} - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js deleted file mode 100644 index 9b18cb4..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js +++ /dev/null @@ -1,159 +0,0 @@ -var bpui; -if(typeof bpui == "undefined") { - bpui=new Object(); -} -bpui.petstoreList=new Object(); - -bpui.petstoreList.divName=""; -bpui.petstoreList.currentCount=0; -bpui.petstoreList.category="feline01"; - - -bpui.petstoreList.initialSetup=function() { - // get outerdiv - var targetDiv=document.getElementById(bpui.petstoreList.divName); - - // containier div - tablex="<table><tr><td align=\"center\">"; - tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; - tablex += "<option value=\"feline01\">Hairy Cat</option>"; - tablex += "<option value=\"feline02\">Groomed Cat</option>"; - tablex += "<option value=\"canine01\">Medium Dogs</option>"; - tablex += "<option value=\"canine02\">Small Dogs</option>"; - tablex += "<option value=\"avian01\">Parrot</option>"; - tablex += "<option value=\"avian02\">Exotic</option>"; - tablex += "<option value=\"fish01\">Small Fish</option>"; - tablex += "<option value=\"fish02\">Large Fish</option>"; - tablex += "<option value=\"reptile01\">Slithering Reptiles</option>"; - tablex += "<option value=\"reptile02\">Crawling Reptiles</option>"; - tablex += "</select>"; - tablex += "</td></tr><tr><td><div class=\"bpui_petstorelist_div\">"; - tablex += "</div>"; - - // add product previous and next - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; - tablex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; - tablex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; - tablex += "</td></tr>"; - tablex += "</table>"; - targetDiv.innerHTML=tablex; - bpui.petstoreList.setSelectedCategory(); -} - -bpui.petstoreList.populateData=function(datax) { - if(typeof datax != "undefined") { - - // get outerdiv - var targetDiv=document.getElementById(bpui.petstoreList.divName); - - // containier div - tablex="<table><tr><td align=\"center\">"; - tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; - tablex += "<option value=\"feline01\">Hairy Cat</option>"; - tablex += "<option value=\"feline02\">Groomed Cat</option>"; - tablex += "<option value=\"canine01\">Medium Dogs</option>"; - tablex += "<option value=\"canine02\">Small Dogs</option>"; - tablex += "<option value=\"avian01\">Parrot</option>"; - tablex += "<option value=\"avian02\">Exotic</option>"; - tablex += "<option value=\"fish01\">Small Fish</option>"; - tablex += "<option value=\"fish02\">Large Fish</option>"; - tablex += "<option value=\"reptile01\">Slithering Reptiles</option>"; - tablex += "<option value=\"reptile02\">Crawling Reptiles</option>"; - tablex += "</select>"; - tablex += "</td></tr><tr><td><div class=\"bpui_petstorelist_div\">"; - - tablex += "<table class=\"bpui_petstorelist_table\">"; - - // loop through product results - for(ii=0; ii < datax.length; ii++) { - // add row - tablex += "<tr class=\"bpui_petstorelist_row\"><td class=\"bpui_petstorelist_cell\">"; - tablex += "<a class=\"bpui_petstorelist_image\" target=\"bppetstore\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + - datax[ii].productID + "," + datax[ii].itemID + "\">"; - - tablex += "<img src=\"http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL + "\"/>"; - - tablex += "</a>"; - tablex += "</td><td class=\"bpui_petstorelist_cell\">"; - tablex += "<a class=\"bpui_petstorelist_link\" target=\"bppetstore\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + - datax[ii].productID + "," + datax[ii].itemID + "\">"; - tablex += "<span class=\"bpui_petstorelist_name\">" + datax[ii].name + "</span><br/>"; - tablex += "</a>"; - tablex += "<span class=\"bpui_petstorelist_description\">" + datax[ii].description + "</span>"; - tablex += "</td><td class=\"bpui_petstorelist_cell\">"; - - // add product price - tablex += "<span class=\"bpui_petstorelist_price\">\$" + datax[ii].price + "</span><br/>"; - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\"><hr class=\"bpui_petstorelist_hr\" /></td></tr>"; - } - - tablex += "</table></div>"; - - // add product previous and next - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; - tablex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; - tablex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; - tablex += "</td></tr>"; - tablex += "</table>"; - targetDiv.innerHTML=tablex; - bpui.petstoreList.setSelectedCategory(); - } -} - -bpui.petstoreList.setSelectedCategory=function() { - catx=document.getElementById("bpui.petstoreList.categoryList"); - for(ii=0; ii < catx.length; ii++) { - if(catx.options[ii].value == bpui.petstoreList.category) { - catx.options[ii].selected=true; - } - } -} - - -bpui.petstoreList.selectCategory=function() { - catx=document.getElementById("bpui.petstoreList.categoryList"); - bpui.petstoreList.category=catx.value; - - bpui.petstoreList.currentCount=0; - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.nextProducts=function() { - // load data from service - bpui.petstoreList.currentCount += 5; - bpui.petstoreList.updateProducts(); -} - -bpui.petstoreList.previousProducts=function() { - bpui.petstoreList.currentCount -= 5; - if(bpui.petstoreList.currentCount < 0) { - bpui.petstoreList.currentCount=0; - } - bpui.petstoreList.updateProducts(); -} - -bpui.petstoreList.updateProducts=function() { - // load data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=" + bpui.petstoreList.currentCount + "&length=5&format=jsonp"); - bodyTag.appendChild(scriptx); -} - -bpui.petstoreList.createPetstoreList=function(divName) { - // keep divName for later references - bpui.petstoreList.divName=divName; - - // load data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=0&length=5&format=jsonp"); - bodyTag.appendChild(scriptx); - -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp deleted file mode 100644 index 60ef953..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp +++ /dev/null @@ -1,23 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: captchaerror.jsp,v 1.1 2006/02/17 03:04:22 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Captcha Error</title> - </head> - <body> - - <h1>Please input the right captcha string -- <a href="./">Try again</a> - - - - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js deleted file mode 100644 index 4bdfc69..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js +++ /dev/null @@ -1,329 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: catalog.js,v 1.21 2007/01/17 22:16:44 basler Exp $ */ - -var ac; -var is; -var controller; -//var debug=true; - -function getApplicationContextRoot() { - var urlArray=window.location.toString().split("/", 4); - return "/" + urlArray[3]; -} - -var applicationContextRoot=getApplicationContextRoot(); - -function initCatalog() { - ac = new AccordionMenu(); - is = new ImageScroller(); - is.load(); - controller = new CatalogController(); - // wire in a listener for the rating component - dojo.event.connect("before", bpui.rating, "doClick", controller, "modifyState"); - controller.initialize(); -} - -function CatalogController() { - dojo.event.topic.subscribe("/catalog", this, handleEvent); - - // this object structure contains a list of the products and chunks that have been loaded - var pList = new ProductList(); - - var CHUNK_SIZE=7; - var initalRating; - var initalItem; - var originalURL; - - // using this for some browsers that do not support innerHTML - var useDOMInjection = false; - - var infoName = document.getElementById("infopaneName"); - var infoRating = document.getElementById("infopaneRating"); - var infoPrice = document.getElementById("infopanePrice"); - var infoBuyNow = document.getElementById("infopaneBuyNow"); - var infoShortDescription = document.getElementById("infopaneShortDescription"); - var infoDescription = document.getElementById("infopaneDescription"); - // for paypal - var buyNowAmount = document.getElementById("buyNow1_amount"); - var buyNowItemName = document.getElementById("buyNow1_item_name"); - - function handleEvent(args) { - if (args.type == "showingItem") { - // update the id on the ratring component - if (typeof bpui != 'undefined') { - var groupId = is.getGroupId(); - window.location.href= originalURL + "#" + groupId + "," + args.id; - if (typeof bpui.rating != 'undefined') { - // update the rating - bpui.rating.state["rating"].bindings["itemId"]=args.id; - bpui.rating.modifyDisplay("rating", args.rating, true); - // get the currrent item - showItemDetails(args.id); - } else { - initalItem = args.id; - initalRating = args.rating; - } - } else { - // things haven't been loaded to set the inital rating - initalItem = args.id; - initalRating = args.rating; - } - } else if (args.type == "getChunk") { - populateItems(args.id, args.index, args.currentChunk, false); - - } else if (args.type == "showItemDetails") { - showProductDetails(args.productId, args.itemId); - - } else if (args.type == "showProducts") { - is.reset(); - populateItems(args.productId, 0, 0, true); - } - } - - function showItemDetails(id) { - var i = is.getItems().get(id); - setNodeText(infoName, i.name + "<br/><a href='javascript:controller.disableItem("" + id + "","" + i.name + "")'><font size='-1' color='white'><i>Flag as inappropriate</i></font></a>"); - setNodeText(infoPrice, i.price); - setNodeText(infoShortDescription, i.shortDescription); - setNodeText(infoDescription, i.description); - // update the paypal - buyNowAmount.value = i.price; - buyNowItemName.value = i.name; - } - - function setNodeText(t, text) { - if (useDOMInjection) { - t.lastChild.nodeValue = text; - } else { - t.innerHTML = text; - } - } - - this.initialize = function() { - // check whether the innerHTML changes can be used in the infopane - infoName.innerHTML = " "; - if (!useDOMInjection && infoName.innerHTML != " ") { - useDOMInjection = true; - - infoName.appendChild(document.createTextNode("Name")); - infoPrice.appendChild(document.createTextNode("$0.00")); - infoShortDescription.appendChild(document.createTextNode("<description>")); - infoDescription.appendChild(document.createTextNode("<description>")); - } - - var ratingInstance = bpui.rating.state["rating"]; - ratingInstance.grade = initalRating; - bpui.rating.state["rating"].bindings["itemId"]=initalItem; - bpui.rating.modifyDisplay("rating", initalRating, true); - loadAccordion(); - } - - - this.modifyState = function(arg, rating) { - var itemId = initalItem; - if (typeof bpui.rating.state["rating"].bindings["itemId"] != 'undefined') { - itemId = bpui.rating.state["rating"].bindings["itemId"]; - } - // set the cached rating to the new rating that was set. - is.getItems().get(itemId).rating = rating; - } - - - function loadAccordion () { - // go out and get the categories - // this should be made more geric - var bindArgs = { - url: applicationContextRoot + "/catalog?command=categories&format=json", - mimetype: "text/json", - load: function(type,json) { - ac.load(json); - processURLParameters(); - }, - error: ajaxBindError - }; - dojo.io.bind(bindArgs); - } - - // this needs to happen after we have loaded the accordion data - function processURLParameters() { - originalURL = decodeURIComponent(window.location.href); - var params = {}; - // look for the params - if (originalURL.indexOf("#") != -1) { - var qString = originalURL.split('#')[1]; - var args = qString.split(','); - originalURL = originalURL.split('#')[0]; - ac.loadCategoryItem(args[0], args[1]); - return; - } else if (originalURL.indexOf("?") != -1) { - var qString = originalURL.split('?')[1]; - // get rid of any bookmarking stuff - if (qString.indexOf("#") != -1) { - qString = qString.split('#')[0]; - originalURL = originalURL.split('#')[0]; - window.location.href = originalURL; - } - ps = qString.split('&'); - // now go through and create the params map as an object literal - for (var i in ps) { - var t = ps[i].split('='); - params[t[0]] = t[1]; - } - // first check for the item in product - if (typeof params.itemId != 'undefined' && typeof params.pid != 'undefined') { - ac.loadCategoryItem(params.pid, params.itemId); - // next if there is a catid definition then do it - } else if (typeof params.catid != 'undefined') { - ac.showCategory(params.catid); - } - } else { - // nothing is selected - ac.showFirstCategory(); - } - } - - - - function showProductDetails(pid, itemId) { - is.reset(); - is.showProgressIndicator(); - var bindArgs = { - url: applicationContextRoot + "/catalog?command=itemInChunk&pid=" + pid + "&itemId=" + itemId + "&length=" + CHUNK_SIZE, - mimetype: "text/xml", - load: function(type,data,postProcessHandler) { - processProductData(data,true, pid, itemId); - showItemDetails(itemId); - is.doMaximize(); - }, - error: ajaxBindError - }; - dojo.io.bind(bindArgs); - } - - - - function populateItems(pid, index, neededChunk, showImage) { - is.showProgressIndicator(); - is.setGroupId(pid); - printDebug("populateItems - need to make sure displaying - pid=" + pid + " Chunk=" + neededChunk); - - // check to see if relevant scroller page is already loaded - if(!is.containsChunk(pid + "_" + neededChunk)) { - - // not loaded, so see if it is in the cache - if (pList.hasChunk(pid, neededChunk)) { - // in cache, so add chunk to scroller - printDebug("**** adding chunk from cache - pid=" + pid + " Chunk=" + neededChunk); - is.addChunk(pid + "_" + neededChunk); - is.addItems(pList.getChunk(pid, neededChunk)); - - // show first image if you have it - if(showImage && is.getScrollerItems().length > 0) { - is.showImage(is.getScrollerItems()[0].id); - } - - } else { - // not in cache so load it - startRetIndex=(neededChunk * CHUNK_SIZE); - - printDebug("**** retrieving chunk from server - pid=" + pid + " currentIndex=" + index + " startIndex=" + startRetIndex + " Chunk=" + neededChunk); - var bindArgs = { - url: applicationContextRoot + "/catalog?command=items&pid=" + pid + "&start=" + startRetIndex + "&length=" + CHUNK_SIZE, - mimetype: "text/xml", - load: function(type,data,postProcessHandler) { - processProductData(data, showImage, pid, null, neededChunk); - }, - error: ajaxBindError - }; - dojo.io.bind(bindArgs); - } - } else { - printDebug("*** items already showing"); - } - - } - - - function processProductData(responseXML, showImage, pid, iId, chunkId) { - var items = []; - var count = responseXML.getElementsByTagName("item").length; - for (var loop=0; loop < count ; loop++) { - - var item = responseXML.getElementsByTagName("item")[loop]; - var itemId = item.getElementsByTagName("id")[0].firstChild.nodeValue; - var name = item.getElementsByTagName("name")[0].firstChild.nodeValue; - var thumbURL = item.getElementsByTagName("image-tb-url")[0].firstChild.nodeValue; - var imageURL = item.getElementsByTagName("image-url")[0].firstChild.nodeValue; - var description = item.getElementsByTagName("description")[0].firstChild.nodeValue; - var price = item.getElementsByTagName("price")[0].firstChild.nodeValue; - var rating = item.getElementsByTagName("rating")[0].firstChild.nodeValue; - var shortDescription; - if (description.length > 71) { - shortDescription = description.substring(0,71) + "..."; - } else { - shortDescription = description; - } - var i = {id: itemId, name: name, image: imageURL, thumbnail: thumbURL, shortDescription: shortDescription, description: description, price:price, rating: rating}; - items.push(i); - } - - // cache the chunks - pList.addChunk(pid, chunkId, items); - is.addItems(items); - is.addChunk(pid + "_" + chunkId); - - if (showImage && iId == null) { - is.setGroupId(pid); - is.showImage(items[0].id); - } else { - is.setGroupId(pid); - is.showImage(iId); - } - is.hideProgressIndicator(); - } - - function ProductList() { - var _plist = this; - var map = new Map(); - - this.addChunk = function(pid, chunkNumber, items) { - map.put(pid + "_" + chunkNumber, items, true); - } - - this.getChunk = function(pid, chunkNumber) { - return map.get(pid + "_" + chunkNumber); - } - - this.hasChunk = function(pid, chunkNumber) { - return (map.get(pid + "_" + chunkNumber) != null); - } - - this.contents = function() { - return map.contents(); - } - } - - - this.disableItem=function(itemId, itemName) { - // go out and get the categories - // this should be made more geric - if (confirm("Are you sure you want to effectively remove this item from Petstore?")) { - var bindArgs = { - url: applicationContextRoot + "/catalog?command=disable&id=" + itemId, - mimetype: "text/xml", - load: function(type,json) { - //alert("The item named '" + itemName + "' has been disabled!"); - pList = new ProductList(); - is.reset(); - populateItems(is.getGroupId(), 0, 0, true); - }, - error: ajaxBindError - }; - dojo.io.bind(bindArgs); - } - } - - -} - - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp deleted file mode 100644 index 443857b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp +++ /dev/null @@ -1,95 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: catalog.jsp,v 1.22 2007/03/16 21:42:03 basler Exp $ --%> -<script type="text/javascript" src="common.js"></script> -<script type="text/javascript" src="scroller.js"></script> -<link rel="stylesheet" type="text/css" href="scroller.css"></link> -<script type="text/javascript" src="accordion.js"></script> -<link rel="stylesheet" type="text/css" href="accordion.css"></link> -<script type="text/javascript" src="catalog.js"></script> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> -<body> -<jsp:include page="banner.jsp" /> -<script type="text/javascript"> - dojo.event.connect(window, "onload", function(){initCatalog();}); -</script> -<center> - <table border="0"> - <tr> - <td> - <table id="accordion"> - <tr id="accordionTitle" class="accordionTitle"><td>Pets</td></tr> - <tr><td> - <table id="accordionBody" border="0" class="accordionBody"> - </table> - </td></tr> - </table> - </td> - <td> - <div id="CatalogBrowser"> - <table border="0" class="slider" width="500px" > - <tr height="415" valign="top"> - <td id="bodySpace" border="0" align="center"></td> - </tr> - <tr id="targetRow"> - <td width="500" height="70 align="top"> - <div class="nav" id="right_button"> - <img src="${pageContext.request.contextPath}/images/right.gif" name="nextRoll" title="Show More Items" border="0"> - </div> - <div class="nav" id="left_button"> - <img src="${pageContext.request.contextPath}/images/left.gif" name="previousRoll" title="Show Previous Items" border="0"> - </div> - <div id="infopane" class="infopane"> - <table class="infopaneTable"> - <tr> - <td id="infopaneName" class="infopaneTitle"> - </td> - <td id="infopaneRating" class="infopaneRating"> - <f:view> - <ui:rating id="rating" maxGrade="5" includeNotInterested="false" includeClear="false" - hoverTexts="#{RatingBean.ratingText}" notInterestedHoverText="Not Interested" clearHoverText="Clear Rating" - grade="#{RatingBean.grade}"/> - <f:verbatim></td><td id="infopanePrice" class="infopanePrice"></td><td id="infopanePayPal" class="infopanePayPal"></f:verbatim> - <ui:buyNow business="donate(a)animalfoundation.com" id="buyNow1" itemName="Buy Item One" - amount="100.00" quantity="1" type="BuyNow" postData="#{PayPalBean.postData}" target="paypal"/> - </f:view> - </td> - <td id="infopaneIndicator" class="infopaneIndicator"> - </td> - <td id="infopaneDetailsIcon"> - </td> - </tr> - <tr> - <td id="infopaneShortDescription" colspan="7" class="infopaneShortDescription"> - </td> - </tr> - <tr style="height:20px"> - <td></td> - </tr> - <tr> - <td id="infopaneDescription" colspan="6" class="infopaneDescription"> - </td> - </tr> - </table> - </div> - </td> - </tr> - </table> - </td> - <td style="vertical-align:top; width:300px; text-align:right;"> - <div id="downloadAds"> - <jsp:include page="download.jsp" /> - </div> - </td> - </tr> - </table> - </div> - <div id="status" style="text-align:left"></div> <div id="status_2"></div> - <div id="dstatus"></div> - <div id="injection_point"></div> -</center> -<jsp:include page="footer.jsp" /> -</body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old deleted file mode 100644 index 13914ed..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old +++ /dev/null @@ -1,95 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: catalog.jsp,v 1.20 2006/12/01 21:38:40 basler Exp $ --%> -<script type="text/javascript" src="common.js"></script> -<script type="text/javascript" src="scroller.js"></script> -<link rel="stylesheet" type="text/css" href="scroller.css"></link> -<script type="text/javascript" src="accordion.js"></script> -<link rel="stylesheet" type="text/css" href="accordion.css"></link> -<script type="text/javascript" src="catalog.js"></script> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> -<body> -<jsp:include page="banner.jsp" /> -<script type="text/javascript"> - dojo.event.connect(window, "onload", function(){initCatalog();}); -</script> -<center> - <table border="0"> - <tr> - <td> - <table id="accordion"> - <tr id="accordionTitle" class="accordionTitle"><td>Pets</td></tr> - <tr><td> - <table id="accordionBody" border="0" class="accordionBody"> - </table> - </td></tr> - </table> - </td> - <td style="min-width:500px;"> - <div id="CatalogBrowser"> - <table width="500px"border="1" class="slider" > - <tr height="415" valign="top"> - <td id="bodySpace" border="0" align="center"></td> - </tr> - <tr id="targetRow"> - <td width="500px" height="70px" align="top"> - <div class="nav" id="right_button"> - <img src="${pageContext.request.contextPath}/images/right.gif" name="nextRoll" title="Show More Items" border="0"> - </div> - <div class="nav" id="left_button"> - <img src="${pageContext.request.contextPath}/images/left.gif" name="previousRoll" title="Show Previous Items" border="0"> - </div> - <div id="infopane" class="infopane"> - <table class="infopaneTable"> - <tr> - <td id="infopaneName" class="infopaneTitle"> - </td> - <td id="infopaneRating" class="infopaneRating"> - <f:view> - <ui:rating id="rating" maxGrade="5" includeNotInterested="false" includeClear="false" - hoverTexts="#{RatingBean.ratingText}" notInterestedHoverText="Not Interested" clearHoverText="Clear Rating" - grade="#{RatingBean.grade}"/> - <f:verbatim></td><td id="infopanePrice" class="infopanePrice"></td><td id="infopanePayPal" class="infopanePayPal"></f:verbatim> - <ui:buyNow business="donate(a)animalfoundation.com" id="buyNow1" itemName="Buy Item One" - amount="100.00" quantity="1" type="BuyNow" postData="#{PayPalBean.postData}" target="paypal"/> - </f:view> - </td> - <td id="infopaneIndicator" class="infopaneIndicator"> - </td> - <td id="infopaneDetailsIcon"> - </td> - </tr> - <tr> - <td id="infopaneShortDescription" colspan="7" class="infopaneShortDescription"> - </td> - </tr> - <tr style="height:20px"> - <td></td> - </tr> - <tr> - <td id="infopaneDescription" colspan="6" class="infopaneDescription"> - </td> - </tr> - </table> - </div> - </td> - </tr> - </table> - </td> - <td style="vertical-align:top; width:300px; text-align:right;"> - <div id="downloadAds"> - <jsp:include page="download.jsp" /> - </div> - </td> - </tr> - </table> - </div> - <div id="status" style="text-align:left"></div> <div id="status_2"></div> - <div id="dstatus"></div> - <div id="injection_point"></div> -</center> -<jsp:include page="footer.jsp" /> -</body> -</html> \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js deleted file mode 100644 index 03a3ba2..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js +++ /dev/null @@ -1,77 +0,0 @@ - - function ajaxBindError(type, errObj) { - // can't use the error page, because unless and exception in the internal servlet container - // nullpointer exceptions will be thrown - //window.location="./systemerror.jsp?message=" + errObj.message; - - alert("An Exception has been encountered on the server side during an Ajax request. Please see the server logs for more information " + errObj.message); - } - - - function debugProperties(namex) { - var listx=""; - var ob=namex; - for(xx in ob) { - listx += xx + " = " + ob[xx] + "<br/>" - } - //document.write(listx); - alert(listx); - } - - - function printDebug(argx) { - if (typeof debug != 'undefined') { - document.getElementById("status").innerHTML = argx + "<br\>" + document.getElementById("status").innerHTML; - } - } - - - function Map() { - var size = 0; - var keys = []; - var values = []; - - this.put = function(key, value, replace) { - if (this.get(key) == null) { - keys[size] = key; - values[size] = value; - size++; - } else if (replace) { - for (i=0; i < size; i++) { - if (keys[i] == key) { - values[i] = value; - } - } - } - } - - this.get = function(key) { - for (i=0; i < size; i++) { - if (keys[i] == key) { - return values[i]; - } - } - return null; - } - - this.clear = function() { - size = 0; - keys = []; - values = []; - } - - // return keys show can show main image - this.getKeys = function() { - return keys; - } - - // dump contents of map keys as string - this.contents = function() { - var retx=""; - for(ii=0; ii < size; ii++) { - retx += keys[ii] + ", "; - } - return retx; - } - - } \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp deleted file mode 100644 index 20ef584..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<div id="downloadAds" style="text-align:center; border-style:none; width:100%;"> - <table style="width:100%;"> - <tr> - <td style="text-align:center;"> - <a href="http://java.sun.com/javaee/downloads/index.jsp" target="downloads"><img style="border:none" src="./images/ad-sdk.jpg" alt="Download Java EE 5 SDK"/></a> - <br/> - </td> - </tr> - <tr> - <td style="text-align:center;"> - <a href="http://www.netbeans.org/downloads/index.html" target="downloads"><img style="border:none" src="./images/ad-netbeans.jpg" alt="Download Netbeans IDE"/></a> - <br/> - </td> - </tr> - <tr> - <td style="text-align:center;"> - <a href="http://java.com/en/download/index.jsp" target="downloads"><img style="border:none" src="./images/ad-jre.jpg" alt="Download Java SE"/></a> - <br/> - </td> - </tr> - </table> -</div> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js deleted file mode 100644 index 65855c2..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js +++ /dev/null @@ -1,54 +0,0 @@ -dojo.require("dojo.io"); -function checkAdPage() { - var bindArgs = { - // check to see if an updated page is available - URL: "http://localhost:8080/petstore/downloadAd.txt", - mimetype: "text/plain", - load: returnFunctionx, - error: ajaxBindError}; - - // dispatch the request - dojo.io.bind(bindArgs); -} - -function returnFunctionx(type, data, evt) { - // statically setup popup for simple case - // check return of the dojo call to make sure it is valid - if (evt.readyState == 4) { - if (evt.status == 200) { - alert("data = " + data); - document.getElementById("downloadAds").innerHTML=data; - } - } -} - - -var req; - -function checkAdPageMark() { - // calculate arrow and border image location - req=initRequest(); - - url="http://blueprints.dev.java.net/petstore/downloadAd.txt", - req.onreadystatechange = returnFunctionxMark; - req.open("GET", url, true); - req.send(null); -} - - -function returnFunctionxMark() { - if (req.readyState == 4) { - if (req.status == 200) { - alert("data = " + req.responseText); - document.getElementById("downloadAds").innerHTML=req.responseText; - } - } -} - -initRequest=function() { - if (window.XMLHttpRequest) { - return new XMLHttpRequest(); - } else if (window.ActiveXObject) { - return new ActiveXObject("Microsoft.XMLHTTP"); - } -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json deleted file mode 100644 index 3bbf564..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json +++ /dev/null @@ -1,7 +0,0 @@ -jsonpTest({"keyId":"TestData"}); - -function testexample() { - alert("testexample!!"); -} - -testexample(); \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt deleted file mode 100644 index e9a0944..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt +++ /dev/null @@ -1 +0,0 @@ -<div id='downloadAds' style='text-align:center; border-style:double; width:100%;'> <table style='width:100%'> <tr> <th style='text-align:center; border-bottom:thin solid black;'>DOWNLOADS Blueprints</th> </tr> <tr> <td style='text-align:center;'> <a href='http://java.sun.com/javaee/downloads/index.jsp' target='downloads'><img style='border:none' src='./images/ad-sdk.jpg' alt='Download Java EE 5 SDK'/></a> </td> </tr> <tr> <td style='text-align:center;'> <a href='http://www.netbeans.org/downloads/index.html' target='downloads'><img style='border:none' src='./images/ad-netbeans.jpg' alt='Download Netbeans IDE'/></a> </td> </tr> <tr> <td style='text-align:center;'> <a href='http://java.com/en/download/index.jsp' target='downloads'><img style='border:none' src='./images/ad-jre.jpg' alt='Download Java SE'/></a> </td> </tr> </table></div> \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js deleted file mode 100644 index 0e5b14e..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js +++ /dev/null @@ -1,241 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: engine.js,v 1.10 2006/05/03 22:00:32 inder Exp $ */ - -function Engine () { - - /** - * - * Load template text aloing with an associated script - * - * Argument p properties are as follows: - * - * url : Not required but used if you want to get the template from - * something other than the injection serlvet. For example if - * you want to load content directly from a a JSP or HTML file. - * - * p.template : Not required if you specficy a url property Otherewise this - * is the name of the template file. - * - * p.initFunction: Not required. This function or function pointer will be called - * after the template text and script are loaded. The result of - * the evaluated script will be accessible in the context of - * this function. - * - * p.injectionPoint: Not required. This is the id of an element into. If this is - * not specfied a div will be created under the roon node of - * the document and the template will be injected into it. - * Content is injected by setting the innerHTML property - * of an element to the template text. - */ - this.inject = function (p) { - var targetUrl; - if (!p.url) targetUrl = "controller?command=content&target=/" + p.template; - else targetUrl = p.url; - var templateArgs = { - url: targetUrl, - mimetype: "text/html", - load: function(type, data) { - //if no parent is given append to the document root - var nData = includeEmbeddedResources(data, p.initFunction ); - if (!p.injectionPoint) { - var injectionPoint = document.createElement("div"); - injectionPoint.innerHTML = nData; - document.firstChild.appendChild(injectionPoint); - } else { - p.injectionPoint.innerHTML = nData; - } - if (p.script) { - // now load the associated JavaScript - loadScript(p.script,p.initFunction); - } - } - }; - dojo.io.bind(templateArgs); - } - - function loadScript(targetURL,callback) { - var templateArgs = { - url: targetURL, - mimetype: "text/plain", - load: callback - }; - dojo.io.bind(templateArgs); - } - - /** - * If were returning an text document remove any script in the - * the document and add it to the global scope using a time out. - */ - function includeEmbeddedResources(target, initFunction) { - var bodyText = ""; - var embeddedScripts = []; - var embeddedStyles = []; - var scriptReferences = []; - var styleReferences = []; - var styles = []; - // recursively go through and weed out the scripts - // TODO: Use some better REGEX processing - // TODO: Also support single quotes - while (target.indexOf("<script") != -1) { - var realStart = target.indexOf("<script"); - var scriptSourceStart = target.indexOf("src=", (realStart)); - var scriptElementEnd = target.indexOf(">", realStart); - var end = target.indexOf("</script>", (realStart)) + "</script>".length; - if (realStart != -1 && scriptSourceStart != -1) { - var scriptSourceName; - var scriptSourceLinkStart= scriptSourceStart + 5; - var scriptSourceLinkEnd= target.indexOf("\"", (scriptSourceLinkStart + 1)); - if (scriptSourceStart < scriptElementEnd) { - scriptSourceName = target.substring(scriptSourceLinkStart, scriptSourceLinkEnd); - // prevent multiple inclusions of dojo.js. - // there is no way you would get to this point without dojo being included - if (scriptSourceName.indexOf("dojo.js") == -1) { - scriptReferences.push(scriptSourceName); - } - } - } - // now remove the script body - var scriptBodyStart = scriptElementEnd + 1; - var sBody = target.substring(scriptBodyStart, end - "</script>".length); - if (sBody.length > 0) { - embeddedScripts.push(sBody); - } - //remove script - target = target.substring(0, realStart) + target.substring(end, target.length); - } - - while (target.indexOf("<style") != -1) { - var realStart = target.indexOf("<style"); - var styleElementEnd = target.indexOf(">", realStart); - var end = target.indexOf("</style>", (realStart)) ; - var styleBodyStart = styleElementEnd + 1; - var sBody = target.substring(styleBodyStart, end); - if (sBody.length > 0) { - embeddedStyles.push(sBody); - } - //remove style - target = target.substring(0, realStart) + target.substring(end + "</style>".length, target.length); - } - // get the links - while (target.indexOf("<link") != -1) { - var realStart = target.indexOf("<link"); - var styleSourceStart = target.indexOf("href=", (realStart)); - var styleElementEnd = target.indexOf(">", realStart) +1; - if (realStart != -1 && styleSourceStart != -1) { - var styletSourceName; - var styleSourceLinkStart= styleSourceStart + 6; - var styleSourceLinkEnd= target.indexOf("\"", (styleSourceLinkStart + 1)); - if (styleSourceStart < styleElementEnd) { - styleSourceName = target.substring(styleSourceLinkStart, styleSourceLinkEnd); - styleReferences.push(styleSourceName); - } - //remove style - target = target.substring(0, realStart) + target.substring(styleElementEnd, target.length); - } - } - - var head = document.getElementsByTagName("head")[0]; - - // inject the links - for(var loop = 0; loop < styleReferences.length; loop++) { - var link = document.createElement("link"); - link.href = styleReferences[loop]; - link.type = "text/css"; - link.rel = "stylesheet"; - head.appendChild(link); - } - - var stylesElement; - if (embeddedStyles.length > 0) { - stylesElement = document.createElement("style"); - stylesElement.type="text/css"; - var stylesText; - for(var loop = 0; loop < embeddedStyles.length; loop++) { - stylesText = stylesText + embeddedStyles[loop]; - } - if (document.styleSheets[0].cssText) { - document.styleSheets[0].cssText = document.styleSheets[0].cssText + stylesText; - } else { - stylesElement.appendChild(document.createTextNode(stylesText)); - head.appendChild(stylesElement); - } - } - - scriptLoader(scriptReferences, 0, function() { - this.embeddedScripts = embeddedScripts; - // evaluate the embedded javascripts in the order they were added - // consider using an onload handler - for(var loop = 0; loop < embeddedScripts.length; loop++) { - //alert("evaluating " + embeddedScripts[loop]); - var script = embeddedScripts[loop]; - // append to the script a method to call the scriptLoaderCallback - eval(script); - if (loop == (embeddedScripts.length -1)) { - initFunction(); - } - } - }); - - return target; - } - - - /** - * Load the scripts in order and load them one after on another - */ - function scriptLoader(scripts, index, callbackFunction) { - var head = document.getElementsByTagName("head").item(0); - var scriptElement = document.createElement("script"); - scriptElement.id = "c_script_" + index; - scriptElement.type = "text/javascript"; - - var loadHandler = function () { - if (index < scripts.length && index != scripts.length -1) { - scriptLoader(scripts, ++index, callbackFunction); - } else { - callbackFunction(); - } - } - if (typeof scriptElement.onreadystatechange != 'undefined') { - scriptElement.onreadystatechange = function () { - if (this.readyState == 'loaded') { - loadHandler(); - } - }; - } - scriptElement.onload = loadHandler; - - // Safari not seeing the onload event and does not support the onreadystate - if (navigator.userAgent.toLowerCase().indexOf("safari") != -1) { - scriptElement.src = scripts[index]; - setTimeout(loadHandler, 0); - } - head.appendChild(scriptElement); - setTimeout("document.getElementById('c_script_" + index + "').src ='" + scripts[index] + "'", 0); - - scriptElement = null; - head = null; - } - - /** - * If were returning an XML document remove any script in the - * the document and add it to the global scope using a time out. - */ - function includeEmbeddedScripts(xmlDocument) { - var items = new Array(); - var xmlDocument = document.getElementsByTagName("script"); - - for(var loop = 0; loop < targets.length; loop++) { - var children = targets[loop].childNodes; - var iScript = ""; - for(var innerLoop = 0; innerLoop < children.length; innerLoop++) { - iScript += children[innerLoop].data; - } - items.add(iScript); - children[loop].parentNode.removeChild(children[loop]); - } - for(var loop = 0; loop < items.length; loop++) { - setTimeout(items[loop],0); - } - } -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp deleted file mode 100644 index bb8fb85..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp +++ /dev/null @@ -1,266 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: fileupload.jsp,v 1.57 2007/03/08 21:58:48 inder Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="com.sun.javaee.blueprints.petstore.util.PetstoreConstants"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <title>Petstore Seller page</title> - <script type="text/javascript"> - var submittingForm=false; - - function testRetFunction(type, data, evt){ - if (evt.readyState == 4) { - if(evt.status == 200) { - // check for error - submittingForm=false; - var resultx=data.getElementsByTagName("response")[0]; - var message=resultx.getElementsByTagName("message")[0].childNodes[0].nodeValue; - if(message == "Captchas Filter Error") { - // captcha error - alert("Authorization failed : please enter the correct captcha string"); - } else if(message == "Validation Error") { - alert("Validation failed on the Server :\n" + resultx.getElementsByTagName("detail")[0].childNodes[0].nodeValue); - } else if(message == "Upload Size Error") { - alert("The size of the uploaded image must not be more than 100 KB"); - } else { - // fileupload complete - var thumbpath=resultx.getElementsByTagName("thumbnail")[0].childNodes[0].nodeValue; - var productId=resultx.getElementsByTagName("productId")[0].childNodes[0].nodeValue; - var itemid=resultx.getElementsByTagName("itemId")[0].childNodes[0].nodeValue; - // forward to status page - location.href="fileuploadstatus.jsp?message=" + message + "&id=" + itemid + "&productId=" + productId + "&thumb=" + thumbpath; - } - } else { - // server error, send to error page - // can't forward to errorpage because null pointer gets thrown on lookup of status code ("javax.servlet.error.status_code") - //ajaxBindError(type, data.message); - alert("Persistence failed : Please check if the server logs for more information!") - } - } - } - - - function storeCookie() { - currentcap = "j_captcha_response="+document.getElementById("TestFileuploadForm:captcharesponse").value; - document.cookie = currentcap; - } - - function extractCity(citystatezip) { - var index = citystatezip.indexOf(','); - var nextcity = citystatezip.substring(0, index+4); - return nextcity; - } - - function chooseCity(city) { - var index = city.indexOf(','); - var state = city.substring(index+2, index+4); - var zip = city.substring(index+5); - city = city.substring(0, index); - - document.getElementById('TestFileuploadForm:cityField').value = city; - document.getElementById('TestFileuploadForm:stateField').value = state; - document.getElementById('TestFileuploadForm:zipField').value = zip; - } - - function fileuploadOnsubmit() { - if(!submittingForm) { - var valMess=""; - - // save rich text editor text to element - var descx=dojo.widget.byId('rtEditor').getEditorContent() - var lowDescx=descx.toLowerCase(); - - // START: check validation - if(dojo.byId("TestFileuploadForm:name").value == "") { - valMess += "Error: Pet Name is required.\n"; - } - - // make sure there isn't a script/link tag in the description - if(lowDescx == "" || lowDescx.indexOf("<script") > -1 || lowDescx.indexOf("<link") > -1) { - valMess += "Error: The Description must exist and the field can't have a '<script>' and/or a '<link>' tag in it\n"; - } - - // make sure price is a number - var pricex=dojo.byId("TestFileuploadForm:price").value; - if(pricex == "" || isNaN(parseInt(pricex))) { - // price should be a number - valMess += "Error: Price should should exist and be a number in American Dollars in the format '*.00'.\n"; - } - - // make sure the upload file ends in an suffix - var filex=dojo.byId("fileToUploadId").value; - var lengthx=filex.length; - var suffix=filex.substr(lengthx-4).toLowerCase(); - if(lengthx < 1 || (suffix != ".jpg" && suffix != ".gif" && suffix != ".png")) { - // not a proper upload so error - valMess += "Error: The image upload file must exist and be of type .jpg, .gif or .png\n"; - } - - - // make sure make and address is entered - if(dojo.byId("TestFileuploadForm:firstName").value == "") { - // price should be a number - valMess += "Error: First Name is required.\n"; - } - if(dojo.byId("TestFileuploadForm:lastName").value == "") { - valMess += "Error: Last Name is required.\n"; - } - if(dojo.byId("TestFileuploadForm:street1").value == "") { - valMess += "Error: Street is required.\n"; - } - if(dojo.byId("TestFileuploadForm:cityField").value == "") { - valMess += "Error: City is required.\n"; - } - if(dojo.byId("TestFileuploadForm:stateField").value == "") { - valMess += "Error: State is required.\n"; - } - if(dojo.byId("TestFileuploadForm:zipField").value == "") { - valMess += "Error: Zip Code is required.\n"; - } - - if(valMess != "") { - // error, show message - alert(valMess + "\nPlease addresses the error(s) and re-submit your entry!"); - } else { - // no validation errors, so submit form - submittingForm=true; - // set description - dojo.byId('description').value=descx; - - storeCookie() - document.forms['TestFileuploadForm'].onsubmit(); - } - } - } - - function showFU() { - document.getElementById("fucomponent").style.visibility = "visible"; - } - - function switchPanes(fromDivId, toDivId) { - // show pane - var divx=document.getElementById(fromDivId); - divx.style.visibility='hidden'; - divx=document.getElementById(toDivId); - divx.style.visibility='visible'; - } -</script> -<style> -span.button { - background-color: #6699CC; - color: white; - cursor:pointer; - border: thin outset black; - padding: 1px 5px; -} -div.pane { - width: 90%; - background-color: #EEEEEE; - border: thin double blue; - padding: .5cm; - font: 12px arial; -} - -.nameCol { - width: 45%; -} -.dataCol { - width: 55%; -} - -</style> - </head> - <body onload="showFU()"> - <jsp:include page="banner.jsp"/> - <script>dojo.require("dojo.widget.Editor2");</script> - <br/> - <div id="fucomponent" style="visibility:hidden;"> - <f:view> - - <ui:fileUploadTag id="TestFileuploadForm" serverLocationDir="#{FileUploadBean.uploadImageDirectory}" - postProcessingMethod="#{FileUploadBean.postProcessingMethod}" - retMimeType="text/xml" retFunction="testRetFunction" - progressBarDivId="progress" progressBarSize="40"> - <div id="pane2" class="pane" style="visibility: hidden;"> - <h:panelGrid border="0" columns="2" style="width: 100%" columnClasses="nameCol, dataCol"> - <f:facet name="header"> - <h:outputText value="Information about yourself"/> - </f:facet> - <h:outputText value="*First Name"/> - <h:inputText size="20" id="firstName"></h:inputText> - <h:outputText value="*Last Name"/> - <h:inputText size="20" id="lastName"></h:inputText> - <h:outputText value="Seller Email"/> - <h:inputText size="20" id="email"></h:inputText> - <h:outputText value="*Street"/> - <h:inputText size="20" id="street1"></h:inputText> - <h:outputText value="*City"/> - <ui:autoComplete size="20" maxlength="10" id="cityField" - completionMethod="#{AutocompleteBean.completeCity}" - value="#{AddressBean.city}" required="true" - ondisplay="function(item) { return extractCity(item); }" - onchoose="function(item) { return chooseCity(item); }" /> - <h:outputText value="*State"/> - <ui:autoComplete size="2" maxlength="10" id="stateField" - completionMethod="#{AutocompleteBean.completeState}" - value="#{AddressBean.state}" required="true" /> - <h:outputText value="*Zip Code"/> - <h:inputText size="5" id="zipField" value="#{AddressBean.zip}" required="true" /> - - <h:outputText value="Enter the text as it is shown below (case insensitive)"/> - <h:outputText /> - <h:graphicImage id="captchaImg" url="CaptchaServlet"/> - <h:inputText id="captcharesponse"></h:inputText> - <br/><span class="button" onclick="switchPanes('pane2', 'pane1');"><< Previous</span> -    <span class="button" onclick="fileuploadOnsubmit()">Submit</span> - <br/><div id="progress"></div><br/> - - </h:panelGrid> - </div> - <div class="pane"style="position:absolute; top:125px;" id="pane1"> - <h:panelGrid border="0" columns="2" style="width: 100%" columnClasses="nameCol, dataCol"> - <f:facet name="header"> - <h:outputText value="Information about your pet"/> - </f:facet> - - <h:outputText value="Category"/> - <h:selectOneMenu id="product"> - <f:selectItems value="#{FileUploadBean.products}"/> - </h:selectOneMenu> - - <h:outputText value="*Pet's Name"/> - <h:inputText size="20" id="name"></h:inputText> - - <h:outputText value="*Description (3 lines max display in catalog)"/> - - <div style="border-style:inset; border-width:thin; background-color:white"> - <textarea wrap="soft" dojoType="Editor2" widgetId="rtEditor" id="description" name="TestFileuploadForm:description" - toolbarTemplatePath="${pageContext.request.contextPath}/rteToolBar.html"></textarea> - </div> - - <h:outputText value="*Price (is US dollars)"/> - <h:inputText size="20" id="price"></h:inputText> - - <h:outputText value="*Image File"/> - <input type="file" size="20" name="fileToUpload" id="fileToUploadId"/> - - <h:outputText value="Custom Tag Keywords (separated by spaces)"/> - <h:inputText size="20" id="tags"></h:inputText> - </h:panelGrid> - <br/><span class="button" onclick="switchPanes('pane1', 'pane2');">Next >></span> - </div> - Required fields are designated by a * - </ui:fileUploadTag> - </f:view> - </div> - - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp deleted file mode 100644 index 50e3730..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp +++ /dev/null @@ -1,134 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: fileuploadstatus.jsp,v 1.8 2006/05/05 21:05:47 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Seller Photo Submit Status</title> - <style type="text/css"> - #status { background-color : #E0FFFF; - border : none; - width : 50%; - } - </style> - <script type="text/javascript"> - window.onload = function() { - var thumbfile = "${param.thumb}"; - if (thumbfile == "") { - thumbfile = "${sessionScope['fileuploadResponse'].thumbnail}"; - } - thumbpath = "http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.servletContext.contextPath}/ImageServlet/"; - thumbpath += thumbfile; - var divNode = document.getElementById("thumb"); - var imgNode = document.createElement("img"); - imgNode.setAttribute("src", thumbpath); - divNode.appendChild(imgNode); - - // initialize buttons - initButtonImage(); - } - - var imageLayerId = new Array(); - var imageLayerG = new Array(); - var imageLayerC = new Array(); - var imageText = new Array(); - function initButtonImage(){ - imageLayerId[1] ="seller" - imageLayerG[1] = "../images/seller-thumb-g.jpg"; - imageLayerC[1] = "../images/seller-thumb.jpg"; - imageLayerId[2] ="catalog" - imageLayerG[2] = "../images/catalog-thumb-g.jpg"; - imageLayerC[2] = "../images/catalog-thumb.jpg"; - imageLayerId[3] ="home" - imageLayerG[3] = "../images/index-thumb-g.jpg"; - imageLayerC[3] = "../images/index-thumb.jpg"; - - imageText[1] = "Submit another pet"; - imageText[2] = "Go to your pet page"; - imageText[3] = "Go back to PetStore home"; - } - - function highlightButton(n) { - switchButton(true, n); - } - function darkenButton(n) { - switchButton(false, n); - } - - function switchButton(highlight, n){ - var id = imageLayerId[n]; - var btn = document.getElementById(id); - if (highlight) { - btn.src = imageLayerC[n]; - popupText(imageText[n]); - } else { - btn.src = imageLayerG[n]; - popupText(null); - } - } - var Mx; - var My; - function popupText(txt) { - var pNode = document.getElementById("popupText"); - var rx; - var ry; - if (document.all) { - rx = event.clientX + document.body.scrollLeft +10; - ry = event.clientY + document.body.scrollTop -20; - } else { - rx = Mx + 10; - ry = My -20; - } - if (txt) { - pNode.style.display = "block"; - pNode.style.left = rx + "px"; - pNode.style.top = ry + "px"; - pNode.innerHTML = txt; - } else { - pNode.style.display = "none"; - pNode.innerHTML = ""; - } - } - function getMouseXY(mEvent) { - Mx = mEvent.pageX; - My = mEvent.pageY; - } - window.onmousemove = getMouseXY; - </script> - </head> - <body> - <jsp:include page="banner.jsp"/> - <center> - <div id="status"> - <h4>${param.message}</h4> - Here's the uploaded photo of your pet<br/><br/> - <div id="thumb"></div> - <br/><br/> - Would you like to :-<br/><br/> - - <div id="popupText" style="position:absolute;z-index:2;border:1px solid;padding:5px; - border-color:blue;font-size:10pt;background-color:#00ffff;color:blue;display:none"></div> - <table border="0" cellpadding="4" cellspacing="4"> - <tr> - <td><a href="fileupload.jsp" onmouseover="highlightButton(1)" onmouseout="darkenButton(1)"> - <img name="seller" id="seller" src="../images/seller-thumb-g.jpg" alt="seller" width="105" height="60" border="0"> - </a> - </td> - <td><a href="catalog.jsp?pid=${param.productId}&itemId=${param.id}" onmouseover="highlightButton(2)" onmouseout="darkenButton(2)"> - <img name="catalog" id="catalog" src="../images/catalog-thumb-g.jpg" alt="catalog" width="105" height="60" border="0"> - </a> - </td> - <td><a href="http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.servletContext.contextPath}/index.jsp" onmouseover="highlightButton(3)" onmouseout="darkenButton(3)"> - <img name="home" id="home" src="../images/index-thumb-g.jpg" alt="index" width="105" height="60" border="0"> - </a> - </td> - </tr> - </table> - </div> - </center> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp deleted file mode 100644 index 8fda523..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: footer.jsp,v 1.10 2007/01/31 19:40:34 basler Exp $ --%> - -<hr/> -<center> - If you have any questions or suggestions, please use the <a - href="https://blueprints.dev.java.net/feedback.html" target="petstore">feedback page</a>. - <br/> - To access the latest versions of any of the BluePrints projects, please use the <a - href="https://blueprints.dev.java.net/downloads.html" target="petstore">download page</a>. - <br/> - <a href="http://blueprints.dev.java.net/" target="petstore">Java BluePrints</a> | - <a href="http://sun.com/" target="petstore">Sun Microsystems</a> © 2007 Sun Microsystems Inc. All rights reserved. Use is subject to license terms. -</center> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg deleted file mode 100644 index 734f0ba..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg deleted file mode 100644 index 1d6b615..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg deleted file mode 100644 index d50fc6f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg deleted file mode 100644 index 77fb082..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg deleted file mode 100644 index 93a3832..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg deleted file mode 100644 index b7c7c3b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg deleted file mode 100644 index 0c9ce17..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg deleted file mode 100644 index caaf6a7..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg deleted file mode 100644 index 6c7d06e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg deleted file mode 100644 index f7daf7a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg deleted file mode 100644 index 2794a4b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg deleted file mode 100644 index 57175e3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg deleted file mode 100644 index d1b3610..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg deleted file mode 100644 index dd57db1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg deleted file mode 100644 index 2f14c53..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg deleted file mode 100644 index 334a0f8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg deleted file mode 100644 index 6bec9fa..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg deleted file mode 100644 index 6219a97..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg deleted file mode 100644 index 61b9b59..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg deleted file mode 100644 index d4a91e0..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg deleted file mode 100644 index 9c7c4ab..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg deleted file mode 100644 index 93eb9da..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg deleted file mode 100644 index cacb8f6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg deleted file mode 100644 index f1da9d8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg deleted file mode 100644 index a999838..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg deleted file mode 100644 index e3eeb3e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg deleted file mode 100644 index bf3aa59..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg deleted file mode 100644 index 990e44b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg deleted file mode 100644 index 873beb5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg deleted file mode 100644 index e9f2fbb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg deleted file mode 100644 index 4119ae3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg deleted file mode 100644 index efa8fa8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg deleted file mode 100644 index 6ac0c46..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg deleted file mode 100644 index 1ab033b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg deleted file mode 100644 index 4b75817..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg deleted file mode 100644 index 0bbad05..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg deleted file mode 100644 index f63f01a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg deleted file mode 100644 index 10f22cc..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg deleted file mode 100644 index e18660f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg deleted file mode 100644 index e651619..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg deleted file mode 100644 index 3f93502..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg deleted file mode 100644 index d33f856..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg deleted file mode 100644 index 43cd251..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg deleted file mode 100644 index aa0820c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg deleted file mode 100644 index 8b73de1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg deleted file mode 100644 index 248ca28..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg deleted file mode 100644 index 0c3fb87..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg deleted file mode 100644 index ff93f90..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg deleted file mode 100644 index 4571a4b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg deleted file mode 100644 index 647323b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg deleted file mode 100644 index e870f66..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg deleted file mode 100644 index 23dd110..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg deleted file mode 100644 index 3355eaa..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg deleted file mode 100644 index 531ec1e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg deleted file mode 100644 index 9cd85f5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg deleted file mode 100644 index 72377b5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg deleted file mode 100644 index 2788d06..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg deleted file mode 100644 index 2b836df..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg deleted file mode 100644 index 9ef87c3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg deleted file mode 100644 index 753d1e9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg deleted file mode 100644 index 29953c4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg deleted file mode 100644 index a4a0247..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg deleted file mode 100644 index 7caf368..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg deleted file mode 100644 index 9f18ed6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg deleted file mode 100644 index 65bc52f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg deleted file mode 100644 index b0f299d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg deleted file mode 100644 index d1e9cc3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg deleted file mode 100644 index 862c6f8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg deleted file mode 100644 index 5c7b519..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg deleted file mode 100644 index 079b2fa..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg deleted file mode 100644 index 2a1a88a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg deleted file mode 100644 index 4d1ed42..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg deleted file mode 100644 index 87ea286..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg deleted file mode 100644 index 7b76088..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg deleted file mode 100644 index 8005ff3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg deleted file mode 100644 index 4b21f49..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg deleted file mode 100644 index 88a889c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg deleted file mode 100644 index 8adf561..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg deleted file mode 100644 index c262965..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif deleted file mode 100644 index 85de81a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif deleted file mode 100644 index 06f1abe..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif deleted file mode 100644 index 9601f1c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif deleted file mode 100644 index f48a7ec..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif deleted file mode 100644 index eaaa3e5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif deleted file mode 100644 index 9f440f1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif deleted file mode 100644 index affd8e0..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif deleted file mode 100644 index 8b14629..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg deleted file mode 100644 index 8c54af1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg deleted file mode 100644 index ccdea14..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg deleted file mode 100644 index b3f1d09..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg deleted file mode 100644 index d3dcfd7..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg deleted file mode 100644 index a4b48da..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg deleted file mode 100644 index 5a172c5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg deleted file mode 100644 index 40303af..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg deleted file mode 100644 index 83d74d2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg deleted file mode 100644 index 004dfe3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg deleted file mode 100644 index 3e77142..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg deleted file mode 100644 index 4c260e8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg deleted file mode 100644 index b146396..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg deleted file mode 100644 index 742336f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg deleted file mode 100644 index e5bbc24..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif deleted file mode 100644 index 1fd4d1c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif deleted file mode 100644 index 8bc7f6c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif deleted file mode 100644 index a51bc96..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif deleted file mode 100644 index e594c67..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif deleted file mode 100644 index 6ac8718..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif deleted file mode 100644 index 4716f5d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif deleted file mode 100644 index 0793e3f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif deleted file mode 100644 index 2d289ba..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif deleted file mode 100644 index 2ea6132..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif deleted file mode 100644 index 159ba6a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif deleted file mode 100644 index a9ed7c9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif deleted file mode 100644 index 02faffb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg deleted file mode 100644 index 1a13b11..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg deleted file mode 100644 index d6148de..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif deleted file mode 100644 index db70d7d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif deleted file mode 100644 index 83b8761..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg deleted file mode 100644 index 84e4e89..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg deleted file mode 100644 index 5830e57..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg deleted file mode 100644 index bb91e94..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg deleted file mode 100644 index 9e8d17d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif deleted file mode 100644 index 3c517f3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg deleted file mode 100644 index 575a854..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg deleted file mode 100644 index 9c2dc57..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif deleted file mode 100644 index 92e71b5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif deleted file mode 100644 index e581980..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif deleted file mode 100644 index 9baa503..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif deleted file mode 100644 index 9124427..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif deleted file mode 100644 index 3f1690e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif deleted file mode 100644 index 2bf1380..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif deleted file mode 100644 index b13e5b9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg deleted file mode 100644 index ff83a16..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg deleted file mode 100644 index 814dab1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg deleted file mode 100644 index 2623f3c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg deleted file mode 100644 index ccf10a2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg deleted file mode 100644 index 7a7a59e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg deleted file mode 100644 index 1f65136..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg deleted file mode 100644 index 4709e19..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg deleted file mode 100644 index 76a7ff1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg deleted file mode 100644 index 13194bd..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg deleted file mode 100644 index cd8ad6e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif deleted file mode 100644 index 4d9916c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif deleted file mode 100644 index 258489d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif deleted file mode 100644 index d3e39e1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif deleted file mode 100644 index 730c813..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg deleted file mode 100644 index cbe5030..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg deleted file mode 100644 index 11954df..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif deleted file mode 100644 index 4bf637f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg deleted file mode 100644 index 097b144..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg deleted file mode 100644 index ec5d64b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg deleted file mode 100644 index 31bb43c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg deleted file mode 100644 index 70cdc2a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg deleted file mode 100644 index a6646c7..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg deleted file mode 100644 index 262659a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg deleted file mode 100644 index ea0c069..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg deleted file mode 100644 index 828bba2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg deleted file mode 100644 index 5b28bd0..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg deleted file mode 100644 index 3c4d322..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg deleted file mode 100644 index c7c1486..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg deleted file mode 100644 index 6003c8c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg deleted file mode 100644 index a538759..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg deleted file mode 100644 index 2369c90..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg deleted file mode 100644 index 13c3f9b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg deleted file mode 100644 index 61d877b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg deleted file mode 100644 index 4303498..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg deleted file mode 100644 index 37ebbe9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg deleted file mode 100644 index a42ddb4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg deleted file mode 100644 index 571475a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif deleted file mode 100644 index 6da716a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif deleted file mode 100644 index 31d0ada..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg deleted file mode 100644 index d4144da..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg deleted file mode 100644 index fe37700..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg deleted file mode 100644 index d83d3f9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg deleted file mode 100644 index ba460be..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg deleted file mode 100644 index 7afa021..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg deleted file mode 100644 index f7fa2b2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg deleted file mode 100644 index 8c06c3d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg deleted file mode 100644 index 84e82f5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg deleted file mode 100644 index 72a724f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg deleted file mode 100644 index ae9054e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif deleted file mode 100644 index 46b3630..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif deleted file mode 100644 index f50cbed..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg deleted file mode 100644 index 620c826..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg deleted file mode 100644 index 2a52e80..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg deleted file mode 100644 index 7b77428..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg deleted file mode 100644 index b3748ae..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif deleted file mode 100644 index 665c4d6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif deleted file mode 100644 index 2e59d89..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif deleted file mode 100644 index 6dca58f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg deleted file mode 100644 index cef3163..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg deleted file mode 100644 index 7e97d51..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg deleted file mode 100644 index a95ff80..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg deleted file mode 100644 index b7ae026..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg deleted file mode 100644 index 7acf48e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg deleted file mode 100644 index 140a325..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg deleted file mode 100644 index 4b96d8d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg deleted file mode 100644 index 5e3b381..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg deleted file mode 100644 index f2f1848..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg deleted file mode 100644 index a68cd9e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif deleted file mode 100644 index da05f30..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg deleted file mode 100644 index 35387ca..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg deleted file mode 100644 index 7365af9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg deleted file mode 100644 index 0e6a1a5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg deleted file mode 100644 index 950c84e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif deleted file mode 100644 index 8408264..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg deleted file mode 100644 index dea6b6d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg deleted file mode 100644 index 0f0ac10..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg deleted file mode 100644 index 3c7618a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg deleted file mode 100644 index e765076..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg deleted file mode 100644 index 7c7d897..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg deleted file mode 100644 index 4cdb8bb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg deleted file mode 100644 index f38af83..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg deleted file mode 100644 index bec9ee6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg deleted file mode 100644 index 9bb9a17..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg deleted file mode 100644 index c91be8e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg deleted file mode 100644 index f4ce9ec..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg deleted file mode 100644 index b599c76..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg deleted file mode 100644 index cae1408..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg deleted file mode 100644 index 57e02ff..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg deleted file mode 100644 index 758ed35..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg deleted file mode 100644 index 3aec8c4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg deleted file mode 100644 index 13164b8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg deleted file mode 100644 index fbd5412..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg deleted file mode 100644 index 148006d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg deleted file mode 100644 index f25a814..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg deleted file mode 100644 index 2d9c2b1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg deleted file mode 100644 index 3573943..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg deleted file mode 100644 index 9be6e41..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg deleted file mode 100644 index 0559845..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg deleted file mode 100644 index d4521a3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg deleted file mode 100644 index 370e4fd..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg deleted file mode 100644 index 5b89061..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg deleted file mode 100644 index efff187..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg deleted file mode 100644 index 93af55f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg deleted file mode 100644 index d751856..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg deleted file mode 100644 index 9c72270..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg deleted file mode 100644 index 9003e0c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif deleted file mode 100644 index 0ee4c52..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif deleted file mode 100644 index 89e7ba1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg deleted file mode 100644 index 16d1692..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg deleted file mode 100644 index f183f1c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg deleted file mode 100644 index 005d708..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg deleted file mode 100644 index e82c87d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg deleted file mode 100644 index 508edb1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg deleted file mode 100644 index 870c2f3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg deleted file mode 100644 index a18e30a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg deleted file mode 100644 index febadd3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg deleted file mode 100644 index c7329f4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg deleted file mode 100644 index 3753577..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg deleted file mode 100644 index a9c45e8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg deleted file mode 100644 index 2b7adf1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg deleted file mode 100644 index 93e78ee..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg deleted file mode 100644 index cdbb5fb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif deleted file mode 100644 index cdae47c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg deleted file mode 100644 index 6c1e407..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg deleted file mode 100644 index 991392d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg deleted file mode 100644 index 49898fb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg deleted file mode 100644 index eb43a52..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg deleted file mode 100644 index c918e36..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg deleted file mode 100644 index f5063e3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif deleted file mode 100644 index 39fa7ba..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif deleted file mode 100644 index 52bc595..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif deleted file mode 100644 index 0393bc1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp deleted file mode 100644 index 9ce0b8d..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp +++ /dev/null @@ -1,239 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: index.jsp,v 1.17 2007/03/15 23:19:46 basler Exp $ --%> -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> - -<% -try { - CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); - List<Tag> tags=cf.getTagsInChunk(0, 12); - // since top 20 come from database or desending refCount order, need to reorder by tag name - Collections.sort(tags, new Comparator() { - public int compare(Object one, Object two) { - int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); - return (cc < 0 ? 1 : cc > 0 ? -1 : 0); - } - }); -%> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > - <title>Java Pet Store Reference Application</title> - <script type="text/javascript" src="./common.js"></script> - <link type="text/css" rel="stylesheet" href="./tag.css"/> - <script type="text/javascript"> - //var djConfig = {isDebug: true }; - </script> - </head> - <body> - - <jsp:include page="banner.jsp" /> - <script> - dojo.require("dojo.widget.FisheyeList"); - dojo.require("dojo.io.*"); - dojo.require("dojo.io.ScriptSrcIO"); - //transport: "ScriptSrcTransport", - //url: "http://localhost:8080/petstore/downloadAd.json", - - function browse(category) { - window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; - - } - - - function debugProperties(namex) { - var listx=""; - var ob=namex; - for(xx in ob) { - listx += xx + " = " + ob[xx] + "<br/>" - } - //document.write(listx); - alert(listx); - } - - function checkAdPage() { - var bindArgs = { - //url: "https://blueprints.dev.java.net/petstore/downloadAd.json", - //url: "http://localhost:8080/petstore/downloadAd.json", - url: "http://search.yahooapis.com/ImageSearchService/V1/imageSearch?appid=YahooDe…", - transport: "ScriptSrcTransport", - jsonParamName: "callback", - mimetype: "text/json", - load: function(type, data, event, kwArgs) { - /* type will be "load", data will be response data, event will null, and kwArgs are the keyword arguments used in the dojo.io.bind call. */ - alert("load = " + data.ResultSet.totalResultsAvailable); - //debugProperties(data); - //document.getElementById("downloadAds").innerHTML=data.downloadxx; - - - }, - error: function(type, data, event, kwArgs) { - /* type will be "error", data will be response data, event will null, and kwArgs are the keyword arguments used in the dojo.io.bind call. */ - alert("error"); - }, - timeout: function() { - /* Called if there is a timeout */ - alert("timeout"); - }, - timeoutSeconds: 10}; - // dispatch the request - dojo.io.bind(bindArgs); - } - - function callback() { - alert("callback"); - } - - function returnFunctionx(type, data, evt) { - // statically setup popup for simple case - // check return of the dojo call to make sure it is valid - if (evt.readyState == 4) { - if (evt.status == 200) { - alert("data = " + data.downloadxx); - //document.getElementById("downloadAds").innerHTML=data; - document.getElementById("downloadAds").innerHTML=data.downloadxx; - } - } - } - - function testit() { - testx={download:"test", textx:"it"}; - alert("test = " + testx.download); - } - - - </script> - <span onclick="checkAdPage();">test it</span> - - - <table bgcolor="white"> - <tr> - <td valign="top"> - <div class="outerbar" style="width: 200px"> - - <div dojoType="FisheyeList" - itemWidth="170" itemHeight="50" - itemMaxWidth="340" itemMaxHeight="100" - orientation="vertical" - effectUnits="2" - itemPadding="10" - attachEdge="top" - labelEdge="bottom" - enableCrappySvgSupport="false"> - - <div dojoType="FisheyeListItem" onClick="browse('Dogs');" - iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Cats');" - iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Birds');" - iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Fish');" - iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" - iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> - </div> - </div> - - </div> - </td> - <td valign="top" style="width: 400px"> - <div id="bodyCenter"> - <table valign="top" id="bodyTable" border="0"> - <tr> - <td> - <map name="petmap"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="72,2,280,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" - alt="Fish" - coords="2,180,72,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" - alt="Dogs" - coords="60,250,130,320"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" - alt="Reptiles" - coords="140,270,210,340"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" - alt="Cats" - coords="225,240,295,310"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="280,180,350,250"> - </map> - - <img src="${pageContext.request.contextPath}/images/splash.gif" - alt="Pet Selection Map" - usemap="#petmap" - width="350" - height="355" - border="0"> - </td> - </tr> - </table> - - </div> - </td> - <td style="vertical-align:top;"> - <div style="border-style: double; width:100%;"> - <table border="0"> - <tr> - <th colspan="2" style="text-align:center">Most Popular Tags</th> - </tr> - <tr> -<% - String style=null; - int refx=0, ii=0; - for(Tag tag : tags) { - refx=tag.getRefCount() / 5; - if(refx >= 3) { - style="xxlarge"; - } else if(refx == 2) { - style="xlarge"; - } else if(refx == 1) { - style="large"; - } else { - style="medium"; - } - - if((ii % 2) == 0) out.println("</tr>\n<tr>"); - out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + - tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); - ii++; - } -%> - </tr> - </table> - </div> - </td> - <td valign="top" style="vertical-align:top; width:250px;"> - <div id="downloadAds"> - <jsp:include page="download.jsp" /> - </div> - </td> - </tr> - </table> - - <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> - <table id="completeTable" class="popupTable" ></table> - </div> - - <br/><br/> - <jsp:include page="footer.jsp" /> - </body> -</html> -<% - } catch(Exception e) { - e.printStackTrace(); - } -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html deleted file mode 100644 index 8c5ca1b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html +++ /dev/null @@ -1,117 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> - <title>Java Pet Store Reference Application, 2.0 Early Access</title> -</head> -<body> -<hr> -<h1>Java Pet Store Reference Application, 2.0 Early Access</h1> -<h2><a href="./faces/index.jsp">Enter the Store</a></h2> -The Java Pet Store Reference Application is a sample application -brought to -you by the <a href="http://blueprints.dev.java.net/">Java BluePrints</a> -program at <a href="http://sun.com">Sun Microsystems</a>. -This application is designed to illustrate how the Java EE 5 Platform -can be used to develop an AJAX-enabled Web 2.0 application. The -application comes with full source-code available under a  -BSD-style license, so you can experiment with it and use it in your own -applications. <br> -<br> -<a href="#try">Try the Petstore Demo</a><br> -<a href="#learn">Learn more about features in Java Petstore</a><br> -<a href="#contributors">Show appreciation for Pet Store image -contributors</a><br> -<a href="#about">About BluePrints</a> -<h2><a name="try"></a>Try the Pet Store Demo</h2> -Now that you have the application deployed, you can use it and try out -the features. You can browse the catalog of pets for sale, sell your -own pets on the store, search for pets by location using Google maps, -view the RSS news bar for BluePrints news, and more.<a - href="./faces/index.jsp">Enter the Store</a> -<h2><a name="features"></a>Learn More About Features in Java Petstore</h2> -<p>Here are some of the features of this application. For a detailed -description of  the features in the Java Pet -Store Reference application, please  refer to the article at <a - href="http://java.sun.com/developer/technicalArticles/J2EE/petstore/">http://java.sun.com/developer/technicalArticles/J2EE/petstore/</a><a - href="http://java.sun.com/developer/technicalArticles/J2EE/petstore/"></a><b> -</b></p> -<ol> - <li>Using AJAX for single-page interactive Web applications: The -application is designed to be a single-page application where the user -never leaves the page. Different sections of the page are dynamically -loaded based on the user actions. These sections are loaded -asynchronously to avoid any browser refreshes, and to give a richer -interactive user-experience. </li> - <li>Mash-ups with Google maps: The petstore uses a mashup with -Google's Map service, alongwith Yahoo's Geo-coder service to allow -users to see the available pets in a neighborhood. </li> - <li>Community-created content: The application allows a user to add a -pet for sale or adoption on the Website. The seller uploads </li> - <ol> - <li>Using Captchas to discourage spam in the community created -content: Whenever a website allows its users to add content, it needs -to build mechanisms to discourage placement of spurious content on its -Website through automated mechanisms. We demonstrate how captchas can -be used for this purpose. </li> - <li>Community rated content: Each item in the petstore website can -be rated by the users </li> - <li>Payments through PayPal: The application provides a meeting -ground for -buyers and sellers of pets. The application uses the PayPal service to -allow sellers to accept payments.</li> - </ol> - <li>Integration of an RSS feed: The website integrates an RSS feed of -news items coming out the Java BluePrints website. The </li> - <li>Integration of  a search engine: The application integrates -Apache Lucene search engine to handle all website searches. </li> -</ol> -This application also demonstrate the use of various features of  -the Java EE 5 platform such as: <br> -<ol> - <li>JavaServer Faces: Many of the AJAX features are implemented as -reusable JavaServer Faces components. </li> - <li>Java Persistence API: The application uses Java Persistence APIs -to create an object/relational mapping layer. </li> - <li>Dependency Injection: The application uses dependency injection -instead of deployment descriptors.</li> -</ol> -See the <a - href="https://blueprints.dev.java.net/petstore/architecture.html">Pet -Store Architecure document</a> for more detail. -<h2><a name="contributors"></a>Show Appreciation for Pet Store Image -Contributors</h2> -<p>For many images in the Java Petstore, some organizations and people -were kind enough to give us permission to photograph their animals or -even give us photos to use in the Java Petstore. See the <a - href="https://blueprints.dev.java.net/petstore/imagecontributors.html"> -image contributors </a> page for a more detail on these friends of the -animals.  -</p> -<h2><a name="about"></a>About Java BluePrints</h2> -<p>The Java BluePrints program defines the application programming -model for the Java EE™ platform. It provides best practice guidelines -and -architectural recommendations for real-world application scenarios to -enable developers to build portable, scalable, and robust applications -using the Java EE technologies.<br> -<br> -Some other popular projects from Java BluePrints are <a - href="http://blueprints.dev.java.net/bpcatalog/">Java BluePrints -Solutions Catalog</a>,  <a target="_blank" - href="https://blueprints.dev.java.net/adventurebuilder/">Java -Adventure Builder Reference</a> application, <a target="_blank" - href="http://java.sun.com/blueprints/guidelines/designing_webservices/">Designing -Web Services with the J2EE(TM) 1.4 Platform : JAX-RPC, SOAP, and XML -Technologies</a> book, and the <a target="_blank" - href="http://java.sun.com/blueprints/guidelines/designing_enterprise_applications…"><span - class="body"><span class="title">Designing -Enterprise Applications with the J2EE Platform, Second Edition</span></span></a> -book. You can access these projects and other content from Java -BluePrints by visiting the <a target="_blank" - href="http://java.sun.com/reference/blueprints/index.html">Java -BluePrints website</a>. </p> -<hr noshade="noshade">Copyright © 2007 Sun Microsystems, -Inc. All Rights Reserved. -</body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp deleted file mode 100644 index ab59139..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp +++ /dev/null @@ -1,164 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: index.jsp,v 1.20 2007/03/16 20:18:59 basler Exp $ --%> -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> - -<% -try { - CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); - List<Tag> tags=cf.getTagsInChunk(0, 12); - // since top 20 come from database or desending refCount order, need to reorder by tag name - Collections.sort(tags, new Comparator() { - public int compare(Object one, Object two) { - int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); - return (cc < 0 ? 1 : cc > 0 ? -1 : 0); - } - }); -%> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > - <title>Java Pet Store Reference Application</title> - <link type="text/css" rel="stylesheet" href="./tag.css"/> - </head> - <body> - - <jsp:include page="banner.jsp" /> - <script> - dojo.require("dojo.widget.FisheyeList"); - function browse(category) { - window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; - } - </script> - <table bgcolor="white"> - <tr> - <td valign="top"> - <div class="outerbar" style="width: 200px"> - - <div dojoType="FisheyeList" - itemWidth="170" itemHeight="50" - itemMaxWidth="340" itemMaxHeight="100" - orientation="vertical" - effectUnits="2" - itemPadding="10" - attachEdge="top" - labelEdge="bottom" - enableCrappySvgSupport="false"> - - <div dojoType="FisheyeListItem" onClick="browse('Dogs');" - iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Cats');" - iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Birds');" - iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Fish');" - iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" - iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> - </div> - </div> - - </div> - </td> - <td valign="top" style="width: 400px"> - <div id="bodyCenter"> - <table valign="top" id="bodyTable" border="0"> - <tr> - <td> - <map name="petmap"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="72,2,280,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" - alt="Fish" - coords="2,180,72,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" - alt="Dogs" - coords="60,250,130,320"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" - alt="Reptiles" - coords="140,270,210,340"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" - alt="Cats" - coords="225,240,295,310"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="280,180,350,250"> - </map> - - <img src="${pageContext.request.contextPath}/images/splash.gif" - alt="Pet Selection Map" - usemap="#petmap" - width="350" - height="355" - border="0"> - </td> - </tr> - </table> - - </div> - </td> - <td style="vertical-align:top;"> - <div style="border-style: double; width:100%;"> - <table border="0"> - <tr> - <th colspan="2" style="text-align:center">Most Popular Tags</th> - </tr> - <tr> -<% - String style=null; - int refx=0, ii=0; - for(Tag tag : tags) { - refx=tag.getRefCount() / 5; - if(refx >= 3) { - style="xxlarge"; - } else if(refx == 2) { - style="xlarge"; - } else if(refx == 1) { - style="large"; - } else { - style="medium"; - } - - if((ii % 2) == 0) out.println("</tr>\n<tr>"); - out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + - tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); - ii++; - } -%> - </tr> - </table> - </div> - </td> - <td style="vertical-align:top; width:300px; text-align:right;"> - <div id="downloadAds"> - <jsp:include page="download.jsp" /> - </div> - </td> - </tr> - </table> - - <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> - <table id="completeTable" class="popupTable" ></table> - </div> - - <br/><br/> - <jsp:include page="footer.jsp" /> - - </body> -</html> -<% - } catch(Exception e) { - e.printStackTrace(); - } -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp deleted file mode 100644 index 54f30ce..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp +++ /dev/null @@ -1,194 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: index.jsp,v 1.18 2007/03/16 15:29:15 basler Exp $ --%> -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> - -<% -try { - CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); - List<Tag> tags=cf.getTagsInChunk(0, 12); - // since top 20 come from database or desending refCount order, need to reorder by tag name - Collections.sort(tags, new Comparator() { - public int compare(Object one, Object two) { - int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); - return (cc < 0 ? 1 : cc > 0 ? -1 : 0); - } - }); -%> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > - <title>Java Pet Store Reference Application</title> - <link type="text/css" rel="stylesheet" href="./tag.css"/> - <script type="text/javascript" src="https://blueprints.dev.java.net/petstore/downloadAd.js"></script> - </head> - <body onload="alterDownloadAd()"> - - <jsp:include page="banner.jsp" /> - <script> - dojo.require("dojo.widget.FisheyeList"); - function browse(category) { - window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; - } - - function alterDownloadAd() { - if(typeof checkAdPage != "undefined") { - var textx=checkAdPage(); - if(typeof textx != "undefined") { - document.getElementById("downloadAds").innerHTML=textx; - } - } - } - - - </script> - <table bgcolor="white"> - <tr> - <td valign="top"> - <div class="outerbar" style="width: 200px"> - - <div dojoType="FisheyeList" - itemWidth="170" itemHeight="50" - itemMaxWidth="340" itemMaxHeight="100" - orientation="vertical" - effectUnits="2" - itemPadding="10" - attachEdge="top" - labelEdge="bottom" - enableCrappySvgSupport="false"> - - <div dojoType="FisheyeListItem" onClick="browse('Dogs');" - iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Cats');" - iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Birds');" - iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Fish');" - iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" - iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> - </div> - </div> - - </div> - </td> - <td valign="top" style="width: 400px"> - <div id="bodyCenter"> - <table valign="top" id="bodyTable" border="0"> - <tr> - <td> - <map name="petmap"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="72,2,280,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" - alt="Fish" - coords="2,180,72,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" - alt="Dogs" - coords="60,250,130,320"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" - alt="Reptiles" - coords="140,270,210,340"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" - alt="Cats" - coords="225,240,295,310"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="280,180,350,250"> - </map> - - <img src="${pageContext.request.contextPath}/images/splash.gif" - alt="Pet Selection Map" - usemap="#petmap" - width="350" - height="355" - border="0"> - </td> - </tr> - </table> - - </div> - </td> - <td style="vertical-align:top;"> - <div style="border-style: double; width:100%;"> - <table border="0"> - <tr> - <th colspan="2" style="text-align:center">Most Popular Tags</th> - </tr> - <tr> -<% - String style=null; - int refx=0, ii=0; - for(Tag tag : tags) { - refx=tag.getRefCount() / 5; - if(refx >= 3) { - style="xxlarge"; - } else if(refx == 2) { - style="xlarge"; - } else if(refx == 1) { - style="large"; - } else { - style="medium"; - } - - if((ii % 2) == 0) out.println("</tr>\n<tr>"); - out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + - tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); - ii++; - } -%> - </tr> - </table> - </div> - </td> - <td style="vertical-align:top; width:250px; text-align:right;"> - <div id="downloadAds"> - <div id="downloadAds" style="text-align:center; border-style:none; width:100%;"> - <table style="width:100%"> - <tr> - <td style="text-align:center;"> - <a href="http://java.sun.com/javaee/downloads/index.jsp" target="downloads"><img style="border:none" src="./images/ad-sdk.jpg" alt="Download Java EE 5 SDK"/></a> - </td> - </tr> - <tr> - <td style="text-align:center;"> - <a href="http://www.netbeans.org/downloads/index.html" target="downloads"><img style="border:none" src="./images/ad-netbeans.jpg" alt="Download Netbeans IDE"/></a> - </td> - </tr> - <tr> - <td style="text-align:center;"> - <a href="http://java.com/en/download/index.jsp" target="downloads"><img style="border:none" src="./images/ad-jre.jpg" alt="Download Java SE"/></a> - </td> - </tr> - </table> - </div> - </div> - </td> - </tr> - </table> - - <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> - <table id="completeTable" class="popupTable" ></table> - </div> - - <br/><br/> - <jsp:include page="footer.jsp" /> - - </body> -</html> -<% - } catch(Exception e) { - e.printStackTrace(); - } -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp deleted file mode 100644 index d2fd4c5..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp +++ /dev/null @@ -1,53 +0,0 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>JSON Test Page</title> - <script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> - - <script type="text/javascript"> - function getJSON() { - // get data and send to controller servlet - var bindArgs = { - url: "${pageContext.request.contextPath}/catalog?command=items&pid=feline01&start=0&length=2&format=json", - mimetype: "text/json", - error: function(){ alert("error")}, - load: callbackx - }; - - dojo.io.bind(bindArgs); - } - - function callbackx(type, data, evt) { - // check successful response - if (evt.readyState == 4) { - if (evt.status == 200) { - var prodsx=data.products; - rep="Products:<br\>"; - for(ii=0; ii < prodsx.length; ii++) { - rep += prodsx[ii].name + "<br/>"; - } - rep+="<br\>"; - document.getElementById("testResult").innerHTML=rep; - } - } - } - - </script> - - </head> - <body> - - <h1>JSON Test Page</h1> - <span onclick="getJSON();"> GET DATA </span><br/><br/> - - <div id="testResult"> - This should be populated with result. If not, look at the error console for errors. - </div> - - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp deleted file mode 100644 index b634b42..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: lookup.jsp,v 1.7 2007/01/19 21:47:31 basler Exp $ --%> - -<%@page contentType="text/xml"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item"%> - -<% - String itemId=request.getParameter("itemId"); - String popupView=request.getParameter("popupView"); - - try { - ServletContext context=config.getServletContext(); - CatalogFacade cf=(CatalogFacade)context.getAttribute("CatalogFacade"); - Item item=cf.getItem(itemId); - - if(itemId != null) { - out.println("<response>"); - out.println("<name>" + item.getName() + "</name>"); - String tmp=null; - if(popupView != null && popupView.equals("2")) { - tmp=item.getAddress().addressToString(); - } else { - tmp=item.getDescription(); - } - out.println("<description><![CDATA[" + tmp + "]]></description>"); - out.println("<price>" + java.text.NumberFormat.getCurrencyInstance(java.util.Locale.US).format(item.getPrice()) + "</price>"); - out.println("<image>" + request.getContextPath() + "/ImageServlet/" + item.getImageThumbURL() + "</image>"); - out.println("</response>"); - out.flush(); - } - } catch(Exception ee) { - ee.printStackTrace(); - } - -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf deleted file mode 100644 index b207a5a..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf +++ /dev/null @@ -1,36 +0,0 @@ - - - <table valign="top" id="bodyTable" border="0"> - <tr> - <td> - <map name="petmap"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('BIRDS')" - alt="Birds" - coords="72,2,280,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('FISH')" - alt="Fish" - coords="2,180,72,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('DOGS')" - alt="Dogs" - coords="60,250,130,320"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('REPTILES')" - alt="Reptiles" - coords="140,270,210,340"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('CATS')" - alt="Cats" - coords="225,240,295,310"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('BIRDS')" - alt="Birds" - coords="280,180,350,250"> - </map> - - <img src="images/splash.gif" - alt="Pet Selection Map" - usemap="#petmap" - width="350" - height="355" - border="0"> - </td> - </tr> - </table> \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js deleted file mode 100644 index b8de8fc..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: main.js,v 1.9 2006/05/03 22:00:33 inder Exp $ */ - -var isIE; -var bodyRowText; - -dojo.require("dojo.widget.FisheyeList"); -init(); - -function browse(category) { - window.location.href="catalog.jsp?catid=" + category; -} - -function loadPetstore() { - init(); - showMain(); -} - -function init() { - if (navigator.userAgent.indexOf("IE") != -1) isIE = true; -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp deleted file mode 100644 index c2673c9..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp +++ /dev/null @@ -1,143 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: map.jsp,v 1.20 2006/11/02 00:34:49 basler Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item, com.sun.javaee.blueprints.petstore.mapviewer.MapBean, com.sun.javaee.blueprints.components.ui.mapviewer.MapMarker"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Map Display</title> - </head> - <body> - <jsp:include page="banner.jsp" /> - <br> - <center> - <table border="1" cellspacing="5px" cellpadding="5px" - style="border-style:double; border-color:darkgreen; padding:5px"> - <tr> - <td valign="top" align="center" width="200px"> - <table border="0"> - <c:if test="${!empty sessionScope.MapBean.locations}"> - <tr> - <th> - <u>${sessionScope.MapBean.locationCount} Items Displayed</u> - </th> - </tr> - <tr> - <td> - <ul> -<% - try { - // need to use scriptlet to preform the reconciliation of items to map coords - // this way I don't have to create a new wrapper object - MapBean mapBean=(MapBean)session.getAttribute("MapBean"); - MapMarker[] mapMarkers=(MapMarker[])mapBean.getLocations(); - java.util.List<Item> items=mapBean.getItems(); - Item itemxx=null; - String popupOptions=null; - for(int ii=0; ii < mapMarkers.length; ii++) { - - //System.out.println("loop - " + ii + " - " + mapBean.getCenterAddress()); - if(mapBean.getCenterAddress() != null && !mapBean.getCenterAddress().equals("")) { - // center point is set to the first mapMarker, items are off by one - if(ii > 0) { - // reconcile correct mapMarkers with items list - itemxx=items.get(ii - 1); - popupOptions="onmouseover=\"bpui.popup.show('pop1', event, '" + itemxx.getItemID() + "')\" onmouseout=\"bpui.popup.hide('pop1')\""; - } else { - // first item of mapMarker is centerpoint, so no corresponding item, also no popup on mouseover - itemxx=null; - popupOptions=""; - } - } else { - // no center point items should be 1-to-1 with mappedMarkers - itemxx=items.get(ii); - popupOptions="onmouseover=\"bpui.popup.show('pop1', event, '" + itemxx.getItemID() + "')\" onmouseout=\"bpui.popup.hide('pop1')\""; - } -%> - <li> - <a href="javascript:mapViewerx.openInfoWindowHtml(new GPoint(<%= mapMarkers[ii].getLongitude() %>,<%= mapMarkers[ii].getLatitude() %>), '<%= mapMarkers[ii].getMarkup() %>');" <%= popupOptions %>> - <%= mapBean.changeSpaces((itemxx == null) ? mapMarkers[ii].getMarkup() : "<b>" + itemxx.getName() + "</b>") %> - </a> -<% - if(itemxx != null) { - // remove these links for center point entry -%> - <a href="${pageContext.request.contextPath}/faces/catalog.jsp?pid=<%= itemxx.getProductID() %>&itemId=<%= itemxx.getItemID() %>" alt="Go to Detailed Catalog Page"> - <i>(detail)</i> - </a> - - <br/> - <a href="javascript:mapViewerx.openInfoWindowHtml(new GPoint(<%= mapMarkers[ii].getLongitude() %>, <%= mapMarkers[ii].getLatitude() %>), '<%= mapMarkers[ii].getMarkup() %>');" <%= popupOptions %>> - <font size="-1"><%= mapBean.changeSpaces((itemxx == null) ? mapMarkers[ii].getMarkup() : itemxx.getAddress().addressToString()) %></font> - </a> -<% - } -%> - </li> - <% - } - } catch(Exception ee) { - ee.printStackTrace(); - - } - %> - </ul> - <td> - </tr> - </c:if> - </table> - </td> - <td valign="top"> - <f:view> - <ui:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?itemId=" - elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> -  - <img id="spaceImage" height="10px" width="12px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> - <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> - <tr> - <td align="left" valign="top"><b>Name:</b> - <span id="value1">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Description:</b> - <span id="value2">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Price:</b> - <span id="value3">Loading Data...</span></td> - </tr> - <tr> - <td colspan="2" align="center"><img name="image" id="imageId" src="" - alt="[Loading Image...]" border="2"/><br/><br/></td> - </tr> - </table> - </ui:popupTag> - - - <ui:mapViewer id="mapViewerx" center="#{MapBean.mapPoint}" info="#{MapBean.mapMarker}" - markers="#{MapBean.locations}" zoomLevel="#{MapBean.zoomLevel}" style="height: 500px; width: 700px"/> - - </f:view> - </td> - </tr> - </table> - <script type="text/javascript"> - bpui.mapviewer.createMapControl = function() { - return new GLargeMapControl(); - } - - </script> - <br/><br/> - </center> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp deleted file mode 100644 index a3ae6dc..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp +++ /dev/null @@ -1,65 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: mapAll.jsp,v 1.14 2006/12/06 22:44:37 basler Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Map Viewer Page</title> - </head> - <body> - <jsp:include page="banner.jsp" /> - <center> - <f:view> - - <h:form id="form1"> - <table border="1" cellpadding="5" cellspacing="5" style="border-style:double; width:600px; border-color:darkgreen; padding:5px"> - <tr> - <td colspan=3> - <i>Select the category whose items will be displayed in a Google map based on the Seller's address. - Optionally, enter a "Center Point Address" and "Area" to limit the search to a specific - area around the center point.</i> - </td> - </tr> - <tr> - <th align="right">Select Category to Map:</th> - <td align="center" colspan=2> - <h:selectOneRadio value="#{MapBean.category}" required="true"> - <f:selectItems value="#{MapBean.categories}"/> - </h:selectOneRadio> - </td> - </tr> - <tr> - <th align="right">Center Point Address:</th> - <td> - <h:inputText id="centerAddress" value="#{MapBean.centerAddress}" size="70"/> - <br/><small><i>For example: 4140 Network Circle, Santa Clara, CA, 95054</i></small> - </td> - </tr> - <tr> - <th align="right">Area (in Miles):</th> - <td> - <h:inputText id="radius" value="#{MapBean.radius}" size="5"/> - </td> - </tr> - <tr> - <td colspan="2" align="center"> - <h:commandButton action="#{MapBean.findAllByCategory}" id="submitCat" type="submit" value="Map Category"/> - </td> - </tr> - - </table> - <h:messages/> - </h:form> - </f:view> -     - </center> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js deleted file mode 100644 index 5bcac34..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js +++ /dev/null @@ -1,190 +0,0 @@ - -dojo.require("dojo.io.*"); -dojo.require("dojo.event.*"); - -var bpuinews; -if (typeof bpuinews == "undefined") { - bpuinews = new Object(); -} - -bpuinews.RSS = function() { - var currentItem = 0; - var limitCharNum = 75; - var itemNum=0; - var rssData = null; - var prev; - var next; - var prevHit=false; - - this.getRssInJson = function (method, uri) { - prev = document.getElementById("previous"); - next = document.getElementById("next"); - dojo.event.connect(prev, "onclick", function(evt) {showPrevious();}); - dojo.event.connect(next, "onclick", function (evt) {showNext();}); - prev.disabled=true; - - var encodedURI = encodeURI(method + "?style=json&itemCount=0&url="+uri); - var bindArgs = { - url: encodedURI, - mimetype: "text/json", - load: function (type, data, http) { - handleJsonRss(data); - }, - error: function (t, e) { - dojo.debug("ERROR : " + e.message); - } - } - dojo.io.bind(bindArgs); - return false; - } - - function handleJsonRss(json) { - rssData = json; - itemNum = json.channel.item.length; - showNext(); - } - - function createUl(skip) { - var i; - var cp="<ul>\n"; - for (i = currentItem; i<currentItem + skip; i++) { - cp += "<li><b>"+decodeURL(rssData.channel.item[i].title)+"</b>\n"; - cp += "<p>" + decodeURL(rssData.channel.item[i].description) + "</p>\n</li>\n"; - } - cp += "</ul>\n"; - return cp; - } - - // Following funcs(showNext, showPrevious) should be connected to the button - // by dojo.event.connect. - function showNext() { - var skip = 5; - if (prevHit) { - currentItem = currentItem + skip; - prevHit = false; - } - var nextCurrentItem = currentItem + skip; - if (nextCurrentItem >= itemNum) { - skip = itemNum - currentItem; - // deactivate "next" button - next.disabled=true; - nextCurrentItem = currentItem; - } - // activate "previous" button - if (currentItem != 0) { - prev.disabled=false; - } - var cp = createUl(skip); - var elm = document.getElementById("news"); - elm.innerHTML = cp; - currentItem = nextCurrentItem; - } - - function showPrevious() { - prevHit = true; - var skip = 5; - currentItem = currentItem - skip; - if (currentItem <= 0) { - currentItem = 0; - // deactivate "previous" button - prev.disabled=true; - } - next.disabled=false; - var cp = createUl(skip); - var elm = document.getElementById("news"); - elm.innerHTML = cp; - } - - - /* Compatible function to java.net.URLDecoder.decode(). - * (decodeURI() is not compatible) - */ - function decodeURL(str){ - var targetStr=""; - var s, tmpStr, unicode, f; - // take a look at every char in the source str - var i, j; - for (i = 0; i < str.length; i++) { - s = str.charAt(i); - // handle WS, which is the most common char - if (s == "+") { - targetStr += " "; - } else { - if (s != "%") { - // Non-encoded char - targetStr += s; - } else{ - // encoding begin - unicode = 0; // uncode representation - f = 1; // flag to specify the escape sequence - while (true) { - tmpStr = ""; - // get the two HEX chars and put that in the temp string. If no char, that is not a HEX. - for (j = 0; j < 2; j++ ) { - tmptmpStr = str.charAt(++i); - if (((tmptmpStr >= "0") && (tmptmpStr <= "9")) || - ((tmptmpStr >= "a") && (tmptmpStr <= "f")) || - ((tmptmpStr >= "A") && (tmptmpStr <= "F"))) { - tmpStr += tmptmpStr; - } else { - --i; - break; - } - } - /* parse the HEX - * <= 0x7f : Single byte - * >=0xc0 && <=0xdf : Two bytes - * >=0xe0 && <=0xef : Three bytes - * >=0xf0 && <=0xf7 : Four bytes - * >=0x80 && <=0xbf : may not occur - just shift it - * <=1 : sequence terminated - */ - var byte = parseInt(tmpStr, 16); - if (byte <= 0x7f) {unicode = byte; f = 1;} - if ((byte >= 0xc0) && (byte <= 0xdf)) {unicode = byte & 0x1f; f = 2;} - if ((byte >= 0xe0) && (byte <= 0xef)) {unicode = byte & 0x0f; f = 3;} - if ((byte >= 0xf0) && (byte <= 0xf7)) {unicode = byte & 0x07; f = 4;} - if ((byte >= 0x80) && (byte <= 0xbf)) {unicode = (unicode << 6) + (byte & 0x3f); --f;} - if (f <= 1) { - break; - } - if (str.charAt(i + 1) == "%") { - i++ ; - } else { - // Error. should not occur - break; - } - } - targetStr += String.fromCharCode(unicode); - } - } - } - return targetStr; - } - - /* Cut the string at the WS so that it's shorter than the limitCharNum. - */ - function cutStringatWs(str, limitCharNum) { - var tmpStr = str; - var cnum = 0; - while (true) { - cnum = tmpStr.lastIndexOf(" "); - // no occurance of WS - if (cnum < 0) { - // if str is still longer than limit - if (tmpStr.length >= limitCharNum) { - tmpStr = tmpStr.substring(0, limitCharNum); - } - break; - } else { - tmpStr = tmpStr.substring(0, cnum); - if (cnum <= limitCharNum) { - break; - } - } - } - return tmpStr; - } - -} - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp deleted file mode 100644 index b57de0b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp +++ /dev/null @@ -1,51 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. -All rights reserved. You may not modify, use, reproduce, or distribute -this software except in compliance with the terms of the License at: -http://developer.sun.com/berkeley_license.html -$Id: news.jsp,v 1.2 2006/12/14 01:04:50 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>BluePrints News Page</title> - <script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> - <script type="text/javascript" src="${pageContext.request.contextPath}/news.js"></script> - - <style> - p { - width : 70%; - background-color : #FFEFD5; - font-size : 80% - } - </style> - - </head> - <script type="text/javascript"> - var news = new bpuinews.RSS(); - dojo.addOnLoad(function(){news.getRssInJson('${pageContext.request.contextPath}/faces/dynamic/bpui_rssfeedhandler/getRssfeed', 'https://blueprints.dev.java.net/servlets/ProjectRSS?type=news');}); - </script> - <body> - <jsp:include page="banner.jsp" /> - <h2><a href="http://blueprints.dev.java.net">BluePrints News</a></h2> - <center> - <table border="0" width="95%"> - <tr> - <td> - <button id="previous" type="button"><< Previous</button> - </td> - <td> - <button id="next" type="button">Next &gt&gt</button> - </td> - </tr> - </table> - </center> - <div id="news"></div> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp deleted file mode 100644 index 923739b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp +++ /dev/null @@ -1,21 +0,0 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>jsonp test page</title> - <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/bp_petstorelist.css"></link> - <script type="text/javascript" src="${pageContext.request.contextPath}/bp_petstorelist.js"></script> - <script type="text/javascript"> - var petstoreList; - function init() { - petstoreList=new bpui.petstoreList.createPetstoreList("petstoreListDiv"); - } - </script> - </head> - <body onload="init()"> - <h1>jsonp test page</h1> - - <div id="petstoreListDiv"></div> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js deleted file mode 100644 index 66700d3..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js +++ /dev/null @@ -1,110 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: rss.js,v 1.3 2006/05/31 19:13:03 basler Exp $ */ - -dojo.require("dojo.io.*"); - -if (bpui = 'undefined') { - bpui = new Object(); -} - -bpui.RSS = function() { - var jsonData = null; - var rssItemNum = 0; - var currentItem = 0; - var rssTimeout = null; - var itemIntervalMsec = 2000; - var rssFadeoutCounter = 110; - var rssFadeinCounter = 110; - var itemIntervalId = 0; - - this.getRssInJson = function (uri, number) { - rssItemNum = number; - var encodedURI = encodeURI(bpui.contextRoot + "/faces/dynamic/bpui_rssfeedhandler/getRssfeed?style=json&itemNumber="+number+"&url="+uri); - //alert("encoded url=" + encodedURI); - var bindArgs = { - url: encodedURI, - mimetype: "text/json", - load: function (type, data, http) { - handleJsonRss(data); - for (var key in data.channel.item) { - dojo.debug("ITEM Title ", key, ":", data.channel.item[key].title); - dojo.debug("ITEM LInk ", key, ":", data.channel.item[key].link); - } - }, - error: function (t, e) { - dj_debug("ERROR : " + e.message); - } - } - dojo.io.bind(bindArgs); - return false; - } - - function handleJsonRss(json) { - jsonData = json; - // setting top title and link - generateHref(json.channel.title, json.channel.link, "rss-channel"); - // setting items - generateHref(json.channel.item[0].title, json.channel.item[0].link, "rss-item"); - var aNodes = document.getElementById("rss-item").getElementsByTagName("a"); - dojo.event.connect(aNodes[0], "onmouseover", "pauseCycle"); - dojo.event.connect(aNodes[0], "onmouseout", "resumeCycle"); - cycleRss(); - } - - function generateHref (title, link, nodeId) { - var node = document.getElementById(nodeId); - var aNode = document.createElement("a"); - aNode.setAttribute("href", link); - aNode.appendChild(document.createTextNode(title)); - if (node.hasChildNodes()) { - node.removeChild(node.firstChild); - } - node.appendChild(aNode); - } - - function cycleRss () { - itemIntervalId = setTimeout(replaceItem, itemIntervalMsec); - } - - - function replaceItem() { - if (itemIntervalId) { - clearTimeout(itemIntervalId); - } - // fadeout the current item and pop the next one in. - var cItem = document.getElementById("rss-item"); - dojo.fx.html.fadeOut(cItem.getElementsByTagName('a')[0], 500); - var waitId = setTimeout(function(waitId) { - clearTimeout(waitId); - //cItem.removeChild(cItem.firstChild); - if (currentItem < (rssItemNum -1)) { - currentItem += 1; - } else { - currentItem = 0; - } - generateHref(jsonData.channel.item[currentItem].title, jsonData.channel.item[currentItem].link, "rss-item"); - // attach event for onmouseover(pause) and onmouseout(resume) - var aNodes = cItem.getElementsByTagName("a"); - dojo.event.connect(aNodes[0], "onmouseover", "pauseCycle"); - dojo.event.connect(aNodes[0], "onmouseout", "resumeCycle"); - cycleRss();}, 500); - } - - function pauseCycle(evt) { - if (itemIntervalId) { - clearTimeout(itemIntervalId); - } - } - - function resumeCycle (evt) { - cycleRss(); - } - - bpui.getContextRoot = function() { - var urlArray=window.location.toString().split("/", 4); - return "/" + urlArray[3]; - } - - bpui.contextRoot = bpui.getContextRoot(); -} - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp deleted file mode 100644 index e57e4dc..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp +++ /dev/null @@ -1,33 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: rss.jsp,v 1.2 2006/05/03 22:00:34 inder Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - -<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> -<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>RSS</title> - </head> - <body> - - <h1>RSS test</h1> - <f:view> - <ui:rssreader> - <ui:rsscategory title="JavaEE 5"> - <ui:rssfeed title="BluePrints" url="https://blueprints.dev.java.net/servlets/ProjectRSS?type=news"></ui:rssfeed> - <ui:rssfeed title="GlassFish" url="http://blogs.sun.com/roller/rss/theaquarium"></ui:rssfeed> - </ui:rsscategory> - <ui:rsscategory title="Yahoo!"> - <ui:rssfeed title="World" url="http://rss.news.yahoo.com/rss/world"></ui:rssfeed> - <ui:rssfeed title="US" url="http://rss.news.yahoo.com/rss/us"></ui:rssfeed> - </ui:rsscategory> - </ui:rssreader> - - </f:view> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp deleted file mode 100644 index 6f9c2f9..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: rssbar.jsp,v 1.7 2006/05/06 01:44:59 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - -<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> -<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - - - - <f:view> - <ui:rssBar url="https://blueprints.dev.java.net/servlets/ProjectRSS?type=news" - itemCount="4" - title="News from BluePrints" - speed="6000" - backgroundImage="no" - color="#00ffff" hoverColor="#ff00ff"></ui:rssBar> - </f:view> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html deleted file mode 100644 index 9cc8c0a..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html +++ /dev/null @@ -1,60 +0,0 @@ -<div class="EditorToolbarDomNode EditorToolbarSmallBg"> - <table cellpadding="1" cellspacing="0" border="0"> - <tbody> - <tr valign="top" align="left"> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="bold"> - <span title="Toggle Bold (Ctrl-B)" class="dojoE2TBIcon dojoE2TBIcon_Bold"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="italic"> - <span title="Toggle Italic (Ctrl-I)" class="dojoE2TBIcon dojoE2TBIcon_Italic"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="underline"> - <span title="Toggle Underline (Ctrl-U)" class="dojoE2TBIcon dojoE2TBIcon_Underline"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="strikethrough"> - <span title="Toggle Strike-Through" -class="dojoE2TBIcon dojoE2TBIcon_StrikeThrough"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="inserthorizontalrule"> - <span title="Insert Horizontal Rule" class="dojoE2TBIcon dojoE2TBIcon_HorizontalLine "> </span> - </span> - </td> - <td isSpacer="true"> -  - <span class="iconContainer"> - <span class="dojoE2TBIcon dojoE2TBIcon_Sep" style="width: 5px; min-width: 5px;"></span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="forecolor"> - <span title="Change Text Color" class="dojoE2TBIcon dojoE2TBIcon_TextColor" -unselectable="on"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="hilitecolor"> - <span title="Change Background Color" class="dojoE2TBIcon dojoE2TBIcon_BackgroundColor" -unselectable="on"> </span> - </span> - </td> - <td width="*"> </td> - </tr> - </tbody> - </table> -</div> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css deleted file mode 100644 index 151df6d..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css +++ /dev/null @@ -1 +0,0 @@ -.slider { border-width:1px; border-style:solid; border-color:black; background:#404040; } .tile { position: absolute; top:0px; left:0px; cursor:pointer; border-width:1px; border-style:solid; border-color:black; visibility:hidden; z-index:1; background:white; opacity: .99; } .tileImage { width: 94; height: 70; } .nav { cursor:pointer; position: absolute; vertical-align:bottom; z-index:11; opacity: .85; } .infopane { z-index:0; width:475px; position: absolute; border-width:1px; border-style:solid; border-color:black; background:black; opacity: .65; } .infopaneDescription { color:white; font-size:12px; } .infopaneShortDescription { color:white; font-size:16px; } .infopanePrice { color:white; text-align: center; height:20px; } .infopanePayPal{ vertical-valign: bottom; text-align: right; height:20px; } .infopaneRating{ vertical-valign: top; text-align: center; width:125px; height:15px; color:white; opacity: .95; } .infopaneTitle { width:255px; height:15px; color:white; font-size:18px; } \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js deleted file mode 100644 index 1f72578..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js +++ /dev/null @@ -1,643 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: scroller.js,v 1.32 2007/01/17 18:00:09 basler Exp $ */ - -/** -* ImageScroller - A multipurpose item brower -* @ Author: Greg Murray -* -*/ - -function getApplicationContextRoot() { - var urlArray=window.location.toString().split("/", 4); - return "/" + urlArray[3]; -} - -var applicationContextRoot=getApplicationContextRoot(); - - -function ImageScroller() { - var _this = this; - var initialized = false; - // default sizes - - var VIEWPORT_WIDTH = 500; - // all sizes are realitive the the viewport width - var IMAGEPANE_WIDTH = VIEWPORT_WIDTH; - var IMAGEPANE_HEIGHT = Math.round(VIEWPORT_WIDTH / 1.49); - var INFOPANE_DEFAULT_HEIGHT = Math.round(VIEWPORT_WIDTH / 6.67); - var INFOPANE_EXPAND_HEIGHT = Math.round(VIEWPORT_WIDTH / 2.86); - var THUMB_WIDTH = Math.round(VIEWPORT_WIDTH / 5);; - var THUMB_HEIGHT = Math.round(VIEWPORT_WIDTH / 6.67); - - var CHUNK_SIZE = 7; - var PREFETCH_THRESHHOLD = 5; - - var IMAGE_PANE_ID = "imagePane"; - var IMAGE_PANE_BUFFER_ID = "imageBufferPane"; - - var PADDING = 3; - - var MINIMIZE_IMG_URI = applicationContextRoot + "/images/minimize.gif"; - var MAXIMIZE_IMG_URI = applicationContextRoot + "/images/maximize.gif"; - var INDICATOR_IMG_URI = applicationContextRoot + "/images/indicator-black.gif"; - var MAXIMIZE_IMG_TOOLTIP = "Show Details"; - var MINIMIZE_IMG_TOOLTIP = "Show Less Details"; - - // this is an array of the tiles which are divs for each thumb - var tiles = []; - - var injectionPoint; - - // for scrolling - - var SCROLL_INCREMENT = 5; - var INFOPANE_INCREMENT = 3; - var tileY; - var tileX; - // this is the index of the image tile on the far left - var index = 0; - // keeps track how for the scroll has gone - var offset = 0; - - var timeout = 30; // in ms - var isScrollingRight = false; - var isScrollingLeft = false; - - // large image pane - var imagePane; - var imageLoadingPane; - var loadingPane; - // images - var minimizeImage; - - var indicatorImage; - var leftButton; - var rightButton; - - // infopane - var infoPane; - var infoTableMinimize; - var indicatorCell; - var minimizeLink; - var infoPaneLoop = 0; - var maximizing = false; - var minimizing = false; - var maximized = false; - - // prefetch thresh-hold - var prefetchThreshold = 2; - - // a growing list of items; - var items = []; - // cached chunks that are already in the items array - var loadedChunks = []; - - // used for debugging when debug is true - var debug = false; - var statusDiv; - var status2Div; - - var showingBuffer = false; - var imageBuffer; - var imageReloadTries = 0; - var IMG_RELOAD_RETRY_MAX = 30; - // used for url book marking - - - var pid; - var currentChunk; - // this map contains all the items - var map; - // this is the main container div - var containerDiv; - - this.getItems = function() { - return map; - } - - this.getScrollerItems = function() { - return items; - } - - - this.getGroupId = function() { - return pid; - } - - this.reset = function() { - resetTitles() - tiles = []; - index = 0; - offset = 0; - currentChunk = 0; - items = []; - loadedChunks = []; - } - - function resetTitles() { - for (var l = 0; l < tiles.length; l++) { - tiles[l].parentNode.removeChild(tiles[l]); - } - } - - // event bound to the mouseOut event of both scroll buttons - function scrollDone() { - isScrollingLeft = false; - isScrollingRight = false; - } - - // looping method for time out - function scroll() { - if (isScrollingRight) scrollRight(); - else if (isScrollingLeft) scrollLeft(); - } - - - // do the value list pre-emptive fetching - function prefetch() { - //printDebug("** scoller index = " + index); - if (isScrollingRight && (index + PREFETCH_THRESHHOLD) % CHUNK_SIZE == 0) { - - if ((Math.round(index / CHUNK_SIZE)) >= currentChunk) { - currentChunk = Math.round(index / CHUNK_SIZE) + 1; - // fire an event - dojo.event.topic.publish("/catalog", {type:"getChunk", id: pid, index: index, currentChunk: currentChunk}); - } - } - } - - this.setGroupId = function(id) { - pid = id; - } - - this.containsChunk = function(chunkId) { - printDebug("containsChunk = " + loadedChunks); - ret=false; - for(ii=0; ii < loadedChunks.length; ii++) { - if(chunkId == loadedChunks[ii]) { - ret=true; - break; - } - } - return ret; - } - - this.addChunk = function(chunkId) { - loadedChunks.push(chunkId); - } - - this.addItems = function(inItems) { - for (var loop=0; loop < inItems.length ; loop++) { - items.push(inItems[loop]); - map.put(inItems[loop].id, inItems[loop]); - createTile(inItems[loop]); - if (loop == 0 && !loadImage) { - showImage(inItems[loop].id); - } - - } - drawTiles(); - rightButton.style.visibility="visible"; - _this.hideProgressIndicator(); - } - - this.showProgressIndicator = function() { - if (indicatorImage) { - indicatorImage.style.visibility = "visible"; - } - } - - this.hideProgressIndicator = function() { - indicatorImage.style.visibility = "hidden"; - } - - function postImageLoad(loadIntoBuffer) { - if (debug) { - status2Div.innerHTML = "Try " + imageReloadTries + " " + url + " image.complete=" + imageBuffer.complete; - } - // keep calling this funtion until imageReloadTries < IMG_RELOAD_RETRY_MAX - if (!imageBuffer.complete) { - if (imageReloadTries < IMG_RELOAD_RETRY_MAX) { - setTimeout(function(){this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer);},500); - } else { - this.hideProgressIndicator(); - } - imageReloadTries = imageReloadTries + 1; - return; - } - var id; - - _this.hideProgressIndicator(); - if (loadIntoBuffer) { - imageLoadingPane.src = imageBuffer.src; - } else { - imagePane.src = imageBuffer.src; - - } - // do a cross fade as long as the images aren't the same - if (imageLoadingPane.src != imagePane.src) { - crossFade(0,loadIntoBuffer ); - } - } - - - this.showImage = function(itemId) { - - _this.showProgressIndicator(); - //setTimeout(this.showProgressIndicator,0); - var i = map.get(itemId); - - if (!i) { - return; - } - dojo.event.topic.publish("/catalog", {type:"showingItem", id: itemId, rating: i.rating}); - // create the image pane and append the description nodes - // asumption is that if the imagePane is not set neigher are the info children - if (typeof imagePane == 'undefined') { - imagePane = document.createElement("img"); - imagePane.style.width = IMAGEPANE_WIDTH + "px"; - imagePane.style.height = IMAGEPANE_HEIGHT + "px"; - imagePane.id = IMAGE_PANE_ID; - - var targetElement = document.getElementById("bodySpace"); - imageLoadingPane = document.createElement("img"); - imageLoadingPane.style.position = "absolute"; - imageLoadingPane.style.visibility = "hidden"; - imageLoadingPane.style.width = IMAGEPANE_WIDTH + "px"; - imageLoadingPane.style.height = IMAGEPANE_HEIGHT + "px"; - imageLoadingPane.id = IMAGE_PANE_BUFFER_ID; - targetElement.appendChild(imagePane); - targetElement.appendChild(imageLoadingPane); - imageLoadingPane.style.left = tileX + "px"; - - loadImage(i.image, false); - } else { - imageLoadingPane.style.visibility = "visible"; - if (showingBuffer) { - showingBuffer = false; - } else { - showingBuffer = true; - } - loadImage(i.image, showingBuffer); - } - } - - function loadImage(url, loadIntoBuffer) { - imageReloadTries = 0; - imageBuffer = new Image(); - if (loadIntoBuffer) { - imageBuffer.src = url; - imageLoadingPane.onLoad = setTimeout(function(){this.url=url;this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer,url);},0); - } else { - imageBuffer.src = url; - imageBuffer.onLoad = setTimeout(function(){this.url = url;this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer,url);},0); - } - } - - function setOpacity(opacity, id) { - var target = document.getElementById(id); - if (typeof target.style.filter != 'undefined') { - target.style.filter = "alpha(opacity:" + opacity + ")"; - } else { - target.style.opacity = opacity/100; - } - } - - function crossFade(count,loadIntoBuffer) { - var percentage = Number(count); - if (loadIntoBuffer) { - setOpacity(100 - percentage, IMAGE_PANE_ID); - setOpacity(percentage, IMAGE_PANE_BUFFER_ID); - } else { - setOpacity(100 - percentage, IMAGE_PANE_BUFFER_ID); - setOpacity(percentage, IMAGE_PANE_ID); - - } - if (percentage < 100) { - percentage = percentage + 10; - setTimeout(function(){this.loadIntoBuffer = loadIntoBuffer;this.percentage = percentage;crossFade(percentage,loadIntoBuffer);}, 25); - } - } - - - // calling this function will result in the maximizing event being fired - // if the pane is maximized it will asume the event want to minimize - this.doMaximize = function() { - if (!maximizing && !minimizing && !maximized) { - infoPaneLoop = INFOPANE_DEFAULT_HEIGHT; - maximizing = true; - minimizing = false; - } else if (!maximizing && !minimizing) { - minimizing = true; - maximizing = false; - } - setTimeout(changeInfoPane, 0); - } - - // will handle either minimizing or maximing but not both - // this method is called recursively until the maximinging - // or minimizing is done. - function changeInfoPane() { - if (maximizing) { - maxmizeInfoPane(); - } else if (minimizing) { - minimizeInfoPane(); - } - } - - function maxmizeInfoPane() { - if (infoPaneLoop < INFOPANE_EXPAND_HEIGHT) { - infoPaneLoop = infoPaneLoop + INFOPANE_INCREMENT; - var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ infoPaneLoop +'px,' + 0 + 'px)'; - infoPane.style.clip = clipMe; - infoPane.style.height = infoPaneLoop; - infoPane.style.top = (tileY + (PADDING *2) + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT) - infoPaneLoop; - setTimeout(changeInfoPane, 5); - } else { - minimizeImage.src= MINIMIZE_IMG_URI; - minimizeLink.title = MINIMIZE_IMG_TOOLTIP; - maximized = true; - maximizing = false; - minimizing = false; - } - } - - function minimizeInfoPane() { - if (infoPaneLoop > INFOPANE_DEFAULT_HEIGHT) { - infoPaneLoop = infoPaneLoop - INFOPANE_INCREMENT; - var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ infoPaneLoop +'px,' + 0 + 'px)'; - infoPane.style.clip = clipMe; - infoPane.style.height = infoPaneLoop; - infoPane.style.top = (tileY + (PADDING *2) + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT) - infoPaneLoop; - if (debug) { - status2Div.innerHTML = "minimize infoPaneLoop =" + infoPaneLoop + " infopane.top=" + infoPane.style.top; - } - setTimeout(changeInfoPane, 5); - } else { - minimizeImage.src= MAXIMIZE_IMG_URI; - minimizeLink.title = MAXIMIZE_IMG_TOOLTIP; - maximizing = false; - minimizing = false; - maximized = false; - } - } - - function scrollRight() { - isScrollingRight = true; - if ( (index + 4) >= tiles.length) { - // hide the rightButton - rightButton.style.visibility="hidden"; - return; - } else { - leftButton.style.visibility="visible"; - } - offset = offset - SCROLL_INCREMENT; - drawTiles(); - setTimeout(scroll, timeout); - } - - function getNext() { - isScrollingRight = true; - setTimeout(scroll, timeout); - } - - - function getPrevious () { - isScrollingLeft = true; - setTimeout(scroll, timeout); - } - - function scrollLeft() { - if (offset >= 0) { - leftButton.style.visibility="hidden"; - return; - } else { - leftButton.style.visibility="visible"; - } - offset = offset + SCROLL_INCREMENT; - drawTiles(); - setTimeout(scroll, timeout); - } - - function drawTiles() { - // draw the first one if its off the screen - // check if the far right image is out view - var overHang; - var temp = offset; - index = Math.floor((offset)/THUMB_WIDTH); - overHang = offset % THUMB_WIDTH; - if (overHang < 0) { - overHang = overHang * -1; - } - if (index < 0) { - index = index * -1; - } - // check for next set of images - prefetch(); - var startIndex = index; - if (overHang > 0 && index >0) { - startIndex = index -1; - } - var stopIndex = index + Math.round(VIEWPORT_WIDTH / THUMB_WIDTH); - if (stopIndex > tiles.length) { - stopIndex = tiles.length; - } - var displayX = 0; - for (var tl=startIndex; tl < stopIndex; tl++) { - if (debug) { - statusDiv.innerHTML = "overhang=" + overHang + " startIndex=" + startIndex + " stopIndex=" + stopIndex + " offset=" + offset + " displayX=" + displayX; - } - if (overHang > 0 && tl == startIndex) { - rightButton.style.visibility="visible"; - // clip: rect(top right bottom left) - borders of the clipped area - // clip the left - var clipMe = 'rect(' + '0px,' + THUMB_WIDTH + 'px,'+ THUMB_HEIGHT +'px,' + overHang + 'px)'; - tiles[tl].style.clip = clipMe; - tiles[tl].style.left = (tileX - overHang) + "px"; - displayX = displayX + (THUMB_WIDTH - overHang); - } else if (tl == stopIndex -1) { - var underHang = VIEWPORT_WIDTH - displayX ; - if (underHang > 0 && underHang) { - var clipMe = 'rect(' + '0px,' + (underHang) + "px," + THUMB_HEIGHT +'px,' + 0 + 'px)'; - tiles[tl].style.clip = clipMe; - tiles[tl].style.left = tileX + (offset + (tl * THUMB_WIDTH)) + 'px'; - tiles[tl].style.visibility = "visible"; - // resize the previous one to its real length - } else if (underHang < 0 && tl > 0) { - var clipMe = 'rect(' + '0px,' + (THUMB_WIDTH + underHang) + "px," + THUMB_HEIGHT +'px,' + 0 + 'px)'; - tiles[tl-1].style.clip = clipMe; - tiles[tl-1].style.visibility = "visible"; - tiles[tl-1].style.left = tileX + (offset + ((tl -1) * THUMB_WIDTH)) + 'px'; - } else { - tiles[tl].style.left = '0px'; - tiles[tl].style.visibility = "hidden"; - } - } else { - displayX = displayX + THUMB_WIDTH; - tiles[tl].style.left = tileX + (offset + (tl * THUMB_WIDTH)) + 'px'; - tiles[tl].style.visibility = "visible"; - } - } - if (stopIndex < tiles.length) { - tiles[stopIndex].style.visibility = "hidden"; - tiles[stopIndex].style.left = "0px"; - } - } - - - this.load = function () { - map = new Map(); - dojo.event.connect(window, "onresize", layout); - var loadImage; - - var targetRow = document.getElementById("targetRow"); - injectionPoint = document.getElementById("injection_point"); - - // for status output - statusDiv = document.getElementById("status"); - status2Div = document.getElementById("status_2"); - - initLayout(); - initialized = true; - } - - function initLayout() { - containerDiv = document.getElementById("CatalogBrowser"); - rightButton = document.getElementById("right_button"); - leftButton = document.getElementById("left_button"); - layout(); - leftButton.style.visibility="hidden"; - if (typeof rightButton.attachEvent != 'undefined') { - rightButton.attachEvent('onmouseover',function(e){scrollDone();getNext();}); - rightButton.attachEvent('onmouseout',function(e){scrollDone();}); - leftButton.attachEvent('onmouseover',function(e){scrollDone();getPrevious();}); - leftButton.attachEvent('onmouseout',function(e){scrollDone();}); - } else if (typeof rightButton.addEventListener != 'undefined') { - rightButton.addEventListener('mouseover',function(e){scrollDone();getNext();}, false); - rightButton.addEventListener('mouseout',function(e){scrollDone();}, false); - leftButton.addEventListener('mouseover',function(e){scrollDone();getPrevious();}, false); - leftButton.addEventListener('mouseout',function(e){scrollDone();}, false); - } - createInfoPane(); - } - - function layout() { - var ua = navigator.userAgent.toLowerCase(); - - // this will need to be made generic depending on the thumb height - tileY = findY(containerDiv); - tileX = findX(containerDiv) + 4; - var rightX = tileX + VIEWPORT_WIDTH - 20; - rightButton.style.left = rightX + "px"; - var buttonY = tileY + IMAGEPANE_HEIGHT + INFOPANE_DEFAULT_HEIGHT + 12; - rightButton.style.top = buttonY + "px"; - leftButton.style.top = buttonY + "px"; - - if (ua.indexOf('ie') != -1) { - isIE = true; - } else if (ua.indexOf('safari') != -1) { - tileX = tileX + 8; - timeout = 20; - } - drawTiles(); - if (infoPane) { - infoPane.style.left = tileX + "px"; - if (maximized) { - - infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2) - infoPane.style.height) + "px"; - } else { - infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2)) + "px"; - } - if (maximized) { - infoPaneLoop = infoPane.style.height; - } else { - infoPaneLoop = INFOPANE_DEFAULT_HEIGHT; - } - } - if (typeof imageLoadingPane != 'undefined') { - imageLoadingPane.style.left = tileX; - imageLoadingPane.style.top = tileY; - } - } - - function createInfoPane() { - infoPane = document.getElementById("infopane"); - infoPane.style.width = VIEWPORT_WIDTH + "px"; - // give room for 4 pixels above and below - infoPane.style.height = (INFOPANE_DEFAULT_HEIGHT) + "px"; - // give 3px padding for a border - infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2)) + "px"; - infoPane.style.left = tileX + "px"; - infoTableMinimize = document.getElementById("infopaneDetailsIcon"); - indicatorCell = document.getElementById("infopaneIndicator"); - indicatorCell.style.width = (10) + "px"; - indicatorImage = document.createElement("img"); - indicatorImage.className = "infopaneIndicator"; - indicatorImage.src = INDICATOR_IMG_URI; - indicatorImage.style.visibility = "hidden"; - indicatorCell.appendChild(indicatorImage); - minimizeLink = document.createElement("a"); - minimizeLink.className = "infopaneLink"; - minimizeLink.title = MAXIMIZE_IMG_TOOLTIP; - minimizeImage = document.createElement("img"); - minimizeImage.src= MAXIMIZE_IMG_URI; - minimizeLink.appendChild(minimizeImage); - infoTableMinimize.appendChild(minimizeLink); - - if (typeof minimizeLink.attachEvent != 'undefined') { - minimizeLink.attachEvent("onclick",function(e){_this.doMaximize();}); - } else { - minimizeLink.addEventListener("click",function(e){_this.doMaximize();}, true); - } - var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ INFOPANE_DEFAULT_HEIGHT +'px,' + 0 + 'px)'; - infoPane.style.clip = clipMe; - } - - function createTile(i) { - var div = document.createElement("div"); - div.className = "tile"; - div.id = i.id; - var link = document.createElement("a"); - var img = document.createElement("img"); - img.title = i.name; - img.src = i.thumbnail; - img.className = "tileImage"; - link.appendChild(img); - link.setAttribute("id", i.id); - if (typeof div.attachEvent != 'undefined') { - div.attachEvent('onclick',function(e){this.id = div.id; _this.showImage(this.id, false);}); - } else { - link.addEventListener('click',function(e){this.id = div.id; _this.showImage(this.id, false);}, true); - } - div.appendChild(link); - injectionPoint.appendChild(div); - div.style.top = tileY + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT + (PADDING * 3) + "px"; - tiles.push(div); - } - - - function findY(element) { - var t = 0; - if (element.offsetParent) { - while (element.offsetParent) { - t += element.offsetTop - element = element.offsetParent; - } - } else if (element.y) { - t += element.y; - } - return t; - } - - function findX(element) { - var l = 0; - if (element.offsetParent) { - while (element.offsetParent) { - l += element.offsetLeft - element = element.offsetParent; - } - } else if (element.x) - l += element.x; - return l; - } -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp deleted file mode 100644 index e12d666..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp +++ /dev/null @@ -1,290 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: search.jsp,v 1.28 2006/12/04 21:34:10 basler Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.search.*"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui5" uri="http://java.sun.com/blueprints/ui" %> - - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Search Page</title> - <style> - .itemTable { - padding: 0.3cm; - width: 800px; - border-style: double; - border-color: darkgreen; - } - .itemCell { - border-style: solid; - border-color: darkgreen; - border-width: thin; - padding: 5px - } - .tagDiv { - border-style: groove; - border-color: darkgreen; - background-color: white; - border-width: thick; - padding: 5px; - visibility: hidden; - position:absolute; - left:0px; - top:0px; - z-index: 3; - } - </style> - <script type="text/javascript" src="common.js"></script> - </head> - <body> - <jsp:include page="banner.jsp" /> - <center> - - <script type="text/javascript"> - function checkAll() { - var elems=dojo.byId("resultsForm").elements; - for(ii=0; ii < elems.length; ii++) { - if(elems[ii].name.indexOf("mapSelectedItems") >= 0) { - elems[ii].checked=true; - } - } - return false; - } - - function uncheckAll() { - var elems=dojo.byId("resultsForm").elements; - for(ii=0; ii < elems.length; ii++) { - if(elems[ii].name.indexOf("mapSelectedItems") >= 0) { - elems[ii].checked=false; - } - } - return false; - } - - function addTags(eventx, namex, itemIdx) { - var xx=0; - var yy=0; - if (!eventx) var eventx=window.event; - if (eventx.pageX || eventx.pageY){ - xx=eventx.pageX; - yy=eventx.pageY; - } else if (eventx.clientX || eventx.clientY) { - xx=eventx.clientX + document.body.scrollLeft; - yy=eventx.clientY + document.body.scrollTop; - } - divId="addTags"; - document.getElementById("addTagsItemId").value=itemIdx; - document.getElementById("addTagsTags").value=""; - document.getElementById("addTagsTitle").innerHTML="<b>Add Tags to '" + namex + "'</b>"; - document.getElementById(divId).style.left=(xx - 170) + "px"; - document.getElementById(divId).style.top=(yy - 140) + "px"; - document.getElementById(divId).style.visibility='visible'; - document.getElementById("addTagsTags").focus(); - } - - function saveAddTags() { - // get data and send to controller servlet - itemIdx=document.getElementById("addTagsItemId").value; - tagsx=document.getElementById("addTagsTags").value; - var bindArgs = { - url: "../TagServlet?itemId=" + escape(itemIdx) + "&tags=" + escape(tagsx), - mimetype: "text/xml", - error: ajaxBindError, - load: function(type, data, evt){ - // check successful response - if (evt.readyState == 4) { - if (evt.status == 200) { - // get results and replace dom elements - var resultx=data.getElementsByTagName("response")[0]; - itemIdx=resultx.getElementsByTagName("itemId")[0].childNodes[0].nodeValue; - - // change DOM data - document.getElementById("ITEMID_TAGS_" + itemIdx).innerHTML=resultx.getElementsByTagName("tags")[0].childNodes[0].nodeValue; - - } else if (evt.status == 204){ - alert("204 return"); - } - } - } - }; - - dojo.io.bind(bindArgs); - // make sure it was updated - - // show messages if error - - // hide popup - document.getElementById(divId).style.visibility='hidden'; - } - - function cancelAddTags() { - // hide popup - document.getElementById(divId).style.visibility='hidden'; - } - - </script> - - <f:view> - - <ui5:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?popupView=2&itemId=" - elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> -  - <img id="spaceImage" height="10px" width="3px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> - <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> - <tr> - <td align="left" valign="top"><b>Name:</b> - <span id="value1">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Seller Address:</b> - <span id="value2">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Price:</b> - <span id="value3">Loading Data...</span></td> - </tr> - <tr> - <td colspan="2" align="center"><img name="image" id="imageId" src="" - alt="[Loading Image...]" border="2"/><br/><br/></td> - </tr> - </table> - </ui5:popupTag> - - <h1>Search Page</h1> - <h:form id="searchForm"> - <table class="itemTable" style="width: 700px"> - <tr> - <th class="itemCell">Search String</th> - <td class="itemCell"> - <h:inputText size="50" id="searchString" value="#{SearchBean.searchString}"/> -    Also Search Tags:<h:selectBooleanCheckbox id="searchTags" value="#{SearchBean.searchTags}"/> - </td> - </tr> - <tr> - <td class="itemCell" align="center" colspan="2"> - <h:commandButton action="#{SearchBean.searchAction}" id="searchSubmit" type="submit" value="Submit"/> - <h:commandButton id="searchReset" type="reset" value="Reset"/> - </td> - </tr> - </table> - <h:messages/> - </h:form> - <br/> - - - - <h:form id="resultsForm" rendered="#{SearchBean.showResults}"> - <table class="itemTable"> - <tr> - <th class="itemCell"> - Map - <br/> - <img src="../images/check_all.gif" onclick="return checkAll()"/><img src="../images/uncheck_all.gif" onclick="return uncheckAll()"/> - </th> - <th class="itemCell">Name</th> - <th class="itemCell">Description</th> - <th class="itemCell">Tags</th> - <th class="itemCell">Price</th> - </tr> -<% -SearchBean searchBean=(SearchBean)session.getAttribute("SearchBean"); -if(searchBean != null) { - List<IndexDocument> hits=searchBean.getHits(); - if(hits != null) { - for(IndexDocument indexDoc : hits) { -%> - <tr> - <td class="itemCell"> - <input type="checkbox" name="mapSelectedItems" value="<%= indexDoc.getUID() %>"/> - </td> - <td class="itemCell"> - <a href="${pageContext.request.contextPath}/faces/catalog.jsp?pid=<%= indexDoc.getProduct() %>&itemId=<%= indexDoc.getUID() %>" - onmouseover="bpui.popup.show('pop1', event, '<%= indexDoc.getUID() %>')" onmouseout="bpui.popup.hide('pop1')"> - <%= indexDoc.getTitle() %> - </a> - </td> - <td class="itemCell"> - <%= indexDoc.getSummary() %> - </td> - <td class="itemCell"> - <span id="ITEMID_TAGS_<%= indexDoc.getUID() %>"><%= (indexDoc.getTag().equals("") ? " " : indexDoc.getTag()) %></span> - <br/><input type="button" value="Add Tags" onclick="addTags(event, '<%= indexDoc.getTitle() %>', '<%= indexDoc.getUID() %>')"/> - </td> - <td class="itemCell"> - <%= indexDoc.getPriceDisplay() %> - </td> - </tr> -<% - } - } -} -%> - <tr> - <td colspan="5"> - <br/> - <center> - <table class="itemTable"> - <tr> - <th align="right">Center Point Address:</th> - <td> - <h:inputText id="centerAddress" value="#{MapBean.centerAddress}" size="50"/> - <br/><small><i>For example: 4140 Network Circle, Santa Clara, CA, 95054</i></small> - </td> - </tr> - <tr> - <th align="right">Area (in Miles):</th> - <td> - <h:inputText id="radius" value="#{MapBean.radius}" size="5"/> - </td> - </tr> - <tr> - <td align="center" colspan="2"> - <h:commandButton action="#{MapBean.findAllByIDs}" id="mapSubmit" type="submit" - value="Map Checked Item(s)" rendered="#{SearchBean.showResults}"/> - </td> - </tr> - </table> - </center> - <br/> - </td> - </tr> - </table> - - <h:messages/> - </h:form> - <br/><br/><br/> - <div class="tagDiv" id="addTags"> - <form> - <table> - <tr> - <td align="center"> - <span id="addTagsTitle"><b>Tag Title</b></span><br/><i>(seperated by spaces)</i> - </td> - </tr> - <tr> - <td align="center"> - <input id="addTagsTags" type="text" size="50"/> - </td> - </tr> - <tr> - <td align="center"> - <input type="button" value="Save" onclick="saveAddTags()"/>  <input type="button" value="Cancel" onclick="cancelAddTags()"/> - </td> - </tr> - </table> - <input type="hidden" id="addTagsItemId"/> - </form> - </div> - </f:view> - </center> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css deleted file mode 100644 index 24ffbf9..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css +++ /dev/null @@ -1,130 +0,0 @@ - -.dojoHtmlFisheyeListBar { - cursor:pointer; - margin: 0; - width: 300px; - text-align: right; -} - -.outerbar { - background-color: white; - text-align: left; - width: 300px; -} - -.editText { - height:25; - font-size:18px; - font-weight: bold; - font-family: Arial; -} - -.plainText { - height:25; - font-size:20px; - font-weight: bold; - font-family: Arial -} - -.plainTextSelect { - height:25; - font-size:20px; - font-weight: bold; - font-family: Arial; - background: red -} - -.smallText { - height:15; - font-size:13px; - font-weight: bold; - font-family: Arial -} - -.banner { - height:35; - font-size:35; - font-weight: bold; - font-family: Arial -} - - -.menuItem { - background: white; - color: black; - text-decoration: none; - font-size: 1.4em; -} - -.menuLink { - cursor:pointer; - color: black; - text-decoration: none; - font-size: 1.3em; -} - -.menuLinkHover { - cursor:pointer; - color: black; - font-size: 1.3em; - text-decoration: underline; -} - -.autocomplete { - position:absolute; -} - -.autocompleteTable { - padding:0; - visibility: hidden; - border-spacing: 0; - border-width:1px; - border-style:solid; - border-color:black; -} - -.popupRowHover { - color: #FFFAFA; - cursor:pointer; - padding-left:3; - padding-right:3; - border-spacing: 0; - border-width:0px; - background: #7A8AFF; -} - -.popupRow { - padding-left:3; - padding-right:3; - border-spacing: 0; - border-width:0px; - background: #FFFAFA; -} - -.popupRowEven { - padding-left:3; - padding-right:3; - border-spacing: 0; - border-width:0px; - background: #FFFADA; -} - -.popupItem { - background: #FFFAFA; - color: #000000; - text-decoration: none; - font-size: 1.2em; -} - -.shadow { - top:0px; - left:0px; - position: absolute; - visibility: hidden; - width:0; - height:0; - z-index:0; - background:gray; - opacity: .5; -} - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp deleted file mode 100644 index c7a5309..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp +++ /dev/null @@ -1,28 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: systemerror.jsp,v 1.3 2007/01/09 19:02:12 basler Exp $ --%> -<%@ page isErrorPage="true" %> -<%@ page import="com.sun.javaee.blueprints.petstore.util.PetstoreUtil, java.util.logging.Level" %> -<% -PetstoreUtil.getLogger().log(Level.INFO, "Encountered a Runtime Exception and being transferred the the systemerror page", exception); -%> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > - <title>Java Pet Store Reference Application: System Error Page</title> - </head> - <body> - - <jsp:include page="banner.jsp" /> - - <h2>System Error !</h2> - <p>We had problems processing your request. An exception has been caught, - so perhaps your application was not set up or deployed properly.</p> - - The Exception that was thrown is:<b> <%= exception.toString() %></b>. The server log will contain the stack trace of the exception. - - <p><a href="${pageContext.request.contextPath}/faces/index.jsp">Go back to sample application home</a></p> - <br/><br/> - <jsp:include page="footer.jsp" /> - - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css deleted file mode 100644 index bfbab6e..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css +++ /dev/null @@ -1,47 +0,0 @@ - .itemTable { - padding: 0.3cm; - border-style: double; - width: 800px; - border-color: darkgreen; - } - .itemCell { - border-style: solid; - border-color: darkgreen; - border-width: thin; - padding: 5px - } - .tagCell { - padding: 0.3cm; - } - .xxlarge - { - font-size: xx-large; - color: red; - cursor: pointer; - text-decoration: underline; - } - .xlarge - { - font-size: x-large; - color: blue; - cursor: pointer; - text-decoration: underline; - } - .large - { - font-size: large; - color: green; - cursor: pointer; - text-decoration: underline; - } - .medium - { - font-size: medium; - cursor: pointer; - color: black; - text-decoration: underline; - } - .items - { - visibility: hidden; - } diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp deleted file mode 100644 index f9c74f3..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp +++ /dev/null @@ -1,158 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: tag.jsp,v 1.11 2007/01/17 18:00:09 basler Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui5" uri="http://java.sun.com/blueprints/ui" %> - - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Tag Page</title> - <script type="text/javascript" src="./common.js"></script> - <link type="text/css" rel="stylesheet" href="./tag.css"/> -<% -try { - CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); - List<Tag> tags=cf.getTagsInChunk(0, 90); - // since top 20 come from database or desending refCount order, need to reorder by tag name - Collections.sort(tags, new Comparator() { - public int compare(Object one, Object two) { - return ((Tag)one).getTag().compareTo(((Tag)two).getTag()); - } - }); -%> - <script language="javascript"> - function retrieveItems(tag) { - var bindArgs = { - // url when using the jsp to serve the ajax request - url: "../tagItemLookup.jsp?tag=" + escape(tag), - mimetype: "text/xml", - load: returnFunctionx, - error: ajaxBindError}; - - // dispatch the request - dojo.io.bind(bindArgs); - } - - - function returnFunctionx(type, data, evt) { - // statically setup popup for simple case - var componentId="displayItems"; - // check return of the dojo call to make sure it is valid - if (evt.readyState == 4) { - if (evt.status == 200) { - // get results and replace dom elements - var itemsx=data.getElementsByTagName("item"); - display="<table class='itemTable'><tr><td class='itemCell' align='center' colspan='4'><h2>Tag: " + - data.getElementsByTagName("tag")[0].childNodes[0].nodeValue + - "</h2></td></tr><tr><th class='itemCell'>Name</th><th class='itemCell'>Description</th><th class='itemCell'>Tags</th><th class='itemCell'>Price</th></tr>" - for(ii=0; ii < itemsx.length; ii++) { - display += "<tr>"; - display +="<td class='itemCell'><a href='./catalog.jsp?pid="+ itemsx[ii].getElementsByTagName("productID")[0].childNodes[0].nodeValue +"&itemId=" + - itemsx[ii].getElementsByTagName("itemID")[0].childNodes[0].nodeValue + "' onmouseover='bpui.popup.show("pop1", event, "" + - itemsx[ii].getElementsByTagName("itemID")[0].childNodes[0].nodeValue + "")' onmouseout='bpui.popup.hide("pop1")'>" + - itemsx[ii].getElementsByTagName("name")[0].childNodes[0].nodeValue +"</a></td>"; - display +="<td class='itemCell'>" + itemsx[ii].getElementsByTagName("description")[0].childNodes[0].nodeValue +"</td>"; - display +="<td class='itemCell'>" + itemsx[ii].getElementsByTagName("tags")[0].childNodes[0].nodeValue +"</td>"; - display +="<td class='itemCell' style='text-align: right'>" + itemsx[ii].getElementsByTagName("price")[0].childNodes[0].nodeValue +"</td>"; - display +="</tr>"; - } - display += "</table>"; - document.getElementById(componentId).innerHTML=display; - document.getElementById(componentId).style.visibility='visible'; - } else if (evt.status == 204){ - alert("204 return"); - } - } - } - - - function checkQueryString() { -  - var iPos=window.location.href.indexOf("?tag="); - if(iPos > -1) { - // have tag so retrieve items - retrieveItems(window.location.href.substr(iPos + 5)); - } - } - - </script> - </head> - <body onload="checkQueryString();"> - <jsp:include page="banner.jsp" /> - <f:view> - - <ui5:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?popupView=2&itemId=" - elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> -  - <img id="spaceImage" height="10px" width="10px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> - <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> - <tr> - <td align="left" valign="top"><b>Name:</b> - <span id="value1">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Seller Address:</b> - <span id="value2">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Price:</b> - <span id="value3">Loading Data...</span></td> - </tr> - <tr> - <td colspan="2" align="center"><img name="image" id="imageId" src="" - alt="[Loading Image...]" border="2"/><br/><br/></td> - </tr> - </table> - </ui5:popupTag> - <center> - <h1>Tag Page</h1> - <table border="0"> - <tr> -<% - String style=null; - int refx=0, ii=0; - for(Tag tag : tags) { - refx=tag.getRefCount() / 5; - if(refx >= 3) { - style="xxlarge"; - } else if(refx == 2) { - style="xlarge"; - } else if(refx == 1) { - style="large"; - } else { - style="medium"; - } - - if((ii % 6) == 0) out.println("</tr>\n<tr>"); - //out.println("<td class='tagCell'><span onclick=\"retrieveItems('" + tag.getTag() + "')\" class='" + style +"'>" + tag.getTag() + "</span> (" + tag.getRefCount() + ")</td>"); - out.println("<td class='tagCell'><span onclick=\"retrieveItems('" + tag.getTag() + "')\" class='" + style +"'>" + tag.getTag() + "</span></td>"); - ii++; - } -%> - </tr> - </table> - <div id="displayItems" class="items"> - - </div> - </center> - </f:view> - <br/><br/><br/><br/> - <jsp:include page="footer.jsp" /> - - </body> -</html> - -<% - } catch(Exception e) { - e.printStackTrace(); - } -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp deleted file mode 100644 index 05ef352..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp +++ /dev/null @@ -1,45 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: tagItemLookup.jsp,v 1.4 2007/01/19 21:47:31 basler Exp $ --%> - -<%@page contentType="text/xml"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, java.text.NumberFormat, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item, com.sun.javaee.blueprints.petstore.model.Tag"%> - -<% - String sxTag=request.getParameter("tag"); - - try { - response.setHeader("Pragma", "No-Cache"); - response.setHeader("Cache-Control", "no-cache,no-store,max-age=0"); - response.setDateHeader("Expires", 1); - - ServletContext context=config.getServletContext(); - CatalogFacade cf=(CatalogFacade)context.getAttribute("CatalogFacade"); - Tag tag=cf.getTagWithPersistentItems(sxTag); - out.println("<response>"); - - if(tag != null) { - out.println("<tag>" + tag.getTag() + "</tag>"); - out.println("<items>"); - Collection<Item> items=tag.getItems(); - for(Item item : items) { - if(item.getDisabled() == 0) { - out.println("<item>"); - out.println("<itemID>" + item.getItemID() + "</itemID>"); - out.println("<productID>" + item.getProductID() + "</productID>"); - out.println("<name><![CDATA[" + item.getName() + "]]></name>"); - out.println("<description><![CDATA[" + item.getDescription() + "]]></description>"); - out.println("<tags><![CDATA[" + item.tagsAsString() + "]]></tags>"); - out.println("<price><![CDATA[" + NumberFormat.getCurrencyInstance(java.util.Locale.US).format(item.getPrice()) + "]]></price>"); - out.println("</item>"); - } - } - out.println("</items>"); - } - out.println("</response>"); - out.flush(); - } catch(Exception ee) { - ee.printStackTrace(); - } - -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp deleted file mode 100644 index e5dd68a..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%-- -The taglib directive below imports the JSTL library. If you uncomment it, -you must also add the JSTL library to the project. The Add Library... action -on Libraries node in Projects view can be used to add the JSTL 1.1 library. ---%> -<%-- -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> ---%> - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>JSP Page</title> - </head> - <body> - - <h1>JSP Page</h1> - - <%-- - This example uses JSTL, uncomment the taglib directive above. - To test, display the page like this: index.jsp?sayHello=true&name=Murphy - --%> - <%-- - <c:if test="${param.sayHello}"> -  - Hello ${param.name}! - </c:if> - --%> - - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/scripts/assembly.xml b/etc/samples/sample-bundle/src/main/scripts/assembly.xml deleted file mode 100644 index 942e5f9..0000000 --- a/etc/samples/sample-bundle/src/main/scripts/assembly.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0"?> - - - -<assembly> -  - <id></id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <baseDirectory>target/bundle</baseDirectory> - <fileSets> - <fileSet> - <directory>target/bundle</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.sh</exclude> - <exclude>**/*.so</exclude> - <exclude>**/*.sl</exclude> - <exclude>**/*.dylib</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>target/bundle</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>**/*.sh</include> - <include>**/*.so</include> - <include>**/*.sl</include> - <include>**/*.dylib</include> - </includes> - <fileMode>0755</fileMode> - </fileSet> - </fileSets> -</assembly> - diff --git a/etc/samples/sample-bundle/src/main/scripts/build.xml b/etc/samples/sample-bundle/src/main/scripts/build.xml deleted file mode 100644 index fed3f16..0000000 --- a/etc/samples/sample-bundle/src/main/scripts/build.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0"?> - - - -<project name="sample-bundle" basedir="." default="build"> - - <target name="build"> - -  - <property name="tmp.dir" location="${java.io.tmpdir}/${user.name}"/> - <echo>tmp.dir="${tmp.dir}"</echo> - <mkdir dir="${tmp.dir}"/> - - <get src="http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-6.0.0.M3/jboss-a…" - dest="${tmp.dir}/jbossas.zip" - usetimestamp="true"/> - <property name="jboss.home" location="target/jbossas-petstore"/> - <echo>jboss.home="${jboss.home}"</echo> - <mkdir dir="${jboss.home}"/> - <unzip src="${tmp.dir}/jbossas.zip" dest="${jboss.home}"> - <mapper> - <globmapper from="jboss-6.0.0.20100429-M3/*" to="*"/> - </mapper> - </unzip> - -  - <delete includeemptydirs="true"> - <fileset dir="${jboss.home}/server"> - <exclude name="default/**"/> - </fileset> - </delete> - -  - <delete dir="${jboss.home}/docs"/> - <delete> - <fileset dir="${jboss.home}" includes="*.*" /> - </delete> - - <property name="jboss.config.dir" location="${jboss.home}/server/default"/> - - <echo>Copying Derby JDBC driver jar to $${jboss.home}/server/default/lib/...</echo> - <copy file="${settings.localRepository}/org/apache/derby/derbyclient/${derbyclient.version}/derbyclient-${derbyclient.version}.jar" - toDir="${jboss.config.dir}/lib" failonerror="false" verbose="true" /> - -  - <copy todir="${jboss.home}"> - <fileset dir="src/main/petstore"/> - </copy> - - <mkdir dir="target/bundle"/> - -  - <zip destfile="target/bundle/jbossas-petstore.zip" basedir="${jboss.home}"/> - -  - <copy todir="target/bundle"> - <fileset dir="src/main/bundle"/> - </copy> - - </target> - -</project> - commit b661d3a756edffbde2cc92079a7c2b2a078251a7 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jun 28 16:37:11 2010 -0400 [BZ 604471] Make the Bundle Handler resources Services under the platform as opposed to Server resources. In this way the user does not have to explicitly import them and provisioning will be supported out of the box. They do still show up as children under the platform resource. diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java index 50a2f86..33da95d 100644 --- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java +++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java @@ -37,9 +37,9 @@ public class AntBundlePluginDiscoveryComponent implements ResourceDiscoveryCompo HashSet<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>(); String key = "ant-bundle"; - String name = "Ant Bundle Handler"; + String name = "Bundle Handler - Ant"; String version = this.getClass().getPackage().getImplementationVersion(); - String description = "Processes bundles whose recipes are Ant scripts"; + String description = "For provisioning bundles with Ant script recipes"; DiscoveredResourceDetails resource = new DiscoveredResourceDetails(context.getResourceType(), key, name, version, description, null, null); diff --git a/modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml index ce2b150..529507d 100644 --- a/modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml @@ -7,14 +7,23 @@ xmlns="urn:xmlns:rhq-plugin" xmlns:c="urn:xmlns:rhq-configuration"> - - <server name="Ant Bundle Handler Server" + <service name="Ant Bundle Handler" discovery="AntBundlePluginDiscoveryComponent" class="AntBundlePluginComponent" singleton="true" description="This plugin is used to process Ant bundles"> + <runs-inside> + <parent-resource-type name="Windows" plugin="Platforms"/> + <parent-resource-type name="Linux" plugin="Platforms"/> + <parent-resource-type name="Solaris" plugin="Platforms"/> + <parent-resource-type name="HP-UX" plugin="Platforms"/> + <parent-resource-type name="AIX" plugin="Platforms"/> + <parent-resource-type name="FreeBSD" plugin="Platforms"/> + <parent-resource-type name="Mac OS X" plugin="Platforms"/> + </runs-inside> + <bundle type="Ant Bundle" /> - </server> + </service> </plugin> diff --git a/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java b/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java index faae71d..8562eeb 100644 --- a/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java +++ b/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java @@ -37,9 +37,9 @@ public class FileTemplateBundlePluginDiscoveryComponent implements ResourceDisco HashSet<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>(); String key = "file-template-bundle"; - String name = "File Template Bundle Handler"; + String name = "Bundle Handler - File Template"; String version = this.getClass().getPackage().getImplementationVersion(); - String description = "Processes file template bundles"; + String description = "For provisioning bundles with File Template recipes"; DiscoveredResourceDetails resource = new DiscoveredResourceDetails(context.getResourceType(), key, name, version, description, null, null); diff --git a/modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml index a07d411..98132f5 100644 --- a/modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml @@ -8,13 +8,23 @@ xmlns:c="urn:xmlns:rhq-configuration"> - <server name="File Template Bundle Handler Server" + <service name="File Template Bundle Handler" discovery="FileTemplateBundlePluginDiscoveryComponent" class="FileTemplateBundlePluginServerComponent" singleton="true" description="This plugin is used to process File Template bundles"> + <runs-inside> + <parent-resource-type name="Windows" plugin="Platforms"/> + <parent-resource-type name="Linux" plugin="Platforms"/> + <parent-resource-type name="Solaris" plugin="Platforms"/> + <parent-resource-type name="HP-UX" plugin="Platforms"/> + <parent-resource-type name="AIX" plugin="Platforms"/> + <parent-resource-type name="FreeBSD" plugin="Platforms"/> + <parent-resource-type name="Mac OS X" plugin="Platforms"/> + </runs-inside> + <bundle type="File Template Bundle" /> - </server> + </service> </plugin> commit 13c15e74eee55b4910c517419d1e5028a03bf3aa Merge: a76a1d4... 358f16a... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jun 28 16:54:54 2010 -0400 Merge branch 'release-3.0.0' into release-3.0.0-jay commit a76a1d4d666ce8b69fb111f44ee24f69866d1960 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jun 28 16:41:00 2010 -0400 Work In Progress - sample provisioning scripts diff --git a/etc/samples/provisioning/sample-cli/resources/sample-bundle-v1.zip b/etc/samples/provisioning/sample-cli/resources/sample-bundle-v1.zip new file mode 100644 index 0000000..c044d9a Binary files /dev/null and b/etc/samples/provisioning/sample-cli/resources/sample-bundle-v1.zip differ diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js new file mode 100644 index 0000000..5c8d36a --- /dev/null +++ b/etc/samples/provisioning/sample-cli/scripts/cli-1-createBundle.js @@ -0,0 +1,55 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * This sample script shows how to create a Bundle by uploading an existing Bundle Distribution file. + * The Bundle uses the Ant Bundle Type provided with RHQ. + * Prerequisites: + * - The "Ant Bundle Handler Server" resource must be in inventory on the target platforms + */ + +var bundleName = 'test-bundle-upgrade-ant'; +var bundleDistroV1Path = '../resources/sample-bundle-v1.zip'; + +// delete the test bundle if it exists +var bc = new BundleCriteria(); +bc.addFilterName( bundleName ); +var bundles = BundleManager.findBundlesByCriteria( bc ); +if ( null != bundles && bundles.size() > 0 ) { + print( "\nDeleting sample bundle [" + bundleName + "] to re-run sample scripts...") + BundleManager.deleteBundle( bundles.get(0).getId() ); +} + +// create bundleVersion 1.0 for the sample bundle +var distributionFile = new java.io.File(bundleDistroV1Path); +distributionFile = new java.io.File(distributionFile.getAbsolutePath()); +Assert.assertTrue(distributionFile.exists(), "Missing ant bundle distribution file: " + distributionFile); +var bundleVersion1 = BundleManager.createBundleVersionViaFile( distributionFile ); + +print( "\nCreated Bundle [" + bundleVersion1 + "]!") + + + + + + diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js new file mode 100644 index 0000000..e4e61ec --- /dev/null +++ b/etc/samples/provisioning/sample-cli/scripts/cli-2-deployBundle.js @@ -0,0 +1,66 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * Thus test script works with a real env including at least one platform resource and a running agent on + * said platform. It will deploy an original distro file then upgrade it, utilitizing the + * Ant bundle system. + */ + +var TestsEnabled = true; + +var bundleName = 'test-bundle-upgrade-ant'; +var bundleZipFile1 = 'src/test/resources/test-upgrade-bundle-ant1.zip'; +var bundleZipFile2 = 'src/test/resources/test-upgrade-bundle-ant2.zip'; + +// note, super-user, will not test any security constraints +var subject = rhq.login('rhqadmin', 'rhqadmin'); + +executeAllTests(); + +rhq.logout(); + +function testGroupDeployment() { + if ( !TestsEnabled ) { + return; + } + + var groupId = getGroupId(); + var bundleType = getBundleType(); + Assert.assertNotNull(bundleType, "need ant bundle plugin installed for this test"); + + // delete the test bundle if it exists + var bc = new BundleCriteria(); + bc.addFilterName( bundleName ); + var bundles = BundleManager.findBundlesByCriteria( bc ); + if ( null != bundles && bundles.size() > 0 ) { + print( "\nDeleting existing test ant bundle in order to test a fresh deploy...") + BundleManager.deleteBundle( bundles.get(0).getId() ); + } + + // create bundleVersion 1.0 + var distributionFile1 = new java.io.File(bundleZipFile1); + distributionFile1 = new java.io.File(distributionFile1.getAbsolutePath()); + Assert.assertTrue(distributionFile1.exists(), "missing ant bundle file 1: " + distributionFile1); + var testBundleVersion1 = BundleManager.createBundleVersionViaFile( distributionFile1 ); + diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js new file mode 100644 index 0000000..e4e61ec --- /dev/null +++ b/etc/samples/provisioning/sample-cli/scripts/cli-3-upgradeBundle.js @@ -0,0 +1,66 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * Thus test script works with a real env including at least one platform resource and a running agent on + * said platform. It will deploy an original distro file then upgrade it, utilitizing the + * Ant bundle system. + */ + +var TestsEnabled = true; + +var bundleName = 'test-bundle-upgrade-ant'; +var bundleZipFile1 = 'src/test/resources/test-upgrade-bundle-ant1.zip'; +var bundleZipFile2 = 'src/test/resources/test-upgrade-bundle-ant2.zip'; + +// note, super-user, will not test any security constraints +var subject = rhq.login('rhqadmin', 'rhqadmin'); + +executeAllTests(); + +rhq.logout(); + +function testGroupDeployment() { + if ( !TestsEnabled ) { + return; + } + + var groupId = getGroupId(); + var bundleType = getBundleType(); + Assert.assertNotNull(bundleType, "need ant bundle plugin installed for this test"); + + // delete the test bundle if it exists + var bc = new BundleCriteria(); + bc.addFilterName( bundleName ); + var bundles = BundleManager.findBundlesByCriteria( bc ); + if ( null != bundles && bundles.size() > 0 ) { + print( "\nDeleting existing test ant bundle in order to test a fresh deploy...") + BundleManager.deleteBundle( bundles.get(0).getId() ); + } + + // create bundleVersion 1.0 + var distributionFile1 = new java.io.File(bundleZipFile1); + distributionFile1 = new java.io.File(distributionFile1.getAbsolutePath()); + Assert.assertTrue(distributionFile1.exists(), "missing ant bundle file 1: " + distributionFile1); + var testBundleVersion1 = BundleManager.createBundleVersionViaFile( distributionFile1 ); + diff --git a/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js b/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js new file mode 100644 index 0000000..e4e61ec --- /dev/null +++ b/etc/samples/provisioning/sample-cli/scripts/cli-4-revertBundle.js @@ -0,0 +1,66 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2010 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, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** + * Thus test script works with a real env including at least one platform resource and a running agent on + * said platform. It will deploy an original distro file then upgrade it, utilitizing the + * Ant bundle system. + */ + +var TestsEnabled = true; + +var bundleName = 'test-bundle-upgrade-ant'; +var bundleZipFile1 = 'src/test/resources/test-upgrade-bundle-ant1.zip'; +var bundleZipFile2 = 'src/test/resources/test-upgrade-bundle-ant2.zip'; + +// note, super-user, will not test any security constraints +var subject = rhq.login('rhqadmin', 'rhqadmin'); + +executeAllTests(); + +rhq.logout(); + +function testGroupDeployment() { + if ( !TestsEnabled ) { + return; + } + + var groupId = getGroupId(); + var bundleType = getBundleType(); + Assert.assertNotNull(bundleType, "need ant bundle plugin installed for this test"); + + // delete the test bundle if it exists + var bc = new BundleCriteria(); + bc.addFilterName( bundleName ); + var bundles = BundleManager.findBundlesByCriteria( bc ); + if ( null != bundles && bundles.size() > 0 ) { + print( "\nDeleting existing test ant bundle in order to test a fresh deploy...") + BundleManager.deleteBundle( bundles.get(0).getId() ); + } + + // create bundleVersion 1.0 + var distributionFile1 = new java.io.File(bundleZipFile1); + distributionFile1 = new java.io.File(distributionFile1.getAbsolutePath()); + Assert.assertTrue(distributionFile1.exists(), "missing ant bundle file 1: " + distributionFile1); + var testBundleVersion1 = BundleManager.createBundleVersionViaFile( distributionFile1 ); + commit 5c1112f7c170af81986456808ba1fee557c58036 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jun 28 16:37:11 2010 -0400 [BZ 604471] Make the Bundle Handler resources Services under the platform as opposed to Server resources. In this way the user does not have to explicitly import them and provisioning will be supported out of the box. They do still show up as children under the platform resource. diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java index 50a2f86..33da95d 100644 --- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java +++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java @@ -37,9 +37,9 @@ public class AntBundlePluginDiscoveryComponent implements ResourceDiscoveryCompo HashSet<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>(); String key = "ant-bundle"; - String name = "Ant Bundle Handler"; + String name = "Bundle Handler - Ant"; String version = this.getClass().getPackage().getImplementationVersion(); - String description = "Processes bundles whose recipes are Ant scripts"; + String description = "For provisioning bundles with Ant script recipes"; DiscoveredResourceDetails resource = new DiscoveredResourceDetails(context.getResourceType(), key, name, version, description, null, null); diff --git a/modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml index ce2b150..529507d 100644 --- a/modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml @@ -7,14 +7,23 @@ xmlns="urn:xmlns:rhq-plugin" xmlns:c="urn:xmlns:rhq-configuration"> - - <server name="Ant Bundle Handler Server" + <service name="Ant Bundle Handler" discovery="AntBundlePluginDiscoveryComponent" class="AntBundlePluginComponent" singleton="true" description="This plugin is used to process Ant bundles"> + <runs-inside> + <parent-resource-type name="Windows" plugin="Platforms"/> + <parent-resource-type name="Linux" plugin="Platforms"/> + <parent-resource-type name="Solaris" plugin="Platforms"/> + <parent-resource-type name="HP-UX" plugin="Platforms"/> + <parent-resource-type name="AIX" plugin="Platforms"/> + <parent-resource-type name="FreeBSD" plugin="Platforms"/> + <parent-resource-type name="Mac OS X" plugin="Platforms"/> + </runs-inside> + <bundle type="Ant Bundle" /> - </server> + </service> </plugin> diff --git a/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java b/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java index faae71d..8562eeb 100644 --- a/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java +++ b/modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java @@ -37,9 +37,9 @@ public class FileTemplateBundlePluginDiscoveryComponent implements ResourceDisco HashSet<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>(); String key = "file-template-bundle"; - String name = "File Template Bundle Handler"; + String name = "Bundle Handler - File Template"; String version = this.getClass().getPackage().getImplementationVersion(); - String description = "Processes file template bundles"; + String description = "For provisioning bundles with File Template recipes"; DiscoveredResourceDetails resource = new DiscoveredResourceDetails(context.getResourceType(), key, name, version, description, null, null); diff --git a/modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml index a07d411..98132f5 100644 --- a/modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml @@ -8,13 +8,23 @@ xmlns:c="urn:xmlns:rhq-configuration"> - <server name="File Template Bundle Handler Server" + <service name="File Template Bundle Handler" discovery="FileTemplateBundlePluginDiscoveryComponent" class="FileTemplateBundlePluginServerComponent" singleton="true" description="This plugin is used to process File Template bundles"> + <runs-inside> + <parent-resource-type name="Windows" plugin="Platforms"/> + <parent-resource-type name="Linux" plugin="Platforms"/> + <parent-resource-type name="Solaris" plugin="Platforms"/> + <parent-resource-type name="HP-UX" plugin="Platforms"/> + <parent-resource-type name="AIX" plugin="Platforms"/> + <parent-resource-type name="FreeBSD" plugin="Platforms"/> + <parent-resource-type name="Mac OS X" plugin="Platforms"/> + </runs-inside> + <bundle type="File Template Bundle" /> - </server> + </service> </plugin> commit 11ecc3d372952e868fde0c003dae356aebb7adda Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jun 28 16:30:27 2010 -0400 Move etc/samples/sample-bundle to etc/samples/provisioning/sample-bundle diff --git a/etc/samples/provisioning/sample-bundle/pom.xml b/etc/samples/provisioning/sample-bundle/pom.xml new file mode 100644 index 0000000..6bd4a88 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/pom.xml @@ -0,0 +1,92 @@ +<?xml version="1.0"?> + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.rhq.sample</groupId> + <artifactId>rhq-sample-bundle</artifactId> + <version>2.0</version> + <packaging>pom</packaging> + + <name>RHQ Sample Bundle</name> + <description>a sample bundle consisting of JBossAS 6.0 running the Java Petstore application</description> + + <scm> + <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/etc/modules/sample-bundle/</connection> + <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/etc/modules/sample-bundle/</developerConnection> + </scm> + + <properties> +  + <derbyclient.version>10.5.3.0_1</derbyclient.version> + </properties> + + <dependencies> + +  + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbyclient</artifactId> + <version>${derbyclient.version}</version> + </dependency> + + </dependencies> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-bundle</id> + <phase>process-resources</phase> + <configuration> + <tasks> + <echo>settings.localRepository=${settings.localRepository}</echo> + <echo>project.build.outputDirectory=${project.build.outputDirectory}</echo> + <ant antfile="src/main/scripts/build.xml"> + <property name="settings.localRepository" value="${settings.localRepository}"/> + <property name="project.version" value="${project.version}"/> + <property name="project.build.outputDirectory" value="${project.build.outputDirectory}"/> + <property name="derbyclient.version" value="${derbyclient.version}"/> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/scripts/assembly.xml</descriptor> + </descriptors> + <finalName>${project.build.finalName}</finalName> + </configuration> + <executions> + <execution> + <id>assemble-bundle</id> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/bundle/deploy.xml b/etc/samples/provisioning/sample-bundle/src/main/bundle/deploy.xml new file mode 100644 index 0000000..8bfec17 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/bundle/deploy.xml @@ -0,0 +1,57 @@ +<?xml version="1.0"?> + +<project name="petstore" default="main" + xmlns:rhq="antlib:org.rhq.bundle"> + + <rhq:bundle name="Java Petstore" version="2.0" + description="a sample bundle consisting of JBossAS 6.0 running the Java Petstore application"> + + <rhq:input-property + name="jboss.bind.address" + description="the IP address the JBoss AS server should bind to" + required="true"/> + + <rhq:input-property + name="http.port" + description="the HTTP port the JBoss AS server should listen on" + required="true" + type="integer"/> + + <rhq:input-property + name="https.port" + description="the HTTPS port the JBoss AS server should listen on" + required="true" + type="integer"/> + + <rhq:deployment-unit name="appserver" + preinstallTarget="appserver-preinstall" postinstallTarget="appserver-postinstall"> + <rhq:system-service name="jbossas-petstore" scriptFile="jbossas-init-script" + configFile="jbossas-init-config" overwriteScript="true" + startLevels="3,4,5" startPriority="80" stopPriority="20"/> + + <rhq:archive name="jbossas-petstore.zip"/> + +  + <rhq:ignore> + <rhq:fileset> + <include name="server/default/data/**"/> + <include name="server/default/logs/**"/> + <include name="server/default/tmp/**"/> + <include name="server/default/work/**"/> + </rhq:fileset> + </rhq:ignore> + </rhq:deployment-unit> + + </rhq:bundle> + + <target name="main"/> + + <target name="appserver-preinstall"> + <echo>Installing Java Petstore App Server to ${rhq.deploy.dir}...</echo> + </target> + + <target name="appserver-postinstall"> + <echo>Done installing Java Petstore App Server to ${rhq.deploy.dir}.</echo> + </target> + +</project> diff --git a/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-config b/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-config new file mode 100644 index 0000000..a2fc4c1 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-config @@ -0,0 +1,69 @@ +# Configuration file for jbossas init script that configures the +# settings needed to start a particular JBoss AS instance. + +# +# the JBoss AS installation directory (e.g. /opt/jboss-6.0.0.M1) +# (*REQUIRED*) +# +JBOSS_HOME="@@rhq.deploy.dir@@" + +# +# the args that will be passed to run.sh +# (i.e. org.jboss.Main). +# +JBOSS_OPTS="-b @@jboss.bind.address@@" + +# What UNIX user the JBoss AS java process will run as. +# (The shutdown client is always run as the invoker of the +# init script). JBoss AS will be run as root by default, but, for +# the sake of security, it is recommended that you chown the JBoss +# AS installation files to a non-root user and use that use here. +# Note, you do need to run as root if your server will listen on one +# or more privileged (< 1024) ports. If you really do want to run as +# root, comment out the JBOSS_USER variable completely (i.e. do not +# set it to root). This will run the server process without "su". +#JBOSS_USER=jboss + +# +# Specify the maximum file descriptor limit, use "max" or "maximum" to use +# the default, as queried by the system. +# +# Defaults to "maximum" +# +#MAX_FD="maximum" + +# +# Specify the profiler configuration file to load. +# +# Default is to not load profiler configuration file. +# +#PROFILER= + +# +# Specify the location of the Java Rntime Environment (JRE) or +# Java Development Kit (JDK) installation directory. If not set, +# "/usr/java/default" will be used. +# +#JAVA_HOME="/usr/java/default" + +# +# Specify options to pass to the Java VM (if unset, a default +# set of options will be used). +# +# Note, if you want to pass the default options but some of +# your own additional options in, then set the +# ADDITIONAL_JAVA_OPTS variable (see below), rather than JAVA_OPTS. +# +#JAVA_OPTS="-Xms128M -Xmx512M -XX:MaxPermSize=256M -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djava.net.preferIPv4Stack=true" + +# +# Specify additional options to pass to the Java VM. These are passed +# in addition to the default set of options, +# i.e. java $JAVA_OPTS $ADDITIONAL_JAVA_OPTS ... org.jboss.Main ... +# +# Sample JPDA settings (uncomment either a) or b)) +# a) remote socket debugging +#ADDITIONAL_JAVA_OPTS="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" +# b) shared memory debugging +#ADDITIONAL_JAVA_OPTS="-Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss" + diff --git a/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-script b/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-script new file mode 100644 index 0000000..58eb98e --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/bundle/jbossas-init-script @@ -0,0 +1,328 @@ +#!/bin/bash +# +# jbossas - This shell script takes care of starting and stopping +# a JBoss Application Server (AS) instance on a Red Hat +# Linux system. It can be run as a system service (init +# script) and/or run manually. +# +# chkconfig: 345 84 16 +# description: JBoss AS server +# processname: java +# pidfile: /var/run/jbossas.pid + +# Source init-script function library. +FUNCTIONS=/etc/rc.d/init.d/functions +if [ ! -f "$FUNCTIONS" ]; then + echo "Functions library ($FUNCTIONS) not found." >&2 + exit 1 +fi +. $FUNCTIONS + +# Find the name of this service (e.g. "jbossas"). +NAME=`basename $0` +if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]; then + NAME=${NAME:3} +fi + +# Set names of pid, lock, and log files - all based on the service name. +PIDFILE="/var/run/$NAME.pid" +LOCKFILE="/var/lock/subsys/$NAME" +LOGFILE="/var/log/$NAME.log" + +# Set defaults for optional configuration variables. +JAVA_HOME="/usr/java/default" +JAVA_OPTS="-Xms128M -Xmx512M -XX:MaxPermSize=256M" +JAVA_OPTS="$JAVA_OPTS -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" +# (Prefer IPv4 stack as as temporary workaround to avoid 'all' config startup +# issues from IPv4 multicast addresses. See JBAS-7936.) +JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true" + +# Source the service's config file, potentially overriding the defaults set +# above. +CONFIG="/etc/sysconfig/${NAME}" +if [ ! -f "$CONFIG" ]; then + echo "Required configuration file $CONFIG not found." >&2 + exit 1 +fi +. "$CONFIG" + +# Bail out if required variables were not set in the config file. +if [ -z "$JBOSS_HOME" ]; then + echo "Required variable JBOSS_HOME was not set in $CONFIG." >&2 + exit 1 +fi + + +start() +{ + # See if the service is already running, and, if so, exit with an error. + PID=`pidfileofproc "$NAME"` + if [ -n "$PID" ]; then + # pid file exists - see if process is actually running. + kill -0 $PID 2>/dev/null + if [ $? -eq 0 ]; then + echo "$NAME service is already running (pid=$PID)." >&2 + exit 1 + else + echo "Removing bogus pid file $PIDFILE..." + rm -f "$PIDFILE" + if [ -f "$LOCKFILE" ]; then + echo "Removing bogus lock file $LOCKFILE..." + rm -f "$LOCKFILE" + fi + fi + fi + + # Check that JAVA_HOME is valid. + JAVA="$JAVA_HOME/bin/java" + if [ ! -f "$JAVA" ]; then + echo "Java not found at $JAVA - please set JAVA_HOME in $CONFIG." >&2 + exit 1 + fi + if [ ! -x "$JAVA" ]; then + echo "$JAVA is not executable." >&2 + exit 5 + fi + + # Setup the classpath + JBOSS_BOOT_CLASSPATH="$JBOSS_HOME/bin/run.jar" + if [ ! -f "$JBOSS_BOOT_CLASSPATH" ]; then + echo "Missing required file: $JBOSS_BOOT_CLASSPATH" >&2 + exit 1 + fi + + # By default, Tomcat uses the JDT Compiler for compiling JSPs. However, + # include tools.jar in the classpath if we can find it under JAVA_HOME + # or if the user specified it via the JAVAC_JAR variable. + JAVAC_JAR_FILE="${JAVAC_JAR:-$JAVA_HOME/lib/tools.jar}" + if [ ! -f "$JAVAC_JAR_FILE" ]; then + [ -n "$JAVAC_JAR" ] && echo "Missing javac jar file $JAVAC_JAR as defined by the JAVAC_JAR variable. Unexpected results may occur." + unset JAVAC_JAR_FILE + fi + + # If -server not set in JAVA_OPTS, set it, if supported. + SERVER_SET=`echo $JAVA_OPTS | grep "\-server"` + if [ -z "$SERVER_SET" ]; then + # Check for Sun JVM w/ HotSpot support. + HAS_HOTSPOT=`"$JAVA" -version 2>&1 | grep -i HotSpot` + + # Check for OpenJDK JVM w/ server support. + HAS_OPENJDK=`"$JAVA" -version 2>&1 | grep -i OpenJDK` + + # Enable -server if we have Hotspot or OpenJDK, unless we can't + if [ -n "$HAS_HOTSPOT" ] || [ -n "$HAS_OPENJDK" ]; then + JAVA_OPTS="-server $JAVA_OPTS" + fi + fi + + # Setup JBoss-specific properties. + JAVA_OPTS="-Dprogram.name=$NAME $JAVA_OPTS" + + # Setup JBoss Native library path. + unset JBOSS_NATIVE_DIR + for DIR in "$JBOSS_HOME/../native/lib" "$JBOSS_HOME/../native" "$JBOSS_HOME/../native/lib64" "$JBOSS_HOME/native/lib64" "$JBOSS_HOME/native/bin" "$JBOSS_HOME/bin/native"; do + if [ -d "$DIR" ]; then + JBOSS_NATIVE_DIR=`cd "$DIR/.." && pwd` + break + fi + done + if [ -d "$JBOSS_NATIVE_DIR" ]; then + IS_64_BIT_JVM=`"$JAVA" $JAVA_OPTS -version 2>&1 | grep -i 64-bit` + if [ -n "$IS_64_BIT_JVM" ]; then + JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64" + else + JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib" + fi + LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH + JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$LD_LIBRARY_PATH" + fi + + # Setup the Java endorsed dirs. + JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=\"$JBOSS_ENDORSED_DIRS\"" + + # Setup the Java classpath. + JBOSS_CLASSPATH="${JBOSS_CLASSPATH:+$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH}" + JBOSS_CLASSPATH="${JBOSS_CLASSPATH:-$JBOSS_BOOT_CLASSPATH}" + JBOSS_CLASSPATH="$JBOSS_CLASSPATH${JAVAC_JAR_FILE:+:$JAVAC_JAR_FILE}" + JAVA_OPTS="$JAVA_OPTS -classpath \"$JBOSS_CLASSPATH\"" + + # Display a summary of our environment if we're associated with a terminal. + if tty -s; then + echo "========================================================================="; echo + echo " JBoss AS Bootstrap Environment" ; echo + echo " JBOSS_HOME: $JBOSS_HOME" ; echo + echo " JAVA: $JAVA" ; echo + echo " JAVA_OPTS: $JAVA_OPTS" ; echo + echo " JBOSS_OPTS: $JBOSS_OPTS" ; echo + echo "========================================================================="; echo + fi + + # JBoss AS expects its current working dir to be $JBOSS_HOME/bin + cd "$JBOSS_HOME/bin" + + # JBoss AS expects JBOSS_HOME to be set in its environment. + export JBOSS_HOME + + # We only need to bother with nohup if we're associated with a terminal. + if tty -s; then + NOHUP=nohup + else + unset NOHUP + fi + + # If they set NICELEVEL in the config file, honor it. + [ -n "${NICELEVEL:-}" ] && NICE="nice -n $NICELEVEL" + + # If JBOSS_USER was specified in the config and current user is root, we + # want to setuid the JBoss AS process to JBOSS_USER. + if [ -n "$JBOSS_USER" ] && [ "$EUID" -eq 0 ]; then + # For SELinux we need to use 'runuser', not 'su'. + if [ -x /sbin/runuser ]; then + SU=runuser + else + SU=su + fi + else + unset SU + fi + + if [ -n "$SU" ]; then + WRAPPER="$NOHUP $NICE $SU -s /bin/bash - $JBOSS_USER -c" + else + WRAPPER="$NOHUP $NICE bash -c" + fi + + # Make sure log file exists and has correct ownership and permissions. + if [ "$EUID" -eq 0 ]; then + touch -a "$LOGFILE" || exit 4 + [ -n "$JBOSS_USER" ] && chown $JBOSS_USER "$LOGFILE" + [ -n "$JBOSS_GROUP" ] && chgrp $JBOSS_GROUP "$LOGFILE" + chmod u=rw "$LOGFILE" + [ -n "$JBOSS_GROUP" ] && chmod g+r "$LOGFILE" + [ -x /sbin/restorecon ] && /sbin/restorecon "$LOGFILE" + fi + + # Make sure pid file has correct ownership and permissions. + if [ "$EUID" -eq 0 ] && [ -f "$PIDFILE" ]; then + [ -n "$JBOSS_USER" ] && chown $JBOSS_USER "$PIDFILE" + [ -n "$JBOSS_GROUP" ] && chgrp $JBOSS_GROUP "$PIDFILE" + chmod u=rw "$PIDFILE" + [ -n "$JBOSS_GROUP" ] && chmod g+r + [ -x /sbin/restorecon ] && /sbin/restorecon "$PIDFILE" + fi + + echo -n "Starting $NAME service: " + + # Make sure to escape the $$'s within the subshell to prevent our own shell + # from evaluating them and writing our own pid to the pid file. + $WRAPPER "echo \$\$ >\"$PIDFILE\" || ( echo \"Failed to write pid (\$\$) to $PIDFILE.\" >&2; exit 4 ); exec \"$JAVA\" $JAVA_OPTS org.jboss.Main $JBOSS_OPTS" >>"$LOGFILE" 2>&1 & + if [ $? -ne 0 ]; then + failure "$NAME startup" + echo + EXIT_STATUS=$? + fi + + # Wait a few seconds and then check that the process is running. Note, this + # will *not* verify that JBoss AS started properly without any configuration + # or deployment errors. + sleep 3 + + if pidfileofproc "$NAME"; then + success "$NAME startup" + echo + touch "$LOCKFILE" + EXIT_STATUS=0 + else + failure "$NAME startup" + echo + EXIT_STATUS=1 + fi +} + +stop() +{ + # See if service is running, and, if not, exit without any error. + PID=`pidfileofproc "$NAME"` + unset NOT_RUNNING + if [ -z "$PID" ]; then + NOT_RUNNING=1 + else + # pid file exists - see if process is actually running. + kill -0 $PID 2>/dev/null + if [ $? -ne 0 ]; then + NOT_RUNNING=1 + if [ -f "$PIDFILE" ]; then + echo "Removing bogus pid file $PIDFILE..." + rm -f "$PIDFILE" + fi + if [ -f "$LOCKFILE" ]; then + echo "Removing bogus lock file $LOCKFILE..." + rm -f "$LOCKFILE" + fi + fi + fi + if [ -n "$NOT_RUNNING" ]; then + echo "$NAME service is not running." + exit 0 + fi + + echo -n "Stopping $NAME service: " + killproc -d 30 "$NAME" + EXIT_STATUS=$? + if [ $EXIT_STATUS -eq 0 ]; then + rm -f "$LOCKFILE" + fi + echo +} + +# NOTE: We don't name this function 'status', since that would override the +# 'status function defined in /etc/init.d/functions. +_status() +{ + status "$NAME" + EXIT_CODE=$? +} + +restart() +{ + stop || exit $? + start +} + +condrestart() +{ + [ -f "$PIDFILE" ] && restart +} + +usage() +{ + echo "Usage: $NAME {start|stop|status|restart|condrestart}" >&2 + EXIT_CODE=2 +} + +# The +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + _status + ;; + restart) + restart + ;; + condrestart) + condrestart + ;; + *) + usage + ;; +esac + +exit $EXIT_STATUS + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/petstore-db.changelog.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/petstore-db.changelog.xml new file mode 100644 index 0000000..42ced88 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/petstore-db.changelog.xml @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd"> + <changeSet author="ips (generated)" id="1272025063915-1"> + <createTable schemaName="APP" tableName="ADDRESS"> + <column name="ADDRESSID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635960"/> + </column> + <column name="STREET1" type="VARCHAR(55)"> + <constraints nullable="false"/> + </column> + <column name="STREET2" type="VARCHAR(55)"/> + <column name="CITY" type="VARCHAR(55)"> + <constraints nullable="false"/> + </column> + <column name="STATE" type="VARCHAR(25)"> + <constraints nullable="false"/> + </column> + <column name="ZIP" type="VARCHAR(5)"> + <constraints nullable="false"/> + </column> + <column name="LATITUDE" type="DECIMAL(14,10)"> + <constraints nullable="false"/> + </column> + <column name="LONGITUDE" type="DECIMAL(14,10)"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-2"> + <createTable schemaName="APP" tableName="CATEGORY"> + <column name="CATEGORYID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635550"/> + </column> + <column name="NAME" type="VARCHAR(25)"> + <constraints nullable="false"/> + </column> + <column name="DESCRIPTION" type="VARCHAR(255)"> + <constraints nullable="false"/> + </column> + <column name="IMAGEURL" type="VARCHAR(55)"/> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-3"> + <createTable schemaName="APP" tableName="ID_GEN"> + <column name="GEN_KEY" type="VARCHAR(20)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636590"/> + </column> + <column name="GEN_VALUE" type="INT"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-4"> + <createTable schemaName="APP" tableName="ITEM"> + <column name="ITEMID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636230"/> + </column> + <column name="PRODUCTID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + <column name="NAME" type="VARCHAR(30)"> + <constraints nullable="false"/> + </column> + <column name="DESCRIPTION" type="VARCHAR(500)"> + <constraints nullable="false"/> + </column> + <column name="IMAGEURL" type="VARCHAR(55)"/> + <column name="IMAGETHUMBURL" type="VARCHAR(55)"/> + <column name="PRICE" type="DECIMAL(14,2)"> + <constraints nullable="false"/> + </column> + <column name="ADDRESS_ADDRESSID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + <column name="CONTACTINFO_CONTACTINFOID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + <column name="TOTALSCORE" type="INT"> + <constraints nullable="false"/> + </column> + <column name="NUMBEROFVOTES" type="INT"> + <constraints nullable="false"/> + </column> + <column name="DISABLED" type="INT"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-5"> + <createTable schemaName="APP" tableName="PRODUCT"> + <column name="PRODUCTID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635740"/> + </column> + <column name="CATEGORYID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + <column name="NAME" type="VARCHAR(25)"> + <constraints nullable="false"/> + </column> + <column name="DESCRIPTION" type="VARCHAR(255)"> + <constraints nullable="false"/> + </column> + <column name="IMAGEURL" type="VARCHAR(55)"/> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-6"> + <createTable schemaName="APP" tableName="SELLERCONTACTINFO"> + <column name="CONTACTINFOID" type="VARCHAR(10)"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636080"/> + </column> + <column name="LASTNAME" type="VARCHAR(24)"> + <constraints nullable="false"/> + </column> + <column name="FIRSTNAME" type="VARCHAR(24)"> + <constraints nullable="false"/> + </column> + <column name="EMAIL" type="VARCHAR(24)"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-7"> + <createTable schemaName="APP" tableName="TAG"> + <column name="TAGID" type="INT"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636830"/> + </column> + <column name="TAG" type="VARCHAR(30)"> + <constraints nullable="false"/> + </column> + <column name="REFCOUNT" type="INT"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-8"> + <createTable schemaName="APP" tableName="TAG_ITEM"> + <column name="TAGID" type="INT"> + <constraints nullable="false"/> + </column> + <column name="ITEMID" type="VARCHAR(10)"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-9"> + <createTable schemaName="APP" tableName="ZIPLOCATION"> + <column name="ZIPCODE" type="INT"> + <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636710"/> + </column> + <column name="CITY" type="VARCHAR(30)"> + <constraints nullable="false"/> + </column> + <column name="STATE" type="VARCHAR(2)"> + <constraints nullable="false"/> + </column> + </createTable> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-10"> + <createIndex indexName="SQL100422173636831" schemaName="APP" tableName="TAG" unique="true"> + <column name="TAG"/> + </createIndex> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-11"> + <createIndex indexName="SQL100422173637010" schemaName="APP" tableName="TAG_ITEM" unique="true"> + <column name="TAGID"/> + <column name="ITEMID"/> + </createIndex> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-12"> + <addForeignKeyConstraint baseColumnNames="ADDRESS_ADDRESSID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636231" deferrable="false" initiallyDeferred="false" referencedColumnNames="ADDRESSID" referencedTableName="ADDRESS" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-13"> + <addForeignKeyConstraint baseColumnNames="CONTACTINFO_CONTACTINFOID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636233" deferrable="false" initiallyDeferred="false" referencedColumnNames="CONTACTINFOID" referencedTableName="SELLERCONTACTINFO" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-14"> + <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636232" deferrable="false" initiallyDeferred="false" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-15"> + <addForeignKeyConstraint baseColumnNames="CATEGORYID" baseTableName="PRODUCT" baseTableSchemaName="APP" constraintName="SQL100422173635741" deferrable="false" initiallyDeferred="false" referencedColumnNames="CATEGORYID" referencedTableName="CATEGORY" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-16"> + <addForeignKeyConstraint baseColumnNames="ITEMID" baseTableName="TAG_ITEM" baseTableSchemaName="APP" constraintName="SQL100422173637011" deferrable="false" initiallyDeferred="false" referencedColumnNames="ITEMID" referencedTableName="ITEM" referencedTableSchemaName="APP"/> + </changeSet> + <changeSet author="ips (generated)" id="1272025063915-17"> + <addForeignKeyConstraint baseColumnNames="TAGID" baseTableName="TAG_ITEM" baseTableSchemaName="APP" constraintName="SQL100422173637012" deferrable="false" initiallyDeferred="false" referencedColumnNames="TAGID" referencedTableName="TAG" referencedTableSchemaName="APP"/> + </changeSet> +</databaseChangeLog> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml new file mode 100644 index 0000000..ae5ea7c --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<datasources> + + <local-tx-datasource> + +  +  + <jndi-name>jdbc/PetstoreDB</jndi-name> + +  + <connection-url>jdbc:derby://localhost:1527/petstore;create=true</connection-url> + +  + <driver-class>org.apache.derby.jdbc.ClientDriver</driver-class> + +  + <user-name>APP</user-name> + <password>APP</password> + +  + <min-pool-size>5</min-pool-size> + +  + <max-pool-size>20</max-pool-size> + +  + <idle-timeout-minutes>5</idle-timeout-minutes> + +  + <track-statements/> + + </local-tx-datasource> + +</datasources> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml new file mode 100644 index 0000000..eadc0f4 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4"> + + <display-name>Java Pet Store</display-name> + + <module> + <web> + <web-uri>petstore.war</web-uri> + <context-root>/petstore</context-root> + </web> + </module> + + <module> + <ejb>petstore-ejb.jar</ejb> + </module> + +</application> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml new file mode 100644 index 0000000..76e0703 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> + + <persistence-unit name="PetstorePu"> + <description>Petstore Persistence Unit</description> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>java:jdbc/PetstoreDB</jta-data-source> + <non-jta-data-source>java:jdbc/PetstoreDB</non-jta-data-source> + <properties> + <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/> + <property name="hibernate.connection.username" value="APP"/> + <property name="hibernate.connection.password" value="APP"/> + <property name="hibernate.format_sql" value="true"/> + </properties> + </persistence-unit> + +</persistence> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class new file mode 100644 index 0000000..c9dc392 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class new file mode 100644 index 0000000..be2275b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class new file mode 100644 index 0000000..8842106 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class new file mode 100644 index 0000000..dda3feb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class new file mode 100644 index 0000000..b5dbe74 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class new file mode 100644 index 0000000..1b5785b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class new file mode 100644 index 0000000..591af10 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF new file mode 100644 index 0000000..7a679c4 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.7.1 +Created-By: 16.0-b13 (Sun Microsystems Inc.) + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class new file mode 100644 index 0000000..abac5a6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class new file mode 100644 index 0000000..7d7af77 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class new file mode 100644 index 0000000..b8bfa4d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class new file mode 100644 index 0000000..8c469f4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class new file mode 100644 index 0000000..e2b4ca5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class new file mode 100644 index 0000000..223289e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class new file mode 100644 index 0000000..61f3863 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class new file mode 100644 index 0000000..7c149e3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class new file mode 100644 index 0000000..c5fb59a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class new file mode 100644 index 0000000..65d4cdb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class new file mode 100644 index 0000000..1ee72ad Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class new file mode 100644 index 0000000..f56c35e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class new file mode 100644 index 0000000..56fc53d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class new file mode 100644 index 0000000..ee55705 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class new file mode 100644 index 0000000..30e70ab Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class new file mode 100644 index 0000000..dd5b7c1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class new file mode 100644 index 0000000..03400b2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class new file mode 100644 index 0000000..23a204c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class new file mode 100644 index 0000000..18f8102 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class new file mode 100644 index 0000000..b6e2b0d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class new file mode 100644 index 0000000..be21196 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class new file mode 100644 index 0000000..185dc01 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class new file mode 100644 index 0000000..18b3463 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class new file mode 100644 index 0000000..0c448bf Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class new file mode 100644 index 0000000..4a19fad Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class new file mode 100644 index 0000000..a8b6521 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class new file mode 100644 index 0000000..2b42389 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class new file mode 100644 index 0000000..8ab0084 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class new file mode 100644 index 0000000..a4cc2bf Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class new file mode 100644 index 0000000..50007c4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class new file mode 100644 index 0000000..1ef9761 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class new file mode 100644 index 0000000..5570fac Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties new file mode 100644 index 0000000..112905d --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties @@ -0,0 +1,10 @@ +index.exception=An exception was encountered while indexing the data. Please checked to make sure there indexes are not locked by another user. +index.sql.statement=Select statement used for retrieving database data "{0}" +search.string=Searching indexes for string "{0}" +search.results=Search String returned "{0}" hits +search.exception=An exception was encountered while performing the search. Please check to make sure the indexes exist. +fileupload.persist.exception=Error persisting seller data +fileupload.rollback.exception=Persisting seller data, rollback failed +geocoder.lookup.exception=The GeoCode address lookup from Yahoo has returned and Exception +image_does_not_exist=The image doesn't exist in the default image directory or in the upload directory "{0}" +resource_bundle_does_not_exist=The MessageStrings.properties file does not exist!. diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties new file mode 100644 index 0000000..7ca2d9d --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties @@ -0,0 +1,10 @@ +invalid_contact_firstname=First Name is required. +invalid_contact_lastname=Last Name is required. +invalid_address_street1=Street is required. +invalid_address_city=City is required. +invalid_address_state=State is required. +invalid_address_zip=Zip Code is required. +invalid_item_name=Pet Name is required. +invalid_item_description=The Description should exist and the field can't have a '<script>' and/or a '<link>' tag in it. +invalid_item_price=Price should should exist and be a number greater or equal to 0. +invalid_item_imageurl=The image upload file must exist and be of type '.jpg', '.gif' or '.png'. diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class new file mode 100644 index 0000000..5aa4b42 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class new file mode 100644 index 0000000..a521d71 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml new file mode 100644 index 0000000..22f03df --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml @@ -0,0 +1,94 @@ +<?xml version='1.0' encoding='UTF-8'?> + + + +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" + version="1.2"> +  + +  + <managed-bean> + <managed-bean-name>SearchBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.search.SearchBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>RatingBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.model.RatingBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>itemId</property-name> + <value>#{param.itemIdBinding}</value> + </managed-property> + </managed-bean> + + <managed-bean> + <managed-bean-name>PayPalBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.model.PayPalBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>FileUploadBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.FileUploadBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>MapBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.mapviewer.MapBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>AutocompleteBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.AutocompleteBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <managed-bean> + <managed-bean-name>AddressBean</managed-bean-name> + <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.AddressBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + +  + <navigation-rule> + <from-view-id>/mapLocation.jsp</from-view-id> + <navigation-case> + <from-outcome>map</from-outcome> + <to-view-id>/map.jsp</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/mapAll.jsp</from-view-id> + <navigation-case> + <from-outcome>map</from-outcome> + <to-view-id>/map.jsp</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/map.jsp</from-view-id> + <navigation-case> + <to-view-id>/mapLocation.jsp</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/search.jsp</from-view-id> + <navigation-case> + <from-outcome>displayResults</from-outcome> + <to-view-id>/search.jsp</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>map</from-outcome> + <to-view-id>/map.jsp</to-view-id> + </navigation-case> + </navigation-rule> + +</faces-config> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml new file mode 100644 index 0000000..0862993 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-web> + <resource-ref> + <res-ref-name>jdbc/PetstoreDB</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <jndi-name>java:jdbc/PetstoreDB</jndi-name> + </resource-ref> +</jboss-web> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar new file mode 100644 index 0000000..f6bd6d2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar new file mode 100644 index 0000000..fc5763d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar new file mode 100644 index 0000000..b2867cd Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar new file mode 100644 index 0000000..2ff9bbd Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar new file mode 100644 index 0000000..288e64c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar new file mode 100644 index 0000000..db6456f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar new file mode 100644 index 0000000..27d2ad3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar new file mode 100644 index 0000000..c2a26da Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar new file mode 100644 index 0000000..128045d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml new file mode 100644 index 0000000..a9c411b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd"> +<sun-web-app error-url=""> + <context-root>/petstore</context-root> + <class-loader delegate="true"/> + <jsp-config> + <property name="classdebuginfo" value="true"> + <description>Enable debug info compilation in the generated servlet class</description> + </property> + <property name="mappedfile" value="true"> + <description>Maintain a one-to-one correspondence between static content and the generated servlet class' java code</description> + </property> + </jsp-config> +</sun-web-app> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml new file mode 100644 index 0000000..6c65069 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>Petstore</display-name> + <filter> + <filter-name>CaptchaValidateFilter</filter-name> + <filter-class>com.sun.javaee.blueprints.petstore.controller.CaptchaValidateFilter</filter-class> + </filter> + <filter> + <filter-name>EntryFilter</filter-name> + <filter-class>com.sun.javaee.blueprints.petstore.controller.EntryFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>EntryFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>CaptchaValidateFilter</filter-name> + <url-pattern>/faces/dynamic/bpui_fileupload_handler/handleFileUpload</url-pattern> + </filter-mapping> + <listener> + <listener-class>com.sun.javaee.blueprints.petstore.model.CatalogFacade</listener-class> + </listener> + + <servlet> + <display-name>ControllerServlet</display-name> + <servlet-name>ControllerServlet</servlet-name> + <servlet-class>com.sun.javaee.blueprints.petstore.controller.ControllerServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/catalog</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/controller</url-pattern> + </servlet-mapping> + + <context-param> + <description> + Google Maps authorization key for "http://localhost:8080/" + To use a another URL a new map key will have to be generated from http://www.google.com/apis/maps/ + </description> + <param-name>com.sun.j2ee.blueprints.ui.mapviewer.KEY</param-name> + <param-value>ABQIAAAAyQYKk4__l80DyIsqLPvvuxTwM0brOpm-All5BF6PoaKBxRWWERSt2NPUufvDhWGdrb-pCzTZQ2vi2A</param-value> + </context-param> + + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>false</param-value> + </context-param> + + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>false</param-value> + </context-param> + + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value>/WEB-INF/faces-config.xml</param-value> + </context-param> + +  + <context-param> + <param-name>proxyHost</param-name> + <param-value></param-value> + </context-param> + <context-param> + <param-name>proxyPort</param-name> + <param-value></param-value> + </context-param> +  + <context-param> + <param-name>entryPages</param-name> + <param-value>.jpg|.gif|index.html|index.jsp|fileupload.jsp|search.jsp|catalog.jsp|mapAll.jsp|tag.jsp|news.jsp</param-value> + </context-param> + + +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + +  + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/faces/CaptchaServlet</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/ImageServlet/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>ControllerServlet</servlet-name> + <url-pattern>/TagServlet/*</url-pattern> + </servlet-mapping> + <error-page> + <exception-type>java.lang.RuntimeException</exception-type> + <location>/systemerror.jsp</location> + </error-page> + <resource-ref> + <res-ref-name>jdbc/PetstoreDB</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + <res-sharing-scope>Shareable</res-sharing-scope> + </resource-ref> +</web-app> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css new file mode 100644 index 0000000..14c6ed0 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css @@ -0,0 +1 @@ +.accordion { width:150px; height:400px; border-width:1px; border-style:solid; border-color:black; background:#404040; } .accordionBody { width:160px; height:400px; border-width:1px; border-style:solid; border-color:black; background:#404040; } .accordionTitle { vertical-align: top; padding-top: 10px; text-align: center; width:150px; height:90px; color:white; font-size:22px; font-weight: bold; background:black; opacity: .99; } .accordionRow { color:white; cursor: pointer; font-size:18px; font-weight: bold; vertical-align: middle; padding-top: 5px; text-align: center; width:150px; height:40px; background:#104E8B; opacity: .99; } .accordionProduct { text-align: center; width:150px; color:white; font-size:12px; font-weight: bold; background:#104E8B; opacity: .99; } .accordionLink { cursor: pointer; text-decoration: none; color:white; } .accordionLinkSelected { text-align: center; width:150px; color:red; font-size:12px; font-weight: bold; background:black; opacity: .99; } .accordionLinkHover { text-decoration: underline; color:white; } \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js new file mode 100644 index 0000000..1c1ee6b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js @@ -0,0 +1,249 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: accordion.js,v 1.22 2006/05/03 22:00:32 inder Exp $ */ + +function AccordionMenu () { + + dojo.event.topic.subscribe("/accordion", this, this.handleEvent); + + var displayPortWidth = 100; + var HEIGHT = 400; + + var EXPANDED_HEIGHT = 125; + var ITEM_HEIGHT = 55; + var INCREMENT = 10; + + var timeout = 5; // in ms + + var accordion = document.getElementById("accordionBody"); + var divs = []; + var oExpandedIndex = -1; + var nExpandedIndex = -1; + var oHeight = ITEM_HEIGHT; + var nHeight = ITEM_HEIGHT; + var tHeight = 165; + var expanding = false; + var categories; + + // while control the inline debug statements + var debug = false; + var status = document.getElementById("status"); + + function Row(id, div, defaultHeight) { + this.id = id; + this.div = div; + //this.height = height; + this.h = defaultHeight; + this.div.style.height = defaultHeight + "px" + } + + Row.prototype.setHeight = function(nH) { + this.h = nH; + this.div.style.height = nH + "px"; + // re-adjust for ie in that it does not follow the boxmodel + if (this.div.offsetHeight > nH) { + this.div.style.height = (nH - (this.div.offsetHeight - nH)) + 'px'; + } + } + + Row.prototype.getTotalHeight = function() { + return this.div.offsetHeight; + } + + Row.prototype.getHeight = function() { + return this.h; + } + + this.handleEvent = function(args) { + if (args.type) { + if (args.type == 'expand') { + var targetRow = args.targetRow; + initiateExpansion(targetRow); + } + } + } + + this.load = function(lcategories) { + categories = lcategories; + // create all the rows + for (var l=0; l < categories.length; l++) { + var row = createRow(l,"accordionRow", ITEM_HEIGHT); + createLinks(row.div, categories[l].name, l, "accordionLink"); + divs.push(row); + } + } + + function showStatus() { + if (debug) { + var stat = "oExpandedIndex=" + oExpandedIndex + " " ; + for (var i=0; i < divs.length; i++) { + stat = stat + i + "=" + divs[i].getTotalHeight() + " "; + } + status.innerHTML = stat + " total height=" + accordion.offsetHeight; + var totalH = 0; + var tH = 0; + for (var i=0; i < divs.length; i++) { + totalH = totalH + divs[i].getHeight(); + tH = tH + divs[i].getTotalHeight(); + } + } + } + + this.showCategory = function(catid) { + for (var l=0; l < categories.length; l++) { + if (catid == categories[l].name) { + // now tell the scroller to load the first product + initiateExpansion(l); + if (categories[l].products[0]) { + dojo.event.topic.publish("/catalog", {type:"showProducts", productId:categories[l].products[0].id}); + } + break; + } + } + } + + this.showFirstCategory = function() { + initiateExpansion(0); + if (categories[0].products[0]) { + dojo.event.topic.publish("/catalog", {type:"showProducts", productId:categories[0].products[0].id}); + } + } + + this.loadCategoryItem = function(pid, itemId) { + // find the right product and expand the accordion + for (var l=0; l < categories.length; l++) { + // now tell the scroller to load the first product + for (var il=0; il < categories[l].products.length; il++) { + if (categories[l].products[il].id == pid ) { + initiateExpansion(l); + break; + } + } + } + dojo.event.topic.publish("/catalog", {type:"showItemDetails", productId: pid , itemId: itemId}); + } + + function initiateExpansion(id) { + // jump out if we are in progress + if (!expanding && oExpandedIndex != Number(id)) { + expanding = true; + nExpandedIndex = Number(id); + if (oExpandedIndex != -1) { + var targetDiv = divs[oExpandedIndex].div; + if (targetDiv && targetDiv.childNodes) { + for (var l = targetDiv.childNodes.length -1; l >= 0 ; l--) { + targetDiv.removeChild(targetDiv.childNodes[l]); + } + } + createLinks(divs[oExpandedIndex].div, categories[oExpandedIndex].name, oExpandedIndex, "accordionLink"); + } + expandRow(id); + } + } + + function expandRow() { + if (expanding) { + showStatus(); + // + if (nHeight < EXPANDED_HEIGHT) { + nHeight = nHeight + INCREMENT; + divs[nExpandedIndex].setHeight(nHeight); + if (oExpandedIndex != -1) { + if (tHeight >= ITEM_HEIGHT) { + oHeight = oHeight - INCREMENT; + // take all out of the old expanded + } else { + oHeight = oHeight - INCREMENT; + } + divs[oExpandedIndex].setHeight(oHeight); + } + // default exapnd here + } else if (oExpandedIndex != -1 && oHeight > ITEM_HEIGHT) { + oHeight = oHeight - INCREMENT; + divs[oExpandedIndex].setHeight(oHeight); + } else { + // set the contents of the new menu + var targetDiv = divs[nExpandedIndex].div; + if (targetDiv && targetDiv.childNodes) { + for (var l = targetDiv.childNodes.length -1; l >= 0 ; l--) { + targetDiv.removeChild(targetDiv.childNodes[l]); + } + } + divs[nExpandedIndex].div.appendChild(document.createTextNode(categories[nExpandedIndex].name)); + divs[nExpandedIndex].div.appendChild(document.createElement("p")); + for (var l= 0; l < categories[nExpandedIndex].products.length; l++) { + var span = document.createElement("span"); + span.className = "accordionProduct"; + var link = document.createElement("a"); + var target = categories[nExpandedIndex].products[l].id; + link.id = target; + link.className = "accordionLink"; + // some browsers aren't setting the styles for hovers so forcing them + link.setAttribute("onmouseover", "this.className='accordionLinkHover';"); + link.setAttribute("onmouseout", "this.className='accordionLink';"); + dojo.event.connect(link, "onclick", function(evt) { + this._target = target + var src; + if (evt.target) { + src = evt.target; + } else if (evt.srcElement) { + src = evt.srcElement; + } + //src.parentNode.className = "accordionLinkSelected"; + // set this so the next time around it can be removed; + dojo.event.topic.publish("/catalog", {type:"showProducts", productId:src.id}); + }); + link.appendChild(document.createTextNode(categories[nExpandedIndex].products[l].name)); + span.appendChild(link); + divs[nExpandedIndex].div.appendChild(span); + if (l < categories[nExpandedIndex].products.length - 1) { + divs[nExpandedIndex].div.appendChild(document.createElement("p")); + } + link = null; + } + expanding = false; + oExpandedIndex = nExpandedIndex; + nExpandedIndex = -1; + oHeight = nHeight; + nHeight = ITEM_HEIGHT; + return; + } + + setTimeout(expandRow, timeout); + } + } + + function createLinks(tDiv, text, id, linkStyle) { + var link = document.createElement("a"); + link.className = linkStyle; + link.appendChild(document.createTextNode(text)); + link.setAttribute("id", id); + if (link.attachEvent) { + link.attachEvent('onmouseover',function(e){initiateExpansion(e.srcElement.getAttribute("id"));}); + } else if (link.addEventListener) { + link.addEventListener('mouseover',function(e){initiateExpansion(e.currentTarget.getAttribute("id"));}, true); + } + tDiv.appendChild(link); + } + + function createRow(id, rowStyle, height) { + var nDiv = document.createElement("div"); + nDiv.className = rowStyle; + var row; + var cell; + if (accordion.insertRow) { + row = accordion.insertRow(accordion.rows.length); + + } else { + row = document.createElement("tr"); + accordion.appendChild(row); + } + if (row.inserCell) { + cell = row.insertCell(0); + } else { + cell = document.createElement("td"); + row.appendChild(cell); + } + cell.appendChild(nDiv); + return new Row(id, nDiv, height); + } +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp new file mode 100644 index 0000000..c43dd98 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp @@ -0,0 +1,80 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: banner.jsp,v 1.28 2006/12/19 20:23:53 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> +<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/styles.css"></link> +<script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> +<script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/rss/rssbar.js"></script> +<link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}/faces/static/META-INF/rss/rssbar.css" /> +<style type="text/css"> + +#rss-bar { + margin: 0 auto 0px; +} + +#rss-bar table td#rss-channel { + background-repeat: no-repeat; + background-position: top left; + font-size: 14px; + font-weight: bold; + vertical-align: top; + text-align: center; + width: 254px; +} + +#rss-bar table td#rss-item { + background-repeat: no-repeat; + font-size: 14px; + width: 534px; + text-align: left; +} + +#rss-bar table a { + color: white; + text-decoration: none; +} +#rss-bar table a:hover { color: #ffff00;} + +</style> +<script type="text/javascript"> + var rss = new bpui.RSS(); + dojo.addOnLoad(function(){rss.getRssInJson('${pageContext.request.contextPath}/faces/dynamic/bpui_rssfeedhandler/getRssfeed', 'https://blueprints.dev.java.net/servlets/ProjectRSS?type=news', '4', '4000', 'News from BluePrints', 'news.jsp');}); +</script> + +<table border="0" bordercolor="gray" cellpadding="0" cellspacing="0" bgcolor="white" width="100%"> + <tr id="injectionPoint"> + <td width="100"><a class="menuLink" href="${pageContext.request.contextPath}/faces/index.jsp""><img src="${pageContext.request.contextPath}/images/banner_logo.gif" border="0" width="70" height="70"></a></td> + <td align="left"> + <div class="banner">Java Pet Store</div> + </td> + <td id="bannerRight" align="right"> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/fileupload.jsp">Seller</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/search.jsp">Search</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/catalog.jsp">Catalog</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/mapAll.jsp">Map</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/tag.jsp">Tags</a> <span class="menuItem">|</span> + <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/index.jsp">Home</a> + </td> + </tr> + </tr> + <tr bgcolor="gray"> + <td id="menubar" align="left" colspan="3" height="25" > + <div id="rss-bar"> + <table border="0" cellpadding="0" cellspacing="0"> + <tr> + <td id="rss-channel" nowrap="true"></td> + <td id="rss-item" nowrap="true"></td> + </tr> + </table> + </div> + </td> + </tr> + </table> + + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css new file mode 100644 index 0000000..5c906b5 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css @@ -0,0 +1,48 @@ +.bpui_petstorelist_dataDiv { + border-style: groove; + overflow: auto; + width: 600px; + height: 500px; + padding: 10px; +} + +.bpui_petstorelist_pageDiv { +} + + +.bpui_petstorelist_table { +} + +.bpui_petstorelist_cell { + padding: 5px; + vertical-align: top; +} + +.bpui_petstorelist_row { + border-bottom: dotted; +} + +.bpui_petstorelist_hr { + width: 90%; +} + +.bpui_petstorelist_image { +} + +.bpui_petstorelist_link{ +} + +.bpui_petstorelist_name{ +} + +.bpui_petstorelist_description{ +} + +.bpui_petstorelist_price { +} + +.bpui_petstorelist_previous { +} + +.bpui_petstorelist_next { +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js new file mode 100644 index 0000000..4df46fb --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js @@ -0,0 +1,269 @@ +var bpui; +if(typeof bpui == "undefined") { + bpui=new Object(); +} +bpui.petstoreList=new Object(); + +bpui.petstoreList.divName=""; +bpui.petstoreList.currentCount=0; +bpui.petstoreList.numberPerPage=5; +bpui.petstoreList.category="feline01"; +bpui.petstoreList.cachedData=new Object(); +bpui.petstoreList.debug=false; +bpui.petstoreList.timer; + +bpui.petstoreList.initialSetup=function() { + // get outerdiv + var targetDiv=document.getElementById(bpui.petstoreList.divName); + + // containier div + tablex="<table><tr><td align=\"center\">"; + tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; + tablex += "<option value=\"loading\">Loading Data...</option>"; + tablex += "</select>"; + tablex += "</td></tr><tr><td><div id=\"bpui.petstoreList.dataDiv\" class=\"bpui_petstorelist_dataDiv\">"; + tablex += "</div>"; + + // add product previous and next + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; + tablex += "<div id=\"bpui.petstoreList.pageDiv\" class=\"bpui_petstorelist_pageDiv\">"; + tablex += "</div>"; + tablex += "</td></tr>"; + // add in debug div, if debugging + if(bpui.petstoreList.debug) { + tablex += "<tr><td colspan=\"3\">"; + tablex += "<div id=\"bpui.petstoreList.debugDiv\">"; + tablex += "</div>"; + tablex += "</td></tr>"; + } + tablex += "</table>"; + targetDiv.innerHTML=tablex; + bpui.petstoreList.setSelectedCategory(); +} + + +bpui.petstoreList.populateData=function(datax) { + // clear response timer + clearTimeout(bpui.petstoreList.timer); + + if(typeof datax != "undefined") { + // check to see if at last page and no data is returned + if(datax.length < 1) { + alert("At last page for category!"); + // keep currentCount correct by removing the increment that was added + bpui.petstoreList.currentCount -= bpui.petstoreList.numberPerPage; + } else { + // add data to cache if it doesn't already exist + // if a full set isn't returned don't cache it, so the data will be retrieved again from the server. + // This is optional, you have to weigh the performance hit with the consiquences of not doing an update + key=bpui.petstoreList.category + "|" + bpui.petstoreList.currentCount; + cachedSet=bpui.petstoreList.cachedData[key]; + if(typeof cachedSet == "undefined" && datax.length >= bpui.petstoreList.numberPerPage) { + // need to cache data + if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Adding cache data by key: " + key); + bpui.petstoreList.cachedData[key]=datax; + } + + // get outerdiv + var targetDiv=document.getElementById("bpui.petstoreList.dataDiv"); + + // containier div + tablex="<table class=\"bpui_petstorelist_table\">"; + tablex += "<tr class=\"bpui_petstorelist_row\">"; + tablex += "<th class=\"bpui_petstorelist_cell\">Pet Image</td>"; + tablex += "<th class=\"bpui_petstorelist_cell\">Name & Description</td>"; + tablex += "<th class=\"bpui_petstorelist_cell\">Price ($)</td>"; + tablex += "</tr>"; + + // loop through product results + for(ii=0; ii < datax.length; ii++) { + // add row + tablex += "<tr class=\"bpui_petstorelist_row\"><td class=\"bpui_petstorelist_cell\">"; + tablex += "<a class=\"bpui_petstorelist_image\" target=\"_blank\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + + datax[ii].productID + "," + datax[ii].itemID + "\">"; + + tablex += "<img src=\"http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL + "\"/>"; + + tablex += "</a>"; + tablex += "</td><td class=\"bpui_petstorelist_cell\">"; + tablex += "<a class=\"bpui_petstorelist_link\" target=\"_blank\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + + datax[ii].productID + "," + datax[ii].itemID + "\">"; + tablex += "<span class=\"bpui_petstorelist_name\">" + datax[ii].name + "</span><br/>"; + tablex += "</a>"; + tablex += "<span class=\"bpui_petstorelist_description\">" + datax[ii].description + "</span>"; + tablex += "</td><td class=\"bpui_petstorelist_cell\">"; + + // add product price + tablex += "<span class=\"bpui_petstorelist_price\">\$" + datax[ii].price + "</span><br/>"; + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\"><hr class=\"bpui_petstorelist_hr\" /></td></tr>"; + } + + tablex += "</table>"; + targetDiv.innerHTML=tablex; + } + + // setup previous next buttons + pagex=""; + var targetDiv=document.getElementById("bpui.petstoreList.pageDiv"); + if(bpui.petstoreList.currentCount >= bpui.petstoreList.numberPerPage) { + // add previous + pagex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; + } + if(datax.length == bpui.petstoreList.numberPerPage) { + // add next only if full page has been returned. Need to change when add cache ??? + pagex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; + } + targetDiv.innerHTML=pagex; + } +} + +bpui.petstoreList.setSelectedCategory=function() { + catx=document.getElementById("bpui.petstoreList.categoryList"); + for(ii=0; ii < catx.length; ii++) { + if(catx.options[ii].value == bpui.petstoreList.category) { + catx.options[ii].selected=true; + } + } +} + +bpui.petstoreList.selectCategory=function() { + catx=document.getElementById("bpui.petstoreList.categoryList"); + bpui.petstoreList.category=catx.value; + + bpui.petstoreList.currentCount=0; + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.nextProducts=function() { + // load data from service + bpui.petstoreList.currentCount += bpui.petstoreList.numberPerPage; + bpui.petstoreList.updateProducts(); +} + +bpui.petstoreList.previousProducts=function() { + bpui.petstoreList.currentCount -= bpui.petstoreList.numberPerPage; + if(bpui.petstoreList.currentCount < 0) { + bpui.petstoreList.currentCount=0; + } + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.updateProducts=function() { + // check to see if in cache + key=bpui.petstoreList.category + "|" + bpui.petstoreList.currentCount; + cachedSet=bpui.petstoreList.cachedData[key]; + // see if data in cache + if(typeof cachedSet != "undefined") { + // get data from cache + if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Pulling data from cache using: " + key + " with " + cachedSet.length + " items."); + bpui.petstoreList.populateData(cachedSet); + } else { + // load data from service + if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Retrieving data from service for : " + bpui.petstoreList.category + " starting at item " + bpui.petstoreList.currentCount); + + // set degradation timeout + bpui.petstoreList.timer=setTimeout('bpui.petstoreList.requestTimedOut()', 20000); + + // create dynamic script + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=" + bpui.petstoreList.currentCount + "&length=" + bpui.petstoreList.numberPerPage + "&format=jsonp&callback=bpui.petstoreList.populateData"); + bodyTag.appendChild(scriptx); + } +} + + +bpui.petstoreList.createPetstoreList=function(divName, numberPerPage) { + // keep divName for later references + bpui.petstoreList.divName=divName; + + // see if numberPerPage defined + if(typeof numberPerPage != "undefined") { + bpui.petstoreList.numberPerPage=numberPerPage; + } + + // setup static elements + bpui.petstoreList.initialSetup(); + + // set timer to make sure service look up returns. Eventhough the Javascript library was able to be fetched, the database could be down or the + // service could be responding very slowly and the request timeout. Wait for 30 seconds and then set data div to service may not be responding message. + // Since both calls hit the database, if one returns propertly the other should also. + bpui.petstoreList.timer=setTimeout('bpui.petstoreList.requestTimedOut()', 20000); + + // load categories from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=categories&format=jsonp&call…"); + bodyTag.appendChild(scriptx); + + // load pet data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=0&length=" + bpui.petstoreList.numberPerPage + "&format=jsonp&callback=bpui.petstoreList.populateData"); + bodyTag.appendChild(scriptx); +} + + +bpui.petstoreList.requestTimedOut=function() { + document.getElementById("bpui.petstoreList.dataDiv").innerHTML="<b><font color=\"#0000FF\">The Java BluePrint's Pet Store JSONP Service is either responding very slowly or not responding at all! Please check with the service provider for more information.</font></b>"; +} + + + +bpui.petstoreList.debugMessage=function(messx) { + targetDiv=document.getElementById("bpui.petstoreList.debugDiv"); + targetDiv.innerHTML=messx + "<br/>" + targetDiv.innerHTML; +} + + +bpui.petstoreList.populateCategory=function(datax) { + // clear response timer + clearTimeout(bpui.petstoreList.timer); + + if(typeof datax != "undefined") { + catx=document.getElementById("bpui.petstoreList.categoryList"); + countx=0; + // loop through top level categories + for(ii=0; ii < datax.length; ii++) { + // loop through individual categories + for(yy=0; yy < datax[ii].products.length; yy++) { + // set default value for select list + bCurrentSelect=false + if(datax[ii].products[yy].id == bpui.petstoreList.category) { + bCurrentSelect=true; + } + catx.options[countx]=new Option(datax[ii].products[yy].name, datax[ii].products[yy].id, false, bCurrentSelect); + countx++; + } + } + } +} + + +bpui.petstoreList.hackerExample=function() { + /* + bodyTag=document.getElementsByTagName("body")[0]; + iframex=document.createElement("iframe"); + iframex.setAttribute("src", "http://localhost:8080/bp-clientside-mashup/show.jsp?cookies=" + escape(document.cookie)); + bodyTag.appendChild(iframex); + */ + // load pet data from service + + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/bp-clientside-mashup/show.jsp?cookies=" + escape(document.cookie)); + bodyTag.appendChild(scriptx); + + +} + + + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js new file mode 100644 index 0000000..d00e427 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js @@ -0,0 +1,136 @@ +var bpui; +if(typeof bpui == "undefined") { + bpui=new Object(); +} +bpui.petstoreList=new Object(); + +bpui.petstoreList.divName=""; +bpui.petstoreList.currentCount=0; + +bpui.petstoreList.populateData=function(datax) { + if(typeof datax != "undefined") { + + // get outerdiv + var targetDiv=document.getElementById(bpui.petstoreList.divName); + + // make sure div is clear + targetDiv.innerHTML=""; + + // add class to containing div + targetDiv.setAttribute("class", "bpui_petstorelist_div") + + // add table + tablex=document.createElement("table"); + tablex.setAttribute("class", "bpui_petstorelist_table") + targetDiv.appendChild(tablex); + + // loop through product results + for(ii=0; ii < datax.length; ii++) { + // add row + rowx=document.createElement("tr"); + + // add product image with hyperlink + colx=document.createElement("td"); + ax=document.createElement("a"); + ax.setAttribute("href", "http://localhost:8080/petstore/faces/catalog.jsp#" + datax[ii].productID + "," + datax[ii].itemID) + ax.setAttribute("target", "bppetstore") + ax.setAttribute("class", "bpui_petstorelist_image") + imgx=document.createElement("img"); + imgx.setAttribute("src", "http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL); + ax.appendChild(imgx); + colx.appendChild(ax); + rowx.appendChild(colx); + + // add product name with hyperlink + colx=document.createElement("td"); + ax=document.createElement("a"); + ax.setAttribute("href", "http://localhost:8080/petstore/faces/catalog.jsp#" + datax[ii].productID + "," + datax[ii].itemID) + ax.setAttribute("target", "bppetstore") + ax.setAttribute("class", "bpui_petstorelist_name_link") + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_name") + spanx.appendChild(document.createTextNode(datax[ii].name)); + ax.appendChild(spanx); + colx.appendChild(ax); + colx.appendChild(document.createElement("br")); + // add product description + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_description"); + spanx.appendChild(document.createTextNode(datax[ii].description)); + colx.appendChild(spanx); + rowx.appendChild(colx); + + // add product price + colx=document.createElement("td"); + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_price"); + spanx.appendChild(document.createTextNode("\$" + datax[ii].price)); + colx.appendChild(spanx); + rowx.appendChild(colx); + + // add row to table + tablex.appendChild(rowx); + } + + // add product previous and next + rowx=document.createElement("tr"); + colx=document.createElement("td"); + colx.setAttribute("colspan", "3"); + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_previous"); + spanx.setAttribute("onclick", "bpui.petstoreList.previousProducts();"); + spanx.appendChild(document.createTextNode("<< PREVIOUS")); + colx.appendChild(spanx); + + spanx=document.createElement("span"); + spanx.setAttribute("class", "bpui_petstorelist_next"); + spanx.setAttribute("onclick", "bpui.petstoreList.nextProducts();"); + spanx.appendChild(document.createTextNode("NEXT >>")); + colx.appendChild(spanx); + rowx.appendChild(colx); + + // add row to table + tablex.appendChild(rowx); + } +} + + +bpui.petstoreList.nextProducts=function() { + // load data from service + bpui.petstoreList.currentCount += 5; + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.previousProducts=function() { + bpui.petstoreList.currentCount -= 5; + if(bpui.petstoreList.currentCount < 0) { + bpui.petstoreList.currentCount=0; + } + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.updateProducts=function() { + // load data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=feline01&start=" + bpui.petstoreList.currentCount + "&length=5&format=jsonp"); + bodyTag.appendChild(scriptx); +} + + + +bpui.petstoreList.createPetstoreList=function(divName) { + // keep divName for later references + bpui.petstoreList.divName=divName; + + // load data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=feline01&start=0&l…"); + bodyTag.appendChild(scriptx); +} + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js new file mode 100644 index 0000000..9b18cb4 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js @@ -0,0 +1,159 @@ +var bpui; +if(typeof bpui == "undefined") { + bpui=new Object(); +} +bpui.petstoreList=new Object(); + +bpui.petstoreList.divName=""; +bpui.petstoreList.currentCount=0; +bpui.petstoreList.category="feline01"; + + +bpui.petstoreList.initialSetup=function() { + // get outerdiv + var targetDiv=document.getElementById(bpui.petstoreList.divName); + + // containier div + tablex="<table><tr><td align=\"center\">"; + tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; + tablex += "<option value=\"feline01\">Hairy Cat</option>"; + tablex += "<option value=\"feline02\">Groomed Cat</option>"; + tablex += "<option value=\"canine01\">Medium Dogs</option>"; + tablex += "<option value=\"canine02\">Small Dogs</option>"; + tablex += "<option value=\"avian01\">Parrot</option>"; + tablex += "<option value=\"avian02\">Exotic</option>"; + tablex += "<option value=\"fish01\">Small Fish</option>"; + tablex += "<option value=\"fish02\">Large Fish</option>"; + tablex += "<option value=\"reptile01\">Slithering Reptiles</option>"; + tablex += "<option value=\"reptile02\">Crawling Reptiles</option>"; + tablex += "</select>"; + tablex += "</td></tr><tr><td><div class=\"bpui_petstorelist_div\">"; + tablex += "</div>"; + + // add product previous and next + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; + tablex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; + tablex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; + tablex += "</td></tr>"; + tablex += "</table>"; + targetDiv.innerHTML=tablex; + bpui.petstoreList.setSelectedCategory(); +} + +bpui.petstoreList.populateData=function(datax) { + if(typeof datax != "undefined") { + + // get outerdiv + var targetDiv=document.getElementById(bpui.petstoreList.divName); + + // containier div + tablex="<table><tr><td align=\"center\">"; + tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; + tablex += "<option value=\"feline01\">Hairy Cat</option>"; + tablex += "<option value=\"feline02\">Groomed Cat</option>"; + tablex += "<option value=\"canine01\">Medium Dogs</option>"; + tablex += "<option value=\"canine02\">Small Dogs</option>"; + tablex += "<option value=\"avian01\">Parrot</option>"; + tablex += "<option value=\"avian02\">Exotic</option>"; + tablex += "<option value=\"fish01\">Small Fish</option>"; + tablex += "<option value=\"fish02\">Large Fish</option>"; + tablex += "<option value=\"reptile01\">Slithering Reptiles</option>"; + tablex += "<option value=\"reptile02\">Crawling Reptiles</option>"; + tablex += "</select>"; + tablex += "</td></tr><tr><td><div class=\"bpui_petstorelist_div\">"; + + tablex += "<table class=\"bpui_petstorelist_table\">"; + + // loop through product results + for(ii=0; ii < datax.length; ii++) { + // add row + tablex += "<tr class=\"bpui_petstorelist_row\"><td class=\"bpui_petstorelist_cell\">"; + tablex += "<a class=\"bpui_petstorelist_image\" target=\"bppetstore\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + + datax[ii].productID + "," + datax[ii].itemID + "\">"; + + tablex += "<img src=\"http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL + "\"/>"; + + tablex += "</a>"; + tablex += "</td><td class=\"bpui_petstorelist_cell\">"; + tablex += "<a class=\"bpui_petstorelist_link\" target=\"bppetstore\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + + datax[ii].productID + "," + datax[ii].itemID + "\">"; + tablex += "<span class=\"bpui_petstorelist_name\">" + datax[ii].name + "</span><br/>"; + tablex += "</a>"; + tablex += "<span class=\"bpui_petstorelist_description\">" + datax[ii].description + "</span>"; + tablex += "</td><td class=\"bpui_petstorelist_cell\">"; + + // add product price + tablex += "<span class=\"bpui_petstorelist_price\">\$" + datax[ii].price + "</span><br/>"; + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\"><hr class=\"bpui_petstorelist_hr\" /></td></tr>"; + } + + tablex += "</table></div>"; + + // add product previous and next + tablex += "</td></tr>"; + tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; + tablex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; + tablex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; + tablex += "</td></tr>"; + tablex += "</table>"; + targetDiv.innerHTML=tablex; + bpui.petstoreList.setSelectedCategory(); + } +} + +bpui.petstoreList.setSelectedCategory=function() { + catx=document.getElementById("bpui.petstoreList.categoryList"); + for(ii=0; ii < catx.length; ii++) { + if(catx.options[ii].value == bpui.petstoreList.category) { + catx.options[ii].selected=true; + } + } +} + + +bpui.petstoreList.selectCategory=function() { + catx=document.getElementById("bpui.petstoreList.categoryList"); + bpui.petstoreList.category=catx.value; + + bpui.petstoreList.currentCount=0; + bpui.petstoreList.updateProducts(); +} + + +bpui.petstoreList.nextProducts=function() { + // load data from service + bpui.petstoreList.currentCount += 5; + bpui.petstoreList.updateProducts(); +} + +bpui.petstoreList.previousProducts=function() { + bpui.petstoreList.currentCount -= 5; + if(bpui.petstoreList.currentCount < 0) { + bpui.petstoreList.currentCount=0; + } + bpui.petstoreList.updateProducts(); +} + +bpui.petstoreList.updateProducts=function() { + // load data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=" + bpui.petstoreList.currentCount + "&length=5&format=jsonp"); + bodyTag.appendChild(scriptx); +} + +bpui.petstoreList.createPetstoreList=function(divName) { + // keep divName for later references + bpui.petstoreList.divName=divName; + + // load data from service + bodyTag=document.getElementsByTagName("body")[0]; + scriptx=document.createElement("script"); + scriptx.setAttribute("type", "text/javascript"); + scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=0&length=5&format=jsonp"); + bodyTag.appendChild(scriptx); + +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp new file mode 100644 index 0000000..60ef953 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp @@ -0,0 +1,23 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: captchaerror.jsp,v 1.1 2006/02/17 03:04:22 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Captcha Error</title> + </head> + <body> + + <h1>Please input the right captcha string -- <a href="./">Try again</a> + + + + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js new file mode 100644 index 0000000..4bdfc69 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js @@ -0,0 +1,329 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: catalog.js,v 1.21 2007/01/17 22:16:44 basler Exp $ */ + +var ac; +var is; +var controller; +//var debug=true; + +function getApplicationContextRoot() { + var urlArray=window.location.toString().split("/", 4); + return "/" + urlArray[3]; +} + +var applicationContextRoot=getApplicationContextRoot(); + +function initCatalog() { + ac = new AccordionMenu(); + is = new ImageScroller(); + is.load(); + controller = new CatalogController(); + // wire in a listener for the rating component + dojo.event.connect("before", bpui.rating, "doClick", controller, "modifyState"); + controller.initialize(); +} + +function CatalogController() { + dojo.event.topic.subscribe("/catalog", this, handleEvent); + + // this object structure contains a list of the products and chunks that have been loaded + var pList = new ProductList(); + + var CHUNK_SIZE=7; + var initalRating; + var initalItem; + var originalURL; + + // using this for some browsers that do not support innerHTML + var useDOMInjection = false; + + var infoName = document.getElementById("infopaneName"); + var infoRating = document.getElementById("infopaneRating"); + var infoPrice = document.getElementById("infopanePrice"); + var infoBuyNow = document.getElementById("infopaneBuyNow"); + var infoShortDescription = document.getElementById("infopaneShortDescription"); + var infoDescription = document.getElementById("infopaneDescription"); + // for paypal + var buyNowAmount = document.getElementById("buyNow1_amount"); + var buyNowItemName = document.getElementById("buyNow1_item_name"); + + function handleEvent(args) { + if (args.type == "showingItem") { + // update the id on the ratring component + if (typeof bpui != 'undefined') { + var groupId = is.getGroupId(); + window.location.href= originalURL + "#" + groupId + "," + args.id; + if (typeof bpui.rating != 'undefined') { + // update the rating + bpui.rating.state["rating"].bindings["itemId"]=args.id; + bpui.rating.modifyDisplay("rating", args.rating, true); + // get the currrent item + showItemDetails(args.id); + } else { + initalItem = args.id; + initalRating = args.rating; + } + } else { + // things haven't been loaded to set the inital rating + initalItem = args.id; + initalRating = args.rating; + } + } else if (args.type == "getChunk") { + populateItems(args.id, args.index, args.currentChunk, false); + + } else if (args.type == "showItemDetails") { + showProductDetails(args.productId, args.itemId); + + } else if (args.type == "showProducts") { + is.reset(); + populateItems(args.productId, 0, 0, true); + } + } + + function showItemDetails(id) { + var i = is.getItems().get(id); + setNodeText(infoName, i.name + "<br/><a href='javascript:controller.disableItem("" + id + "","" + i.name + "")'><font size='-1' color='white'><i>Flag as inappropriate</i></font></a>"); + setNodeText(infoPrice, i.price); + setNodeText(infoShortDescription, i.shortDescription); + setNodeText(infoDescription, i.description); + // update the paypal + buyNowAmount.value = i.price; + buyNowItemName.value = i.name; + } + + function setNodeText(t, text) { + if (useDOMInjection) { + t.lastChild.nodeValue = text; + } else { + t.innerHTML = text; + } + } + + this.initialize = function() { + // check whether the innerHTML changes can be used in the infopane + infoName.innerHTML = " "; + if (!useDOMInjection && infoName.innerHTML != " ") { + useDOMInjection = true; + + infoName.appendChild(document.createTextNode("Name")); + infoPrice.appendChild(document.createTextNode("$0.00")); + infoShortDescription.appendChild(document.createTextNode("<description>")); + infoDescription.appendChild(document.createTextNode("<description>")); + } + + var ratingInstance = bpui.rating.state["rating"]; + ratingInstance.grade = initalRating; + bpui.rating.state["rating"].bindings["itemId"]=initalItem; + bpui.rating.modifyDisplay("rating", initalRating, true); + loadAccordion(); + } + + + this.modifyState = function(arg, rating) { + var itemId = initalItem; + if (typeof bpui.rating.state["rating"].bindings["itemId"] != 'undefined') { + itemId = bpui.rating.state["rating"].bindings["itemId"]; + } + // set the cached rating to the new rating that was set. + is.getItems().get(itemId).rating = rating; + } + + + function loadAccordion () { + // go out and get the categories + // this should be made more geric + var bindArgs = { + url: applicationContextRoot + "/catalog?command=categories&format=json", + mimetype: "text/json", + load: function(type,json) { + ac.load(json); + processURLParameters(); + }, + error: ajaxBindError + }; + dojo.io.bind(bindArgs); + } + + // this needs to happen after we have loaded the accordion data + function processURLParameters() { + originalURL = decodeURIComponent(window.location.href); + var params = {}; + // look for the params + if (originalURL.indexOf("#") != -1) { + var qString = originalURL.split('#')[1]; + var args = qString.split(','); + originalURL = originalURL.split('#')[0]; + ac.loadCategoryItem(args[0], args[1]); + return; + } else if (originalURL.indexOf("?") != -1) { + var qString = originalURL.split('?')[1]; + // get rid of any bookmarking stuff + if (qString.indexOf("#") != -1) { + qString = qString.split('#')[0]; + originalURL = originalURL.split('#')[0]; + window.location.href = originalURL; + } + ps = qString.split('&'); + // now go through and create the params map as an object literal + for (var i in ps) { + var t = ps[i].split('='); + params[t[0]] = t[1]; + } + // first check for the item in product + if (typeof params.itemId != 'undefined' && typeof params.pid != 'undefined') { + ac.loadCategoryItem(params.pid, params.itemId); + // next if there is a catid definition then do it + } else if (typeof params.catid != 'undefined') { + ac.showCategory(params.catid); + } + } else { + // nothing is selected + ac.showFirstCategory(); + } + } + + + + function showProductDetails(pid, itemId) { + is.reset(); + is.showProgressIndicator(); + var bindArgs = { + url: applicationContextRoot + "/catalog?command=itemInChunk&pid=" + pid + "&itemId=" + itemId + "&length=" + CHUNK_SIZE, + mimetype: "text/xml", + load: function(type,data,postProcessHandler) { + processProductData(data,true, pid, itemId); + showItemDetails(itemId); + is.doMaximize(); + }, + error: ajaxBindError + }; + dojo.io.bind(bindArgs); + } + + + + function populateItems(pid, index, neededChunk, showImage) { + is.showProgressIndicator(); + is.setGroupId(pid); + printDebug("populateItems - need to make sure displaying - pid=" + pid + " Chunk=" + neededChunk); + + // check to see if relevant scroller page is already loaded + if(!is.containsChunk(pid + "_" + neededChunk)) { + + // not loaded, so see if it is in the cache + if (pList.hasChunk(pid, neededChunk)) { + // in cache, so add chunk to scroller + printDebug("**** adding chunk from cache - pid=" + pid + " Chunk=" + neededChunk); + is.addChunk(pid + "_" + neededChunk); + is.addItems(pList.getChunk(pid, neededChunk)); + + // show first image if you have it + if(showImage && is.getScrollerItems().length > 0) { + is.showImage(is.getScrollerItems()[0].id); + } + + } else { + // not in cache so load it + startRetIndex=(neededChunk * CHUNK_SIZE); + + printDebug("**** retrieving chunk from server - pid=" + pid + " currentIndex=" + index + " startIndex=" + startRetIndex + " Chunk=" + neededChunk); + var bindArgs = { + url: applicationContextRoot + "/catalog?command=items&pid=" + pid + "&start=" + startRetIndex + "&length=" + CHUNK_SIZE, + mimetype: "text/xml", + load: function(type,data,postProcessHandler) { + processProductData(data, showImage, pid, null, neededChunk); + }, + error: ajaxBindError + }; + dojo.io.bind(bindArgs); + } + } else { + printDebug("*** items already showing"); + } + + } + + + function processProductData(responseXML, showImage, pid, iId, chunkId) { + var items = []; + var count = responseXML.getElementsByTagName("item").length; + for (var loop=0; loop < count ; loop++) { + + var item = responseXML.getElementsByTagName("item")[loop]; + var itemId = item.getElementsByTagName("id")[0].firstChild.nodeValue; + var name = item.getElementsByTagName("name")[0].firstChild.nodeValue; + var thumbURL = item.getElementsByTagName("image-tb-url")[0].firstChild.nodeValue; + var imageURL = item.getElementsByTagName("image-url")[0].firstChild.nodeValue; + var description = item.getElementsByTagName("description")[0].firstChild.nodeValue; + var price = item.getElementsByTagName("price")[0].firstChild.nodeValue; + var rating = item.getElementsByTagName("rating")[0].firstChild.nodeValue; + var shortDescription; + if (description.length > 71) { + shortDescription = description.substring(0,71) + "..."; + } else { + shortDescription = description; + } + var i = {id: itemId, name: name, image: imageURL, thumbnail: thumbURL, shortDescription: shortDescription, description: description, price:price, rating: rating}; + items.push(i); + } + + // cache the chunks + pList.addChunk(pid, chunkId, items); + is.addItems(items); + is.addChunk(pid + "_" + chunkId); + + if (showImage && iId == null) { + is.setGroupId(pid); + is.showImage(items[0].id); + } else { + is.setGroupId(pid); + is.showImage(iId); + } + is.hideProgressIndicator(); + } + + function ProductList() { + var _plist = this; + var map = new Map(); + + this.addChunk = function(pid, chunkNumber, items) { + map.put(pid + "_" + chunkNumber, items, true); + } + + this.getChunk = function(pid, chunkNumber) { + return map.get(pid + "_" + chunkNumber); + } + + this.hasChunk = function(pid, chunkNumber) { + return (map.get(pid + "_" + chunkNumber) != null); + } + + this.contents = function() { + return map.contents(); + } + } + + + this.disableItem=function(itemId, itemName) { + // go out and get the categories + // this should be made more geric + if (confirm("Are you sure you want to effectively remove this item from Petstore?")) { + var bindArgs = { + url: applicationContextRoot + "/catalog?command=disable&id=" + itemId, + mimetype: "text/xml", + load: function(type,json) { + //alert("The item named '" + itemName + "' has been disabled!"); + pList = new ProductList(); + is.reset(); + populateItems(is.getGroupId(), 0, 0, true); + }, + error: ajaxBindError + }; + dojo.io.bind(bindArgs); + } + } + + +} + + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp new file mode 100644 index 0000000..443857b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp @@ -0,0 +1,95 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: catalog.jsp,v 1.22 2007/03/16 21:42:03 basler Exp $ --%> +<script type="text/javascript" src="common.js"></script> +<script type="text/javascript" src="scroller.js"></script> +<link rel="stylesheet" type="text/css" href="scroller.css"></link> +<script type="text/javascript" src="accordion.js"></script> +<link rel="stylesheet" type="text/css" href="accordion.css"></link> +<script type="text/javascript" src="catalog.js"></script> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> +<body> +<jsp:include page="banner.jsp" /> +<script type="text/javascript"> + dojo.event.connect(window, "onload", function(){initCatalog();}); +</script> +<center> + <table border="0"> + <tr> + <td> + <table id="accordion"> + <tr id="accordionTitle" class="accordionTitle"><td>Pets</td></tr> + <tr><td> + <table id="accordionBody" border="0" class="accordionBody"> + </table> + </td></tr> + </table> + </td> + <td> + <div id="CatalogBrowser"> + <table border="0" class="slider" width="500px" > + <tr height="415" valign="top"> + <td id="bodySpace" border="0" align="center"></td> + </tr> + <tr id="targetRow"> + <td width="500" height="70 align="top"> + <div class="nav" id="right_button"> + <img src="${pageContext.request.contextPath}/images/right.gif" name="nextRoll" title="Show More Items" border="0"> + </div> + <div class="nav" id="left_button"> + <img src="${pageContext.request.contextPath}/images/left.gif" name="previousRoll" title="Show Previous Items" border="0"> + </div> + <div id="infopane" class="infopane"> + <table class="infopaneTable"> + <tr> + <td id="infopaneName" class="infopaneTitle"> + </td> + <td id="infopaneRating" class="infopaneRating"> + <f:view> + <ui:rating id="rating" maxGrade="5" includeNotInterested="false" includeClear="false" + hoverTexts="#{RatingBean.ratingText}" notInterestedHoverText="Not Interested" clearHoverText="Clear Rating" + grade="#{RatingBean.grade}"/> + <f:verbatim></td><td id="infopanePrice" class="infopanePrice"></td><td id="infopanePayPal" class="infopanePayPal"></f:verbatim> + <ui:buyNow business="donate(a)animalfoundation.com" id="buyNow1" itemName="Buy Item One" + amount="100.00" quantity="1" type="BuyNow" postData="#{PayPalBean.postData}" target="paypal"/> + </f:view> + </td> + <td id="infopaneIndicator" class="infopaneIndicator"> + </td> + <td id="infopaneDetailsIcon"> + </td> + </tr> + <tr> + <td id="infopaneShortDescription" colspan="7" class="infopaneShortDescription"> + </td> + </tr> + <tr style="height:20px"> + <td></td> + </tr> + <tr> + <td id="infopaneDescription" colspan="6" class="infopaneDescription"> + </td> + </tr> + </table> + </div> + </td> + </tr> + </table> + </td> + <td style="vertical-align:top; width:300px; text-align:right;"> + <div id="downloadAds"> + <jsp:include page="download.jsp" /> + </div> + </td> + </tr> + </table> + </div> + <div id="status" style="text-align:left"></div> <div id="status_2"></div> + <div id="dstatus"></div> + <div id="injection_point"></div> +</center> +<jsp:include page="footer.jsp" /> +</body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old new file mode 100644 index 0000000..13914ed --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old @@ -0,0 +1,95 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: catalog.jsp,v 1.20 2006/12/01 21:38:40 basler Exp $ --%> +<script type="text/javascript" src="common.js"></script> +<script type="text/javascript" src="scroller.js"></script> +<link rel="stylesheet" type="text/css" href="scroller.css"></link> +<script type="text/javascript" src="accordion.js"></script> +<link rel="stylesheet" type="text/css" href="accordion.css"></link> +<script type="text/javascript" src="catalog.js"></script> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> +<body> +<jsp:include page="banner.jsp" /> +<script type="text/javascript"> + dojo.event.connect(window, "onload", function(){initCatalog();}); +</script> +<center> + <table border="0"> + <tr> + <td> + <table id="accordion"> + <tr id="accordionTitle" class="accordionTitle"><td>Pets</td></tr> + <tr><td> + <table id="accordionBody" border="0" class="accordionBody"> + </table> + </td></tr> + </table> + </td> + <td style="min-width:500px;"> + <div id="CatalogBrowser"> + <table width="500px"border="1" class="slider" > + <tr height="415" valign="top"> + <td id="bodySpace" border="0" align="center"></td> + </tr> + <tr id="targetRow"> + <td width="500px" height="70px" align="top"> + <div class="nav" id="right_button"> + <img src="${pageContext.request.contextPath}/images/right.gif" name="nextRoll" title="Show More Items" border="0"> + </div> + <div class="nav" id="left_button"> + <img src="${pageContext.request.contextPath}/images/left.gif" name="previousRoll" title="Show Previous Items" border="0"> + </div> + <div id="infopane" class="infopane"> + <table class="infopaneTable"> + <tr> + <td id="infopaneName" class="infopaneTitle"> + </td> + <td id="infopaneRating" class="infopaneRating"> + <f:view> + <ui:rating id="rating" maxGrade="5" includeNotInterested="false" includeClear="false" + hoverTexts="#{RatingBean.ratingText}" notInterestedHoverText="Not Interested" clearHoverText="Clear Rating" + grade="#{RatingBean.grade}"/> + <f:verbatim></td><td id="infopanePrice" class="infopanePrice"></td><td id="infopanePayPal" class="infopanePayPal"></f:verbatim> + <ui:buyNow business="donate(a)animalfoundation.com" id="buyNow1" itemName="Buy Item One" + amount="100.00" quantity="1" type="BuyNow" postData="#{PayPalBean.postData}" target="paypal"/> + </f:view> + </td> + <td id="infopaneIndicator" class="infopaneIndicator"> + </td> + <td id="infopaneDetailsIcon"> + </td> + </tr> + <tr> + <td id="infopaneShortDescription" colspan="7" class="infopaneShortDescription"> + </td> + </tr> + <tr style="height:20px"> + <td></td> + </tr> + <tr> + <td id="infopaneDescription" colspan="6" class="infopaneDescription"> + </td> + </tr> + </table> + </div> + </td> + </tr> + </table> + </td> + <td style="vertical-align:top; width:300px; text-align:right;"> + <div id="downloadAds"> + <jsp:include page="download.jsp" /> + </div> + </td> + </tr> + </table> + </div> + <div id="status" style="text-align:left"></div> <div id="status_2"></div> + <div id="dstatus"></div> + <div id="injection_point"></div> +</center> +<jsp:include page="footer.jsp" /> +</body> +</html> \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js new file mode 100644 index 0000000..03a3ba2 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js @@ -0,0 +1,77 @@ + + function ajaxBindError(type, errObj) { + // can't use the error page, because unless and exception in the internal servlet container + // nullpointer exceptions will be thrown + //window.location="./systemerror.jsp?message=" + errObj.message; + + alert("An Exception has been encountered on the server side during an Ajax request. Please see the server logs for more information " + errObj.message); + } + + + function debugProperties(namex) { + var listx=""; + var ob=namex; + for(xx in ob) { + listx += xx + " = " + ob[xx] + "<br/>" + } + //document.write(listx); + alert(listx); + } + + + function printDebug(argx) { + if (typeof debug != 'undefined') { + document.getElementById("status").innerHTML = argx + "<br\>" + document.getElementById("status").innerHTML; + } + } + + + function Map() { + var size = 0; + var keys = []; + var values = []; + + this.put = function(key, value, replace) { + if (this.get(key) == null) { + keys[size] = key; + values[size] = value; + size++; + } else if (replace) { + for (i=0; i < size; i++) { + if (keys[i] == key) { + values[i] = value; + } + } + } + } + + this.get = function(key) { + for (i=0; i < size; i++) { + if (keys[i] == key) { + return values[i]; + } + } + return null; + } + + this.clear = function() { + size = 0; + keys = []; + values = []; + } + + // return keys show can show main image + this.getKeys = function() { + return keys; + } + + // dump contents of map keys as string + this.contents = function() { + var retx=""; + for(ii=0; ii < size; ii++) { + retx += keys[ii] + ", "; + } + return retx; + } + + } \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp new file mode 100644 index 0000000..20ef584 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp @@ -0,0 +1,22 @@ +<div id="downloadAds" style="text-align:center; border-style:none; width:100%;"> + <table style="width:100%;"> + <tr> + <td style="text-align:center;"> + <a href="http://java.sun.com/javaee/downloads/index.jsp" target="downloads"><img style="border:none" src="./images/ad-sdk.jpg" alt="Download Java EE 5 SDK"/></a> + <br/> + </td> + </tr> + <tr> + <td style="text-align:center;"> + <a href="http://www.netbeans.org/downloads/index.html" target="downloads"><img style="border:none" src="./images/ad-netbeans.jpg" alt="Download Netbeans IDE"/></a> + <br/> + </td> + </tr> + <tr> + <td style="text-align:center;"> + <a href="http://java.com/en/download/index.jsp" target="downloads"><img style="border:none" src="./images/ad-jre.jpg" alt="Download Java SE"/></a> + <br/> + </td> + </tr> + </table> +</div> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js new file mode 100644 index 0000000..65855c2 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js @@ -0,0 +1,54 @@ +dojo.require("dojo.io"); +function checkAdPage() { + var bindArgs = { + // check to see if an updated page is available + URL: "http://localhost:8080/petstore/downloadAd.txt", + mimetype: "text/plain", + load: returnFunctionx, + error: ajaxBindError}; + + // dispatch the request + dojo.io.bind(bindArgs); +} + +function returnFunctionx(type, data, evt) { + // statically setup popup for simple case + // check return of the dojo call to make sure it is valid + if (evt.readyState == 4) { + if (evt.status == 200) { + alert("data = " + data); + document.getElementById("downloadAds").innerHTML=data; + } + } +} + + +var req; + +function checkAdPageMark() { + // calculate arrow and border image location + req=initRequest(); + + url="http://blueprints.dev.java.net/petstore/downloadAd.txt", + req.onreadystatechange = returnFunctionxMark; + req.open("GET", url, true); + req.send(null); +} + + +function returnFunctionxMark() { + if (req.readyState == 4) { + if (req.status == 200) { + alert("data = " + req.responseText); + document.getElementById("downloadAds").innerHTML=req.responseText; + } + } +} + +initRequest=function() { + if (window.XMLHttpRequest) { + return new XMLHttpRequest(); + } else if (window.ActiveXObject) { + return new ActiveXObject("Microsoft.XMLHTTP"); + } +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json new file mode 100644 index 0000000..3bbf564 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json @@ -0,0 +1,7 @@ +jsonpTest({"keyId":"TestData"}); + +function testexample() { + alert("testexample!!"); +} + +testexample(); \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt new file mode 100644 index 0000000..e9a0944 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt @@ -0,0 +1 @@ +<div id='downloadAds' style='text-align:center; border-style:double; width:100%;'> <table style='width:100%'> <tr> <th style='text-align:center; border-bottom:thin solid black;'>DOWNLOADS Blueprints</th> </tr> <tr> <td style='text-align:center;'> <a href='http://java.sun.com/javaee/downloads/index.jsp' target='downloads'><img style='border:none' src='./images/ad-sdk.jpg' alt='Download Java EE 5 SDK'/></a> </td> </tr> <tr> <td style='text-align:center;'> <a href='http://www.netbeans.org/downloads/index.html' target='downloads'><img style='border:none' src='./images/ad-netbeans.jpg' alt='Download Netbeans IDE'/></a> </td> </tr> <tr> <td style='text-align:center;'> <a href='http://java.com/en/download/index.jsp' target='downloads'><img style='border:none' src='./images/ad-jre.jpg' alt='Download Java SE'/></a> </td> </tr> </table></div> \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js new file mode 100644 index 0000000..0e5b14e --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js @@ -0,0 +1,241 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: engine.js,v 1.10 2006/05/03 22:00:32 inder Exp $ */ + +function Engine () { + + /** + * + * Load template text aloing with an associated script + * + * Argument p properties are as follows: + * + * url : Not required but used if you want to get the template from + * something other than the injection serlvet. For example if + * you want to load content directly from a a JSP or HTML file. + * + * p.template : Not required if you specficy a url property Otherewise this + * is the name of the template file. + * + * p.initFunction: Not required. This function or function pointer will be called + * after the template text and script are loaded. The result of + * the evaluated script will be accessible in the context of + * this function. + * + * p.injectionPoint: Not required. This is the id of an element into. If this is + * not specfied a div will be created under the roon node of + * the document and the template will be injected into it. + * Content is injected by setting the innerHTML property + * of an element to the template text. + */ + this.inject = function (p) { + var targetUrl; + if (!p.url) targetUrl = "controller?command=content&target=/" + p.template; + else targetUrl = p.url; + var templateArgs = { + url: targetUrl, + mimetype: "text/html", + load: function(type, data) { + //if no parent is given append to the document root + var nData = includeEmbeddedResources(data, p.initFunction ); + if (!p.injectionPoint) { + var injectionPoint = document.createElement("div"); + injectionPoint.innerHTML = nData; + document.firstChild.appendChild(injectionPoint); + } else { + p.injectionPoint.innerHTML = nData; + } + if (p.script) { + // now load the associated JavaScript + loadScript(p.script,p.initFunction); + } + } + }; + dojo.io.bind(templateArgs); + } + + function loadScript(targetURL,callback) { + var templateArgs = { + url: targetURL, + mimetype: "text/plain", + load: callback + }; + dojo.io.bind(templateArgs); + } + + /** + * If were returning an text document remove any script in the + * the document and add it to the global scope using a time out. + */ + function includeEmbeddedResources(target, initFunction) { + var bodyText = ""; + var embeddedScripts = []; + var embeddedStyles = []; + var scriptReferences = []; + var styleReferences = []; + var styles = []; + // recursively go through and weed out the scripts + // TODO: Use some better REGEX processing + // TODO: Also support single quotes + while (target.indexOf("<script") != -1) { + var realStart = target.indexOf("<script"); + var scriptSourceStart = target.indexOf("src=", (realStart)); + var scriptElementEnd = target.indexOf(">", realStart); + var end = target.indexOf("</script>", (realStart)) + "</script>".length; + if (realStart != -1 && scriptSourceStart != -1) { + var scriptSourceName; + var scriptSourceLinkStart= scriptSourceStart + 5; + var scriptSourceLinkEnd= target.indexOf("\"", (scriptSourceLinkStart + 1)); + if (scriptSourceStart < scriptElementEnd) { + scriptSourceName = target.substring(scriptSourceLinkStart, scriptSourceLinkEnd); + // prevent multiple inclusions of dojo.js. + // there is no way you would get to this point without dojo being included + if (scriptSourceName.indexOf("dojo.js") == -1) { + scriptReferences.push(scriptSourceName); + } + } + } + // now remove the script body + var scriptBodyStart = scriptElementEnd + 1; + var sBody = target.substring(scriptBodyStart, end - "</script>".length); + if (sBody.length > 0) { + embeddedScripts.push(sBody); + } + //remove script + target = target.substring(0, realStart) + target.substring(end, target.length); + } + + while (target.indexOf("<style") != -1) { + var realStart = target.indexOf("<style"); + var styleElementEnd = target.indexOf(">", realStart); + var end = target.indexOf("</style>", (realStart)) ; + var styleBodyStart = styleElementEnd + 1; + var sBody = target.substring(styleBodyStart, end); + if (sBody.length > 0) { + embeddedStyles.push(sBody); + } + //remove style + target = target.substring(0, realStart) + target.substring(end + "</style>".length, target.length); + } + // get the links + while (target.indexOf("<link") != -1) { + var realStart = target.indexOf("<link"); + var styleSourceStart = target.indexOf("href=", (realStart)); + var styleElementEnd = target.indexOf(">", realStart) +1; + if (realStart != -1 && styleSourceStart != -1) { + var styletSourceName; + var styleSourceLinkStart= styleSourceStart + 6; + var styleSourceLinkEnd= target.indexOf("\"", (styleSourceLinkStart + 1)); + if (styleSourceStart < styleElementEnd) { + styleSourceName = target.substring(styleSourceLinkStart, styleSourceLinkEnd); + styleReferences.push(styleSourceName); + } + //remove style + target = target.substring(0, realStart) + target.substring(styleElementEnd, target.length); + } + } + + var head = document.getElementsByTagName("head")[0]; + + // inject the links + for(var loop = 0; loop < styleReferences.length; loop++) { + var link = document.createElement("link"); + link.href = styleReferences[loop]; + link.type = "text/css"; + link.rel = "stylesheet"; + head.appendChild(link); + } + + var stylesElement; + if (embeddedStyles.length > 0) { + stylesElement = document.createElement("style"); + stylesElement.type="text/css"; + var stylesText; + for(var loop = 0; loop < embeddedStyles.length; loop++) { + stylesText = stylesText + embeddedStyles[loop]; + } + if (document.styleSheets[0].cssText) { + document.styleSheets[0].cssText = document.styleSheets[0].cssText + stylesText; + } else { + stylesElement.appendChild(document.createTextNode(stylesText)); + head.appendChild(stylesElement); + } + } + + scriptLoader(scriptReferences, 0, function() { + this.embeddedScripts = embeddedScripts; + // evaluate the embedded javascripts in the order they were added + // consider using an onload handler + for(var loop = 0; loop < embeddedScripts.length; loop++) { + //alert("evaluating " + embeddedScripts[loop]); + var script = embeddedScripts[loop]; + // append to the script a method to call the scriptLoaderCallback + eval(script); + if (loop == (embeddedScripts.length -1)) { + initFunction(); + } + } + }); + + return target; + } + + + /** + * Load the scripts in order and load them one after on another + */ + function scriptLoader(scripts, index, callbackFunction) { + var head = document.getElementsByTagName("head").item(0); + var scriptElement = document.createElement("script"); + scriptElement.id = "c_script_" + index; + scriptElement.type = "text/javascript"; + + var loadHandler = function () { + if (index < scripts.length && index != scripts.length -1) { + scriptLoader(scripts, ++index, callbackFunction); + } else { + callbackFunction(); + } + } + if (typeof scriptElement.onreadystatechange != 'undefined') { + scriptElement.onreadystatechange = function () { + if (this.readyState == 'loaded') { + loadHandler(); + } + }; + } + scriptElement.onload = loadHandler; + + // Safari not seeing the onload event and does not support the onreadystate + if (navigator.userAgent.toLowerCase().indexOf("safari") != -1) { + scriptElement.src = scripts[index]; + setTimeout(loadHandler, 0); + } + head.appendChild(scriptElement); + setTimeout("document.getElementById('c_script_" + index + "').src ='" + scripts[index] + "'", 0); + + scriptElement = null; + head = null; + } + + /** + * If were returning an XML document remove any script in the + * the document and add it to the global scope using a time out. + */ + function includeEmbeddedScripts(xmlDocument) { + var items = new Array(); + var xmlDocument = document.getElementsByTagName("script"); + + for(var loop = 0; loop < targets.length; loop++) { + var children = targets[loop].childNodes; + var iScript = ""; + for(var innerLoop = 0; innerLoop < children.length; innerLoop++) { + iScript += children[innerLoop].data; + } + items.add(iScript); + children[loop].parentNode.removeChild(children[loop]); + } + for(var loop = 0; loop < items.length; loop++) { + setTimeout(items[loop],0); + } + } +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp new file mode 100644 index 0000000..bb8fb85 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp @@ -0,0 +1,266 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: fileupload.jsp,v 1.57 2007/03/08 21:58:48 inder Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="com.sun.javaee.blueprints.petstore.util.PetstoreConstants"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <title>Petstore Seller page</title> + <script type="text/javascript"> + var submittingForm=false; + + function testRetFunction(type, data, evt){ + if (evt.readyState == 4) { + if(evt.status == 200) { + // check for error + submittingForm=false; + var resultx=data.getElementsByTagName("response")[0]; + var message=resultx.getElementsByTagName("message")[0].childNodes[0].nodeValue; + if(message == "Captchas Filter Error") { + // captcha error + alert("Authorization failed : please enter the correct captcha string"); + } else if(message == "Validation Error") { + alert("Validation failed on the Server :\n" + resultx.getElementsByTagName("detail")[0].childNodes[0].nodeValue); + } else if(message == "Upload Size Error") { + alert("The size of the uploaded image must not be more than 100 KB"); + } else { + // fileupload complete + var thumbpath=resultx.getElementsByTagName("thumbnail")[0].childNodes[0].nodeValue; + var productId=resultx.getElementsByTagName("productId")[0].childNodes[0].nodeValue; + var itemid=resultx.getElementsByTagName("itemId")[0].childNodes[0].nodeValue; + // forward to status page + location.href="fileuploadstatus.jsp?message=" + message + "&id=" + itemid + "&productId=" + productId + "&thumb=" + thumbpath; + } + } else { + // server error, send to error page + // can't forward to errorpage because null pointer gets thrown on lookup of status code ("javax.servlet.error.status_code") + //ajaxBindError(type, data.message); + alert("Persistence failed : Please check if the server logs for more information!") + } + } + } + + + function storeCookie() { + currentcap = "j_captcha_response="+document.getElementById("TestFileuploadForm:captcharesponse").value; + document.cookie = currentcap; + } + + function extractCity(citystatezip) { + var index = citystatezip.indexOf(','); + var nextcity = citystatezip.substring(0, index+4); + return nextcity; + } + + function chooseCity(city) { + var index = city.indexOf(','); + var state = city.substring(index+2, index+4); + var zip = city.substring(index+5); + city = city.substring(0, index); + + document.getElementById('TestFileuploadForm:cityField').value = city; + document.getElementById('TestFileuploadForm:stateField').value = state; + document.getElementById('TestFileuploadForm:zipField').value = zip; + } + + function fileuploadOnsubmit() { + if(!submittingForm) { + var valMess=""; + + // save rich text editor text to element + var descx=dojo.widget.byId('rtEditor').getEditorContent() + var lowDescx=descx.toLowerCase(); + + // START: check validation + if(dojo.byId("TestFileuploadForm:name").value == "") { + valMess += "Error: Pet Name is required.\n"; + } + + // make sure there isn't a script/link tag in the description + if(lowDescx == "" || lowDescx.indexOf("<script") > -1 || lowDescx.indexOf("<link") > -1) { + valMess += "Error: The Description must exist and the field can't have a '<script>' and/or a '<link>' tag in it\n"; + } + + // make sure price is a number + var pricex=dojo.byId("TestFileuploadForm:price").value; + if(pricex == "" || isNaN(parseInt(pricex))) { + // price should be a number + valMess += "Error: Price should should exist and be a number in American Dollars in the format '*.00'.\n"; + } + + // make sure the upload file ends in an suffix + var filex=dojo.byId("fileToUploadId").value; + var lengthx=filex.length; + var suffix=filex.substr(lengthx-4).toLowerCase(); + if(lengthx < 1 || (suffix != ".jpg" && suffix != ".gif" && suffix != ".png")) { + // not a proper upload so error + valMess += "Error: The image upload file must exist and be of type .jpg, .gif or .png\n"; + } + + + // make sure make and address is entered + if(dojo.byId("TestFileuploadForm:firstName").value == "") { + // price should be a number + valMess += "Error: First Name is required.\n"; + } + if(dojo.byId("TestFileuploadForm:lastName").value == "") { + valMess += "Error: Last Name is required.\n"; + } + if(dojo.byId("TestFileuploadForm:street1").value == "") { + valMess += "Error: Street is required.\n"; + } + if(dojo.byId("TestFileuploadForm:cityField").value == "") { + valMess += "Error: City is required.\n"; + } + if(dojo.byId("TestFileuploadForm:stateField").value == "") { + valMess += "Error: State is required.\n"; + } + if(dojo.byId("TestFileuploadForm:zipField").value == "") { + valMess += "Error: Zip Code is required.\n"; + } + + if(valMess != "") { + // error, show message + alert(valMess + "\nPlease addresses the error(s) and re-submit your entry!"); + } else { + // no validation errors, so submit form + submittingForm=true; + // set description + dojo.byId('description').value=descx; + + storeCookie() + document.forms['TestFileuploadForm'].onsubmit(); + } + } + } + + function showFU() { + document.getElementById("fucomponent").style.visibility = "visible"; + } + + function switchPanes(fromDivId, toDivId) { + // show pane + var divx=document.getElementById(fromDivId); + divx.style.visibility='hidden'; + divx=document.getElementById(toDivId); + divx.style.visibility='visible'; + } +</script> +<style> +span.button { + background-color: #6699CC; + color: white; + cursor:pointer; + border: thin outset black; + padding: 1px 5px; +} +div.pane { + width: 90%; + background-color: #EEEEEE; + border: thin double blue; + padding: .5cm; + font: 12px arial; +} + +.nameCol { + width: 45%; +} +.dataCol { + width: 55%; +} + +</style> + </head> + <body onload="showFU()"> + <jsp:include page="banner.jsp"/> + <script>dojo.require("dojo.widget.Editor2");</script> + <br/> + <div id="fucomponent" style="visibility:hidden;"> + <f:view> + + <ui:fileUploadTag id="TestFileuploadForm" serverLocationDir="#{FileUploadBean.uploadImageDirectory}" + postProcessingMethod="#{FileUploadBean.postProcessingMethod}" + retMimeType="text/xml" retFunction="testRetFunction" + progressBarDivId="progress" progressBarSize="40"> + <div id="pane2" class="pane" style="visibility: hidden;"> + <h:panelGrid border="0" columns="2" style="width: 100%" columnClasses="nameCol, dataCol"> + <f:facet name="header"> + <h:outputText value="Information about yourself"/> + </f:facet> + <h:outputText value="*First Name"/> + <h:inputText size="20" id="firstName"></h:inputText> + <h:outputText value="*Last Name"/> + <h:inputText size="20" id="lastName"></h:inputText> + <h:outputText value="Seller Email"/> + <h:inputText size="20" id="email"></h:inputText> + <h:outputText value="*Street"/> + <h:inputText size="20" id="street1"></h:inputText> + <h:outputText value="*City"/> + <ui:autoComplete size="20" maxlength="10" id="cityField" + completionMethod="#{AutocompleteBean.completeCity}" + value="#{AddressBean.city}" required="true" + ondisplay="function(item) { return extractCity(item); }" + onchoose="function(item) { return chooseCity(item); }" /> + <h:outputText value="*State"/> + <ui:autoComplete size="2" maxlength="10" id="stateField" + completionMethod="#{AutocompleteBean.completeState}" + value="#{AddressBean.state}" required="true" /> + <h:outputText value="*Zip Code"/> + <h:inputText size="5" id="zipField" value="#{AddressBean.zip}" required="true" /> + + <h:outputText value="Enter the text as it is shown below (case insensitive)"/> + <h:outputText /> + <h:graphicImage id="captchaImg" url="CaptchaServlet"/> + <h:inputText id="captcharesponse"></h:inputText> + <br/><span class="button" onclick="switchPanes('pane2', 'pane1');"><< Previous</span> +    <span class="button" onclick="fileuploadOnsubmit()">Submit</span> + <br/><div id="progress"></div><br/> + + </h:panelGrid> + </div> + <div class="pane"style="position:absolute; top:125px;" id="pane1"> + <h:panelGrid border="0" columns="2" style="width: 100%" columnClasses="nameCol, dataCol"> + <f:facet name="header"> + <h:outputText value="Information about your pet"/> + </f:facet> + + <h:outputText value="Category"/> + <h:selectOneMenu id="product"> + <f:selectItems value="#{FileUploadBean.products}"/> + </h:selectOneMenu> + + <h:outputText value="*Pet's Name"/> + <h:inputText size="20" id="name"></h:inputText> + + <h:outputText value="*Description (3 lines max display in catalog)"/> + + <div style="border-style:inset; border-width:thin; background-color:white"> + <textarea wrap="soft" dojoType="Editor2" widgetId="rtEditor" id="description" name="TestFileuploadForm:description" + toolbarTemplatePath="${pageContext.request.contextPath}/rteToolBar.html"></textarea> + </div> + + <h:outputText value="*Price (is US dollars)"/> + <h:inputText size="20" id="price"></h:inputText> + + <h:outputText value="*Image File"/> + <input type="file" size="20" name="fileToUpload" id="fileToUploadId"/> + + <h:outputText value="Custom Tag Keywords (separated by spaces)"/> + <h:inputText size="20" id="tags"></h:inputText> + </h:panelGrid> + <br/><span class="button" onclick="switchPanes('pane1', 'pane2');">Next >></span> + </div> + Required fields are designated by a * + </ui:fileUploadTag> + </f:view> + </div> + + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp new file mode 100644 index 0000000..50e3730 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp @@ -0,0 +1,134 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: fileuploadstatus.jsp,v 1.8 2006/05/05 21:05:47 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Seller Photo Submit Status</title> + <style type="text/css"> + #status { background-color : #E0FFFF; + border : none; + width : 50%; + } + </style> + <script type="text/javascript"> + window.onload = function() { + var thumbfile = "${param.thumb}"; + if (thumbfile == "") { + thumbfile = "${sessionScope['fileuploadResponse'].thumbnail}"; + } + thumbpath = "http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.servletContext.contextPath}/ImageServlet/"; + thumbpath += thumbfile; + var divNode = document.getElementById("thumb"); + var imgNode = document.createElement("img"); + imgNode.setAttribute("src", thumbpath); + divNode.appendChild(imgNode); + + // initialize buttons + initButtonImage(); + } + + var imageLayerId = new Array(); + var imageLayerG = new Array(); + var imageLayerC = new Array(); + var imageText = new Array(); + function initButtonImage(){ + imageLayerId[1] ="seller" + imageLayerG[1] = "../images/seller-thumb-g.jpg"; + imageLayerC[1] = "../images/seller-thumb.jpg"; + imageLayerId[2] ="catalog" + imageLayerG[2] = "../images/catalog-thumb-g.jpg"; + imageLayerC[2] = "../images/catalog-thumb.jpg"; + imageLayerId[3] ="home" + imageLayerG[3] = "../images/index-thumb-g.jpg"; + imageLayerC[3] = "../images/index-thumb.jpg"; + + imageText[1] = "Submit another pet"; + imageText[2] = "Go to your pet page"; + imageText[3] = "Go back to PetStore home"; + } + + function highlightButton(n) { + switchButton(true, n); + } + function darkenButton(n) { + switchButton(false, n); + } + + function switchButton(highlight, n){ + var id = imageLayerId[n]; + var btn = document.getElementById(id); + if (highlight) { + btn.src = imageLayerC[n]; + popupText(imageText[n]); + } else { + btn.src = imageLayerG[n]; + popupText(null); + } + } + var Mx; + var My; + function popupText(txt) { + var pNode = document.getElementById("popupText"); + var rx; + var ry; + if (document.all) { + rx = event.clientX + document.body.scrollLeft +10; + ry = event.clientY + document.body.scrollTop -20; + } else { + rx = Mx + 10; + ry = My -20; + } + if (txt) { + pNode.style.display = "block"; + pNode.style.left = rx + "px"; + pNode.style.top = ry + "px"; + pNode.innerHTML = txt; + } else { + pNode.style.display = "none"; + pNode.innerHTML = ""; + } + } + function getMouseXY(mEvent) { + Mx = mEvent.pageX; + My = mEvent.pageY; + } + window.onmousemove = getMouseXY; + </script> + </head> + <body> + <jsp:include page="banner.jsp"/> + <center> + <div id="status"> + <h4>${param.message}</h4> + Here's the uploaded photo of your pet<br/><br/> + <div id="thumb"></div> + <br/><br/> + Would you like to :-<br/><br/> + + <div id="popupText" style="position:absolute;z-index:2;border:1px solid;padding:5px; + border-color:blue;font-size:10pt;background-color:#00ffff;color:blue;display:none"></div> + <table border="0" cellpadding="4" cellspacing="4"> + <tr> + <td><a href="fileupload.jsp" onmouseover="highlightButton(1)" onmouseout="darkenButton(1)"> + <img name="seller" id="seller" src="../images/seller-thumb-g.jpg" alt="seller" width="105" height="60" border="0"> + </a> + </td> + <td><a href="catalog.jsp?pid=${param.productId}&itemId=${param.id}" onmouseover="highlightButton(2)" onmouseout="darkenButton(2)"> + <img name="catalog" id="catalog" src="../images/catalog-thumb-g.jpg" alt="catalog" width="105" height="60" border="0"> + </a> + </td> + <td><a href="http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.servletContext.contextPath}/index.jsp" onmouseover="highlightButton(3)" onmouseout="darkenButton(3)"> + <img name="home" id="home" src="../images/index-thumb-g.jpg" alt="index" width="105" height="60" border="0"> + </a> + </td> + </tr> + </table> + </div> + </center> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp new file mode 100644 index 0000000..8fda523 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp @@ -0,0 +1,15 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: footer.jsp,v 1.10 2007/01/31 19:40:34 basler Exp $ --%> + +<hr/> +<center> + If you have any questions or suggestions, please use the <a + href="https://blueprints.dev.java.net/feedback.html" target="petstore">feedback page</a>. + <br/> + To access the latest versions of any of the BluePrints projects, please use the <a + href="https://blueprints.dev.java.net/downloads.html" target="petstore">download page</a>. + <br/> + <a href="http://blueprints.dev.java.net/" target="petstore">Java BluePrints</a> | + <a href="http://sun.com/" target="petstore">Sun Microsystems</a> © 2007 Sun Microsystems Inc. All rights reserved. Use is subject to license terms. +</center> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg new file mode 100644 index 0000000..734f0ba Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg new file mode 100644 index 0000000..1d6b615 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg new file mode 100644 index 0000000..d50fc6f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg new file mode 100644 index 0000000..77fb082 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg new file mode 100644 index 0000000..93a3832 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg new file mode 100644 index 0000000..b7c7c3b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg new file mode 100644 index 0000000..0c9ce17 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg new file mode 100644 index 0000000..caaf6a7 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg new file mode 100644 index 0000000..6c7d06e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg new file mode 100644 index 0000000..f7daf7a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg new file mode 100644 index 0000000..2794a4b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg new file mode 100644 index 0000000..57175e3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg new file mode 100644 index 0000000..d1b3610 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg new file mode 100644 index 0000000..dd57db1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg new file mode 100644 index 0000000..2f14c53 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg new file mode 100644 index 0000000..334a0f8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg new file mode 100644 index 0000000..6bec9fa Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg new file mode 100644 index 0000000..6219a97 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg new file mode 100644 index 0000000..61b9b59 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg new file mode 100644 index 0000000..d4a91e0 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg new file mode 100644 index 0000000..9c7c4ab Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg new file mode 100644 index 0000000..93eb9da Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg new file mode 100644 index 0000000..cacb8f6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg new file mode 100644 index 0000000..f1da9d8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg new file mode 100644 index 0000000..a999838 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg new file mode 100644 index 0000000..e3eeb3e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg new file mode 100644 index 0000000..bf3aa59 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg new file mode 100644 index 0000000..990e44b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg new file mode 100644 index 0000000..873beb5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg new file mode 100644 index 0000000..e9f2fbb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg new file mode 100644 index 0000000..4119ae3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg new file mode 100644 index 0000000..efa8fa8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg new file mode 100644 index 0000000..6ac0c46 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg new file mode 100644 index 0000000..1ab033b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg new file mode 100644 index 0000000..4b75817 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg new file mode 100644 index 0000000..0bbad05 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg new file mode 100644 index 0000000..f63f01a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg new file mode 100644 index 0000000..10f22cc Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg new file mode 100644 index 0000000..e18660f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg new file mode 100644 index 0000000..e651619 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg new file mode 100644 index 0000000..3f93502 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg new file mode 100644 index 0000000..d33f856 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg new file mode 100644 index 0000000..43cd251 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg new file mode 100644 index 0000000..aa0820c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg new file mode 100644 index 0000000..8b73de1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg new file mode 100644 index 0000000..248ca28 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg new file mode 100644 index 0000000..0c3fb87 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg new file mode 100644 index 0000000..ff93f90 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg new file mode 100644 index 0000000..4571a4b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg new file mode 100644 index 0000000..647323b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg new file mode 100644 index 0000000..e870f66 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg new file mode 100644 index 0000000..23dd110 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg new file mode 100644 index 0000000..3355eaa Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg new file mode 100644 index 0000000..531ec1e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg new file mode 100644 index 0000000..9cd85f5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg new file mode 100644 index 0000000..72377b5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg new file mode 100644 index 0000000..2788d06 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg new file mode 100644 index 0000000..2b836df Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg new file mode 100644 index 0000000..9ef87c3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg new file mode 100644 index 0000000..753d1e9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg new file mode 100644 index 0000000..29953c4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg new file mode 100644 index 0000000..a4a0247 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg new file mode 100644 index 0000000..7caf368 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg new file mode 100644 index 0000000..9f18ed6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg new file mode 100644 index 0000000..65bc52f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg new file mode 100644 index 0000000..b0f299d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg new file mode 100644 index 0000000..d1e9cc3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg new file mode 100644 index 0000000..862c6f8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg new file mode 100644 index 0000000..5c7b519 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg new file mode 100644 index 0000000..079b2fa Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg new file mode 100644 index 0000000..2a1a88a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg new file mode 100644 index 0000000..4d1ed42 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg new file mode 100644 index 0000000..87ea286 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg new file mode 100644 index 0000000..7b76088 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg new file mode 100644 index 0000000..8005ff3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg new file mode 100644 index 0000000..4b21f49 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg new file mode 100644 index 0000000..88a889c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg new file mode 100644 index 0000000..8adf561 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg new file mode 100644 index 0000000..c262965 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif new file mode 100644 index 0000000..85de81a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif new file mode 100644 index 0000000..06f1abe Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif new file mode 100644 index 0000000..9601f1c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif new file mode 100644 index 0000000..f48a7ec Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif new file mode 100644 index 0000000..eaaa3e5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif new file mode 100644 index 0000000..9f440f1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif new file mode 100644 index 0000000..affd8e0 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif new file mode 100644 index 0000000..8b14629 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg new file mode 100644 index 0000000..8c54af1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg new file mode 100644 index 0000000..ccdea14 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg new file mode 100644 index 0000000..b3f1d09 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg new file mode 100644 index 0000000..d3dcfd7 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg new file mode 100644 index 0000000..a4b48da Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg new file mode 100644 index 0000000..5a172c5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg new file mode 100644 index 0000000..40303af Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg new file mode 100644 index 0000000..83d74d2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg new file mode 100644 index 0000000..004dfe3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg new file mode 100644 index 0000000..3e77142 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg new file mode 100644 index 0000000..4c260e8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg new file mode 100644 index 0000000..b146396 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg new file mode 100644 index 0000000..742336f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg new file mode 100644 index 0000000..e5bbc24 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif new file mode 100644 index 0000000..1fd4d1c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif new file mode 100644 index 0000000..8bc7f6c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif new file mode 100644 index 0000000..a51bc96 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif new file mode 100644 index 0000000..e594c67 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif new file mode 100644 index 0000000..6ac8718 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif new file mode 100644 index 0000000..4716f5d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif new file mode 100644 index 0000000..0793e3f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif new file mode 100644 index 0000000..2d289ba Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif new file mode 100644 index 0000000..2ea6132 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif new file mode 100644 index 0000000..159ba6a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif new file mode 100644 index 0000000..a9ed7c9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif new file mode 100644 index 0000000..02faffb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg new file mode 100644 index 0000000..1a13b11 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg new file mode 100644 index 0000000..d6148de Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif new file mode 100644 index 0000000..db70d7d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif new file mode 100644 index 0000000..83b8761 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg new file mode 100644 index 0000000..84e4e89 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg new file mode 100644 index 0000000..5830e57 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg new file mode 100644 index 0000000..bb91e94 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg new file mode 100644 index 0000000..9e8d17d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif new file mode 100644 index 0000000..3c517f3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg new file mode 100644 index 0000000..575a854 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg new file mode 100644 index 0000000..9c2dc57 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif new file mode 100644 index 0000000..92e71b5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif new file mode 100644 index 0000000..e581980 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif new file mode 100644 index 0000000..9baa503 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif new file mode 100644 index 0000000..9124427 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif new file mode 100644 index 0000000..3f1690e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif new file mode 100644 index 0000000..2bf1380 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif new file mode 100644 index 0000000..b13e5b9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg new file mode 100644 index 0000000..ff83a16 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg new file mode 100644 index 0000000..814dab1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg new file mode 100644 index 0000000..2623f3c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg new file mode 100644 index 0000000..ccf10a2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg new file mode 100644 index 0000000..7a7a59e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg new file mode 100644 index 0000000..1f65136 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg new file mode 100644 index 0000000..4709e19 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg new file mode 100644 index 0000000..76a7ff1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg new file mode 100644 index 0000000..13194bd Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg new file mode 100644 index 0000000..cd8ad6e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif new file mode 100644 index 0000000..4d9916c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif new file mode 100644 index 0000000..258489d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif new file mode 100644 index 0000000..d3e39e1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif new file mode 100644 index 0000000..730c813 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg new file mode 100644 index 0000000..cbe5030 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg new file mode 100644 index 0000000..11954df Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif new file mode 100644 index 0000000..4bf637f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg new file mode 100644 index 0000000..097b144 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg new file mode 100644 index 0000000..ec5d64b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg new file mode 100644 index 0000000..31bb43c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg new file mode 100644 index 0000000..70cdc2a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg new file mode 100644 index 0000000..a6646c7 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg new file mode 100644 index 0000000..262659a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg new file mode 100644 index 0000000..ea0c069 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg new file mode 100644 index 0000000..828bba2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg new file mode 100644 index 0000000..5b28bd0 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg new file mode 100644 index 0000000..3c4d322 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg new file mode 100644 index 0000000..c7c1486 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg new file mode 100644 index 0000000..6003c8c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg new file mode 100644 index 0000000..a538759 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg new file mode 100644 index 0000000..2369c90 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg new file mode 100644 index 0000000..13c3f9b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg new file mode 100644 index 0000000..61d877b Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg new file mode 100644 index 0000000..4303498 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg new file mode 100644 index 0000000..37ebbe9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg new file mode 100644 index 0000000..a42ddb4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg new file mode 100644 index 0000000..571475a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif new file mode 100644 index 0000000..6da716a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif new file mode 100644 index 0000000..31d0ada Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg new file mode 100644 index 0000000..d4144da Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg new file mode 100644 index 0000000..fe37700 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg new file mode 100644 index 0000000..d83d3f9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg new file mode 100644 index 0000000..ba460be Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg new file mode 100644 index 0000000..7afa021 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg new file mode 100644 index 0000000..f7fa2b2 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg new file mode 100644 index 0000000..8c06c3d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg new file mode 100644 index 0000000..84e82f5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg new file mode 100644 index 0000000..72a724f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg new file mode 100644 index 0000000..ae9054e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif new file mode 100644 index 0000000..46b3630 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif new file mode 100644 index 0000000..f50cbed Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg new file mode 100644 index 0000000..620c826 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg new file mode 100644 index 0000000..2a52e80 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg new file mode 100644 index 0000000..7b77428 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg new file mode 100644 index 0000000..b3748ae Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif new file mode 100644 index 0000000..665c4d6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif new file mode 100644 index 0000000..2e59d89 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif new file mode 100644 index 0000000..6dca58f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg new file mode 100644 index 0000000..cef3163 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg new file mode 100644 index 0000000..7e97d51 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg new file mode 100644 index 0000000..a95ff80 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg new file mode 100644 index 0000000..b7ae026 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg new file mode 100644 index 0000000..7acf48e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg new file mode 100644 index 0000000..140a325 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg new file mode 100644 index 0000000..4b96d8d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg new file mode 100644 index 0000000..5e3b381 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg new file mode 100644 index 0000000..f2f1848 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg new file mode 100644 index 0000000..a68cd9e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif new file mode 100644 index 0000000..da05f30 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg new file mode 100644 index 0000000..35387ca Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg new file mode 100644 index 0000000..7365af9 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg new file mode 100644 index 0000000..0e6a1a5 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg new file mode 100644 index 0000000..950c84e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif new file mode 100644 index 0000000..8408264 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg new file mode 100644 index 0000000..dea6b6d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg new file mode 100644 index 0000000..0f0ac10 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg new file mode 100644 index 0000000..3c7618a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg new file mode 100644 index 0000000..e765076 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg new file mode 100644 index 0000000..7c7d897 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg new file mode 100644 index 0000000..4cdb8bb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg new file mode 100644 index 0000000..f38af83 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg new file mode 100644 index 0000000..bec9ee6 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg new file mode 100644 index 0000000..9bb9a17 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg new file mode 100644 index 0000000..c91be8e Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg new file mode 100644 index 0000000..f4ce9ec Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg new file mode 100644 index 0000000..b599c76 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg new file mode 100644 index 0000000..cae1408 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg new file mode 100644 index 0000000..57e02ff Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg new file mode 100644 index 0000000..758ed35 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg new file mode 100644 index 0000000..3aec8c4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg new file mode 100644 index 0000000..13164b8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg new file mode 100644 index 0000000..fbd5412 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg new file mode 100644 index 0000000..148006d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg new file mode 100644 index 0000000..f25a814 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg new file mode 100644 index 0000000..2d9c2b1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg new file mode 100644 index 0000000..3573943 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg new file mode 100644 index 0000000..9be6e41 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg new file mode 100644 index 0000000..0559845 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg new file mode 100644 index 0000000..d4521a3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg new file mode 100644 index 0000000..370e4fd Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg new file mode 100644 index 0000000..5b89061 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg new file mode 100644 index 0000000..efff187 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg new file mode 100644 index 0000000..93af55f Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg new file mode 100644 index 0000000..d751856 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg new file mode 100644 index 0000000..9c72270 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg new file mode 100644 index 0000000..9003e0c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif new file mode 100644 index 0000000..0ee4c52 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif new file mode 100644 index 0000000..89e7ba1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg new file mode 100644 index 0000000..16d1692 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg new file mode 100644 index 0000000..f183f1c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg new file mode 100644 index 0000000..005d708 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg new file mode 100644 index 0000000..e82c87d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg new file mode 100644 index 0000000..508edb1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg new file mode 100644 index 0000000..870c2f3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg new file mode 100644 index 0000000..a18e30a Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg new file mode 100644 index 0000000..febadd3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg new file mode 100644 index 0000000..c7329f4 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg new file mode 100644 index 0000000..3753577 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg new file mode 100644 index 0000000..a9c45e8 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg new file mode 100644 index 0000000..2b7adf1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg new file mode 100644 index 0000000..93e78ee Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg new file mode 100644 index 0000000..cdbb5fb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif new file mode 100644 index 0000000..cdae47c Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg new file mode 100644 index 0000000..6c1e407 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg new file mode 100644 index 0000000..991392d Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg new file mode 100644 index 0000000..49898fb Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg new file mode 100644 index 0000000..eb43a52 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg new file mode 100644 index 0000000..c918e36 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg new file mode 100644 index 0000000..f5063e3 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif new file mode 100644 index 0000000..39fa7ba Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif new file mode 100644 index 0000000..52bc595 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif new file mode 100644 index 0000000..0393bc1 Binary files /dev/null and b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif differ diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp new file mode 100644 index 0000000..9ce0b8d --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp @@ -0,0 +1,239 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: index.jsp,v 1.17 2007/03/15 23:19:46 basler Exp $ --%> +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> + +<% +try { + CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); + List<Tag> tags=cf.getTagsInChunk(0, 12); + // since top 20 come from database or desending refCount order, need to reorder by tag name + Collections.sort(tags, new Comparator() { + public int compare(Object one, Object two) { + int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); + return (cc < 0 ? 1 : cc > 0 ? -1 : 0); + } + }); +%> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > + <title>Java Pet Store Reference Application</title> + <script type="text/javascript" src="./common.js"></script> + <link type="text/css" rel="stylesheet" href="./tag.css"/> + <script type="text/javascript"> + //var djConfig = {isDebug: true }; + </script> + </head> + <body> + + <jsp:include page="banner.jsp" /> + <script> + dojo.require("dojo.widget.FisheyeList"); + dojo.require("dojo.io.*"); + dojo.require("dojo.io.ScriptSrcIO"); + //transport: "ScriptSrcTransport", + //url: "http://localhost:8080/petstore/downloadAd.json", + + function browse(category) { + window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; + + } + + + function debugProperties(namex) { + var listx=""; + var ob=namex; + for(xx in ob) { + listx += xx + " = " + ob[xx] + "<br/>" + } + //document.write(listx); + alert(listx); + } + + function checkAdPage() { + var bindArgs = { + //url: "https://blueprints.dev.java.net/petstore/downloadAd.json", + //url: "http://localhost:8080/petstore/downloadAd.json", + url: "http://search.yahooapis.com/ImageSearchService/V1/imageSearch?appid=YahooDe…", + transport: "ScriptSrcTransport", + jsonParamName: "callback", + mimetype: "text/json", + load: function(type, data, event, kwArgs) { + /* type will be "load", data will be response data, event will null, and kwArgs are the keyword arguments used in the dojo.io.bind call. */ + alert("load = " + data.ResultSet.totalResultsAvailable); + //debugProperties(data); + //document.getElementById("downloadAds").innerHTML=data.downloadxx; + + + }, + error: function(type, data, event, kwArgs) { + /* type will be "error", data will be response data, event will null, and kwArgs are the keyword arguments used in the dojo.io.bind call. */ + alert("error"); + }, + timeout: function() { + /* Called if there is a timeout */ + alert("timeout"); + }, + timeoutSeconds: 10}; + // dispatch the request + dojo.io.bind(bindArgs); + } + + function callback() { + alert("callback"); + } + + function returnFunctionx(type, data, evt) { + // statically setup popup for simple case + // check return of the dojo call to make sure it is valid + if (evt.readyState == 4) { + if (evt.status == 200) { + alert("data = " + data.downloadxx); + //document.getElementById("downloadAds").innerHTML=data; + document.getElementById("downloadAds").innerHTML=data.downloadxx; + } + } + } + + function testit() { + testx={download:"test", textx:"it"}; + alert("test = " + testx.download); + } + + + </script> + <span onclick="checkAdPage();">test it</span> + + + <table bgcolor="white"> + <tr> + <td valign="top"> + <div class="outerbar" style="width: 200px"> + + <div dojoType="FisheyeList" + itemWidth="170" itemHeight="50" + itemMaxWidth="340" itemMaxHeight="100" + orientation="vertical" + effectUnits="2" + itemPadding="10" + attachEdge="top" + labelEdge="bottom" + enableCrappySvgSupport="false"> + + <div dojoType="FisheyeListItem" onClick="browse('Dogs');" + iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Cats');" + iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Birds');" + iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Fish');" + iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" + iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> + </div> + </div> + + </div> + </td> + <td valign="top" style="width: 400px"> + <div id="bodyCenter"> + <table valign="top" id="bodyTable" border="0"> + <tr> + <td> + <map name="petmap"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="72,2,280,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" + alt="Fish" + coords="2,180,72,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" + alt="Dogs" + coords="60,250,130,320"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" + alt="Reptiles" + coords="140,270,210,340"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" + alt="Cats" + coords="225,240,295,310"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="280,180,350,250"> + </map> + + <img src="${pageContext.request.contextPath}/images/splash.gif" + alt="Pet Selection Map" + usemap="#petmap" + width="350" + height="355" + border="0"> + </td> + </tr> + </table> + + </div> + </td> + <td style="vertical-align:top;"> + <div style="border-style: double; width:100%;"> + <table border="0"> + <tr> + <th colspan="2" style="text-align:center">Most Popular Tags</th> + </tr> + <tr> +<% + String style=null; + int refx=0, ii=0; + for(Tag tag : tags) { + refx=tag.getRefCount() / 5; + if(refx >= 3) { + style="xxlarge"; + } else if(refx == 2) { + style="xlarge"; + } else if(refx == 1) { + style="large"; + } else { + style="medium"; + } + + if((ii % 2) == 0) out.println("</tr>\n<tr>"); + out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + + tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); + ii++; + } +%> + </tr> + </table> + </div> + </td> + <td valign="top" style="vertical-align:top; width:250px;"> + <div id="downloadAds"> + <jsp:include page="download.jsp" /> + </div> + </td> + </tr> + </table> + + <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> + <table id="completeTable" class="popupTable" ></table> + </div> + + <br/><br/> + <jsp:include page="footer.jsp" /> + </body> +</html> +<% + } catch(Exception e) { + e.printStackTrace(); + } +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html new file mode 100644 index 0000000..8c5ca1b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html @@ -0,0 +1,117 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> + <title>Java Pet Store Reference Application, 2.0 Early Access</title> +</head> +<body> +<hr> +<h1>Java Pet Store Reference Application, 2.0 Early Access</h1> +<h2><a href="./faces/index.jsp">Enter the Store</a></h2> +The Java Pet Store Reference Application is a sample application +brought to +you by the <a href="http://blueprints.dev.java.net/">Java BluePrints</a> +program at <a href="http://sun.com">Sun Microsystems</a>. +This application is designed to illustrate how the Java EE 5 Platform +can be used to develop an AJAX-enabled Web 2.0 application. The +application comes with full source-code available under a  +BSD-style license, so you can experiment with it and use it in your own +applications. <br> +<br> +<a href="#try">Try the Petstore Demo</a><br> +<a href="#learn">Learn more about features in Java Petstore</a><br> +<a href="#contributors">Show appreciation for Pet Store image +contributors</a><br> +<a href="#about">About BluePrints</a> +<h2><a name="try"></a>Try the Pet Store Demo</h2> +Now that you have the application deployed, you can use it and try out +the features. You can browse the catalog of pets for sale, sell your +own pets on the store, search for pets by location using Google maps, +view the RSS news bar for BluePrints news, and more.<a + href="./faces/index.jsp">Enter the Store</a> +<h2><a name="features"></a>Learn More About Features in Java Petstore</h2> +<p>Here are some of the features of this application. For a detailed +description of  the features in the Java Pet +Store Reference application, please  refer to the article at <a + href="http://java.sun.com/developer/technicalArticles/J2EE/petstore/">http://java.sun.com/developer/technicalArticles/J2EE/petstore/</a><a + href="http://java.sun.com/developer/technicalArticles/J2EE/petstore/"></a><b> +</b></p> +<ol> + <li>Using AJAX for single-page interactive Web applications: The +application is designed to be a single-page application where the user +never leaves the page. Different sections of the page are dynamically +loaded based on the user actions. These sections are loaded +asynchronously to avoid any browser refreshes, and to give a richer +interactive user-experience. </li> + <li>Mash-ups with Google maps: The petstore uses a mashup with +Google's Map service, alongwith Yahoo's Geo-coder service to allow +users to see the available pets in a neighborhood. </li> + <li>Community-created content: The application allows a user to add a +pet for sale or adoption on the Website. The seller uploads </li> + <ol> + <li>Using Captchas to discourage spam in the community created +content: Whenever a website allows its users to add content, it needs +to build mechanisms to discourage placement of spurious content on its +Website through automated mechanisms. We demonstrate how captchas can +be used for this purpose. </li> + <li>Community rated content: Each item in the petstore website can +be rated by the users </li> + <li>Payments through PayPal: The application provides a meeting +ground for +buyers and sellers of pets. The application uses the PayPal service to +allow sellers to accept payments.</li> + </ol> + <li>Integration of an RSS feed: The website integrates an RSS feed of +news items coming out the Java BluePrints website. The </li> + <li>Integration of  a search engine: The application integrates +Apache Lucene search engine to handle all website searches. </li> +</ol> +This application also demonstrate the use of various features of  +the Java EE 5 platform such as: <br> +<ol> + <li>JavaServer Faces: Many of the AJAX features are implemented as +reusable JavaServer Faces components. </li> + <li>Java Persistence API: The application uses Java Persistence APIs +to create an object/relational mapping layer. </li> + <li>Dependency Injection: The application uses dependency injection +instead of deployment descriptors.</li> +</ol> +See the <a + href="https://blueprints.dev.java.net/petstore/architecture.html">Pet +Store Architecure document</a> for more detail. +<h2><a name="contributors"></a>Show Appreciation for Pet Store Image +Contributors</h2> +<p>For many images in the Java Petstore, some organizations and people +were kind enough to give us permission to photograph their animals or +even give us photos to use in the Java Petstore. See the <a + href="https://blueprints.dev.java.net/petstore/imagecontributors.html"> +image contributors </a> page for a more detail on these friends of the +animals.  +</p> +<h2><a name="about"></a>About Java BluePrints</h2> +<p>The Java BluePrints program defines the application programming +model for the Java EE™ platform. It provides best practice guidelines +and +architectural recommendations for real-world application scenarios to +enable developers to build portable, scalable, and robust applications +using the Java EE technologies.<br> +<br> +Some other popular projects from Java BluePrints are <a + href="http://blueprints.dev.java.net/bpcatalog/">Java BluePrints +Solutions Catalog</a>,  <a target="_blank" + href="https://blueprints.dev.java.net/adventurebuilder/">Java +Adventure Builder Reference</a> application, <a target="_blank" + href="http://java.sun.com/blueprints/guidelines/designing_webservices/">Designing +Web Services with the J2EE(TM) 1.4 Platform : JAX-RPC, SOAP, and XML +Technologies</a> book, and the <a target="_blank" + href="http://java.sun.com/blueprints/guidelines/designing_enterprise_applications…"><span + class="body"><span class="title">Designing +Enterprise Applications with the J2EE Platform, Second Edition</span></span></a> +book. You can access these projects and other content from Java +BluePrints by visiting the <a target="_blank" + href="http://java.sun.com/reference/blueprints/index.html">Java +BluePrints website</a>. </p> +<hr noshade="noshade">Copyright © 2007 Sun Microsystems, +Inc. All Rights Reserved. +</body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp new file mode 100644 index 0000000..ab59139 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp @@ -0,0 +1,164 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: index.jsp,v 1.20 2007/03/16 20:18:59 basler Exp $ --%> +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> + +<% +try { + CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); + List<Tag> tags=cf.getTagsInChunk(0, 12); + // since top 20 come from database or desending refCount order, need to reorder by tag name + Collections.sort(tags, new Comparator() { + public int compare(Object one, Object two) { + int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); + return (cc < 0 ? 1 : cc > 0 ? -1 : 0); + } + }); +%> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > + <title>Java Pet Store Reference Application</title> + <link type="text/css" rel="stylesheet" href="./tag.css"/> + </head> + <body> + + <jsp:include page="banner.jsp" /> + <script> + dojo.require("dojo.widget.FisheyeList"); + function browse(category) { + window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; + } + </script> + <table bgcolor="white"> + <tr> + <td valign="top"> + <div class="outerbar" style="width: 200px"> + + <div dojoType="FisheyeList" + itemWidth="170" itemHeight="50" + itemMaxWidth="340" itemMaxHeight="100" + orientation="vertical" + effectUnits="2" + itemPadding="10" + attachEdge="top" + labelEdge="bottom" + enableCrappySvgSupport="false"> + + <div dojoType="FisheyeListItem" onClick="browse('Dogs');" + iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Cats');" + iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Birds');" + iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Fish');" + iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" + iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> + </div> + </div> + + </div> + </td> + <td valign="top" style="width: 400px"> + <div id="bodyCenter"> + <table valign="top" id="bodyTable" border="0"> + <tr> + <td> + <map name="petmap"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="72,2,280,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" + alt="Fish" + coords="2,180,72,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" + alt="Dogs" + coords="60,250,130,320"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" + alt="Reptiles" + coords="140,270,210,340"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" + alt="Cats" + coords="225,240,295,310"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="280,180,350,250"> + </map> + + <img src="${pageContext.request.contextPath}/images/splash.gif" + alt="Pet Selection Map" + usemap="#petmap" + width="350" + height="355" + border="0"> + </td> + </tr> + </table> + + </div> + </td> + <td style="vertical-align:top;"> + <div style="border-style: double; width:100%;"> + <table border="0"> + <tr> + <th colspan="2" style="text-align:center">Most Popular Tags</th> + </tr> + <tr> +<% + String style=null; + int refx=0, ii=0; + for(Tag tag : tags) { + refx=tag.getRefCount() / 5; + if(refx >= 3) { + style="xxlarge"; + } else if(refx == 2) { + style="xlarge"; + } else if(refx == 1) { + style="large"; + } else { + style="medium"; + } + + if((ii % 2) == 0) out.println("</tr>\n<tr>"); + out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + + tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); + ii++; + } +%> + </tr> + </table> + </div> + </td> + <td style="vertical-align:top; width:300px; text-align:right;"> + <div id="downloadAds"> + <jsp:include page="download.jsp" /> + </div> + </td> + </tr> + </table> + + <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> + <table id="completeTable" class="popupTable" ></table> + </div> + + <br/><br/> + <jsp:include page="footer.jsp" /> + + </body> +</html> +<% + } catch(Exception e) { + e.printStackTrace(); + } +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp new file mode 100644 index 0000000..54f30ce --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp @@ -0,0 +1,194 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: index.jsp,v 1.18 2007/03/16 15:29:15 basler Exp $ --%> +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> + +<% +try { + CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); + List<Tag> tags=cf.getTagsInChunk(0, 12); + // since top 20 come from database or desending refCount order, need to reorder by tag name + Collections.sort(tags, new Comparator() { + public int compare(Object one, Object two) { + int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); + return (cc < 0 ? 1 : cc > 0 ? -1 : 0); + } + }); +%> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > + <title>Java Pet Store Reference Application</title> + <link type="text/css" rel="stylesheet" href="./tag.css"/> + <script type="text/javascript" src="https://blueprints.dev.java.net/petstore/downloadAd.js"></script> + </head> + <body onload="alterDownloadAd()"> + + <jsp:include page="banner.jsp" /> + <script> + dojo.require("dojo.widget.FisheyeList"); + function browse(category) { + window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; + } + + function alterDownloadAd() { + if(typeof checkAdPage != "undefined") { + var textx=checkAdPage(); + if(typeof textx != "undefined") { + document.getElementById("downloadAds").innerHTML=textx; + } + } + } + + + </script> + <table bgcolor="white"> + <tr> + <td valign="top"> + <div class="outerbar" style="width: 200px"> + + <div dojoType="FisheyeList" + itemWidth="170" itemHeight="50" + itemMaxWidth="340" itemMaxHeight="100" + orientation="vertical" + effectUnits="2" + itemPadding="10" + attachEdge="top" + labelEdge="bottom" + enableCrappySvgSupport="false"> + + <div dojoType="FisheyeListItem" onClick="browse('Dogs');" + iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Cats');" + iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Birds');" + iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Fish');" + iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> + </div> + + <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" + iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> + </div> + </div> + + </div> + </td> + <td valign="top" style="width: 400px"> + <div id="bodyCenter"> + <table valign="top" id="bodyTable" border="0"> + <tr> + <td> + <map name="petmap"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="72,2,280,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" + alt="Fish" + coords="2,180,72,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" + alt="Dogs" + coords="60,250,130,320"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" + alt="Reptiles" + coords="140,270,210,340"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" + alt="Cats" + coords="225,240,295,310"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" + alt="Birds" + coords="280,180,350,250"> + </map> + + <img src="${pageContext.request.contextPath}/images/splash.gif" + alt="Pet Selection Map" + usemap="#petmap" + width="350" + height="355" + border="0"> + </td> + </tr> + </table> + + </div> + </td> + <td style="vertical-align:top;"> + <div style="border-style: double; width:100%;"> + <table border="0"> + <tr> + <th colspan="2" style="text-align:center">Most Popular Tags</th> + </tr> + <tr> +<% + String style=null; + int refx=0, ii=0; + for(Tag tag : tags) { + refx=tag.getRefCount() / 5; + if(refx >= 3) { + style="xxlarge"; + } else if(refx == 2) { + style="xlarge"; + } else if(refx == 1) { + style="large"; + } else { + style="medium"; + } + + if((ii % 2) == 0) out.println("</tr>\n<tr>"); + out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + + tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); + ii++; + } +%> + </tr> + </table> + </div> + </td> + <td style="vertical-align:top; width:250px; text-align:right;"> + <div id="downloadAds"> + <div id="downloadAds" style="text-align:center; border-style:none; width:100%;"> + <table style="width:100%"> + <tr> + <td style="text-align:center;"> + <a href="http://java.sun.com/javaee/downloads/index.jsp" target="downloads"><img style="border:none" src="./images/ad-sdk.jpg" alt="Download Java EE 5 SDK"/></a> + </td> + </tr> + <tr> + <td style="text-align:center;"> + <a href="http://www.netbeans.org/downloads/index.html" target="downloads"><img style="border:none" src="./images/ad-netbeans.jpg" alt="Download Netbeans IDE"/></a> + </td> + </tr> + <tr> + <td style="text-align:center;"> + <a href="http://java.com/en/download/index.jsp" target="downloads"><img style="border:none" src="./images/ad-jre.jpg" alt="Download Java SE"/></a> + </td> + </tr> + </table> + </div> + </div> + </td> + </tr> + </table> + + <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> + <table id="completeTable" class="popupTable" ></table> + </div> + + <br/><br/> + <jsp:include page="footer.jsp" /> + + </body> +</html> +<% + } catch(Exception e) { + e.printStackTrace(); + } +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp new file mode 100644 index 0000000..d2fd4c5 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp @@ -0,0 +1,53 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>JSON Test Page</title> + <script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> + + <script type="text/javascript"> + function getJSON() { + // get data and send to controller servlet + var bindArgs = { + url: "${pageContext.request.contextPath}/catalog?command=items&pid=feline01&start=0&length=2&format=json", + mimetype: "text/json", + error: function(){ alert("error")}, + load: callbackx + }; + + dojo.io.bind(bindArgs); + } + + function callbackx(type, data, evt) { + // check successful response + if (evt.readyState == 4) { + if (evt.status == 200) { + var prodsx=data.products; + rep="Products:<br\>"; + for(ii=0; ii < prodsx.length; ii++) { + rep += prodsx[ii].name + "<br/>"; + } + rep+="<br\>"; + document.getElementById("testResult").innerHTML=rep; + } + } + } + + </script> + + </head> + <body> + + <h1>JSON Test Page</h1> + <span onclick="getJSON();"> GET DATA </span><br/><br/> + + <div id="testResult"> + This should be populated with result. If not, look at the error console for errors. + </div> + + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp new file mode 100644 index 0000000..b634b42 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp @@ -0,0 +1,36 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: lookup.jsp,v 1.7 2007/01/19 21:47:31 basler Exp $ --%> + +<%@page contentType="text/xml"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item"%> + +<% + String itemId=request.getParameter("itemId"); + String popupView=request.getParameter("popupView"); + + try { + ServletContext context=config.getServletContext(); + CatalogFacade cf=(CatalogFacade)context.getAttribute("CatalogFacade"); + Item item=cf.getItem(itemId); + + if(itemId != null) { + out.println("<response>"); + out.println("<name>" + item.getName() + "</name>"); + String tmp=null; + if(popupView != null && popupView.equals("2")) { + tmp=item.getAddress().addressToString(); + } else { + tmp=item.getDescription(); + } + out.println("<description><![CDATA[" + tmp + "]]></description>"); + out.println("<price>" + java.text.NumberFormat.getCurrencyInstance(java.util.Locale.US).format(item.getPrice()) + "</price>"); + out.println("<image>" + request.getContextPath() + "/ImageServlet/" + item.getImageThumbURL() + "</image>"); + out.println("</response>"); + out.flush(); + } + } catch(Exception ee) { + ee.printStackTrace(); + } + +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf new file mode 100644 index 0000000..b207a5a --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf @@ -0,0 +1,36 @@ + + + <table valign="top" id="bodyTable" border="0"> + <tr> + <td> + <map name="petmap"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('BIRDS')" + alt="Birds" + coords="72,2,280,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('FISH')" + alt="Fish" + coords="2,180,72,250"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('DOGS')" + alt="Dogs" + coords="60,250,130,320"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('REPTILES')" + alt="Reptiles" + coords="140,270,210,340"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('CATS')" + alt="Cats" + coords="225,240,295,310"> + <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('BIRDS')" + alt="Birds" + coords="280,180,350,250"> + </map> + + <img src="images/splash.gif" + alt="Pet Selection Map" + usemap="#petmap" + width="350" + height="355" + border="0"> + </td> + </tr> + </table> \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js new file mode 100644 index 0000000..b8de8fc --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js @@ -0,0 +1,21 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: main.js,v 1.9 2006/05/03 22:00:33 inder Exp $ */ + +var isIE; +var bodyRowText; + +dojo.require("dojo.widget.FisheyeList"); +init(); + +function browse(category) { + window.location.href="catalog.jsp?catid=" + category; +} + +function loadPetstore() { + init(); + showMain(); +} + +function init() { + if (navigator.userAgent.indexOf("IE") != -1) isIE = true; +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp new file mode 100644 index 0000000..c2673c9 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp @@ -0,0 +1,143 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: map.jsp,v 1.20 2006/11/02 00:34:49 basler Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item, com.sun.javaee.blueprints.petstore.mapviewer.MapBean, com.sun.javaee.blueprints.components.ui.mapviewer.MapMarker"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Map Display</title> + </head> + <body> + <jsp:include page="banner.jsp" /> + <br> + <center> + <table border="1" cellspacing="5px" cellpadding="5px" + style="border-style:double; border-color:darkgreen; padding:5px"> + <tr> + <td valign="top" align="center" width="200px"> + <table border="0"> + <c:if test="${!empty sessionScope.MapBean.locations}"> + <tr> + <th> + <u>${sessionScope.MapBean.locationCount} Items Displayed</u> + </th> + </tr> + <tr> + <td> + <ul> +<% + try { + // need to use scriptlet to preform the reconciliation of items to map coords + // this way I don't have to create a new wrapper object + MapBean mapBean=(MapBean)session.getAttribute("MapBean"); + MapMarker[] mapMarkers=(MapMarker[])mapBean.getLocations(); + java.util.List<Item> items=mapBean.getItems(); + Item itemxx=null; + String popupOptions=null; + for(int ii=0; ii < mapMarkers.length; ii++) { + + //System.out.println("loop - " + ii + " - " + mapBean.getCenterAddress()); + if(mapBean.getCenterAddress() != null && !mapBean.getCenterAddress().equals("")) { + // center point is set to the first mapMarker, items are off by one + if(ii > 0) { + // reconcile correct mapMarkers with items list + itemxx=items.get(ii - 1); + popupOptions="onmouseover=\"bpui.popup.show('pop1', event, '" + itemxx.getItemID() + "')\" onmouseout=\"bpui.popup.hide('pop1')\""; + } else { + // first item of mapMarker is centerpoint, so no corresponding item, also no popup on mouseover + itemxx=null; + popupOptions=""; + } + } else { + // no center point items should be 1-to-1 with mappedMarkers + itemxx=items.get(ii); + popupOptions="onmouseover=\"bpui.popup.show('pop1', event, '" + itemxx.getItemID() + "')\" onmouseout=\"bpui.popup.hide('pop1')\""; + } +%> + <li> + <a href="javascript:mapViewerx.openInfoWindowHtml(new GPoint(<%= mapMarkers[ii].getLongitude() %>,<%= mapMarkers[ii].getLatitude() %>), '<%= mapMarkers[ii].getMarkup() %>');" <%= popupOptions %>> + <%= mapBean.changeSpaces((itemxx == null) ? mapMarkers[ii].getMarkup() : "<b>" + itemxx.getName() + "</b>") %> + </a> +<% + if(itemxx != null) { + // remove these links for center point entry +%> + <a href="${pageContext.request.contextPath}/faces/catalog.jsp?pid=<%= itemxx.getProductID() %>&itemId=<%= itemxx.getItemID() %>" alt="Go to Detailed Catalog Page"> + <i>(detail)</i> + </a> + + <br/> + <a href="javascript:mapViewerx.openInfoWindowHtml(new GPoint(<%= mapMarkers[ii].getLongitude() %>, <%= mapMarkers[ii].getLatitude() %>), '<%= mapMarkers[ii].getMarkup() %>');" <%= popupOptions %>> + <font size="-1"><%= mapBean.changeSpaces((itemxx == null) ? mapMarkers[ii].getMarkup() : itemxx.getAddress().addressToString()) %></font> + </a> +<% + } +%> + </li> + <% + } + } catch(Exception ee) { + ee.printStackTrace(); + + } + %> + </ul> + <td> + </tr> + </c:if> + </table> + </td> + <td valign="top"> + <f:view> + <ui:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?itemId=" + elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> +  + <img id="spaceImage" height="10px" width="12px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> + <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> + <tr> + <td align="left" valign="top"><b>Name:</b> + <span id="value1">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Description:</b> + <span id="value2">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Price:</b> + <span id="value3">Loading Data...</span></td> + </tr> + <tr> + <td colspan="2" align="center"><img name="image" id="imageId" src="" + alt="[Loading Image...]" border="2"/><br/><br/></td> + </tr> + </table> + </ui:popupTag> + + + <ui:mapViewer id="mapViewerx" center="#{MapBean.mapPoint}" info="#{MapBean.mapMarker}" + markers="#{MapBean.locations}" zoomLevel="#{MapBean.zoomLevel}" style="height: 500px; width: 700px"/> + + </f:view> + </td> + </tr> + </table> + <script type="text/javascript"> + bpui.mapviewer.createMapControl = function() { + return new GLargeMapControl(); + } + + </script> + <br/><br/> + </center> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp new file mode 100644 index 0000000..a3ae6dc --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp @@ -0,0 +1,65 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: mapAll.jsp,v 1.14 2006/12/06 22:44:37 basler Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Map Viewer Page</title> + </head> + <body> + <jsp:include page="banner.jsp" /> + <center> + <f:view> + + <h:form id="form1"> + <table border="1" cellpadding="5" cellspacing="5" style="border-style:double; width:600px; border-color:darkgreen; padding:5px"> + <tr> + <td colspan=3> + <i>Select the category whose items will be displayed in a Google map based on the Seller's address. + Optionally, enter a "Center Point Address" and "Area" to limit the search to a specific + area around the center point.</i> + </td> + </tr> + <tr> + <th align="right">Select Category to Map:</th> + <td align="center" colspan=2> + <h:selectOneRadio value="#{MapBean.category}" required="true"> + <f:selectItems value="#{MapBean.categories}"/> + </h:selectOneRadio> + </td> + </tr> + <tr> + <th align="right">Center Point Address:</th> + <td> + <h:inputText id="centerAddress" value="#{MapBean.centerAddress}" size="70"/> + <br/><small><i>For example: 4140 Network Circle, Santa Clara, CA, 95054</i></small> + </td> + </tr> + <tr> + <th align="right">Area (in Miles):</th> + <td> + <h:inputText id="radius" value="#{MapBean.radius}" size="5"/> + </td> + </tr> + <tr> + <td colspan="2" align="center"> + <h:commandButton action="#{MapBean.findAllByCategory}" id="submitCat" type="submit" value="Map Category"/> + </td> + </tr> + + </table> + <h:messages/> + </h:form> + </f:view> +     + </center> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js new file mode 100644 index 0000000..5bcac34 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js @@ -0,0 +1,190 @@ + +dojo.require("dojo.io.*"); +dojo.require("dojo.event.*"); + +var bpuinews; +if (typeof bpuinews == "undefined") { + bpuinews = new Object(); +} + +bpuinews.RSS = function() { + var currentItem = 0; + var limitCharNum = 75; + var itemNum=0; + var rssData = null; + var prev; + var next; + var prevHit=false; + + this.getRssInJson = function (method, uri) { + prev = document.getElementById("previous"); + next = document.getElementById("next"); + dojo.event.connect(prev, "onclick", function(evt) {showPrevious();}); + dojo.event.connect(next, "onclick", function (evt) {showNext();}); + prev.disabled=true; + + var encodedURI = encodeURI(method + "?style=json&itemCount=0&url="+uri); + var bindArgs = { + url: encodedURI, + mimetype: "text/json", + load: function (type, data, http) { + handleJsonRss(data); + }, + error: function (t, e) { + dojo.debug("ERROR : " + e.message); + } + } + dojo.io.bind(bindArgs); + return false; + } + + function handleJsonRss(json) { + rssData = json; + itemNum = json.channel.item.length; + showNext(); + } + + function createUl(skip) { + var i; + var cp="<ul>\n"; + for (i = currentItem; i<currentItem + skip; i++) { + cp += "<li><b>"+decodeURL(rssData.channel.item[i].title)+"</b>\n"; + cp += "<p>" + decodeURL(rssData.channel.item[i].description) + "</p>\n</li>\n"; + } + cp += "</ul>\n"; + return cp; + } + + // Following funcs(showNext, showPrevious) should be connected to the button + // by dojo.event.connect. + function showNext() { + var skip = 5; + if (prevHit) { + currentItem = currentItem + skip; + prevHit = false; + } + var nextCurrentItem = currentItem + skip; + if (nextCurrentItem >= itemNum) { + skip = itemNum - currentItem; + // deactivate "next" button + next.disabled=true; + nextCurrentItem = currentItem; + } + // activate "previous" button + if (currentItem != 0) { + prev.disabled=false; + } + var cp = createUl(skip); + var elm = document.getElementById("news"); + elm.innerHTML = cp; + currentItem = nextCurrentItem; + } + + function showPrevious() { + prevHit = true; + var skip = 5; + currentItem = currentItem - skip; + if (currentItem <= 0) { + currentItem = 0; + // deactivate "previous" button + prev.disabled=true; + } + next.disabled=false; + var cp = createUl(skip); + var elm = document.getElementById("news"); + elm.innerHTML = cp; + } + + + /* Compatible function to java.net.URLDecoder.decode(). + * (decodeURI() is not compatible) + */ + function decodeURL(str){ + var targetStr=""; + var s, tmpStr, unicode, f; + // take a look at every char in the source str + var i, j; + for (i = 0; i < str.length; i++) { + s = str.charAt(i); + // handle WS, which is the most common char + if (s == "+") { + targetStr += " "; + } else { + if (s != "%") { + // Non-encoded char + targetStr += s; + } else{ + // encoding begin + unicode = 0; // uncode representation + f = 1; // flag to specify the escape sequence + while (true) { + tmpStr = ""; + // get the two HEX chars and put that in the temp string. If no char, that is not a HEX. + for (j = 0; j < 2; j++ ) { + tmptmpStr = str.charAt(++i); + if (((tmptmpStr >= "0") && (tmptmpStr <= "9")) || + ((tmptmpStr >= "a") && (tmptmpStr <= "f")) || + ((tmptmpStr >= "A") && (tmptmpStr <= "F"))) { + tmpStr += tmptmpStr; + } else { + --i; + break; + } + } + /* parse the HEX + * <= 0x7f : Single byte + * >=0xc0 && <=0xdf : Two bytes + * >=0xe0 && <=0xef : Three bytes + * >=0xf0 && <=0xf7 : Four bytes + * >=0x80 && <=0xbf : may not occur - just shift it + * <=1 : sequence terminated + */ + var byte = parseInt(tmpStr, 16); + if (byte <= 0x7f) {unicode = byte; f = 1;} + if ((byte >= 0xc0) && (byte <= 0xdf)) {unicode = byte & 0x1f; f = 2;} + if ((byte >= 0xe0) && (byte <= 0xef)) {unicode = byte & 0x0f; f = 3;} + if ((byte >= 0xf0) && (byte <= 0xf7)) {unicode = byte & 0x07; f = 4;} + if ((byte >= 0x80) && (byte <= 0xbf)) {unicode = (unicode << 6) + (byte & 0x3f); --f;} + if (f <= 1) { + break; + } + if (str.charAt(i + 1) == "%") { + i++ ; + } else { + // Error. should not occur + break; + } + } + targetStr += String.fromCharCode(unicode); + } + } + } + return targetStr; + } + + /* Cut the string at the WS so that it's shorter than the limitCharNum. + */ + function cutStringatWs(str, limitCharNum) { + var tmpStr = str; + var cnum = 0; + while (true) { + cnum = tmpStr.lastIndexOf(" "); + // no occurance of WS + if (cnum < 0) { + // if str is still longer than limit + if (tmpStr.length >= limitCharNum) { + tmpStr = tmpStr.substring(0, limitCharNum); + } + break; + } else { + tmpStr = tmpStr.substring(0, cnum); + if (cnum <= limitCharNum) { + break; + } + } + } + return tmpStr; + } + +} + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp new file mode 100644 index 0000000..b57de0b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp @@ -0,0 +1,51 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. +All rights reserved. You may not modify, use, reproduce, or distribute +this software except in compliance with the terms of the License at: +http://developer.sun.com/berkeley_license.html +$Id: news.jsp,v 1.2 2006/12/14 01:04:50 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>BluePrints News Page</title> + <script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> + <script type="text/javascript" src="${pageContext.request.contextPath}/news.js"></script> + + <style> + p { + width : 70%; + background-color : #FFEFD5; + font-size : 80% + } + </style> + + </head> + <script type="text/javascript"> + var news = new bpuinews.RSS(); + dojo.addOnLoad(function(){news.getRssInJson('${pageContext.request.contextPath}/faces/dynamic/bpui_rssfeedhandler/getRssfeed', 'https://blueprints.dev.java.net/servlets/ProjectRSS?type=news');}); + </script> + <body> + <jsp:include page="banner.jsp" /> + <h2><a href="http://blueprints.dev.java.net">BluePrints News</a></h2> + <center> + <table border="0" width="95%"> + <tr> + <td> + <button id="previous" type="button"><< Previous</button> + </td> + <td> + <button id="next" type="button">Next &gt&gt</button> + </td> + </tr> + </table> + </center> + <div id="news"></div> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp new file mode 100644 index 0000000..923739b --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp @@ -0,0 +1,21 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>jsonp test page</title> + <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/bp_petstorelist.css"></link> + <script type="text/javascript" src="${pageContext.request.contextPath}/bp_petstorelist.js"></script> + <script type="text/javascript"> + var petstoreList; + function init() { + petstoreList=new bpui.petstoreList.createPetstoreList("petstoreListDiv"); + } + </script> + </head> + <body onload="init()"> + <h1>jsonp test page</h1> + + <div id="petstoreListDiv"></div> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js new file mode 100644 index 0000000..66700d3 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js @@ -0,0 +1,110 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: rss.js,v 1.3 2006/05/31 19:13:03 basler Exp $ */ + +dojo.require("dojo.io.*"); + +if (bpui = 'undefined') { + bpui = new Object(); +} + +bpui.RSS = function() { + var jsonData = null; + var rssItemNum = 0; + var currentItem = 0; + var rssTimeout = null; + var itemIntervalMsec = 2000; + var rssFadeoutCounter = 110; + var rssFadeinCounter = 110; + var itemIntervalId = 0; + + this.getRssInJson = function (uri, number) { + rssItemNum = number; + var encodedURI = encodeURI(bpui.contextRoot + "/faces/dynamic/bpui_rssfeedhandler/getRssfeed?style=json&itemNumber="+number+"&url="+uri); + //alert("encoded url=" + encodedURI); + var bindArgs = { + url: encodedURI, + mimetype: "text/json", + load: function (type, data, http) { + handleJsonRss(data); + for (var key in data.channel.item) { + dojo.debug("ITEM Title ", key, ":", data.channel.item[key].title); + dojo.debug("ITEM LInk ", key, ":", data.channel.item[key].link); + } + }, + error: function (t, e) { + dj_debug("ERROR : " + e.message); + } + } + dojo.io.bind(bindArgs); + return false; + } + + function handleJsonRss(json) { + jsonData = json; + // setting top title and link + generateHref(json.channel.title, json.channel.link, "rss-channel"); + // setting items + generateHref(json.channel.item[0].title, json.channel.item[0].link, "rss-item"); + var aNodes = document.getElementById("rss-item").getElementsByTagName("a"); + dojo.event.connect(aNodes[0], "onmouseover", "pauseCycle"); + dojo.event.connect(aNodes[0], "onmouseout", "resumeCycle"); + cycleRss(); + } + + function generateHref (title, link, nodeId) { + var node = document.getElementById(nodeId); + var aNode = document.createElement("a"); + aNode.setAttribute("href", link); + aNode.appendChild(document.createTextNode(title)); + if (node.hasChildNodes()) { + node.removeChild(node.firstChild); + } + node.appendChild(aNode); + } + + function cycleRss () { + itemIntervalId = setTimeout(replaceItem, itemIntervalMsec); + } + + + function replaceItem() { + if (itemIntervalId) { + clearTimeout(itemIntervalId); + } + // fadeout the current item and pop the next one in. + var cItem = document.getElementById("rss-item"); + dojo.fx.html.fadeOut(cItem.getElementsByTagName('a')[0], 500); + var waitId = setTimeout(function(waitId) { + clearTimeout(waitId); + //cItem.removeChild(cItem.firstChild); + if (currentItem < (rssItemNum -1)) { + currentItem += 1; + } else { + currentItem = 0; + } + generateHref(jsonData.channel.item[currentItem].title, jsonData.channel.item[currentItem].link, "rss-item"); + // attach event for onmouseover(pause) and onmouseout(resume) + var aNodes = cItem.getElementsByTagName("a"); + dojo.event.connect(aNodes[0], "onmouseover", "pauseCycle"); + dojo.event.connect(aNodes[0], "onmouseout", "resumeCycle"); + cycleRss();}, 500); + } + + function pauseCycle(evt) { + if (itemIntervalId) { + clearTimeout(itemIntervalId); + } + } + + function resumeCycle (evt) { + cycleRss(); + } + + bpui.getContextRoot = function() { + var urlArray=window.location.toString().split("/", 4); + return "/" + urlArray[3]; + } + + bpui.contextRoot = bpui.getContextRoot(); +} + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp new file mode 100644 index 0000000..e57e4dc --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp @@ -0,0 +1,33 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: rss.jsp,v 1.2 2006/05/03 22:00:34 inder Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> +<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>RSS</title> + </head> + <body> + + <h1>RSS test</h1> + <f:view> + <ui:rssreader> + <ui:rsscategory title="JavaEE 5"> + <ui:rssfeed title="BluePrints" url="https://blueprints.dev.java.net/servlets/ProjectRSS?type=news"></ui:rssfeed> + <ui:rssfeed title="GlassFish" url="http://blogs.sun.com/roller/rss/theaquarium"></ui:rssfeed> + </ui:rsscategory> + <ui:rsscategory title="Yahoo!"> + <ui:rssfeed title="World" url="http://rss.news.yahoo.com/rss/world"></ui:rssfeed> + <ui:rssfeed title="US" url="http://rss.news.yahoo.com/rss/us"></ui:rssfeed> + </ui:rsscategory> + </ui:rssreader> + + </f:view> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp new file mode 100644 index 0000000..6f9c2f9 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp @@ -0,0 +1,20 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: rssbar.jsp,v 1.7 2006/05/06 01:44:59 yutayoshida Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + +<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> +<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> +<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> + + + + <f:view> + <ui:rssBar url="https://blueprints.dev.java.net/servlets/ProjectRSS?type=news" + itemCount="4" + title="News from BluePrints" + speed="6000" + backgroundImage="no" + color="#00ffff" hoverColor="#ff00ff"></ui:rssBar> + </f:view> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html new file mode 100644 index 0000000..9cc8c0a --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html @@ -0,0 +1,60 @@ +<div class="EditorToolbarDomNode EditorToolbarSmallBg"> + <table cellpadding="1" cellspacing="0" border="0"> + <tbody> + <tr valign="top" align="left"> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="bold"> + <span title="Toggle Bold (Ctrl-B)" class="dojoE2TBIcon dojoE2TBIcon_Bold"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="italic"> + <span title="Toggle Italic (Ctrl-I)" class="dojoE2TBIcon dojoE2TBIcon_Italic"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="underline"> + <span title="Toggle Underline (Ctrl-U)" class="dojoE2TBIcon dojoE2TBIcon_Underline"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="strikethrough"> + <span title="Toggle Strike-Through" +class="dojoE2TBIcon dojoE2TBIcon_StrikeThrough"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="inserthorizontalrule"> + <span title="Insert Horizontal Rule" class="dojoE2TBIcon dojoE2TBIcon_HorizontalLine "> </span> + </span> + </td> + <td isSpacer="true"> +  + <span class="iconContainer"> + <span class="dojoE2TBIcon dojoE2TBIcon_Sep" style="width: 5px; min-width: 5px;"></span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="forecolor"> + <span title="Change Text Color" class="dojoE2TBIcon dojoE2TBIcon_TextColor" +unselectable="on"> </span> + </span> + </td> + <td> +  + <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="hilitecolor"> + <span title="Change Background Color" class="dojoE2TBIcon dojoE2TBIcon_BackgroundColor" +unselectable="on"> </span> + </span> + </td> + <td width="*"> </td> + </tr> + </tbody> + </table> +</div> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css new file mode 100644 index 0000000..151df6d --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css @@ -0,0 +1 @@ +.slider { border-width:1px; border-style:solid; border-color:black; background:#404040; } .tile { position: absolute; top:0px; left:0px; cursor:pointer; border-width:1px; border-style:solid; border-color:black; visibility:hidden; z-index:1; background:white; opacity: .99; } .tileImage { width: 94; height: 70; } .nav { cursor:pointer; position: absolute; vertical-align:bottom; z-index:11; opacity: .85; } .infopane { z-index:0; width:475px; position: absolute; border-width:1px; border-style:solid; border-color:black; background:black; opacity: .65; } .infopaneDescription { color:white; font-size:12px; } .infopaneShortDescription { color:white; font-size:16px; } .infopanePrice { color:white; text-align: center; height:20px; } .infopanePayPal{ vertical-valign: bottom; text-align: right; height:20px; } .infopaneRating{ vertical-valign: top; text-align: center; width:125px; height:15px; color:white; opacity: .95; } .infopaneTitle { width:255px; height:15px; color:white; font-size:18px; } \ No newline at end of file diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js new file mode 100644 index 0000000..1f72578 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js @@ -0,0 +1,643 @@ +/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: scroller.js,v 1.32 2007/01/17 18:00:09 basler Exp $ */ + +/** +* ImageScroller - A multipurpose item brower +* @ Author: Greg Murray +* +*/ + +function getApplicationContextRoot() { + var urlArray=window.location.toString().split("/", 4); + return "/" + urlArray[3]; +} + +var applicationContextRoot=getApplicationContextRoot(); + + +function ImageScroller() { + var _this = this; + var initialized = false; + // default sizes + + var VIEWPORT_WIDTH = 500; + // all sizes are realitive the the viewport width + var IMAGEPANE_WIDTH = VIEWPORT_WIDTH; + var IMAGEPANE_HEIGHT = Math.round(VIEWPORT_WIDTH / 1.49); + var INFOPANE_DEFAULT_HEIGHT = Math.round(VIEWPORT_WIDTH / 6.67); + var INFOPANE_EXPAND_HEIGHT = Math.round(VIEWPORT_WIDTH / 2.86); + var THUMB_WIDTH = Math.round(VIEWPORT_WIDTH / 5);; + var THUMB_HEIGHT = Math.round(VIEWPORT_WIDTH / 6.67); + + var CHUNK_SIZE = 7; + var PREFETCH_THRESHHOLD = 5; + + var IMAGE_PANE_ID = "imagePane"; + var IMAGE_PANE_BUFFER_ID = "imageBufferPane"; + + var PADDING = 3; + + var MINIMIZE_IMG_URI = applicationContextRoot + "/images/minimize.gif"; + var MAXIMIZE_IMG_URI = applicationContextRoot + "/images/maximize.gif"; + var INDICATOR_IMG_URI = applicationContextRoot + "/images/indicator-black.gif"; + var MAXIMIZE_IMG_TOOLTIP = "Show Details"; + var MINIMIZE_IMG_TOOLTIP = "Show Less Details"; + + // this is an array of the tiles which are divs for each thumb + var tiles = []; + + var injectionPoint; + + // for scrolling + + var SCROLL_INCREMENT = 5; + var INFOPANE_INCREMENT = 3; + var tileY; + var tileX; + // this is the index of the image tile on the far left + var index = 0; + // keeps track how for the scroll has gone + var offset = 0; + + var timeout = 30; // in ms + var isScrollingRight = false; + var isScrollingLeft = false; + + // large image pane + var imagePane; + var imageLoadingPane; + var loadingPane; + // images + var minimizeImage; + + var indicatorImage; + var leftButton; + var rightButton; + + // infopane + var infoPane; + var infoTableMinimize; + var indicatorCell; + var minimizeLink; + var infoPaneLoop = 0; + var maximizing = false; + var minimizing = false; + var maximized = false; + + // prefetch thresh-hold + var prefetchThreshold = 2; + + // a growing list of items; + var items = []; + // cached chunks that are already in the items array + var loadedChunks = []; + + // used for debugging when debug is true + var debug = false; + var statusDiv; + var status2Div; + + var showingBuffer = false; + var imageBuffer; + var imageReloadTries = 0; + var IMG_RELOAD_RETRY_MAX = 30; + // used for url book marking + + + var pid; + var currentChunk; + // this map contains all the items + var map; + // this is the main container div + var containerDiv; + + this.getItems = function() { + return map; + } + + this.getScrollerItems = function() { + return items; + } + + + this.getGroupId = function() { + return pid; + } + + this.reset = function() { + resetTitles() + tiles = []; + index = 0; + offset = 0; + currentChunk = 0; + items = []; + loadedChunks = []; + } + + function resetTitles() { + for (var l = 0; l < tiles.length; l++) { + tiles[l].parentNode.removeChild(tiles[l]); + } + } + + // event bound to the mouseOut event of both scroll buttons + function scrollDone() { + isScrollingLeft = false; + isScrollingRight = false; + } + + // looping method for time out + function scroll() { + if (isScrollingRight) scrollRight(); + else if (isScrollingLeft) scrollLeft(); + } + + + // do the value list pre-emptive fetching + function prefetch() { + //printDebug("** scoller index = " + index); + if (isScrollingRight && (index + PREFETCH_THRESHHOLD) % CHUNK_SIZE == 0) { + + if ((Math.round(index / CHUNK_SIZE)) >= currentChunk) { + currentChunk = Math.round(index / CHUNK_SIZE) + 1; + // fire an event + dojo.event.topic.publish("/catalog", {type:"getChunk", id: pid, index: index, currentChunk: currentChunk}); + } + } + } + + this.setGroupId = function(id) { + pid = id; + } + + this.containsChunk = function(chunkId) { + printDebug("containsChunk = " + loadedChunks); + ret=false; + for(ii=0; ii < loadedChunks.length; ii++) { + if(chunkId == loadedChunks[ii]) { + ret=true; + break; + } + } + return ret; + } + + this.addChunk = function(chunkId) { + loadedChunks.push(chunkId); + } + + this.addItems = function(inItems) { + for (var loop=0; loop < inItems.length ; loop++) { + items.push(inItems[loop]); + map.put(inItems[loop].id, inItems[loop]); + createTile(inItems[loop]); + if (loop == 0 && !loadImage) { + showImage(inItems[loop].id); + } + + } + drawTiles(); + rightButton.style.visibility="visible"; + _this.hideProgressIndicator(); + } + + this.showProgressIndicator = function() { + if (indicatorImage) { + indicatorImage.style.visibility = "visible"; + } + } + + this.hideProgressIndicator = function() { + indicatorImage.style.visibility = "hidden"; + } + + function postImageLoad(loadIntoBuffer) { + if (debug) { + status2Div.innerHTML = "Try " + imageReloadTries + " " + url + " image.complete=" + imageBuffer.complete; + } + // keep calling this funtion until imageReloadTries < IMG_RELOAD_RETRY_MAX + if (!imageBuffer.complete) { + if (imageReloadTries < IMG_RELOAD_RETRY_MAX) { + setTimeout(function(){this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer);},500); + } else { + this.hideProgressIndicator(); + } + imageReloadTries = imageReloadTries + 1; + return; + } + var id; + + _this.hideProgressIndicator(); + if (loadIntoBuffer) { + imageLoadingPane.src = imageBuffer.src; + } else { + imagePane.src = imageBuffer.src; + + } + // do a cross fade as long as the images aren't the same + if (imageLoadingPane.src != imagePane.src) { + crossFade(0,loadIntoBuffer ); + } + } + + + this.showImage = function(itemId) { + + _this.showProgressIndicator(); + //setTimeout(this.showProgressIndicator,0); + var i = map.get(itemId); + + if (!i) { + return; + } + dojo.event.topic.publish("/catalog", {type:"showingItem", id: itemId, rating: i.rating}); + // create the image pane and append the description nodes + // asumption is that if the imagePane is not set neigher are the info children + if (typeof imagePane == 'undefined') { + imagePane = document.createElement("img"); + imagePane.style.width = IMAGEPANE_WIDTH + "px"; + imagePane.style.height = IMAGEPANE_HEIGHT + "px"; + imagePane.id = IMAGE_PANE_ID; + + var targetElement = document.getElementById("bodySpace"); + imageLoadingPane = document.createElement("img"); + imageLoadingPane.style.position = "absolute"; + imageLoadingPane.style.visibility = "hidden"; + imageLoadingPane.style.width = IMAGEPANE_WIDTH + "px"; + imageLoadingPane.style.height = IMAGEPANE_HEIGHT + "px"; + imageLoadingPane.id = IMAGE_PANE_BUFFER_ID; + targetElement.appendChild(imagePane); + targetElement.appendChild(imageLoadingPane); + imageLoadingPane.style.left = tileX + "px"; + + loadImage(i.image, false); + } else { + imageLoadingPane.style.visibility = "visible"; + if (showingBuffer) { + showingBuffer = false; + } else { + showingBuffer = true; + } + loadImage(i.image, showingBuffer); + } + } + + function loadImage(url, loadIntoBuffer) { + imageReloadTries = 0; + imageBuffer = new Image(); + if (loadIntoBuffer) { + imageBuffer.src = url; + imageLoadingPane.onLoad = setTimeout(function(){this.url=url;this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer,url);},0); + } else { + imageBuffer.src = url; + imageBuffer.onLoad = setTimeout(function(){this.url = url;this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer,url);},0); + } + } + + function setOpacity(opacity, id) { + var target = document.getElementById(id); + if (typeof target.style.filter != 'undefined') { + target.style.filter = "alpha(opacity:" + opacity + ")"; + } else { + target.style.opacity = opacity/100; + } + } + + function crossFade(count,loadIntoBuffer) { + var percentage = Number(count); + if (loadIntoBuffer) { + setOpacity(100 - percentage, IMAGE_PANE_ID); + setOpacity(percentage, IMAGE_PANE_BUFFER_ID); + } else { + setOpacity(100 - percentage, IMAGE_PANE_BUFFER_ID); + setOpacity(percentage, IMAGE_PANE_ID); + + } + if (percentage < 100) { + percentage = percentage + 10; + setTimeout(function(){this.loadIntoBuffer = loadIntoBuffer;this.percentage = percentage;crossFade(percentage,loadIntoBuffer);}, 25); + } + } + + + // calling this function will result in the maximizing event being fired + // if the pane is maximized it will asume the event want to minimize + this.doMaximize = function() { + if (!maximizing && !minimizing && !maximized) { + infoPaneLoop = INFOPANE_DEFAULT_HEIGHT; + maximizing = true; + minimizing = false; + } else if (!maximizing && !minimizing) { + minimizing = true; + maximizing = false; + } + setTimeout(changeInfoPane, 0); + } + + // will handle either minimizing or maximing but not both + // this method is called recursively until the maximinging + // or minimizing is done. + function changeInfoPane() { + if (maximizing) { + maxmizeInfoPane(); + } else if (minimizing) { + minimizeInfoPane(); + } + } + + function maxmizeInfoPane() { + if (infoPaneLoop < INFOPANE_EXPAND_HEIGHT) { + infoPaneLoop = infoPaneLoop + INFOPANE_INCREMENT; + var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ infoPaneLoop +'px,' + 0 + 'px)'; + infoPane.style.clip = clipMe; + infoPane.style.height = infoPaneLoop; + infoPane.style.top = (tileY + (PADDING *2) + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT) - infoPaneLoop; + setTimeout(changeInfoPane, 5); + } else { + minimizeImage.src= MINIMIZE_IMG_URI; + minimizeLink.title = MINIMIZE_IMG_TOOLTIP; + maximized = true; + maximizing = false; + minimizing = false; + } + } + + function minimizeInfoPane() { + if (infoPaneLoop > INFOPANE_DEFAULT_HEIGHT) { + infoPaneLoop = infoPaneLoop - INFOPANE_INCREMENT; + var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ infoPaneLoop +'px,' + 0 + 'px)'; + infoPane.style.clip = clipMe; + infoPane.style.height = infoPaneLoop; + infoPane.style.top = (tileY + (PADDING *2) + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT) - infoPaneLoop; + if (debug) { + status2Div.innerHTML = "minimize infoPaneLoop =" + infoPaneLoop + " infopane.top=" + infoPane.style.top; + } + setTimeout(changeInfoPane, 5); + } else { + minimizeImage.src= MAXIMIZE_IMG_URI; + minimizeLink.title = MAXIMIZE_IMG_TOOLTIP; + maximizing = false; + minimizing = false; + maximized = false; + } + } + + function scrollRight() { + isScrollingRight = true; + if ( (index + 4) >= tiles.length) { + // hide the rightButton + rightButton.style.visibility="hidden"; + return; + } else { + leftButton.style.visibility="visible"; + } + offset = offset - SCROLL_INCREMENT; + drawTiles(); + setTimeout(scroll, timeout); + } + + function getNext() { + isScrollingRight = true; + setTimeout(scroll, timeout); + } + + + function getPrevious () { + isScrollingLeft = true; + setTimeout(scroll, timeout); + } + + function scrollLeft() { + if (offset >= 0) { + leftButton.style.visibility="hidden"; + return; + } else { + leftButton.style.visibility="visible"; + } + offset = offset + SCROLL_INCREMENT; + drawTiles(); + setTimeout(scroll, timeout); + } + + function drawTiles() { + // draw the first one if its off the screen + // check if the far right image is out view + var overHang; + var temp = offset; + index = Math.floor((offset)/THUMB_WIDTH); + overHang = offset % THUMB_WIDTH; + if (overHang < 0) { + overHang = overHang * -1; + } + if (index < 0) { + index = index * -1; + } + // check for next set of images + prefetch(); + var startIndex = index; + if (overHang > 0 && index >0) { + startIndex = index -1; + } + var stopIndex = index + Math.round(VIEWPORT_WIDTH / THUMB_WIDTH); + if (stopIndex > tiles.length) { + stopIndex = tiles.length; + } + var displayX = 0; + for (var tl=startIndex; tl < stopIndex; tl++) { + if (debug) { + statusDiv.innerHTML = "overhang=" + overHang + " startIndex=" + startIndex + " stopIndex=" + stopIndex + " offset=" + offset + " displayX=" + displayX; + } + if (overHang > 0 && tl == startIndex) { + rightButton.style.visibility="visible"; + // clip: rect(top right bottom left) - borders of the clipped area + // clip the left + var clipMe = 'rect(' + '0px,' + THUMB_WIDTH + 'px,'+ THUMB_HEIGHT +'px,' + overHang + 'px)'; + tiles[tl].style.clip = clipMe; + tiles[tl].style.left = (tileX - overHang) + "px"; + displayX = displayX + (THUMB_WIDTH - overHang); + } else if (tl == stopIndex -1) { + var underHang = VIEWPORT_WIDTH - displayX ; + if (underHang > 0 && underHang) { + var clipMe = 'rect(' + '0px,' + (underHang) + "px," + THUMB_HEIGHT +'px,' + 0 + 'px)'; + tiles[tl].style.clip = clipMe; + tiles[tl].style.left = tileX + (offset + (tl * THUMB_WIDTH)) + 'px'; + tiles[tl].style.visibility = "visible"; + // resize the previous one to its real length + } else if (underHang < 0 && tl > 0) { + var clipMe = 'rect(' + '0px,' + (THUMB_WIDTH + underHang) + "px," + THUMB_HEIGHT +'px,' + 0 + 'px)'; + tiles[tl-1].style.clip = clipMe; + tiles[tl-1].style.visibility = "visible"; + tiles[tl-1].style.left = tileX + (offset + ((tl -1) * THUMB_WIDTH)) + 'px'; + } else { + tiles[tl].style.left = '0px'; + tiles[tl].style.visibility = "hidden"; + } + } else { + displayX = displayX + THUMB_WIDTH; + tiles[tl].style.left = tileX + (offset + (tl * THUMB_WIDTH)) + 'px'; + tiles[tl].style.visibility = "visible"; + } + } + if (stopIndex < tiles.length) { + tiles[stopIndex].style.visibility = "hidden"; + tiles[stopIndex].style.left = "0px"; + } + } + + + this.load = function () { + map = new Map(); + dojo.event.connect(window, "onresize", layout); + var loadImage; + + var targetRow = document.getElementById("targetRow"); + injectionPoint = document.getElementById("injection_point"); + + // for status output + statusDiv = document.getElementById("status"); + status2Div = document.getElementById("status_2"); + + initLayout(); + initialized = true; + } + + function initLayout() { + containerDiv = document.getElementById("CatalogBrowser"); + rightButton = document.getElementById("right_button"); + leftButton = document.getElementById("left_button"); + layout(); + leftButton.style.visibility="hidden"; + if (typeof rightButton.attachEvent != 'undefined') { + rightButton.attachEvent('onmouseover',function(e){scrollDone();getNext();}); + rightButton.attachEvent('onmouseout',function(e){scrollDone();}); + leftButton.attachEvent('onmouseover',function(e){scrollDone();getPrevious();}); + leftButton.attachEvent('onmouseout',function(e){scrollDone();}); + } else if (typeof rightButton.addEventListener != 'undefined') { + rightButton.addEventListener('mouseover',function(e){scrollDone();getNext();}, false); + rightButton.addEventListener('mouseout',function(e){scrollDone();}, false); + leftButton.addEventListener('mouseover',function(e){scrollDone();getPrevious();}, false); + leftButton.addEventListener('mouseout',function(e){scrollDone();}, false); + } + createInfoPane(); + } + + function layout() { + var ua = navigator.userAgent.toLowerCase(); + + // this will need to be made generic depending on the thumb height + tileY = findY(containerDiv); + tileX = findX(containerDiv) + 4; + var rightX = tileX + VIEWPORT_WIDTH - 20; + rightButton.style.left = rightX + "px"; + var buttonY = tileY + IMAGEPANE_HEIGHT + INFOPANE_DEFAULT_HEIGHT + 12; + rightButton.style.top = buttonY + "px"; + leftButton.style.top = buttonY + "px"; + + if (ua.indexOf('ie') != -1) { + isIE = true; + } else if (ua.indexOf('safari') != -1) { + tileX = tileX + 8; + timeout = 20; + } + drawTiles(); + if (infoPane) { + infoPane.style.left = tileX + "px"; + if (maximized) { + + infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2) - infoPane.style.height) + "px"; + } else { + infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2)) + "px"; + } + if (maximized) { + infoPaneLoop = infoPane.style.height; + } else { + infoPaneLoop = INFOPANE_DEFAULT_HEIGHT; + } + } + if (typeof imageLoadingPane != 'undefined') { + imageLoadingPane.style.left = tileX; + imageLoadingPane.style.top = tileY; + } + } + + function createInfoPane() { + infoPane = document.getElementById("infopane"); + infoPane.style.width = VIEWPORT_WIDTH + "px"; + // give room for 4 pixels above and below + infoPane.style.height = (INFOPANE_DEFAULT_HEIGHT) + "px"; + // give 3px padding for a border + infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2)) + "px"; + infoPane.style.left = tileX + "px"; + infoTableMinimize = document.getElementById("infopaneDetailsIcon"); + indicatorCell = document.getElementById("infopaneIndicator"); + indicatorCell.style.width = (10) + "px"; + indicatorImage = document.createElement("img"); + indicatorImage.className = "infopaneIndicator"; + indicatorImage.src = INDICATOR_IMG_URI; + indicatorImage.style.visibility = "hidden"; + indicatorCell.appendChild(indicatorImage); + minimizeLink = document.createElement("a"); + minimizeLink.className = "infopaneLink"; + minimizeLink.title = MAXIMIZE_IMG_TOOLTIP; + minimizeImage = document.createElement("img"); + minimizeImage.src= MAXIMIZE_IMG_URI; + minimizeLink.appendChild(minimizeImage); + infoTableMinimize.appendChild(minimizeLink); + + if (typeof minimizeLink.attachEvent != 'undefined') { + minimizeLink.attachEvent("onclick",function(e){_this.doMaximize();}); + } else { + minimizeLink.addEventListener("click",function(e){_this.doMaximize();}, true); + } + var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ INFOPANE_DEFAULT_HEIGHT +'px,' + 0 + 'px)'; + infoPane.style.clip = clipMe; + } + + function createTile(i) { + var div = document.createElement("div"); + div.className = "tile"; + div.id = i.id; + var link = document.createElement("a"); + var img = document.createElement("img"); + img.title = i.name; + img.src = i.thumbnail; + img.className = "tileImage"; + link.appendChild(img); + link.setAttribute("id", i.id); + if (typeof div.attachEvent != 'undefined') { + div.attachEvent('onclick',function(e){this.id = div.id; _this.showImage(this.id, false);}); + } else { + link.addEventListener('click',function(e){this.id = div.id; _this.showImage(this.id, false);}, true); + } + div.appendChild(link); + injectionPoint.appendChild(div); + div.style.top = tileY + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT + (PADDING * 3) + "px"; + tiles.push(div); + } + + + function findY(element) { + var t = 0; + if (element.offsetParent) { + while (element.offsetParent) { + t += element.offsetTop + element = element.offsetParent; + } + } else if (element.y) { + t += element.y; + } + return t; + } + + function findX(element) { + var l = 0; + if (element.offsetParent) { + while (element.offsetParent) { + l += element.offsetLeft + element = element.offsetParent; + } + } else if (element.x) + l += element.x; + return l; + } +} diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp new file mode 100644 index 0000000..e12d666 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp @@ -0,0 +1,290 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: search.jsp,v 1.28 2006/12/04 21:34:10 basler Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.search.*"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui5" uri="http://java.sun.com/blueprints/ui" %> + + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Search Page</title> + <style> + .itemTable { + padding: 0.3cm; + width: 800px; + border-style: double; + border-color: darkgreen; + } + .itemCell { + border-style: solid; + border-color: darkgreen; + border-width: thin; + padding: 5px + } + .tagDiv { + border-style: groove; + border-color: darkgreen; + background-color: white; + border-width: thick; + padding: 5px; + visibility: hidden; + position:absolute; + left:0px; + top:0px; + z-index: 3; + } + </style> + <script type="text/javascript" src="common.js"></script> + </head> + <body> + <jsp:include page="banner.jsp" /> + <center> + + <script type="text/javascript"> + function checkAll() { + var elems=dojo.byId("resultsForm").elements; + for(ii=0; ii < elems.length; ii++) { + if(elems[ii].name.indexOf("mapSelectedItems") >= 0) { + elems[ii].checked=true; + } + } + return false; + } + + function uncheckAll() { + var elems=dojo.byId("resultsForm").elements; + for(ii=0; ii < elems.length; ii++) { + if(elems[ii].name.indexOf("mapSelectedItems") >= 0) { + elems[ii].checked=false; + } + } + return false; + } + + function addTags(eventx, namex, itemIdx) { + var xx=0; + var yy=0; + if (!eventx) var eventx=window.event; + if (eventx.pageX || eventx.pageY){ + xx=eventx.pageX; + yy=eventx.pageY; + } else if (eventx.clientX || eventx.clientY) { + xx=eventx.clientX + document.body.scrollLeft; + yy=eventx.clientY + document.body.scrollTop; + } + divId="addTags"; + document.getElementById("addTagsItemId").value=itemIdx; + document.getElementById("addTagsTags").value=""; + document.getElementById("addTagsTitle").innerHTML="<b>Add Tags to '" + namex + "'</b>"; + document.getElementById(divId).style.left=(xx - 170) + "px"; + document.getElementById(divId).style.top=(yy - 140) + "px"; + document.getElementById(divId).style.visibility='visible'; + document.getElementById("addTagsTags").focus(); + } + + function saveAddTags() { + // get data and send to controller servlet + itemIdx=document.getElementById("addTagsItemId").value; + tagsx=document.getElementById("addTagsTags").value; + var bindArgs = { + url: "../TagServlet?itemId=" + escape(itemIdx) + "&tags=" + escape(tagsx), + mimetype: "text/xml", + error: ajaxBindError, + load: function(type, data, evt){ + // check successful response + if (evt.readyState == 4) { + if (evt.status == 200) { + // get results and replace dom elements + var resultx=data.getElementsByTagName("response")[0]; + itemIdx=resultx.getElementsByTagName("itemId")[0].childNodes[0].nodeValue; + + // change DOM data + document.getElementById("ITEMID_TAGS_" + itemIdx).innerHTML=resultx.getElementsByTagName("tags")[0].childNodes[0].nodeValue; + + } else if (evt.status == 204){ + alert("204 return"); + } + } + } + }; + + dojo.io.bind(bindArgs); + // make sure it was updated + + // show messages if error + + // hide popup + document.getElementById(divId).style.visibility='hidden'; + } + + function cancelAddTags() { + // hide popup + document.getElementById(divId).style.visibility='hidden'; + } + + </script> + + <f:view> + + <ui5:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?popupView=2&itemId=" + elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> +  + <img id="spaceImage" height="10px" width="3px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> + <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> + <tr> + <td align="left" valign="top"><b>Name:</b> + <span id="value1">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Seller Address:</b> + <span id="value2">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Price:</b> + <span id="value3">Loading Data...</span></td> + </tr> + <tr> + <td colspan="2" align="center"><img name="image" id="imageId" src="" + alt="[Loading Image...]" border="2"/><br/><br/></td> + </tr> + </table> + </ui5:popupTag> + + <h1>Search Page</h1> + <h:form id="searchForm"> + <table class="itemTable" style="width: 700px"> + <tr> + <th class="itemCell">Search String</th> + <td class="itemCell"> + <h:inputText size="50" id="searchString" value="#{SearchBean.searchString}"/> +    Also Search Tags:<h:selectBooleanCheckbox id="searchTags" value="#{SearchBean.searchTags}"/> + </td> + </tr> + <tr> + <td class="itemCell" align="center" colspan="2"> + <h:commandButton action="#{SearchBean.searchAction}" id="searchSubmit" type="submit" value="Submit"/> + <h:commandButton id="searchReset" type="reset" value="Reset"/> + </td> + </tr> + </table> + <h:messages/> + </h:form> + <br/> + + + + <h:form id="resultsForm" rendered="#{SearchBean.showResults}"> + <table class="itemTable"> + <tr> + <th class="itemCell"> + Map + <br/> + <img src="../images/check_all.gif" onclick="return checkAll()"/><img src="../images/uncheck_all.gif" onclick="return uncheckAll()"/> + </th> + <th class="itemCell">Name</th> + <th class="itemCell">Description</th> + <th class="itemCell">Tags</th> + <th class="itemCell">Price</th> + </tr> +<% +SearchBean searchBean=(SearchBean)session.getAttribute("SearchBean"); +if(searchBean != null) { + List<IndexDocument> hits=searchBean.getHits(); + if(hits != null) { + for(IndexDocument indexDoc : hits) { +%> + <tr> + <td class="itemCell"> + <input type="checkbox" name="mapSelectedItems" value="<%= indexDoc.getUID() %>"/> + </td> + <td class="itemCell"> + <a href="${pageContext.request.contextPath}/faces/catalog.jsp?pid=<%= indexDoc.getProduct() %>&itemId=<%= indexDoc.getUID() %>" + onmouseover="bpui.popup.show('pop1', event, '<%= indexDoc.getUID() %>')" onmouseout="bpui.popup.hide('pop1')"> + <%= indexDoc.getTitle() %> + </a> + </td> + <td class="itemCell"> + <%= indexDoc.getSummary() %> + </td> + <td class="itemCell"> + <span id="ITEMID_TAGS_<%= indexDoc.getUID() %>"><%= (indexDoc.getTag().equals("") ? " " : indexDoc.getTag()) %></span> + <br/><input type="button" value="Add Tags" onclick="addTags(event, '<%= indexDoc.getTitle() %>', '<%= indexDoc.getUID() %>')"/> + </td> + <td class="itemCell"> + <%= indexDoc.getPriceDisplay() %> + </td> + </tr> +<% + } + } +} +%> + <tr> + <td colspan="5"> + <br/> + <center> + <table class="itemTable"> + <tr> + <th align="right">Center Point Address:</th> + <td> + <h:inputText id="centerAddress" value="#{MapBean.centerAddress}" size="50"/> + <br/><small><i>For example: 4140 Network Circle, Santa Clara, CA, 95054</i></small> + </td> + </tr> + <tr> + <th align="right">Area (in Miles):</th> + <td> + <h:inputText id="radius" value="#{MapBean.radius}" size="5"/> + </td> + </tr> + <tr> + <td align="center" colspan="2"> + <h:commandButton action="#{MapBean.findAllByIDs}" id="mapSubmit" type="submit" + value="Map Checked Item(s)" rendered="#{SearchBean.showResults}"/> + </td> + </tr> + </table> + </center> + <br/> + </td> + </tr> + </table> + + <h:messages/> + </h:form> + <br/><br/><br/> + <div class="tagDiv" id="addTags"> + <form> + <table> + <tr> + <td align="center"> + <span id="addTagsTitle"><b>Tag Title</b></span><br/><i>(seperated by spaces)</i> + </td> + </tr> + <tr> + <td align="center"> + <input id="addTagsTags" type="text" size="50"/> + </td> + </tr> + <tr> + <td align="center"> + <input type="button" value="Save" onclick="saveAddTags()"/>  <input type="button" value="Cancel" onclick="cancelAddTags()"/> + </td> + </tr> + </table> + <input type="hidden" id="addTagsItemId"/> + </form> + </div> + </f:view> + </center> + <jsp:include page="footer.jsp" /> + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css new file mode 100644 index 0000000..24ffbf9 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css @@ -0,0 +1,130 @@ + +.dojoHtmlFisheyeListBar { + cursor:pointer; + margin: 0; + width: 300px; + text-align: right; +} + +.outerbar { + background-color: white; + text-align: left; + width: 300px; +} + +.editText { + height:25; + font-size:18px; + font-weight: bold; + font-family: Arial; +} + +.plainText { + height:25; + font-size:20px; + font-weight: bold; + font-family: Arial +} + +.plainTextSelect { + height:25; + font-size:20px; + font-weight: bold; + font-family: Arial; + background: red +} + +.smallText { + height:15; + font-size:13px; + font-weight: bold; + font-family: Arial +} + +.banner { + height:35; + font-size:35; + font-weight: bold; + font-family: Arial +} + + +.menuItem { + background: white; + color: black; + text-decoration: none; + font-size: 1.4em; +} + +.menuLink { + cursor:pointer; + color: black; + text-decoration: none; + font-size: 1.3em; +} + +.menuLinkHover { + cursor:pointer; + color: black; + font-size: 1.3em; + text-decoration: underline; +} + +.autocomplete { + position:absolute; +} + +.autocompleteTable { + padding:0; + visibility: hidden; + border-spacing: 0; + border-width:1px; + border-style:solid; + border-color:black; +} + +.popupRowHover { + color: #FFFAFA; + cursor:pointer; + padding-left:3; + padding-right:3; + border-spacing: 0; + border-width:0px; + background: #7A8AFF; +} + +.popupRow { + padding-left:3; + padding-right:3; + border-spacing: 0; + border-width:0px; + background: #FFFAFA; +} + +.popupRowEven { + padding-left:3; + padding-right:3; + border-spacing: 0; + border-width:0px; + background: #FFFADA; +} + +.popupItem { + background: #FFFAFA; + color: #000000; + text-decoration: none; + font-size: 1.2em; +} + +.shadow { + top:0px; + left:0px; + position: absolute; + visibility: hidden; + width:0; + height:0; + z-index:0; + background:gray; + opacity: .5; +} + diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp new file mode 100644 index 0000000..c7a5309 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp @@ -0,0 +1,28 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: systemerror.jsp,v 1.3 2007/01/09 19:02:12 basler Exp $ --%> +<%@ page isErrorPage="true" %> +<%@ page import="com.sun.javaee.blueprints.petstore.util.PetstoreUtil, java.util.logging.Level" %> +<% +PetstoreUtil.getLogger().log(Level.INFO, "Encountered a Runtime Exception and being transferred the the systemerror page", exception); +%> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > + <title>Java Pet Store Reference Application: System Error Page</title> + </head> + <body> + + <jsp:include page="banner.jsp" /> + + <h2>System Error !</h2> + <p>We had problems processing your request. An exception has been caught, + so perhaps your application was not set up or deployed properly.</p> + + The Exception that was thrown is:<b> <%= exception.toString() %></b>. The server log will contain the stack trace of the exception. + + <p><a href="${pageContext.request.contextPath}/faces/index.jsp">Go back to sample application home</a></p> + <br/><br/> + <jsp:include page="footer.jsp" /> + + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css new file mode 100644 index 0000000..bfbab6e --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css @@ -0,0 +1,47 @@ + .itemTable { + padding: 0.3cm; + border-style: double; + width: 800px; + border-color: darkgreen; + } + .itemCell { + border-style: solid; + border-color: darkgreen; + border-width: thin; + padding: 5px + } + .tagCell { + padding: 0.3cm; + } + .xxlarge + { + font-size: xx-large; + color: red; + cursor: pointer; + text-decoration: underline; + } + .xlarge + { + font-size: x-large; + color: blue; + cursor: pointer; + text-decoration: underline; + } + .large + { + font-size: large; + color: green; + cursor: pointer; + text-decoration: underline; + } + .medium + { + font-size: medium; + cursor: pointer; + color: black; + text-decoration: underline; + } + .items + { + visibility: hidden; + } diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp new file mode 100644 index 0000000..f9c74f3 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp @@ -0,0 +1,158 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: tag.jsp,v 1.11 2007/01/17 18:00:09 basler Exp $ --%> + +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@taglib prefix="ui5" uri="http://java.sun.com/blueprints/ui" %> + + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>Tag Page</title> + <script type="text/javascript" src="./common.js"></script> + <link type="text/css" rel="stylesheet" href="./tag.css"/> +<% +try { + CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); + List<Tag> tags=cf.getTagsInChunk(0, 90); + // since top 20 come from database or desending refCount order, need to reorder by tag name + Collections.sort(tags, new Comparator() { + public int compare(Object one, Object two) { + return ((Tag)one).getTag().compareTo(((Tag)two).getTag()); + } + }); +%> + <script language="javascript"> + function retrieveItems(tag) { + var bindArgs = { + // url when using the jsp to serve the ajax request + url: "../tagItemLookup.jsp?tag=" + escape(tag), + mimetype: "text/xml", + load: returnFunctionx, + error: ajaxBindError}; + + // dispatch the request + dojo.io.bind(bindArgs); + } + + + function returnFunctionx(type, data, evt) { + // statically setup popup for simple case + var componentId="displayItems"; + // check return of the dojo call to make sure it is valid + if (evt.readyState == 4) { + if (evt.status == 200) { + // get results and replace dom elements + var itemsx=data.getElementsByTagName("item"); + display="<table class='itemTable'><tr><td class='itemCell' align='center' colspan='4'><h2>Tag: " + + data.getElementsByTagName("tag")[0].childNodes[0].nodeValue + + "</h2></td></tr><tr><th class='itemCell'>Name</th><th class='itemCell'>Description</th><th class='itemCell'>Tags</th><th class='itemCell'>Price</th></tr>" + for(ii=0; ii < itemsx.length; ii++) { + display += "<tr>"; + display +="<td class='itemCell'><a href='./catalog.jsp?pid="+ itemsx[ii].getElementsByTagName("productID")[0].childNodes[0].nodeValue +"&itemId=" + + itemsx[ii].getElementsByTagName("itemID")[0].childNodes[0].nodeValue + "' onmouseover='bpui.popup.show("pop1", event, "" + + itemsx[ii].getElementsByTagName("itemID")[0].childNodes[0].nodeValue + "")' onmouseout='bpui.popup.hide("pop1")'>" + + itemsx[ii].getElementsByTagName("name")[0].childNodes[0].nodeValue +"</a></td>"; + display +="<td class='itemCell'>" + itemsx[ii].getElementsByTagName("description")[0].childNodes[0].nodeValue +"</td>"; + display +="<td class='itemCell'>" + itemsx[ii].getElementsByTagName("tags")[0].childNodes[0].nodeValue +"</td>"; + display +="<td class='itemCell' style='text-align: right'>" + itemsx[ii].getElementsByTagName("price")[0].childNodes[0].nodeValue +"</td>"; + display +="</tr>"; + } + display += "</table>"; + document.getElementById(componentId).innerHTML=display; + document.getElementById(componentId).style.visibility='visible'; + } else if (evt.status == 204){ + alert("204 return"); + } + } + } + + + function checkQueryString() { +  + var iPos=window.location.href.indexOf("?tag="); + if(iPos > -1) { + // have tag so retrieve items + retrieveItems(window.location.href.substr(iPos + 5)); + } + } + + </script> + </head> + <body onload="checkQueryString();"> + <jsp:include page="banner.jsp" /> + <f:view> + + <ui5:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?popupView=2&itemId=" + elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> +  + <img id="spaceImage" height="10px" width="10px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> + <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> + <tr> + <td align="left" valign="top"><b>Name:</b> + <span id="value1">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Seller Address:</b> + <span id="value2">Loading Data...</span></td> + </tr> + <tr> + <td align="left" valign="top"><b>Price:</b> + <span id="value3">Loading Data...</span></td> + </tr> + <tr> + <td colspan="2" align="center"><img name="image" id="imageId" src="" + alt="[Loading Image...]" border="2"/><br/><br/></td> + </tr> + </table> + </ui5:popupTag> + <center> + <h1>Tag Page</h1> + <table border="0"> + <tr> +<% + String style=null; + int refx=0, ii=0; + for(Tag tag : tags) { + refx=tag.getRefCount() / 5; + if(refx >= 3) { + style="xxlarge"; + } else if(refx == 2) { + style="xlarge"; + } else if(refx == 1) { + style="large"; + } else { + style="medium"; + } + + if((ii % 6) == 0) out.println("</tr>\n<tr>"); + //out.println("<td class='tagCell'><span onclick=\"retrieveItems('" + tag.getTag() + "')\" class='" + style +"'>" + tag.getTag() + "</span> (" + tag.getRefCount() + ")</td>"); + out.println("<td class='tagCell'><span onclick=\"retrieveItems('" + tag.getTag() + "')\" class='" + style +"'>" + tag.getTag() + "</span></td>"); + ii++; + } +%> + </tr> + </table> + <div id="displayItems" class="items"> + + </div> + </center> + </f:view> + <br/><br/><br/><br/> + <jsp:include page="footer.jsp" /> + + </body> +</html> + +<% + } catch(Exception e) { + e.printStackTrace(); + } +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp new file mode 100644 index 0000000..05ef352 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp @@ -0,0 +1,45 @@ +<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html +$Id: tagItemLookup.jsp,v 1.4 2007/01/19 21:47:31 basler Exp $ --%> + +<%@page contentType="text/xml"%> +<%@page pageEncoding="UTF-8"%> +<%@page import="java.util.*, java.text.NumberFormat, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item, com.sun.javaee.blueprints.petstore.model.Tag"%> + +<% + String sxTag=request.getParameter("tag"); + + try { + response.setHeader("Pragma", "No-Cache"); + response.setHeader("Cache-Control", "no-cache,no-store,max-age=0"); + response.setDateHeader("Expires", 1); + + ServletContext context=config.getServletContext(); + CatalogFacade cf=(CatalogFacade)context.getAttribute("CatalogFacade"); + Tag tag=cf.getTagWithPersistentItems(sxTag); + out.println("<response>"); + + if(tag != null) { + out.println("<tag>" + tag.getTag() + "</tag>"); + out.println("<items>"); + Collection<Item> items=tag.getItems(); + for(Item item : items) { + if(item.getDisabled() == 0) { + out.println("<item>"); + out.println("<itemID>" + item.getItemID() + "</itemID>"); + out.println("<productID>" + item.getProductID() + "</productID>"); + out.println("<name><![CDATA[" + item.getName() + "]]></name>"); + out.println("<description><![CDATA[" + item.getDescription() + "]]></description>"); + out.println("<tags><![CDATA[" + item.tagsAsString() + "]]></tags>"); + out.println("<price><![CDATA[" + NumberFormat.getCurrencyInstance(java.util.Locale.US).format(item.getPrice()) + "]]></price>"); + out.println("</item>"); + } + } + out.println("</items>"); + } + out.println("</response>"); + out.flush(); + } catch(Exception ee) { + ee.printStackTrace(); + } + +%> diff --git a/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp new file mode 100644 index 0000000..e5dd68a --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp @@ -0,0 +1,36 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%-- +The taglib directive below imports the JSTL library. If you uncomment it, +you must also add the JSTL library to the project. The Add Library... action +on Libraries node in Projects view can be used to add the JSTL 1.1 library. +--%> +<%-- +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> +--%> + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <title>JSP Page</title> + </head> + <body> + + <h1>JSP Page</h1> + + <%-- + This example uses JSTL, uncomment the taglib directive above. + To test, display the page like this: index.jsp?sayHello=true&name=Murphy + --%> + <%-- + <c:if test="${param.sayHello}"> +  + Hello ${param.name}! + </c:if> + --%> + + </body> +</html> diff --git a/etc/samples/provisioning/sample-bundle/src/main/scripts/assembly.xml b/etc/samples/provisioning/sample-bundle/src/main/scripts/assembly.xml new file mode 100644 index 0000000..942e5f9 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/scripts/assembly.xml @@ -0,0 +1,41 @@ +<?xml version="1.0"?> + + + +<assembly> +  + <id></id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <baseDirectory>target/bundle</baseDirectory> + <fileSets> + <fileSet> + <directory>target/bundle</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/*.sh</exclude> + <exclude>**/*.so</exclude> + <exclude>**/*.sl</exclude> + <exclude>**/*.dylib</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>target/bundle</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>**/*.sh</include> + <include>**/*.so</include> + <include>**/*.sl</include> + <include>**/*.dylib</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + </fileSets> +</assembly> + diff --git a/etc/samples/provisioning/sample-bundle/src/main/scripts/build.xml b/etc/samples/provisioning/sample-bundle/src/main/scripts/build.xml new file mode 100644 index 0000000..fed3f16 --- /dev/null +++ b/etc/samples/provisioning/sample-bundle/src/main/scripts/build.xml @@ -0,0 +1,63 @@ +<?xml version="1.0"?> + + + +<project name="sample-bundle" basedir="." default="build"> + + <target name="build"> + +  + <property name="tmp.dir" location="${java.io.tmpdir}/${user.name}"/> + <echo>tmp.dir="${tmp.dir}"</echo> + <mkdir dir="${tmp.dir}"/> + + <get src="http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-6.0.0.M3/jboss-a…" + dest="${tmp.dir}/jbossas.zip" + usetimestamp="true"/> + <property name="jboss.home" location="target/jbossas-petstore"/> + <echo>jboss.home="${jboss.home}"</echo> + <mkdir dir="${jboss.home}"/> + <unzip src="${tmp.dir}/jbossas.zip" dest="${jboss.home}"> + <mapper> + <globmapper from="jboss-6.0.0.20100429-M3/*" to="*"/> + </mapper> + </unzip> + +  + <delete includeemptydirs="true"> + <fileset dir="${jboss.home}/server"> + <exclude name="default/**"/> + </fileset> + </delete> + +  + <delete dir="${jboss.home}/docs"/> + <delete> + <fileset dir="${jboss.home}" includes="*.*" /> + </delete> + + <property name="jboss.config.dir" location="${jboss.home}/server/default"/> + + <echo>Copying Derby JDBC driver jar to $${jboss.home}/server/default/lib/...</echo> + <copy file="${settings.localRepository}/org/apache/derby/derbyclient/${derbyclient.version}/derbyclient-${derbyclient.version}.jar" + toDir="${jboss.config.dir}/lib" failonerror="false" verbose="true" /> + +  + <copy todir="${jboss.home}"> + <fileset dir="src/main/petstore"/> + </copy> + + <mkdir dir="target/bundle"/> + +  + <zip destfile="target/bundle/jbossas-petstore.zip" basedir="${jboss.home}"/> + +  + <copy todir="target/bundle"> + <fileset dir="src/main/bundle"/> + </copy> + + </target> + +</project> + diff --git a/etc/samples/sample-bundle/pom.xml b/etc/samples/sample-bundle/pom.xml deleted file mode 100644 index 6bd4a88..0000000 --- a/etc/samples/sample-bundle/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ -<?xml version="1.0"?> - - - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.rhq.sample</groupId> - <artifactId>rhq-sample-bundle</artifactId> - <version>2.0</version> - <packaging>pom</packaging> - - <name>RHQ Sample Bundle</name> - <description>a sample bundle consisting of JBossAS 6.0 running the Java Petstore application</description> - - <scm> - <connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/etc/modules/sample-bundle/</connection> - <developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/etc/modules/sample-bundle/</developerConnection> - </scm> - - <properties> -  - <derbyclient.version>10.5.3.0_1</derbyclient.version> - </properties> - - <dependencies> - -  - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derbyclient</artifactId> - <version>${derbyclient.version}</version> - </dependency> - - </dependencies> - - <build> - - <plugins> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>prepare-bundle</id> - <phase>process-resources</phase> - <configuration> - <tasks> - <echo>settings.localRepository=${settings.localRepository}</echo> - <echo>project.build.outputDirectory=${project.build.outputDirectory}</echo> - <ant antfile="src/main/scripts/build.xml"> - <property name="settings.localRepository" value="${settings.localRepository}"/> - <property name="project.version" value="${project.version}"/> - <property name="project.build.outputDirectory" value="${project.build.outputDirectory}"/> - <property name="derbyclient.version" value="${derbyclient.version}"/> - </ant> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/scripts/assembly.xml</descriptor> - </descriptors> - <finalName>${project.build.finalName}</finalName> - </configuration> - <executions> - <execution> - <id>assemble-bundle</id> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - -</project> - diff --git a/etc/samples/sample-bundle/src/main/bundle/deploy.xml b/etc/samples/sample-bundle/src/main/bundle/deploy.xml deleted file mode 100644 index 8bfec17..0000000 --- a/etc/samples/sample-bundle/src/main/bundle/deploy.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0"?> - -<project name="petstore" default="main" - xmlns:rhq="antlib:org.rhq.bundle"> - - <rhq:bundle name="Java Petstore" version="2.0" - description="a sample bundle consisting of JBossAS 6.0 running the Java Petstore application"> - - <rhq:input-property - name="jboss.bind.address" - description="the IP address the JBoss AS server should bind to" - required="true"/> - - <rhq:input-property - name="http.port" - description="the HTTP port the JBoss AS server should listen on" - required="true" - type="integer"/> - - <rhq:input-property - name="https.port" - description="the HTTPS port the JBoss AS server should listen on" - required="true" - type="integer"/> - - <rhq:deployment-unit name="appserver" - preinstallTarget="appserver-preinstall" postinstallTarget="appserver-postinstall"> - <rhq:system-service name="jbossas-petstore" scriptFile="jbossas-init-script" - configFile="jbossas-init-config" overwriteScript="true" - startLevels="3,4,5" startPriority="80" stopPriority="20"/> - - <rhq:archive name="jbossas-petstore.zip"/> - -  - <rhq:ignore> - <rhq:fileset> - <include name="server/default/data/**"/> - <include name="server/default/logs/**"/> - <include name="server/default/tmp/**"/> - <include name="server/default/work/**"/> - </rhq:fileset> - </rhq:ignore> - </rhq:deployment-unit> - - </rhq:bundle> - - <target name="main"/> - - <target name="appserver-preinstall"> - <echo>Installing Java Petstore App Server to ${rhq.deploy.dir}...</echo> - </target> - - <target name="appserver-postinstall"> - <echo>Done installing Java Petstore App Server to ${rhq.deploy.dir}.</echo> - </target> - -</project> diff --git a/etc/samples/sample-bundle/src/main/bundle/jbossas-init-config b/etc/samples/sample-bundle/src/main/bundle/jbossas-init-config deleted file mode 100644 index a2fc4c1..0000000 --- a/etc/samples/sample-bundle/src/main/bundle/jbossas-init-config +++ /dev/null @@ -1,69 +0,0 @@ -# Configuration file for jbossas init script that configures the -# settings needed to start a particular JBoss AS instance. - -# -# the JBoss AS installation directory (e.g. /opt/jboss-6.0.0.M1) -# (*REQUIRED*) -# -JBOSS_HOME="@@rhq.deploy.dir@@" - -# -# the args that will be passed to run.sh -# (i.e. org.jboss.Main). -# -JBOSS_OPTS="-b @@jboss.bind.address@@" - -# What UNIX user the JBoss AS java process will run as. -# (The shutdown client is always run as the invoker of the -# init script). JBoss AS will be run as root by default, but, for -# the sake of security, it is recommended that you chown the JBoss -# AS installation files to a non-root user and use that use here. -# Note, you do need to run as root if your server will listen on one -# or more privileged (< 1024) ports. If you really do want to run as -# root, comment out the JBOSS_USER variable completely (i.e. do not -# set it to root). This will run the server process without "su". -#JBOSS_USER=jboss - -# -# Specify the maximum file descriptor limit, use "max" or "maximum" to use -# the default, as queried by the system. -# -# Defaults to "maximum" -# -#MAX_FD="maximum" - -# -# Specify the profiler configuration file to load. -# -# Default is to not load profiler configuration file. -# -#PROFILER= - -# -# Specify the location of the Java Rntime Environment (JRE) or -# Java Development Kit (JDK) installation directory. If not set, -# "/usr/java/default" will be used. -# -#JAVA_HOME="/usr/java/default" - -# -# Specify options to pass to the Java VM (if unset, a default -# set of options will be used). -# -# Note, if you want to pass the default options but some of -# your own additional options in, then set the -# ADDITIONAL_JAVA_OPTS variable (see below), rather than JAVA_OPTS. -# -#JAVA_OPTS="-Xms128M -Xmx512M -XX:MaxPermSize=256M -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djava.net.preferIPv4Stack=true" - -# -# Specify additional options to pass to the Java VM. These are passed -# in addition to the default set of options, -# i.e. java $JAVA_OPTS $ADDITIONAL_JAVA_OPTS ... org.jboss.Main ... -# -# Sample JPDA settings (uncomment either a) or b)) -# a) remote socket debugging -#ADDITIONAL_JAVA_OPTS="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" -# b) shared memory debugging -#ADDITIONAL_JAVA_OPTS="-Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss" - diff --git a/etc/samples/sample-bundle/src/main/bundle/jbossas-init-script b/etc/samples/sample-bundle/src/main/bundle/jbossas-init-script deleted file mode 100755 index 58eb98e..0000000 --- a/etc/samples/sample-bundle/src/main/bundle/jbossas-init-script +++ /dev/null @@ -1,328 +0,0 @@ -#!/bin/bash -# -# jbossas - This shell script takes care of starting and stopping -# a JBoss Application Server (AS) instance on a Red Hat -# Linux system. It can be run as a system service (init -# script) and/or run manually. -# -# chkconfig: 345 84 16 -# description: JBoss AS server -# processname: java -# pidfile: /var/run/jbossas.pid - -# Source init-script function library. -FUNCTIONS=/etc/rc.d/init.d/functions -if [ ! -f "$FUNCTIONS" ]; then - echo "Functions library ($FUNCTIONS) not found." >&2 - exit 1 -fi -. $FUNCTIONS - -# Find the name of this service (e.g. "jbossas"). -NAME=`basename $0` -if [ ${NAME:0:1} = "S" -o ${NAME:0:1} = "K" ]; then - NAME=${NAME:3} -fi - -# Set names of pid, lock, and log files - all based on the service name. -PIDFILE="/var/run/$NAME.pid" -LOCKFILE="/var/lock/subsys/$NAME" -LOGFILE="/var/log/$NAME.log" - -# Set defaults for optional configuration variables. -JAVA_HOME="/usr/java/default" -JAVA_OPTS="-Xms128M -Xmx512M -XX:MaxPermSize=256M" -JAVA_OPTS="$JAVA_OPTS -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" -# (Prefer IPv4 stack as as temporary workaround to avoid 'all' config startup -# issues from IPv4 multicast addresses. See JBAS-7936.) -JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true" - -# Source the service's config file, potentially overriding the defaults set -# above. -CONFIG="/etc/sysconfig/${NAME}" -if [ ! -f "$CONFIG" ]; then - echo "Required configuration file $CONFIG not found." >&2 - exit 1 -fi -. "$CONFIG" - -# Bail out if required variables were not set in the config file. -if [ -z "$JBOSS_HOME" ]; then - echo "Required variable JBOSS_HOME was not set in $CONFIG." >&2 - exit 1 -fi - - -start() -{ - # See if the service is already running, and, if so, exit with an error. - PID=`pidfileofproc "$NAME"` - if [ -n "$PID" ]; then - # pid file exists - see if process is actually running. - kill -0 $PID 2>/dev/null - if [ $? -eq 0 ]; then - echo "$NAME service is already running (pid=$PID)." >&2 - exit 1 - else - echo "Removing bogus pid file $PIDFILE..." - rm -f "$PIDFILE" - if [ -f "$LOCKFILE" ]; then - echo "Removing bogus lock file $LOCKFILE..." - rm -f "$LOCKFILE" - fi - fi - fi - - # Check that JAVA_HOME is valid. - JAVA="$JAVA_HOME/bin/java" - if [ ! -f "$JAVA" ]; then - echo "Java not found at $JAVA - please set JAVA_HOME in $CONFIG." >&2 - exit 1 - fi - if [ ! -x "$JAVA" ]; then - echo "$JAVA is not executable." >&2 - exit 5 - fi - - # Setup the classpath - JBOSS_BOOT_CLASSPATH="$JBOSS_HOME/bin/run.jar" - if [ ! -f "$JBOSS_BOOT_CLASSPATH" ]; then - echo "Missing required file: $JBOSS_BOOT_CLASSPATH" >&2 - exit 1 - fi - - # By default, Tomcat uses the JDT Compiler for compiling JSPs. However, - # include tools.jar in the classpath if we can find it under JAVA_HOME - # or if the user specified it via the JAVAC_JAR variable. - JAVAC_JAR_FILE="${JAVAC_JAR:-$JAVA_HOME/lib/tools.jar}" - if [ ! -f "$JAVAC_JAR_FILE" ]; then - [ -n "$JAVAC_JAR" ] && echo "Missing javac jar file $JAVAC_JAR as defined by the JAVAC_JAR variable. Unexpected results may occur." - unset JAVAC_JAR_FILE - fi - - # If -server not set in JAVA_OPTS, set it, if supported. - SERVER_SET=`echo $JAVA_OPTS | grep "\-server"` - if [ -z "$SERVER_SET" ]; then - # Check for Sun JVM w/ HotSpot support. - HAS_HOTSPOT=`"$JAVA" -version 2>&1 | grep -i HotSpot` - - # Check for OpenJDK JVM w/ server support. - HAS_OPENJDK=`"$JAVA" -version 2>&1 | grep -i OpenJDK` - - # Enable -server if we have Hotspot or OpenJDK, unless we can't - if [ -n "$HAS_HOTSPOT" ] || [ -n "$HAS_OPENJDK" ]; then - JAVA_OPTS="-server $JAVA_OPTS" - fi - fi - - # Setup JBoss-specific properties. - JAVA_OPTS="-Dprogram.name=$NAME $JAVA_OPTS" - - # Setup JBoss Native library path. - unset JBOSS_NATIVE_DIR - for DIR in "$JBOSS_HOME/../native/lib" "$JBOSS_HOME/../native" "$JBOSS_HOME/../native/lib64" "$JBOSS_HOME/native/lib64" "$JBOSS_HOME/native/bin" "$JBOSS_HOME/bin/native"; do - if [ -d "$DIR" ]; then - JBOSS_NATIVE_DIR=`cd "$DIR/.." && pwd` - break - fi - done - if [ -d "$JBOSS_NATIVE_DIR" ]; then - IS_64_BIT_JVM=`"$JAVA" $JAVA_OPTS -version 2>&1 | grep -i 64-bit` - if [ -n "$IS_64_BIT_JVM" ]; then - JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64" - else - JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib" - fi - LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - export LD_LIBRARY_PATH - JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$LD_LIBRARY_PATH" - fi - - # Setup the Java endorsed dirs. - JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=\"$JBOSS_ENDORSED_DIRS\"" - - # Setup the Java classpath. - JBOSS_CLASSPATH="${JBOSS_CLASSPATH:+$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH}" - JBOSS_CLASSPATH="${JBOSS_CLASSPATH:-$JBOSS_BOOT_CLASSPATH}" - JBOSS_CLASSPATH="$JBOSS_CLASSPATH${JAVAC_JAR_FILE:+:$JAVAC_JAR_FILE}" - JAVA_OPTS="$JAVA_OPTS -classpath \"$JBOSS_CLASSPATH\"" - - # Display a summary of our environment if we're associated with a terminal. - if tty -s; then - echo "========================================================================="; echo - echo " JBoss AS Bootstrap Environment" ; echo - echo " JBOSS_HOME: $JBOSS_HOME" ; echo - echo " JAVA: $JAVA" ; echo - echo " JAVA_OPTS: $JAVA_OPTS" ; echo - echo " JBOSS_OPTS: $JBOSS_OPTS" ; echo - echo "========================================================================="; echo - fi - - # JBoss AS expects its current working dir to be $JBOSS_HOME/bin - cd "$JBOSS_HOME/bin" - - # JBoss AS expects JBOSS_HOME to be set in its environment. - export JBOSS_HOME - - # We only need to bother with nohup if we're associated with a terminal. - if tty -s; then - NOHUP=nohup - else - unset NOHUP - fi - - # If they set NICELEVEL in the config file, honor it. - [ -n "${NICELEVEL:-}" ] && NICE="nice -n $NICELEVEL" - - # If JBOSS_USER was specified in the config and current user is root, we - # want to setuid the JBoss AS process to JBOSS_USER. - if [ -n "$JBOSS_USER" ] && [ "$EUID" -eq 0 ]; then - # For SELinux we need to use 'runuser', not 'su'. - if [ -x /sbin/runuser ]; then - SU=runuser - else - SU=su - fi - else - unset SU - fi - - if [ -n "$SU" ]; then - WRAPPER="$NOHUP $NICE $SU -s /bin/bash - $JBOSS_USER -c" - else - WRAPPER="$NOHUP $NICE bash -c" - fi - - # Make sure log file exists and has correct ownership and permissions. - if [ "$EUID" -eq 0 ]; then - touch -a "$LOGFILE" || exit 4 - [ -n "$JBOSS_USER" ] && chown $JBOSS_USER "$LOGFILE" - [ -n "$JBOSS_GROUP" ] && chgrp $JBOSS_GROUP "$LOGFILE" - chmod u=rw "$LOGFILE" - [ -n "$JBOSS_GROUP" ] && chmod g+r "$LOGFILE" - [ -x /sbin/restorecon ] && /sbin/restorecon "$LOGFILE" - fi - - # Make sure pid file has correct ownership and permissions. - if [ "$EUID" -eq 0 ] && [ -f "$PIDFILE" ]; then - [ -n "$JBOSS_USER" ] && chown $JBOSS_USER "$PIDFILE" - [ -n "$JBOSS_GROUP" ] && chgrp $JBOSS_GROUP "$PIDFILE" - chmod u=rw "$PIDFILE" - [ -n "$JBOSS_GROUP" ] && chmod g+r - [ -x /sbin/restorecon ] && /sbin/restorecon "$PIDFILE" - fi - - echo -n "Starting $NAME service: " - - # Make sure to escape the $$'s within the subshell to prevent our own shell - # from evaluating them and writing our own pid to the pid file. - $WRAPPER "echo \$\$ >\"$PIDFILE\" || ( echo \"Failed to write pid (\$\$) to $PIDFILE.\" >&2; exit 4 ); exec \"$JAVA\" $JAVA_OPTS org.jboss.Main $JBOSS_OPTS" >>"$LOGFILE" 2>&1 & - if [ $? -ne 0 ]; then - failure "$NAME startup" - echo - EXIT_STATUS=$? - fi - - # Wait a few seconds and then check that the process is running. Note, this - # will *not* verify that JBoss AS started properly without any configuration - # or deployment errors. - sleep 3 - - if pidfileofproc "$NAME"; then - success "$NAME startup" - echo - touch "$LOCKFILE" - EXIT_STATUS=0 - else - failure "$NAME startup" - echo - EXIT_STATUS=1 - fi -} - -stop() -{ - # See if service is running, and, if not, exit without any error. - PID=`pidfileofproc "$NAME"` - unset NOT_RUNNING - if [ -z "$PID" ]; then - NOT_RUNNING=1 - else - # pid file exists - see if process is actually running. - kill -0 $PID 2>/dev/null - if [ $? -ne 0 ]; then - NOT_RUNNING=1 - if [ -f "$PIDFILE" ]; then - echo "Removing bogus pid file $PIDFILE..." - rm -f "$PIDFILE" - fi - if [ -f "$LOCKFILE" ]; then - echo "Removing bogus lock file $LOCKFILE..." - rm -f "$LOCKFILE" - fi - fi - fi - if [ -n "$NOT_RUNNING" ]; then - echo "$NAME service is not running." - exit 0 - fi - - echo -n "Stopping $NAME service: " - killproc -d 30 "$NAME" - EXIT_STATUS=$? - if [ $EXIT_STATUS -eq 0 ]; then - rm -f "$LOCKFILE" - fi - echo -} - -# NOTE: We don't name this function 'status', since that would override the -# 'status function defined in /etc/init.d/functions. -_status() -{ - status "$NAME" - EXIT_CODE=$? -} - -restart() -{ - stop || exit $? - start -} - -condrestart() -{ - [ -f "$PIDFILE" ] && restart -} - -usage() -{ - echo "Usage: $NAME {start|stop|status|restart|condrestart}" >&2 - EXIT_CODE=2 -} - -# The -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - _status - ;; - restart) - restart - ;; - condrestart) - condrestart - ;; - *) - usage - ;; -esac - -exit $EXIT_STATUS - diff --git a/etc/samples/sample-bundle/src/main/petstore/petstore-db.changelog.xml b/etc/samples/sample-bundle/src/main/petstore/petstore-db.changelog.xml deleted file mode 100644 index 42ced88..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/petstore-db.changelog.xml +++ /dev/null @@ -1,187 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd"> - <changeSet author="ips (generated)" id="1272025063915-1"> - <createTable schemaName="APP" tableName="ADDRESS"> - <column name="ADDRESSID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635960"/> - </column> - <column name="STREET1" type="VARCHAR(55)"> - <constraints nullable="false"/> - </column> - <column name="STREET2" type="VARCHAR(55)"/> - <column name="CITY" type="VARCHAR(55)"> - <constraints nullable="false"/> - </column> - <column name="STATE" type="VARCHAR(25)"> - <constraints nullable="false"/> - </column> - <column name="ZIP" type="VARCHAR(5)"> - <constraints nullable="false"/> - </column> - <column name="LATITUDE" type="DECIMAL(14,10)"> - <constraints nullable="false"/> - </column> - <column name="LONGITUDE" type="DECIMAL(14,10)"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-2"> - <createTable schemaName="APP" tableName="CATEGORY"> - <column name="CATEGORYID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635550"/> - </column> - <column name="NAME" type="VARCHAR(25)"> - <constraints nullable="false"/> - </column> - <column name="DESCRIPTION" type="VARCHAR(255)"> - <constraints nullable="false"/> - </column> - <column name="IMAGEURL" type="VARCHAR(55)"/> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-3"> - <createTable schemaName="APP" tableName="ID_GEN"> - <column name="GEN_KEY" type="VARCHAR(20)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636590"/> - </column> - <column name="GEN_VALUE" type="INT"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-4"> - <createTable schemaName="APP" tableName="ITEM"> - <column name="ITEMID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636230"/> - </column> - <column name="PRODUCTID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - <column name="NAME" type="VARCHAR(30)"> - <constraints nullable="false"/> - </column> - <column name="DESCRIPTION" type="VARCHAR(500)"> - <constraints nullable="false"/> - </column> - <column name="IMAGEURL" type="VARCHAR(55)"/> - <column name="IMAGETHUMBURL" type="VARCHAR(55)"/> - <column name="PRICE" type="DECIMAL(14,2)"> - <constraints nullable="false"/> - </column> - <column name="ADDRESS_ADDRESSID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - <column name="CONTACTINFO_CONTACTINFOID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - <column name="TOTALSCORE" type="INT"> - <constraints nullable="false"/> - </column> - <column name="NUMBEROFVOTES" type="INT"> - <constraints nullable="false"/> - </column> - <column name="DISABLED" type="INT"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-5"> - <createTable schemaName="APP" tableName="PRODUCT"> - <column name="PRODUCTID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173635740"/> - </column> - <column name="CATEGORYID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - <column name="NAME" type="VARCHAR(25)"> - <constraints nullable="false"/> - </column> - <column name="DESCRIPTION" type="VARCHAR(255)"> - <constraints nullable="false"/> - </column> - <column name="IMAGEURL" type="VARCHAR(55)"/> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-6"> - <createTable schemaName="APP" tableName="SELLERCONTACTINFO"> - <column name="CONTACTINFOID" type="VARCHAR(10)"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636080"/> - </column> - <column name="LASTNAME" type="VARCHAR(24)"> - <constraints nullable="false"/> - </column> - <column name="FIRSTNAME" type="VARCHAR(24)"> - <constraints nullable="false"/> - </column> - <column name="EMAIL" type="VARCHAR(24)"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-7"> - <createTable schemaName="APP" tableName="TAG"> - <column name="TAGID" type="INT"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636830"/> - </column> - <column name="TAG" type="VARCHAR(30)"> - <constraints nullable="false"/> - </column> - <column name="REFCOUNT" type="INT"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-8"> - <createTable schemaName="APP" tableName="TAG_ITEM"> - <column name="TAGID" type="INT"> - <constraints nullable="false"/> - </column> - <column name="ITEMID" type="VARCHAR(10)"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-9"> - <createTable schemaName="APP" tableName="ZIPLOCATION"> - <column name="ZIPCODE" type="INT"> - <constraints nullable="false" primaryKey="true" primaryKeyName="SQL100422173636710"/> - </column> - <column name="CITY" type="VARCHAR(30)"> - <constraints nullable="false"/> - </column> - <column name="STATE" type="VARCHAR(2)"> - <constraints nullable="false"/> - </column> - </createTable> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-10"> - <createIndex indexName="SQL100422173636831" schemaName="APP" tableName="TAG" unique="true"> - <column name="TAG"/> - </createIndex> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-11"> - <createIndex indexName="SQL100422173637010" schemaName="APP" tableName="TAG_ITEM" unique="true"> - <column name="TAGID"/> - <column name="ITEMID"/> - </createIndex> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-12"> - <addForeignKeyConstraint baseColumnNames="ADDRESS_ADDRESSID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636231" deferrable="false" initiallyDeferred="false" referencedColumnNames="ADDRESSID" referencedTableName="ADDRESS" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-13"> - <addForeignKeyConstraint baseColumnNames="CONTACTINFO_CONTACTINFOID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636233" deferrable="false" initiallyDeferred="false" referencedColumnNames="CONTACTINFOID" referencedTableName="SELLERCONTACTINFO" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-14"> - <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="ITEM" baseTableSchemaName="APP" constraintName="SQL100422173636232" deferrable="false" initiallyDeferred="false" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-15"> - <addForeignKeyConstraint baseColumnNames="CATEGORYID" baseTableName="PRODUCT" baseTableSchemaName="APP" constraintName="SQL100422173635741" deferrable="false" initiallyDeferred="false" referencedColumnNames="CATEGORYID" referencedTableName="CATEGORY" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-16"> - <addForeignKeyConstraint baseColumnNames="ITEMID" baseTableName="TAG_ITEM" baseTableSchemaName="APP" constraintName="SQL100422173637011" deferrable="false" initiallyDeferred="false" referencedColumnNames="ITEMID" referencedTableName="ITEM" referencedTableSchemaName="APP"/> - </changeSet> - <changeSet author="ips (generated)" id="1272025063915-17"> - <addForeignKeyConstraint baseColumnNames="TAGID" baseTableName="TAG_ITEM" baseTableSchemaName="APP" constraintName="SQL100422173637012" deferrable="false" initiallyDeferred="false" referencedColumnNames="TAGID" referencedTableName="TAG" referencedTableSchemaName="APP"/> - </changeSet> -</databaseChangeLog> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml deleted file mode 100644 index ae5ea7c..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<datasources> - - <local-tx-datasource> - -  -  - <jndi-name>jdbc/PetstoreDB</jndi-name> - -  - <connection-url>jdbc:derby://localhost:1527/petstore;create=true</connection-url> - -  - <driver-class>org.apache.derby.jdbc.ClientDriver</driver-class> - -  - <user-name>APP</user-name> - <password>APP</password> - -  - <min-pool-size>5</min-pool-size> - -  - <max-pool-size>20</max-pool-size> - -  - <idle-timeout-minutes>5</idle-timeout-minutes> - -  - <track-statements/> - - </local-tx-datasource> - -</datasources> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml deleted file mode 100644 index eadc0f4..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4"> - - <display-name>Java Pet Store</display-name> - - <module> - <web> - <web-uri>petstore.war</web-uri> - <context-root>/petstore</context-root> - </web> - </module> - - <module> - <ejb>petstore-ejb.jar</ejb> - </module> - -</application> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml deleted file mode 100644 index 76e0703..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> - - <persistence-unit name="PetstorePu"> - <description>Petstore Persistence Unit</description> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:jdbc/PetstoreDB</jta-data-source> - <non-jta-data-source>java:jdbc/PetstoreDB</non-jta-data-source> - <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/> - <property name="hibernate.connection.username" value="APP"/> - <property name="hibernate.connection.password" value="APP"/> - <property name="hibernate.format_sql" value="true"/> - </properties> - </persistence-unit> - -</persistence> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class deleted file mode 100644 index c9dc392..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class deleted file mode 100644 index be2275b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class deleted file mode 100644 index 8842106..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class deleted file mode 100644 index dda3feb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class deleted file mode 100644 index b5dbe74..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class deleted file mode 100644 index 1b5785b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class deleted file mode 100644 index 591af10..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF deleted file mode 100644 index 7a679c4..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.7.1 -Created-By: 16.0-b13 (Sun Microsystems Inc.) - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class deleted file mode 100644 index abac5a6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class deleted file mode 100644 index 7d7af77..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class deleted file mode 100644 index b8bfa4d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class deleted file mode 100644 index 8c469f4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class deleted file mode 100644 index e2b4ca5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class deleted file mode 100644 index 223289e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class deleted file mode 100644 index 61f3863..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class deleted file mode 100644 index 7c149e3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class deleted file mode 100644 index c5fb59a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class deleted file mode 100644 index 65d4cdb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class deleted file mode 100644 index 1ee72ad..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class deleted file mode 100644 index f56c35e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class deleted file mode 100644 index 56fc53d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class deleted file mode 100644 index ee55705..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class deleted file mode 100644 index 30e70ab..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class deleted file mode 100644 index dd5b7c1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class deleted file mode 100644 index 03400b2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class deleted file mode 100644 index 23a204c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class deleted file mode 100644 index 18f8102..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class deleted file mode 100644 index b6e2b0d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class deleted file mode 100644 index be21196..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class deleted file mode 100644 index 185dc01..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class deleted file mode 100644 index 18b3463..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class deleted file mode 100644 index 0c448bf..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class deleted file mode 100644 index 4a19fad..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class deleted file mode 100644 index a8b6521..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class deleted file mode 100644 index 2b42389..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class deleted file mode 100644 index 8ab0084..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class deleted file mode 100644 index a4cc2bf..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class deleted file mode 100644 index 50007c4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class deleted file mode 100644 index 1ef9761..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class deleted file mode 100644 index 5570fac..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties deleted file mode 100644 index 112905d..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties +++ /dev/null @@ -1,10 +0,0 @@ -index.exception=An exception was encountered while indexing the data. Please checked to make sure there indexes are not locked by another user. -index.sql.statement=Select statement used for retrieving database data "{0}" -search.string=Searching indexes for string "{0}" -search.results=Search String returned "{0}" hits -search.exception=An exception was encountered while performing the search. Please check to make sure the indexes exist. -fileupload.persist.exception=Error persisting seller data -fileupload.rollback.exception=Persisting seller data, rollback failed -geocoder.lookup.exception=The GeoCode address lookup from Yahoo has returned and Exception -image_does_not_exist=The image doesn't exist in the default image directory or in the upload directory "{0}" -resource_bundle_does_not_exist=The MessageStrings.properties file does not exist!. diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties deleted file mode 100644 index 7ca2d9d..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties +++ /dev/null @@ -1,10 +0,0 @@ -invalid_contact_firstname=First Name is required. -invalid_contact_lastname=Last Name is required. -invalid_address_street1=Street is required. -invalid_address_city=City is required. -invalid_address_state=State is required. -invalid_address_zip=Zip Code is required. -invalid_item_name=Pet Name is required. -invalid_item_description=The Description should exist and the field can't have a '<script>' and/or a '<link>' tag in it. -invalid_item_price=Price should should exist and be a number greater or equal to 0. -invalid_item_imageurl=The image upload file must exist and be of type '.jpg', '.gif' or '.png'. diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class deleted file mode 100644 index 5aa4b42..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class deleted file mode 100644 index a521d71..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml deleted file mode 100644 index 22f03df..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> - - - -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" - version="1.2"> -  - -  - <managed-bean> - <managed-bean-name>SearchBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.search.SearchBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>RatingBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.model.RatingBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>itemId</property-name> - <value>#{param.itemIdBinding}</value> - </managed-property> - </managed-bean> - - <managed-bean> - <managed-bean-name>PayPalBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.model.PayPalBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>FileUploadBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.FileUploadBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>MapBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.mapviewer.MapBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>AutocompleteBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.AutocompleteBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - - <managed-bean> - <managed-bean-name>AddressBean</managed-bean-name> - <managed-bean-class>com.sun.javaee.blueprints.petstore.controller.AddressBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - -  - <navigation-rule> - <from-view-id>/mapLocation.jsp</from-view-id> - <navigation-case> - <from-outcome>map</from-outcome> - <to-view-id>/map.jsp</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/mapAll.jsp</from-view-id> - <navigation-case> - <from-outcome>map</from-outcome> - <to-view-id>/map.jsp</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/map.jsp</from-view-id> - <navigation-case> - <to-view-id>/mapLocation.jsp</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/search.jsp</from-view-id> - <navigation-case> - <from-outcome>displayResults</from-outcome> - <to-view-id>/search.jsp</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>map</from-outcome> - <to-view-id>/map.jsp</to-view-id> - </navigation-case> - </navigation-rule> - -</faces-config> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml deleted file mode 100644 index 0862993..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-web> - <resource-ref> - <res-ref-name>jdbc/PetstoreDB</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <jndi-name>java:jdbc/PetstoreDB</jndi-name> - </resource-ref> -</jboss-web> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar deleted file mode 100644 index f6bd6d2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar deleted file mode 100644 index fc5763d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar deleted file mode 100644 index b2867cd..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar deleted file mode 100644 index 2ff9bbd..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar deleted file mode 100644 index 288e64c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar deleted file mode 100644 index db6456f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar deleted file mode 100644 index 27d2ad3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar deleted file mode 100644 index c2a26da..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar deleted file mode 100644 index 128045d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml deleted file mode 100644 index a9c411b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd"> -<sun-web-app error-url=""> - <context-root>/petstore</context-root> - <class-loader delegate="true"/> - <jsp-config> - <property name="classdebuginfo" value="true"> - <description>Enable debug info compilation in the generated servlet class</description> - </property> - <property name="mappedfile" value="true"> - <description>Maintain a one-to-one correspondence between static content and the generated servlet class' java code</description> - </property> - </jsp-config> -</sun-web-app> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml deleted file mode 100644 index 6c65069..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml +++ /dev/null @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - - <display-name>Petstore</display-name> - <filter> - <filter-name>CaptchaValidateFilter</filter-name> - <filter-class>com.sun.javaee.blueprints.petstore.controller.CaptchaValidateFilter</filter-class> - </filter> - <filter> - <filter-name>EntryFilter</filter-name> - <filter-class>com.sun.javaee.blueprints.petstore.controller.EntryFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>EntryFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>CaptchaValidateFilter</filter-name> - <url-pattern>/faces/dynamic/bpui_fileupload_handler/handleFileUpload</url-pattern> - </filter-mapping> - <listener> - <listener-class>com.sun.javaee.blueprints.petstore.model.CatalogFacade</listener-class> - </listener> - - <servlet> - <display-name>ControllerServlet</display-name> - <servlet-name>ControllerServlet</servlet-name> - <servlet-class>com.sun.javaee.blueprints.petstore.controller.ControllerServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/catalog</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/controller</url-pattern> - </servlet-mapping> - - <context-param> - <description> - Google Maps authorization key for "http://localhost:8080/" - To use a another URL a new map key will have to be generated from http://www.google.com/apis/maps/ - </description> - <param-name>com.sun.j2ee.blueprints.ui.mapviewer.KEY</param-name> - <param-value>ABQIAAAAyQYKk4__l80DyIsqLPvvuxTwM0brOpm-All5BF6PoaKBxRWWERSt2NPUufvDhWGdrb-pCzTZQ2vi2A</param-value> - </context-param> - - <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> - </context-param> - - <context-param> - <param-name>com.sun.faces.validateXml</param-name> - <param-value>false</param-value> - </context-param> - - <context-param> - <param-name>com.sun.faces.verifyObjects</param-name> - <param-value>false</param-value> - </context-param> - - <context-param> - <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config.xml</param-value> - </context-param> - -  - <context-param> - <param-name>proxyHost</param-name> - <param-value></param-value> - </context-param> - <context-param> - <param-name>proxyPort</param-name> - <param-value></param-value> - </context-param> -  - <context-param> - <param-name>entryPages</param-name> - <param-value>.jpg|.gif|index.html|index.jsp|fileupload.jsp|search.jsp|catalog.jsp|mapAll.jsp|tag.jsp|news.jsp</param-value> - </context-param> - - -  - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - -  - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>/faces/*</url-pattern> - </servlet-mapping> - -  - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/faces/CaptchaServlet</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/ImageServlet/*</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>ControllerServlet</servlet-name> - <url-pattern>/TagServlet/*</url-pattern> - </servlet-mapping> - <error-page> - <exception-type>java.lang.RuntimeException</exception-type> - <location>/systemerror.jsp</location> - </error-page> - <resource-ref> - <res-ref-name>jdbc/PetstoreDB</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - <res-sharing-scope>Shareable</res-sharing-scope> - </resource-ref> -</web-app> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css deleted file mode 100644 index 14c6ed0..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css +++ /dev/null @@ -1 +0,0 @@ -.accordion { width:150px; height:400px; border-width:1px; border-style:solid; border-color:black; background:#404040; } .accordionBody { width:160px; height:400px; border-width:1px; border-style:solid; border-color:black; background:#404040; } .accordionTitle { vertical-align: top; padding-top: 10px; text-align: center; width:150px; height:90px; color:white; font-size:22px; font-weight: bold; background:black; opacity: .99; } .accordionRow { color:white; cursor: pointer; font-size:18px; font-weight: bold; vertical-align: middle; padding-top: 5px; text-align: center; width:150px; height:40px; background:#104E8B; opacity: .99; } .accordionProduct { text-align: center; width:150px; color:white; font-size:12px; font-weight: bold; background:#104E8B; opacity: .99; } .accordionLink { cursor: pointer; text-decoration: none; color:white; } .accordionLinkSelected { text-align: center; width:150px; color:red; font-size:12px; font-weight: bold; background:black; opacity: .99; } .accordionLinkHover { text-decoration: underline; color:white; } \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js deleted file mode 100644 index 1c1ee6b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js +++ /dev/null @@ -1,249 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: accordion.js,v 1.22 2006/05/03 22:00:32 inder Exp $ */ - -function AccordionMenu () { - - dojo.event.topic.subscribe("/accordion", this, this.handleEvent); - - var displayPortWidth = 100; - var HEIGHT = 400; - - var EXPANDED_HEIGHT = 125; - var ITEM_HEIGHT = 55; - var INCREMENT = 10; - - var timeout = 5; // in ms - - var accordion = document.getElementById("accordionBody"); - var divs = []; - var oExpandedIndex = -1; - var nExpandedIndex = -1; - var oHeight = ITEM_HEIGHT; - var nHeight = ITEM_HEIGHT; - var tHeight = 165; - var expanding = false; - var categories; - - // while control the inline debug statements - var debug = false; - var status = document.getElementById("status"); - - function Row(id, div, defaultHeight) { - this.id = id; - this.div = div; - //this.height = height; - this.h = defaultHeight; - this.div.style.height = defaultHeight + "px" - } - - Row.prototype.setHeight = function(nH) { - this.h = nH; - this.div.style.height = nH + "px"; - // re-adjust for ie in that it does not follow the boxmodel - if (this.div.offsetHeight > nH) { - this.div.style.height = (nH - (this.div.offsetHeight - nH)) + 'px'; - } - } - - Row.prototype.getTotalHeight = function() { - return this.div.offsetHeight; - } - - Row.prototype.getHeight = function() { - return this.h; - } - - this.handleEvent = function(args) { - if (args.type) { - if (args.type == 'expand') { - var targetRow = args.targetRow; - initiateExpansion(targetRow); - } - } - } - - this.load = function(lcategories) { - categories = lcategories; - // create all the rows - for (var l=0; l < categories.length; l++) { - var row = createRow(l,"accordionRow", ITEM_HEIGHT); - createLinks(row.div, categories[l].name, l, "accordionLink"); - divs.push(row); - } - } - - function showStatus() { - if (debug) { - var stat = "oExpandedIndex=" + oExpandedIndex + " " ; - for (var i=0; i < divs.length; i++) { - stat = stat + i + "=" + divs[i].getTotalHeight() + " "; - } - status.innerHTML = stat + " total height=" + accordion.offsetHeight; - var totalH = 0; - var tH = 0; - for (var i=0; i < divs.length; i++) { - totalH = totalH + divs[i].getHeight(); - tH = tH + divs[i].getTotalHeight(); - } - } - } - - this.showCategory = function(catid) { - for (var l=0; l < categories.length; l++) { - if (catid == categories[l].name) { - // now tell the scroller to load the first product - initiateExpansion(l); - if (categories[l].products[0]) { - dojo.event.topic.publish("/catalog", {type:"showProducts", productId:categories[l].products[0].id}); - } - break; - } - } - } - - this.showFirstCategory = function() { - initiateExpansion(0); - if (categories[0].products[0]) { - dojo.event.topic.publish("/catalog", {type:"showProducts", productId:categories[0].products[0].id}); - } - } - - this.loadCategoryItem = function(pid, itemId) { - // find the right product and expand the accordion - for (var l=0; l < categories.length; l++) { - // now tell the scroller to load the first product - for (var il=0; il < categories[l].products.length; il++) { - if (categories[l].products[il].id == pid ) { - initiateExpansion(l); - break; - } - } - } - dojo.event.topic.publish("/catalog", {type:"showItemDetails", productId: pid , itemId: itemId}); - } - - function initiateExpansion(id) { - // jump out if we are in progress - if (!expanding && oExpandedIndex != Number(id)) { - expanding = true; - nExpandedIndex = Number(id); - if (oExpandedIndex != -1) { - var targetDiv = divs[oExpandedIndex].div; - if (targetDiv && targetDiv.childNodes) { - for (var l = targetDiv.childNodes.length -1; l >= 0 ; l--) { - targetDiv.removeChild(targetDiv.childNodes[l]); - } - } - createLinks(divs[oExpandedIndex].div, categories[oExpandedIndex].name, oExpandedIndex, "accordionLink"); - } - expandRow(id); - } - } - - function expandRow() { - if (expanding) { - showStatus(); - // - if (nHeight < EXPANDED_HEIGHT) { - nHeight = nHeight + INCREMENT; - divs[nExpandedIndex].setHeight(nHeight); - if (oExpandedIndex != -1) { - if (tHeight >= ITEM_HEIGHT) { - oHeight = oHeight - INCREMENT; - // take all out of the old expanded - } else { - oHeight = oHeight - INCREMENT; - } - divs[oExpandedIndex].setHeight(oHeight); - } - // default exapnd here - } else if (oExpandedIndex != -1 && oHeight > ITEM_HEIGHT) { - oHeight = oHeight - INCREMENT; - divs[oExpandedIndex].setHeight(oHeight); - } else { - // set the contents of the new menu - var targetDiv = divs[nExpandedIndex].div; - if (targetDiv && targetDiv.childNodes) { - for (var l = targetDiv.childNodes.length -1; l >= 0 ; l--) { - targetDiv.removeChild(targetDiv.childNodes[l]); - } - } - divs[nExpandedIndex].div.appendChild(document.createTextNode(categories[nExpandedIndex].name)); - divs[nExpandedIndex].div.appendChild(document.createElement("p")); - for (var l= 0; l < categories[nExpandedIndex].products.length; l++) { - var span = document.createElement("span"); - span.className = "accordionProduct"; - var link = document.createElement("a"); - var target = categories[nExpandedIndex].products[l].id; - link.id = target; - link.className = "accordionLink"; - // some browsers aren't setting the styles for hovers so forcing them - link.setAttribute("onmouseover", "this.className='accordionLinkHover';"); - link.setAttribute("onmouseout", "this.className='accordionLink';"); - dojo.event.connect(link, "onclick", function(evt) { - this._target = target - var src; - if (evt.target) { - src = evt.target; - } else if (evt.srcElement) { - src = evt.srcElement; - } - //src.parentNode.className = "accordionLinkSelected"; - // set this so the next time around it can be removed; - dojo.event.topic.publish("/catalog", {type:"showProducts", productId:src.id}); - }); - link.appendChild(document.createTextNode(categories[nExpandedIndex].products[l].name)); - span.appendChild(link); - divs[nExpandedIndex].div.appendChild(span); - if (l < categories[nExpandedIndex].products.length - 1) { - divs[nExpandedIndex].div.appendChild(document.createElement("p")); - } - link = null; - } - expanding = false; - oExpandedIndex = nExpandedIndex; - nExpandedIndex = -1; - oHeight = nHeight; - nHeight = ITEM_HEIGHT; - return; - } - - setTimeout(expandRow, timeout); - } - } - - function createLinks(tDiv, text, id, linkStyle) { - var link = document.createElement("a"); - link.className = linkStyle; - link.appendChild(document.createTextNode(text)); - link.setAttribute("id", id); - if (link.attachEvent) { - link.attachEvent('onmouseover',function(e){initiateExpansion(e.srcElement.getAttribute("id"));}); - } else if (link.addEventListener) { - link.addEventListener('mouseover',function(e){initiateExpansion(e.currentTarget.getAttribute("id"));}, true); - } - tDiv.appendChild(link); - } - - function createRow(id, rowStyle, height) { - var nDiv = document.createElement("div"); - nDiv.className = rowStyle; - var row; - var cell; - if (accordion.insertRow) { - row = accordion.insertRow(accordion.rows.length); - - } else { - row = document.createElement("tr"); - accordion.appendChild(row); - } - if (row.inserCell) { - cell = row.insertCell(0); - } else { - cell = document.createElement("td"); - row.appendChild(cell); - } - cell.appendChild(nDiv); - return new Row(id, nDiv, height); - } -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp deleted file mode 100644 index c43dd98..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp +++ /dev/null @@ -1,80 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: banner.jsp,v 1.28 2006/12/19 20:23:53 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - -<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> -<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/styles.css"></link> -<script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> -<script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/rss/rssbar.js"></script> -<link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}/faces/static/META-INF/rss/rssbar.css" /> -<style type="text/css"> - -#rss-bar { - margin: 0 auto 0px; -} - -#rss-bar table td#rss-channel { - background-repeat: no-repeat; - background-position: top left; - font-size: 14px; - font-weight: bold; - vertical-align: top; - text-align: center; - width: 254px; -} - -#rss-bar table td#rss-item { - background-repeat: no-repeat; - font-size: 14px; - width: 534px; - text-align: left; -} - -#rss-bar table a { - color: white; - text-decoration: none; -} -#rss-bar table a:hover { color: #ffff00;} - -</style> -<script type="text/javascript"> - var rss = new bpui.RSS(); - dojo.addOnLoad(function(){rss.getRssInJson('${pageContext.request.contextPath}/faces/dynamic/bpui_rssfeedhandler/getRssfeed', 'https://blueprints.dev.java.net/servlets/ProjectRSS?type=news', '4', '4000', 'News from BluePrints', 'news.jsp');}); -</script> - -<table border="0" bordercolor="gray" cellpadding="0" cellspacing="0" bgcolor="white" width="100%"> - <tr id="injectionPoint"> - <td width="100"><a class="menuLink" href="${pageContext.request.contextPath}/faces/index.jsp""><img src="${pageContext.request.contextPath}/images/banner_logo.gif" border="0" width="70" height="70"></a></td> - <td align="left"> - <div class="banner">Java Pet Store</div> - </td> - <td id="bannerRight" align="right"> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/fileupload.jsp">Seller</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/search.jsp">Search</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/catalog.jsp">Catalog</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/mapAll.jsp">Map</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/tag.jsp">Tags</a> <span class="menuItem">|</span> - <a class="menuLink" onmouseover="this.className='menuLinkHover';" onmouseout="this.className='menuLink';" href="${pageContext.request.contextPath}/faces/index.jsp">Home</a> - </td> - </tr> - </tr> - <tr bgcolor="gray"> - <td id="menubar" align="left" colspan="3" height="25" > - <div id="rss-bar"> - <table border="0" cellpadding="0" cellspacing="0"> - <tr> - <td id="rss-channel" nowrap="true"></td> - <td id="rss-item" nowrap="true"></td> - </tr> - </table> - </div> - </td> - </tr> - </table> - - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css deleted file mode 100644 index 5c906b5..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css +++ /dev/null @@ -1,48 +0,0 @@ -.bpui_petstorelist_dataDiv { - border-style: groove; - overflow: auto; - width: 600px; - height: 500px; - padding: 10px; -} - -.bpui_petstorelist_pageDiv { -} - - -.bpui_petstorelist_table { -} - -.bpui_petstorelist_cell { - padding: 5px; - vertical-align: top; -} - -.bpui_petstorelist_row { - border-bottom: dotted; -} - -.bpui_petstorelist_hr { - width: 90%; -} - -.bpui_petstorelist_image { -} - -.bpui_petstorelist_link{ -} - -.bpui_petstorelist_name{ -} - -.bpui_petstorelist_description{ -} - -.bpui_petstorelist_price { -} - -.bpui_petstorelist_previous { -} - -.bpui_petstorelist_next { -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js deleted file mode 100644 index 4df46fb..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js +++ /dev/null @@ -1,269 +0,0 @@ -var bpui; -if(typeof bpui == "undefined") { - bpui=new Object(); -} -bpui.petstoreList=new Object(); - -bpui.petstoreList.divName=""; -bpui.petstoreList.currentCount=0; -bpui.petstoreList.numberPerPage=5; -bpui.petstoreList.category="feline01"; -bpui.petstoreList.cachedData=new Object(); -bpui.petstoreList.debug=false; -bpui.petstoreList.timer; - -bpui.petstoreList.initialSetup=function() { - // get outerdiv - var targetDiv=document.getElementById(bpui.petstoreList.divName); - - // containier div - tablex="<table><tr><td align=\"center\">"; - tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; - tablex += "<option value=\"loading\">Loading Data...</option>"; - tablex += "</select>"; - tablex += "</td></tr><tr><td><div id=\"bpui.petstoreList.dataDiv\" class=\"bpui_petstorelist_dataDiv\">"; - tablex += "</div>"; - - // add product previous and next - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; - tablex += "<div id=\"bpui.petstoreList.pageDiv\" class=\"bpui_petstorelist_pageDiv\">"; - tablex += "</div>"; - tablex += "</td></tr>"; - // add in debug div, if debugging - if(bpui.petstoreList.debug) { - tablex += "<tr><td colspan=\"3\">"; - tablex += "<div id=\"bpui.petstoreList.debugDiv\">"; - tablex += "</div>"; - tablex += "</td></tr>"; - } - tablex += "</table>"; - targetDiv.innerHTML=tablex; - bpui.petstoreList.setSelectedCategory(); -} - - -bpui.petstoreList.populateData=function(datax) { - // clear response timer - clearTimeout(bpui.petstoreList.timer); - - if(typeof datax != "undefined") { - // check to see if at last page and no data is returned - if(datax.length < 1) { - alert("At last page for category!"); - // keep currentCount correct by removing the increment that was added - bpui.petstoreList.currentCount -= bpui.petstoreList.numberPerPage; - } else { - // add data to cache if it doesn't already exist - // if a full set isn't returned don't cache it, so the data will be retrieved again from the server. - // This is optional, you have to weigh the performance hit with the consiquences of not doing an update - key=bpui.petstoreList.category + "|" + bpui.petstoreList.currentCount; - cachedSet=bpui.petstoreList.cachedData[key]; - if(typeof cachedSet == "undefined" && datax.length >= bpui.petstoreList.numberPerPage) { - // need to cache data - if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Adding cache data by key: " + key); - bpui.petstoreList.cachedData[key]=datax; - } - - // get outerdiv - var targetDiv=document.getElementById("bpui.petstoreList.dataDiv"); - - // containier div - tablex="<table class=\"bpui_petstorelist_table\">"; - tablex += "<tr class=\"bpui_petstorelist_row\">"; - tablex += "<th class=\"bpui_petstorelist_cell\">Pet Image</td>"; - tablex += "<th class=\"bpui_petstorelist_cell\">Name & Description</td>"; - tablex += "<th class=\"bpui_petstorelist_cell\">Price ($)</td>"; - tablex += "</tr>"; - - // loop through product results - for(ii=0; ii < datax.length; ii++) { - // add row - tablex += "<tr class=\"bpui_petstorelist_row\"><td class=\"bpui_petstorelist_cell\">"; - tablex += "<a class=\"bpui_petstorelist_image\" target=\"_blank\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + - datax[ii].productID + "," + datax[ii].itemID + "\">"; - - tablex += "<img src=\"http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL + "\"/>"; - - tablex += "</a>"; - tablex += "</td><td class=\"bpui_petstorelist_cell\">"; - tablex += "<a class=\"bpui_petstorelist_link\" target=\"_blank\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + - datax[ii].productID + "," + datax[ii].itemID + "\">"; - tablex += "<span class=\"bpui_petstorelist_name\">" + datax[ii].name + "</span><br/>"; - tablex += "</a>"; - tablex += "<span class=\"bpui_petstorelist_description\">" + datax[ii].description + "</span>"; - tablex += "</td><td class=\"bpui_petstorelist_cell\">"; - - // add product price - tablex += "<span class=\"bpui_petstorelist_price\">\$" + datax[ii].price + "</span><br/>"; - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\"><hr class=\"bpui_petstorelist_hr\" /></td></tr>"; - } - - tablex += "</table>"; - targetDiv.innerHTML=tablex; - } - - // setup previous next buttons - pagex=""; - var targetDiv=document.getElementById("bpui.petstoreList.pageDiv"); - if(bpui.petstoreList.currentCount >= bpui.petstoreList.numberPerPage) { - // add previous - pagex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; - } - if(datax.length == bpui.petstoreList.numberPerPage) { - // add next only if full page has been returned. Need to change when add cache ??? - pagex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; - } - targetDiv.innerHTML=pagex; - } -} - -bpui.petstoreList.setSelectedCategory=function() { - catx=document.getElementById("bpui.petstoreList.categoryList"); - for(ii=0; ii < catx.length; ii++) { - if(catx.options[ii].value == bpui.petstoreList.category) { - catx.options[ii].selected=true; - } - } -} - -bpui.petstoreList.selectCategory=function() { - catx=document.getElementById("bpui.petstoreList.categoryList"); - bpui.petstoreList.category=catx.value; - - bpui.petstoreList.currentCount=0; - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.nextProducts=function() { - // load data from service - bpui.petstoreList.currentCount += bpui.petstoreList.numberPerPage; - bpui.petstoreList.updateProducts(); -} - -bpui.petstoreList.previousProducts=function() { - bpui.petstoreList.currentCount -= bpui.petstoreList.numberPerPage; - if(bpui.petstoreList.currentCount < 0) { - bpui.petstoreList.currentCount=0; - } - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.updateProducts=function() { - // check to see if in cache - key=bpui.petstoreList.category + "|" + bpui.petstoreList.currentCount; - cachedSet=bpui.petstoreList.cachedData[key]; - // see if data in cache - if(typeof cachedSet != "undefined") { - // get data from cache - if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Pulling data from cache using: " + key + " with " + cachedSet.length + " items."); - bpui.petstoreList.populateData(cachedSet); - } else { - // load data from service - if(bpui.petstoreList.debug) bpui.petstoreList.debugMessage("Retrieving data from service for : " + bpui.petstoreList.category + " starting at item " + bpui.petstoreList.currentCount); - - // set degradation timeout - bpui.petstoreList.timer=setTimeout('bpui.petstoreList.requestTimedOut()', 20000); - - // create dynamic script - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=" + bpui.petstoreList.currentCount + "&length=" + bpui.petstoreList.numberPerPage + "&format=jsonp&callback=bpui.petstoreList.populateData"); - bodyTag.appendChild(scriptx); - } -} - - -bpui.petstoreList.createPetstoreList=function(divName, numberPerPage) { - // keep divName for later references - bpui.petstoreList.divName=divName; - - // see if numberPerPage defined - if(typeof numberPerPage != "undefined") { - bpui.petstoreList.numberPerPage=numberPerPage; - } - - // setup static elements - bpui.petstoreList.initialSetup(); - - // set timer to make sure service look up returns. Eventhough the Javascript library was able to be fetched, the database could be down or the - // service could be responding very slowly and the request timeout. Wait for 30 seconds and then set data div to service may not be responding message. - // Since both calls hit the database, if one returns propertly the other should also. - bpui.petstoreList.timer=setTimeout('bpui.petstoreList.requestTimedOut()', 20000); - - // load categories from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=categories&format=jsonp&call…"); - bodyTag.appendChild(scriptx); - - // load pet data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=0&length=" + bpui.petstoreList.numberPerPage + "&format=jsonp&callback=bpui.petstoreList.populateData"); - bodyTag.appendChild(scriptx); -} - - -bpui.petstoreList.requestTimedOut=function() { - document.getElementById("bpui.petstoreList.dataDiv").innerHTML="<b><font color=\"#0000FF\">The Java BluePrint's Pet Store JSONP Service is either responding very slowly or not responding at all! Please check with the service provider for more information.</font></b>"; -} - - - -bpui.petstoreList.debugMessage=function(messx) { - targetDiv=document.getElementById("bpui.petstoreList.debugDiv"); - targetDiv.innerHTML=messx + "<br/>" + targetDiv.innerHTML; -} - - -bpui.petstoreList.populateCategory=function(datax) { - // clear response timer - clearTimeout(bpui.petstoreList.timer); - - if(typeof datax != "undefined") { - catx=document.getElementById("bpui.petstoreList.categoryList"); - countx=0; - // loop through top level categories - for(ii=0; ii < datax.length; ii++) { - // loop through individual categories - for(yy=0; yy < datax[ii].products.length; yy++) { - // set default value for select list - bCurrentSelect=false - if(datax[ii].products[yy].id == bpui.petstoreList.category) { - bCurrentSelect=true; - } - catx.options[countx]=new Option(datax[ii].products[yy].name, datax[ii].products[yy].id, false, bCurrentSelect); - countx++; - } - } - } -} - - -bpui.petstoreList.hackerExample=function() { - /* - bodyTag=document.getElementsByTagName("body")[0]; - iframex=document.createElement("iframe"); - iframex.setAttribute("src", "http://localhost:8080/bp-clientside-mashup/show.jsp?cookies=" + escape(document.cookie)); - bodyTag.appendChild(iframex); - */ - // load pet data from service - - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/bp-clientside-mashup/show.jsp?cookies=" + escape(document.cookie)); - bodyTag.appendChild(scriptx); - - -} - - - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js deleted file mode 100644 index d00e427..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js +++ /dev/null @@ -1,136 +0,0 @@ -var bpui; -if(typeof bpui == "undefined") { - bpui=new Object(); -} -bpui.petstoreList=new Object(); - -bpui.petstoreList.divName=""; -bpui.petstoreList.currentCount=0; - -bpui.petstoreList.populateData=function(datax) { - if(typeof datax != "undefined") { - - // get outerdiv - var targetDiv=document.getElementById(bpui.petstoreList.divName); - - // make sure div is clear - targetDiv.innerHTML=""; - - // add class to containing div - targetDiv.setAttribute("class", "bpui_petstorelist_div") - - // add table - tablex=document.createElement("table"); - tablex.setAttribute("class", "bpui_petstorelist_table") - targetDiv.appendChild(tablex); - - // loop through product results - for(ii=0; ii < datax.length; ii++) { - // add row - rowx=document.createElement("tr"); - - // add product image with hyperlink - colx=document.createElement("td"); - ax=document.createElement("a"); - ax.setAttribute("href", "http://localhost:8080/petstore/faces/catalog.jsp#" + datax[ii].productID + "," + datax[ii].itemID) - ax.setAttribute("target", "bppetstore") - ax.setAttribute("class", "bpui_petstorelist_image") - imgx=document.createElement("img"); - imgx.setAttribute("src", "http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL); - ax.appendChild(imgx); - colx.appendChild(ax); - rowx.appendChild(colx); - - // add product name with hyperlink - colx=document.createElement("td"); - ax=document.createElement("a"); - ax.setAttribute("href", "http://localhost:8080/petstore/faces/catalog.jsp#" + datax[ii].productID + "," + datax[ii].itemID) - ax.setAttribute("target", "bppetstore") - ax.setAttribute("class", "bpui_petstorelist_name_link") - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_name") - spanx.appendChild(document.createTextNode(datax[ii].name)); - ax.appendChild(spanx); - colx.appendChild(ax); - colx.appendChild(document.createElement("br")); - // add product description - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_description"); - spanx.appendChild(document.createTextNode(datax[ii].description)); - colx.appendChild(spanx); - rowx.appendChild(colx); - - // add product price - colx=document.createElement("td"); - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_price"); - spanx.appendChild(document.createTextNode("\$" + datax[ii].price)); - colx.appendChild(spanx); - rowx.appendChild(colx); - - // add row to table - tablex.appendChild(rowx); - } - - // add product previous and next - rowx=document.createElement("tr"); - colx=document.createElement("td"); - colx.setAttribute("colspan", "3"); - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_previous"); - spanx.setAttribute("onclick", "bpui.petstoreList.previousProducts();"); - spanx.appendChild(document.createTextNode("<< PREVIOUS")); - colx.appendChild(spanx); - - spanx=document.createElement("span"); - spanx.setAttribute("class", "bpui_petstorelist_next"); - spanx.setAttribute("onclick", "bpui.petstoreList.nextProducts();"); - spanx.appendChild(document.createTextNode("NEXT >>")); - colx.appendChild(spanx); - rowx.appendChild(colx); - - // add row to table - tablex.appendChild(rowx); - } -} - - -bpui.petstoreList.nextProducts=function() { - // load data from service - bpui.petstoreList.currentCount += 5; - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.previousProducts=function() { - bpui.petstoreList.currentCount -= 5; - if(bpui.petstoreList.currentCount < 0) { - bpui.petstoreList.currentCount=0; - } - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.updateProducts=function() { - // load data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=feline01&start=" + bpui.petstoreList.currentCount + "&length=5&format=jsonp"); - bodyTag.appendChild(scriptx); -} - - - -bpui.petstoreList.createPetstoreList=function(divName) { - // keep divName for later references - bpui.petstoreList.divName=divName; - - // load data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=feline01&start=0&l…"); - bodyTag.appendChild(scriptx); -} - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js deleted file mode 100644 index 9b18cb4..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js +++ /dev/null @@ -1,159 +0,0 @@ -var bpui; -if(typeof bpui == "undefined") { - bpui=new Object(); -} -bpui.petstoreList=new Object(); - -bpui.petstoreList.divName=""; -bpui.petstoreList.currentCount=0; -bpui.petstoreList.category="feline01"; - - -bpui.petstoreList.initialSetup=function() { - // get outerdiv - var targetDiv=document.getElementById(bpui.petstoreList.divName); - - // containier div - tablex="<table><tr><td align=\"center\">"; - tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; - tablex += "<option value=\"feline01\">Hairy Cat</option>"; - tablex += "<option value=\"feline02\">Groomed Cat</option>"; - tablex += "<option value=\"canine01\">Medium Dogs</option>"; - tablex += "<option value=\"canine02\">Small Dogs</option>"; - tablex += "<option value=\"avian01\">Parrot</option>"; - tablex += "<option value=\"avian02\">Exotic</option>"; - tablex += "<option value=\"fish01\">Small Fish</option>"; - tablex += "<option value=\"fish02\">Large Fish</option>"; - tablex += "<option value=\"reptile01\">Slithering Reptiles</option>"; - tablex += "<option value=\"reptile02\">Crawling Reptiles</option>"; - tablex += "</select>"; - tablex += "</td></tr><tr><td><div class=\"bpui_petstorelist_div\">"; - tablex += "</div>"; - - // add product previous and next - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; - tablex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; - tablex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; - tablex += "</td></tr>"; - tablex += "</table>"; - targetDiv.innerHTML=tablex; - bpui.petstoreList.setSelectedCategory(); -} - -bpui.petstoreList.populateData=function(datax) { - if(typeof datax != "undefined") { - - // get outerdiv - var targetDiv=document.getElementById(bpui.petstoreList.divName); - - // containier div - tablex="<table><tr><td align=\"center\">"; - tablex += "<b>Java BluePrint's Pet Store Category:</b> <select size=\"1\" id=\"bpui.petstoreList.categoryList\" onchange=\"bpui.petstoreList.selectCategory()\">"; - tablex += "<option value=\"feline01\">Hairy Cat</option>"; - tablex += "<option value=\"feline02\">Groomed Cat</option>"; - tablex += "<option value=\"canine01\">Medium Dogs</option>"; - tablex += "<option value=\"canine02\">Small Dogs</option>"; - tablex += "<option value=\"avian01\">Parrot</option>"; - tablex += "<option value=\"avian02\">Exotic</option>"; - tablex += "<option value=\"fish01\">Small Fish</option>"; - tablex += "<option value=\"fish02\">Large Fish</option>"; - tablex += "<option value=\"reptile01\">Slithering Reptiles</option>"; - tablex += "<option value=\"reptile02\">Crawling Reptiles</option>"; - tablex += "</select>"; - tablex += "</td></tr><tr><td><div class=\"bpui_petstorelist_div\">"; - - tablex += "<table class=\"bpui_petstorelist_table\">"; - - // loop through product results - for(ii=0; ii < datax.length; ii++) { - // add row - tablex += "<tr class=\"bpui_petstorelist_row\"><td class=\"bpui_petstorelist_cell\">"; - tablex += "<a class=\"bpui_petstorelist_image\" target=\"bppetstore\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + - datax[ii].productID + "," + datax[ii].itemID + "\">"; - - tablex += "<img src=\"http://localhost:8080/petstore/ImageServlet/" + datax[ii].imageThumbURL + "\"/>"; - - tablex += "</a>"; - tablex += "</td><td class=\"bpui_petstorelist_cell\">"; - tablex += "<a class=\"bpui_petstorelist_link\" target=\"bppetstore\" href=\"http://localhost:8080/petstore/faces/catalog.jsp#" + - datax[ii].productID + "," + datax[ii].itemID + "\">"; - tablex += "<span class=\"bpui_petstorelist_name\">" + datax[ii].name + "</span><br/>"; - tablex += "</a>"; - tablex += "<span class=\"bpui_petstorelist_description\">" + datax[ii].description + "</span>"; - tablex += "</td><td class=\"bpui_petstorelist_cell\">"; - - // add product price - tablex += "<span class=\"bpui_petstorelist_price\">\$" + datax[ii].price + "</span><br/>"; - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\"><hr class=\"bpui_petstorelist_hr\" /></td></tr>"; - } - - tablex += "</table></div>"; - - // add product previous and next - tablex += "</td></tr>"; - tablex += "<tr><td colspan=\"3\" style=\"text-align:center;\">"; - tablex += "<span class=\"bpui_petstorelist_previous\" onclick=\"bpui.petstoreList.previousProducts();\"><< PREVIOUS</span>    "; - tablex += "<span class=\"bpui_petstorelist_next\" onclick=\"bpui.petstoreList.nextProducts();\">NEXT >></span><br/>"; - tablex += "</td></tr>"; - tablex += "</table>"; - targetDiv.innerHTML=tablex; - bpui.petstoreList.setSelectedCategory(); - } -} - -bpui.petstoreList.setSelectedCategory=function() { - catx=document.getElementById("bpui.petstoreList.categoryList"); - for(ii=0; ii < catx.length; ii++) { - if(catx.options[ii].value == bpui.petstoreList.category) { - catx.options[ii].selected=true; - } - } -} - - -bpui.petstoreList.selectCategory=function() { - catx=document.getElementById("bpui.petstoreList.categoryList"); - bpui.petstoreList.category=catx.value; - - bpui.petstoreList.currentCount=0; - bpui.petstoreList.updateProducts(); -} - - -bpui.petstoreList.nextProducts=function() { - // load data from service - bpui.petstoreList.currentCount += 5; - bpui.petstoreList.updateProducts(); -} - -bpui.petstoreList.previousProducts=function() { - bpui.petstoreList.currentCount -= 5; - if(bpui.petstoreList.currentCount < 0) { - bpui.petstoreList.currentCount=0; - } - bpui.petstoreList.updateProducts(); -} - -bpui.petstoreList.updateProducts=function() { - // load data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=" + bpui.petstoreList.currentCount + "&length=5&format=jsonp"); - bodyTag.appendChild(scriptx); -} - -bpui.petstoreList.createPetstoreList=function(divName) { - // keep divName for later references - bpui.petstoreList.divName=divName; - - // load data from service - bodyTag=document.getElementsByTagName("body")[0]; - scriptx=document.createElement("script"); - scriptx.setAttribute("type", "text/javascript"); - scriptx.setAttribute("src", "http://localhost:8080/petstore/catalog?command=items&pid=" + bpui.petstoreList.category + "&start=0&length=5&format=jsonp"); - bodyTag.appendChild(scriptx); - -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp deleted file mode 100644 index 60ef953..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp +++ /dev/null @@ -1,23 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: captchaerror.jsp,v 1.1 2006/02/17 03:04:22 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Captcha Error</title> - </head> - <body> - - <h1>Please input the right captcha string -- <a href="./">Try again</a> - - - - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js deleted file mode 100644 index 4bdfc69..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js +++ /dev/null @@ -1,329 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: catalog.js,v 1.21 2007/01/17 22:16:44 basler Exp $ */ - -var ac; -var is; -var controller; -//var debug=true; - -function getApplicationContextRoot() { - var urlArray=window.location.toString().split("/", 4); - return "/" + urlArray[3]; -} - -var applicationContextRoot=getApplicationContextRoot(); - -function initCatalog() { - ac = new AccordionMenu(); - is = new ImageScroller(); - is.load(); - controller = new CatalogController(); - // wire in a listener for the rating component - dojo.event.connect("before", bpui.rating, "doClick", controller, "modifyState"); - controller.initialize(); -} - -function CatalogController() { - dojo.event.topic.subscribe("/catalog", this, handleEvent); - - // this object structure contains a list of the products and chunks that have been loaded - var pList = new ProductList(); - - var CHUNK_SIZE=7; - var initalRating; - var initalItem; - var originalURL; - - // using this for some browsers that do not support innerHTML - var useDOMInjection = false; - - var infoName = document.getElementById("infopaneName"); - var infoRating = document.getElementById("infopaneRating"); - var infoPrice = document.getElementById("infopanePrice"); - var infoBuyNow = document.getElementById("infopaneBuyNow"); - var infoShortDescription = document.getElementById("infopaneShortDescription"); - var infoDescription = document.getElementById("infopaneDescription"); - // for paypal - var buyNowAmount = document.getElementById("buyNow1_amount"); - var buyNowItemName = document.getElementById("buyNow1_item_name"); - - function handleEvent(args) { - if (args.type == "showingItem") { - // update the id on the ratring component - if (typeof bpui != 'undefined') { - var groupId = is.getGroupId(); - window.location.href= originalURL + "#" + groupId + "," + args.id; - if (typeof bpui.rating != 'undefined') { - // update the rating - bpui.rating.state["rating"].bindings["itemId"]=args.id; - bpui.rating.modifyDisplay("rating", args.rating, true); - // get the currrent item - showItemDetails(args.id); - } else { - initalItem = args.id; - initalRating = args.rating; - } - } else { - // things haven't been loaded to set the inital rating - initalItem = args.id; - initalRating = args.rating; - } - } else if (args.type == "getChunk") { - populateItems(args.id, args.index, args.currentChunk, false); - - } else if (args.type == "showItemDetails") { - showProductDetails(args.productId, args.itemId); - - } else if (args.type == "showProducts") { - is.reset(); - populateItems(args.productId, 0, 0, true); - } - } - - function showItemDetails(id) { - var i = is.getItems().get(id); - setNodeText(infoName, i.name + "<br/><a href='javascript:controller.disableItem("" + id + "","" + i.name + "")'><font size='-1' color='white'><i>Flag as inappropriate</i></font></a>"); - setNodeText(infoPrice, i.price); - setNodeText(infoShortDescription, i.shortDescription); - setNodeText(infoDescription, i.description); - // update the paypal - buyNowAmount.value = i.price; - buyNowItemName.value = i.name; - } - - function setNodeText(t, text) { - if (useDOMInjection) { - t.lastChild.nodeValue = text; - } else { - t.innerHTML = text; - } - } - - this.initialize = function() { - // check whether the innerHTML changes can be used in the infopane - infoName.innerHTML = " "; - if (!useDOMInjection && infoName.innerHTML != " ") { - useDOMInjection = true; - - infoName.appendChild(document.createTextNode("Name")); - infoPrice.appendChild(document.createTextNode("$0.00")); - infoShortDescription.appendChild(document.createTextNode("<description>")); - infoDescription.appendChild(document.createTextNode("<description>")); - } - - var ratingInstance = bpui.rating.state["rating"]; - ratingInstance.grade = initalRating; - bpui.rating.state["rating"].bindings["itemId"]=initalItem; - bpui.rating.modifyDisplay("rating", initalRating, true); - loadAccordion(); - } - - - this.modifyState = function(arg, rating) { - var itemId = initalItem; - if (typeof bpui.rating.state["rating"].bindings["itemId"] != 'undefined') { - itemId = bpui.rating.state["rating"].bindings["itemId"]; - } - // set the cached rating to the new rating that was set. - is.getItems().get(itemId).rating = rating; - } - - - function loadAccordion () { - // go out and get the categories - // this should be made more geric - var bindArgs = { - url: applicationContextRoot + "/catalog?command=categories&format=json", - mimetype: "text/json", - load: function(type,json) { - ac.load(json); - processURLParameters(); - }, - error: ajaxBindError - }; - dojo.io.bind(bindArgs); - } - - // this needs to happen after we have loaded the accordion data - function processURLParameters() { - originalURL = decodeURIComponent(window.location.href); - var params = {}; - // look for the params - if (originalURL.indexOf("#") != -1) { - var qString = originalURL.split('#')[1]; - var args = qString.split(','); - originalURL = originalURL.split('#')[0]; - ac.loadCategoryItem(args[0], args[1]); - return; - } else if (originalURL.indexOf("?") != -1) { - var qString = originalURL.split('?')[1]; - // get rid of any bookmarking stuff - if (qString.indexOf("#") != -1) { - qString = qString.split('#')[0]; - originalURL = originalURL.split('#')[0]; - window.location.href = originalURL; - } - ps = qString.split('&'); - // now go through and create the params map as an object literal - for (var i in ps) { - var t = ps[i].split('='); - params[t[0]] = t[1]; - } - // first check for the item in product - if (typeof params.itemId != 'undefined' && typeof params.pid != 'undefined') { - ac.loadCategoryItem(params.pid, params.itemId); - // next if there is a catid definition then do it - } else if (typeof params.catid != 'undefined') { - ac.showCategory(params.catid); - } - } else { - // nothing is selected - ac.showFirstCategory(); - } - } - - - - function showProductDetails(pid, itemId) { - is.reset(); - is.showProgressIndicator(); - var bindArgs = { - url: applicationContextRoot + "/catalog?command=itemInChunk&pid=" + pid + "&itemId=" + itemId + "&length=" + CHUNK_SIZE, - mimetype: "text/xml", - load: function(type,data,postProcessHandler) { - processProductData(data,true, pid, itemId); - showItemDetails(itemId); - is.doMaximize(); - }, - error: ajaxBindError - }; - dojo.io.bind(bindArgs); - } - - - - function populateItems(pid, index, neededChunk, showImage) { - is.showProgressIndicator(); - is.setGroupId(pid); - printDebug("populateItems - need to make sure displaying - pid=" + pid + " Chunk=" + neededChunk); - - // check to see if relevant scroller page is already loaded - if(!is.containsChunk(pid + "_" + neededChunk)) { - - // not loaded, so see if it is in the cache - if (pList.hasChunk(pid, neededChunk)) { - // in cache, so add chunk to scroller - printDebug("**** adding chunk from cache - pid=" + pid + " Chunk=" + neededChunk); - is.addChunk(pid + "_" + neededChunk); - is.addItems(pList.getChunk(pid, neededChunk)); - - // show first image if you have it - if(showImage && is.getScrollerItems().length > 0) { - is.showImage(is.getScrollerItems()[0].id); - } - - } else { - // not in cache so load it - startRetIndex=(neededChunk * CHUNK_SIZE); - - printDebug("**** retrieving chunk from server - pid=" + pid + " currentIndex=" + index + " startIndex=" + startRetIndex + " Chunk=" + neededChunk); - var bindArgs = { - url: applicationContextRoot + "/catalog?command=items&pid=" + pid + "&start=" + startRetIndex + "&length=" + CHUNK_SIZE, - mimetype: "text/xml", - load: function(type,data,postProcessHandler) { - processProductData(data, showImage, pid, null, neededChunk); - }, - error: ajaxBindError - }; - dojo.io.bind(bindArgs); - } - } else { - printDebug("*** items already showing"); - } - - } - - - function processProductData(responseXML, showImage, pid, iId, chunkId) { - var items = []; - var count = responseXML.getElementsByTagName("item").length; - for (var loop=0; loop < count ; loop++) { - - var item = responseXML.getElementsByTagName("item")[loop]; - var itemId = item.getElementsByTagName("id")[0].firstChild.nodeValue; - var name = item.getElementsByTagName("name")[0].firstChild.nodeValue; - var thumbURL = item.getElementsByTagName("image-tb-url")[0].firstChild.nodeValue; - var imageURL = item.getElementsByTagName("image-url")[0].firstChild.nodeValue; - var description = item.getElementsByTagName("description")[0].firstChild.nodeValue; - var price = item.getElementsByTagName("price")[0].firstChild.nodeValue; - var rating = item.getElementsByTagName("rating")[0].firstChild.nodeValue; - var shortDescription; - if (description.length > 71) { - shortDescription = description.substring(0,71) + "..."; - } else { - shortDescription = description; - } - var i = {id: itemId, name: name, image: imageURL, thumbnail: thumbURL, shortDescription: shortDescription, description: description, price:price, rating: rating}; - items.push(i); - } - - // cache the chunks - pList.addChunk(pid, chunkId, items); - is.addItems(items); - is.addChunk(pid + "_" + chunkId); - - if (showImage && iId == null) { - is.setGroupId(pid); - is.showImage(items[0].id); - } else { - is.setGroupId(pid); - is.showImage(iId); - } - is.hideProgressIndicator(); - } - - function ProductList() { - var _plist = this; - var map = new Map(); - - this.addChunk = function(pid, chunkNumber, items) { - map.put(pid + "_" + chunkNumber, items, true); - } - - this.getChunk = function(pid, chunkNumber) { - return map.get(pid + "_" + chunkNumber); - } - - this.hasChunk = function(pid, chunkNumber) { - return (map.get(pid + "_" + chunkNumber) != null); - } - - this.contents = function() { - return map.contents(); - } - } - - - this.disableItem=function(itemId, itemName) { - // go out and get the categories - // this should be made more geric - if (confirm("Are you sure you want to effectively remove this item from Petstore?")) { - var bindArgs = { - url: applicationContextRoot + "/catalog?command=disable&id=" + itemId, - mimetype: "text/xml", - load: function(type,json) { - //alert("The item named '" + itemName + "' has been disabled!"); - pList = new ProductList(); - is.reset(); - populateItems(is.getGroupId(), 0, 0, true); - }, - error: ajaxBindError - }; - dojo.io.bind(bindArgs); - } - } - - -} - - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp deleted file mode 100644 index 443857b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp +++ /dev/null @@ -1,95 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: catalog.jsp,v 1.22 2007/03/16 21:42:03 basler Exp $ --%> -<script type="text/javascript" src="common.js"></script> -<script type="text/javascript" src="scroller.js"></script> -<link rel="stylesheet" type="text/css" href="scroller.css"></link> -<script type="text/javascript" src="accordion.js"></script> -<link rel="stylesheet" type="text/css" href="accordion.css"></link> -<script type="text/javascript" src="catalog.js"></script> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> -<body> -<jsp:include page="banner.jsp" /> -<script type="text/javascript"> - dojo.event.connect(window, "onload", function(){initCatalog();}); -</script> -<center> - <table border="0"> - <tr> - <td> - <table id="accordion"> - <tr id="accordionTitle" class="accordionTitle"><td>Pets</td></tr> - <tr><td> - <table id="accordionBody" border="0" class="accordionBody"> - </table> - </td></tr> - </table> - </td> - <td> - <div id="CatalogBrowser"> - <table border="0" class="slider" width="500px" > - <tr height="415" valign="top"> - <td id="bodySpace" border="0" align="center"></td> - </tr> - <tr id="targetRow"> - <td width="500" height="70 align="top"> - <div class="nav" id="right_button"> - <img src="${pageContext.request.contextPath}/images/right.gif" name="nextRoll" title="Show More Items" border="0"> - </div> - <div class="nav" id="left_button"> - <img src="${pageContext.request.contextPath}/images/left.gif" name="previousRoll" title="Show Previous Items" border="0"> - </div> - <div id="infopane" class="infopane"> - <table class="infopaneTable"> - <tr> - <td id="infopaneName" class="infopaneTitle"> - </td> - <td id="infopaneRating" class="infopaneRating"> - <f:view> - <ui:rating id="rating" maxGrade="5" includeNotInterested="false" includeClear="false" - hoverTexts="#{RatingBean.ratingText}" notInterestedHoverText="Not Interested" clearHoverText="Clear Rating" - grade="#{RatingBean.grade}"/> - <f:verbatim></td><td id="infopanePrice" class="infopanePrice"></td><td id="infopanePayPal" class="infopanePayPal"></f:verbatim> - <ui:buyNow business="donate(a)animalfoundation.com" id="buyNow1" itemName="Buy Item One" - amount="100.00" quantity="1" type="BuyNow" postData="#{PayPalBean.postData}" target="paypal"/> - </f:view> - </td> - <td id="infopaneIndicator" class="infopaneIndicator"> - </td> - <td id="infopaneDetailsIcon"> - </td> - </tr> - <tr> - <td id="infopaneShortDescription" colspan="7" class="infopaneShortDescription"> - </td> - </tr> - <tr style="height:20px"> - <td></td> - </tr> - <tr> - <td id="infopaneDescription" colspan="6" class="infopaneDescription"> - </td> - </tr> - </table> - </div> - </td> - </tr> - </table> - </td> - <td style="vertical-align:top; width:300px; text-align:right;"> - <div id="downloadAds"> - <jsp:include page="download.jsp" /> - </div> - </td> - </tr> - </table> - </div> - <div id="status" style="text-align:left"></div> <div id="status_2"></div> - <div id="dstatus"></div> - <div id="injection_point"></div> -</center> -<jsp:include page="footer.jsp" /> -</body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old deleted file mode 100644 index 13914ed..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old +++ /dev/null @@ -1,95 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: catalog.jsp,v 1.20 2006/12/01 21:38:40 basler Exp $ --%> -<script type="text/javascript" src="common.js"></script> -<script type="text/javascript" src="scroller.js"></script> -<link rel="stylesheet" type="text/css" href="scroller.css"></link> -<script type="text/javascript" src="accordion.js"></script> -<link rel="stylesheet" type="text/css" href="accordion.css"></link> -<script type="text/javascript" src="catalog.js"></script> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> -<body> -<jsp:include page="banner.jsp" /> -<script type="text/javascript"> - dojo.event.connect(window, "onload", function(){initCatalog();}); -</script> -<center> - <table border="0"> - <tr> - <td> - <table id="accordion"> - <tr id="accordionTitle" class="accordionTitle"><td>Pets</td></tr> - <tr><td> - <table id="accordionBody" border="0" class="accordionBody"> - </table> - </td></tr> - </table> - </td> - <td style="min-width:500px;"> - <div id="CatalogBrowser"> - <table width="500px"border="1" class="slider" > - <tr height="415" valign="top"> - <td id="bodySpace" border="0" align="center"></td> - </tr> - <tr id="targetRow"> - <td width="500px" height="70px" align="top"> - <div class="nav" id="right_button"> - <img src="${pageContext.request.contextPath}/images/right.gif" name="nextRoll" title="Show More Items" border="0"> - </div> - <div class="nav" id="left_button"> - <img src="${pageContext.request.contextPath}/images/left.gif" name="previousRoll" title="Show Previous Items" border="0"> - </div> - <div id="infopane" class="infopane"> - <table class="infopaneTable"> - <tr> - <td id="infopaneName" class="infopaneTitle"> - </td> - <td id="infopaneRating" class="infopaneRating"> - <f:view> - <ui:rating id="rating" maxGrade="5" includeNotInterested="false" includeClear="false" - hoverTexts="#{RatingBean.ratingText}" notInterestedHoverText="Not Interested" clearHoverText="Clear Rating" - grade="#{RatingBean.grade}"/> - <f:verbatim></td><td id="infopanePrice" class="infopanePrice"></td><td id="infopanePayPal" class="infopanePayPal"></f:verbatim> - <ui:buyNow business="donate(a)animalfoundation.com" id="buyNow1" itemName="Buy Item One" - amount="100.00" quantity="1" type="BuyNow" postData="#{PayPalBean.postData}" target="paypal"/> - </f:view> - </td> - <td id="infopaneIndicator" class="infopaneIndicator"> - </td> - <td id="infopaneDetailsIcon"> - </td> - </tr> - <tr> - <td id="infopaneShortDescription" colspan="7" class="infopaneShortDescription"> - </td> - </tr> - <tr style="height:20px"> - <td></td> - </tr> - <tr> - <td id="infopaneDescription" colspan="6" class="infopaneDescription"> - </td> - </tr> - </table> - </div> - </td> - </tr> - </table> - </td> - <td style="vertical-align:top; width:300px; text-align:right;"> - <div id="downloadAds"> - <jsp:include page="download.jsp" /> - </div> - </td> - </tr> - </table> - </div> - <div id="status" style="text-align:left"></div> <div id="status_2"></div> - <div id="dstatus"></div> - <div id="injection_point"></div> -</center> -<jsp:include page="footer.jsp" /> -</body> -</html> \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js deleted file mode 100644 index 03a3ba2..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js +++ /dev/null @@ -1,77 +0,0 @@ - - function ajaxBindError(type, errObj) { - // can't use the error page, because unless and exception in the internal servlet container - // nullpointer exceptions will be thrown - //window.location="./systemerror.jsp?message=" + errObj.message; - - alert("An Exception has been encountered on the server side during an Ajax request. Please see the server logs for more information " + errObj.message); - } - - - function debugProperties(namex) { - var listx=""; - var ob=namex; - for(xx in ob) { - listx += xx + " = " + ob[xx] + "<br/>" - } - //document.write(listx); - alert(listx); - } - - - function printDebug(argx) { - if (typeof debug != 'undefined') { - document.getElementById("status").innerHTML = argx + "<br\>" + document.getElementById("status").innerHTML; - } - } - - - function Map() { - var size = 0; - var keys = []; - var values = []; - - this.put = function(key, value, replace) { - if (this.get(key) == null) { - keys[size] = key; - values[size] = value; - size++; - } else if (replace) { - for (i=0; i < size; i++) { - if (keys[i] == key) { - values[i] = value; - } - } - } - } - - this.get = function(key) { - for (i=0; i < size; i++) { - if (keys[i] == key) { - return values[i]; - } - } - return null; - } - - this.clear = function() { - size = 0; - keys = []; - values = []; - } - - // return keys show can show main image - this.getKeys = function() { - return keys; - } - - // dump contents of map keys as string - this.contents = function() { - var retx=""; - for(ii=0; ii < size; ii++) { - retx += keys[ii] + ", "; - } - return retx; - } - - } \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp deleted file mode 100644 index 20ef584..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<div id="downloadAds" style="text-align:center; border-style:none; width:100%;"> - <table style="width:100%;"> - <tr> - <td style="text-align:center;"> - <a href="http://java.sun.com/javaee/downloads/index.jsp" target="downloads"><img style="border:none" src="./images/ad-sdk.jpg" alt="Download Java EE 5 SDK"/></a> - <br/> - </td> - </tr> - <tr> - <td style="text-align:center;"> - <a href="http://www.netbeans.org/downloads/index.html" target="downloads"><img style="border:none" src="./images/ad-netbeans.jpg" alt="Download Netbeans IDE"/></a> - <br/> - </td> - </tr> - <tr> - <td style="text-align:center;"> - <a href="http://java.com/en/download/index.jsp" target="downloads"><img style="border:none" src="./images/ad-jre.jpg" alt="Download Java SE"/></a> - <br/> - </td> - </tr> - </table> -</div> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js deleted file mode 100644 index 65855c2..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js +++ /dev/null @@ -1,54 +0,0 @@ -dojo.require("dojo.io"); -function checkAdPage() { - var bindArgs = { - // check to see if an updated page is available - URL: "http://localhost:8080/petstore/downloadAd.txt", - mimetype: "text/plain", - load: returnFunctionx, - error: ajaxBindError}; - - // dispatch the request - dojo.io.bind(bindArgs); -} - -function returnFunctionx(type, data, evt) { - // statically setup popup for simple case - // check return of the dojo call to make sure it is valid - if (evt.readyState == 4) { - if (evt.status == 200) { - alert("data = " + data); - document.getElementById("downloadAds").innerHTML=data; - } - } -} - - -var req; - -function checkAdPageMark() { - // calculate arrow and border image location - req=initRequest(); - - url="http://blueprints.dev.java.net/petstore/downloadAd.txt", - req.onreadystatechange = returnFunctionxMark; - req.open("GET", url, true); - req.send(null); -} - - -function returnFunctionxMark() { - if (req.readyState == 4) { - if (req.status == 200) { - alert("data = " + req.responseText); - document.getElementById("downloadAds").innerHTML=req.responseText; - } - } -} - -initRequest=function() { - if (window.XMLHttpRequest) { - return new XMLHttpRequest(); - } else if (window.ActiveXObject) { - return new ActiveXObject("Microsoft.XMLHTTP"); - } -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json deleted file mode 100644 index 3bbf564..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json +++ /dev/null @@ -1,7 +0,0 @@ -jsonpTest({"keyId":"TestData"}); - -function testexample() { - alert("testexample!!"); -} - -testexample(); \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt deleted file mode 100644 index e9a0944..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt +++ /dev/null @@ -1 +0,0 @@ -<div id='downloadAds' style='text-align:center; border-style:double; width:100%;'> <table style='width:100%'> <tr> <th style='text-align:center; border-bottom:thin solid black;'>DOWNLOADS Blueprints</th> </tr> <tr> <td style='text-align:center;'> <a href='http://java.sun.com/javaee/downloads/index.jsp' target='downloads'><img style='border:none' src='./images/ad-sdk.jpg' alt='Download Java EE 5 SDK'/></a> </td> </tr> <tr> <td style='text-align:center;'> <a href='http://www.netbeans.org/downloads/index.html' target='downloads'><img style='border:none' src='./images/ad-netbeans.jpg' alt='Download Netbeans IDE'/></a> </td> </tr> <tr> <td style='text-align:center;'> <a href='http://java.com/en/download/index.jsp' target='downloads'><img style='border:none' src='./images/ad-jre.jpg' alt='Download Java SE'/></a> </td> </tr> </table></div> \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js deleted file mode 100644 index 0e5b14e..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js +++ /dev/null @@ -1,241 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: engine.js,v 1.10 2006/05/03 22:00:32 inder Exp $ */ - -function Engine () { - - /** - * - * Load template text aloing with an associated script - * - * Argument p properties are as follows: - * - * url : Not required but used if you want to get the template from - * something other than the injection serlvet. For example if - * you want to load content directly from a a JSP or HTML file. - * - * p.template : Not required if you specficy a url property Otherewise this - * is the name of the template file. - * - * p.initFunction: Not required. This function or function pointer will be called - * after the template text and script are loaded. The result of - * the evaluated script will be accessible in the context of - * this function. - * - * p.injectionPoint: Not required. This is the id of an element into. If this is - * not specfied a div will be created under the roon node of - * the document and the template will be injected into it. - * Content is injected by setting the innerHTML property - * of an element to the template text. - */ - this.inject = function (p) { - var targetUrl; - if (!p.url) targetUrl = "controller?command=content&target=/" + p.template; - else targetUrl = p.url; - var templateArgs = { - url: targetUrl, - mimetype: "text/html", - load: function(type, data) { - //if no parent is given append to the document root - var nData = includeEmbeddedResources(data, p.initFunction ); - if (!p.injectionPoint) { - var injectionPoint = document.createElement("div"); - injectionPoint.innerHTML = nData; - document.firstChild.appendChild(injectionPoint); - } else { - p.injectionPoint.innerHTML = nData; - } - if (p.script) { - // now load the associated JavaScript - loadScript(p.script,p.initFunction); - } - } - }; - dojo.io.bind(templateArgs); - } - - function loadScript(targetURL,callback) { - var templateArgs = { - url: targetURL, - mimetype: "text/plain", - load: callback - }; - dojo.io.bind(templateArgs); - } - - /** - * If were returning an text document remove any script in the - * the document and add it to the global scope using a time out. - */ - function includeEmbeddedResources(target, initFunction) { - var bodyText = ""; - var embeddedScripts = []; - var embeddedStyles = []; - var scriptReferences = []; - var styleReferences = []; - var styles = []; - // recursively go through and weed out the scripts - // TODO: Use some better REGEX processing - // TODO: Also support single quotes - while (target.indexOf("<script") != -1) { - var realStart = target.indexOf("<script"); - var scriptSourceStart = target.indexOf("src=", (realStart)); - var scriptElementEnd = target.indexOf(">", realStart); - var end = target.indexOf("</script>", (realStart)) + "</script>".length; - if (realStart != -1 && scriptSourceStart != -1) { - var scriptSourceName; - var scriptSourceLinkStart= scriptSourceStart + 5; - var scriptSourceLinkEnd= target.indexOf("\"", (scriptSourceLinkStart + 1)); - if (scriptSourceStart < scriptElementEnd) { - scriptSourceName = target.substring(scriptSourceLinkStart, scriptSourceLinkEnd); - // prevent multiple inclusions of dojo.js. - // there is no way you would get to this point without dojo being included - if (scriptSourceName.indexOf("dojo.js") == -1) { - scriptReferences.push(scriptSourceName); - } - } - } - // now remove the script body - var scriptBodyStart = scriptElementEnd + 1; - var sBody = target.substring(scriptBodyStart, end - "</script>".length); - if (sBody.length > 0) { - embeddedScripts.push(sBody); - } - //remove script - target = target.substring(0, realStart) + target.substring(end, target.length); - } - - while (target.indexOf("<style") != -1) { - var realStart = target.indexOf("<style"); - var styleElementEnd = target.indexOf(">", realStart); - var end = target.indexOf("</style>", (realStart)) ; - var styleBodyStart = styleElementEnd + 1; - var sBody = target.substring(styleBodyStart, end); - if (sBody.length > 0) { - embeddedStyles.push(sBody); - } - //remove style - target = target.substring(0, realStart) + target.substring(end + "</style>".length, target.length); - } - // get the links - while (target.indexOf("<link") != -1) { - var realStart = target.indexOf("<link"); - var styleSourceStart = target.indexOf("href=", (realStart)); - var styleElementEnd = target.indexOf(">", realStart) +1; - if (realStart != -1 && styleSourceStart != -1) { - var styletSourceName; - var styleSourceLinkStart= styleSourceStart + 6; - var styleSourceLinkEnd= target.indexOf("\"", (styleSourceLinkStart + 1)); - if (styleSourceStart < styleElementEnd) { - styleSourceName = target.substring(styleSourceLinkStart, styleSourceLinkEnd); - styleReferences.push(styleSourceName); - } - //remove style - target = target.substring(0, realStart) + target.substring(styleElementEnd, target.length); - } - } - - var head = document.getElementsByTagName("head")[0]; - - // inject the links - for(var loop = 0; loop < styleReferences.length; loop++) { - var link = document.createElement("link"); - link.href = styleReferences[loop]; - link.type = "text/css"; - link.rel = "stylesheet"; - head.appendChild(link); - } - - var stylesElement; - if (embeddedStyles.length > 0) { - stylesElement = document.createElement("style"); - stylesElement.type="text/css"; - var stylesText; - for(var loop = 0; loop < embeddedStyles.length; loop++) { - stylesText = stylesText + embeddedStyles[loop]; - } - if (document.styleSheets[0].cssText) { - document.styleSheets[0].cssText = document.styleSheets[0].cssText + stylesText; - } else { - stylesElement.appendChild(document.createTextNode(stylesText)); - head.appendChild(stylesElement); - } - } - - scriptLoader(scriptReferences, 0, function() { - this.embeddedScripts = embeddedScripts; - // evaluate the embedded javascripts in the order they were added - // consider using an onload handler - for(var loop = 0; loop < embeddedScripts.length; loop++) { - //alert("evaluating " + embeddedScripts[loop]); - var script = embeddedScripts[loop]; - // append to the script a method to call the scriptLoaderCallback - eval(script); - if (loop == (embeddedScripts.length -1)) { - initFunction(); - } - } - }); - - return target; - } - - - /** - * Load the scripts in order and load them one after on another - */ - function scriptLoader(scripts, index, callbackFunction) { - var head = document.getElementsByTagName("head").item(0); - var scriptElement = document.createElement("script"); - scriptElement.id = "c_script_" + index; - scriptElement.type = "text/javascript"; - - var loadHandler = function () { - if (index < scripts.length && index != scripts.length -1) { - scriptLoader(scripts, ++index, callbackFunction); - } else { - callbackFunction(); - } - } - if (typeof scriptElement.onreadystatechange != 'undefined') { - scriptElement.onreadystatechange = function () { - if (this.readyState == 'loaded') { - loadHandler(); - } - }; - } - scriptElement.onload = loadHandler; - - // Safari not seeing the onload event and does not support the onreadystate - if (navigator.userAgent.toLowerCase().indexOf("safari") != -1) { - scriptElement.src = scripts[index]; - setTimeout(loadHandler, 0); - } - head.appendChild(scriptElement); - setTimeout("document.getElementById('c_script_" + index + "').src ='" + scripts[index] + "'", 0); - - scriptElement = null; - head = null; - } - - /** - * If were returning an XML document remove any script in the - * the document and add it to the global scope using a time out. - */ - function includeEmbeddedScripts(xmlDocument) { - var items = new Array(); - var xmlDocument = document.getElementsByTagName("script"); - - for(var loop = 0; loop < targets.length; loop++) { - var children = targets[loop].childNodes; - var iScript = ""; - for(var innerLoop = 0; innerLoop < children.length; innerLoop++) { - iScript += children[innerLoop].data; - } - items.add(iScript); - children[loop].parentNode.removeChild(children[loop]); - } - for(var loop = 0; loop < items.length; loop++) { - setTimeout(items[loop],0); - } - } -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp deleted file mode 100644 index bb8fb85..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp +++ /dev/null @@ -1,266 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: fileupload.jsp,v 1.57 2007/03/08 21:58:48 inder Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="com.sun.javaee.blueprints.petstore.util.PetstoreConstants"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <title>Petstore Seller page</title> - <script type="text/javascript"> - var submittingForm=false; - - function testRetFunction(type, data, evt){ - if (evt.readyState == 4) { - if(evt.status == 200) { - // check for error - submittingForm=false; - var resultx=data.getElementsByTagName("response")[0]; - var message=resultx.getElementsByTagName("message")[0].childNodes[0].nodeValue; - if(message == "Captchas Filter Error") { - // captcha error - alert("Authorization failed : please enter the correct captcha string"); - } else if(message == "Validation Error") { - alert("Validation failed on the Server :\n" + resultx.getElementsByTagName("detail")[0].childNodes[0].nodeValue); - } else if(message == "Upload Size Error") { - alert("The size of the uploaded image must not be more than 100 KB"); - } else { - // fileupload complete - var thumbpath=resultx.getElementsByTagName("thumbnail")[0].childNodes[0].nodeValue; - var productId=resultx.getElementsByTagName("productId")[0].childNodes[0].nodeValue; - var itemid=resultx.getElementsByTagName("itemId")[0].childNodes[0].nodeValue; - // forward to status page - location.href="fileuploadstatus.jsp?message=" + message + "&id=" + itemid + "&productId=" + productId + "&thumb=" + thumbpath; - } - } else { - // server error, send to error page - // can't forward to errorpage because null pointer gets thrown on lookup of status code ("javax.servlet.error.status_code") - //ajaxBindError(type, data.message); - alert("Persistence failed : Please check if the server logs for more information!") - } - } - } - - - function storeCookie() { - currentcap = "j_captcha_response="+document.getElementById("TestFileuploadForm:captcharesponse").value; - document.cookie = currentcap; - } - - function extractCity(citystatezip) { - var index = citystatezip.indexOf(','); - var nextcity = citystatezip.substring(0, index+4); - return nextcity; - } - - function chooseCity(city) { - var index = city.indexOf(','); - var state = city.substring(index+2, index+4); - var zip = city.substring(index+5); - city = city.substring(0, index); - - document.getElementById('TestFileuploadForm:cityField').value = city; - document.getElementById('TestFileuploadForm:stateField').value = state; - document.getElementById('TestFileuploadForm:zipField').value = zip; - } - - function fileuploadOnsubmit() { - if(!submittingForm) { - var valMess=""; - - // save rich text editor text to element - var descx=dojo.widget.byId('rtEditor').getEditorContent() - var lowDescx=descx.toLowerCase(); - - // START: check validation - if(dojo.byId("TestFileuploadForm:name").value == "") { - valMess += "Error: Pet Name is required.\n"; - } - - // make sure there isn't a script/link tag in the description - if(lowDescx == "" || lowDescx.indexOf("<script") > -1 || lowDescx.indexOf("<link") > -1) { - valMess += "Error: The Description must exist and the field can't have a '<script>' and/or a '<link>' tag in it\n"; - } - - // make sure price is a number - var pricex=dojo.byId("TestFileuploadForm:price").value; - if(pricex == "" || isNaN(parseInt(pricex))) { - // price should be a number - valMess += "Error: Price should should exist and be a number in American Dollars in the format '*.00'.\n"; - } - - // make sure the upload file ends in an suffix - var filex=dojo.byId("fileToUploadId").value; - var lengthx=filex.length; - var suffix=filex.substr(lengthx-4).toLowerCase(); - if(lengthx < 1 || (suffix != ".jpg" && suffix != ".gif" && suffix != ".png")) { - // not a proper upload so error - valMess += "Error: The image upload file must exist and be of type .jpg, .gif or .png\n"; - } - - - // make sure make and address is entered - if(dojo.byId("TestFileuploadForm:firstName").value == "") { - // price should be a number - valMess += "Error: First Name is required.\n"; - } - if(dojo.byId("TestFileuploadForm:lastName").value == "") { - valMess += "Error: Last Name is required.\n"; - } - if(dojo.byId("TestFileuploadForm:street1").value == "") { - valMess += "Error: Street is required.\n"; - } - if(dojo.byId("TestFileuploadForm:cityField").value == "") { - valMess += "Error: City is required.\n"; - } - if(dojo.byId("TestFileuploadForm:stateField").value == "") { - valMess += "Error: State is required.\n"; - } - if(dojo.byId("TestFileuploadForm:zipField").value == "") { - valMess += "Error: Zip Code is required.\n"; - } - - if(valMess != "") { - // error, show message - alert(valMess + "\nPlease addresses the error(s) and re-submit your entry!"); - } else { - // no validation errors, so submit form - submittingForm=true; - // set description - dojo.byId('description').value=descx; - - storeCookie() - document.forms['TestFileuploadForm'].onsubmit(); - } - } - } - - function showFU() { - document.getElementById("fucomponent").style.visibility = "visible"; - } - - function switchPanes(fromDivId, toDivId) { - // show pane - var divx=document.getElementById(fromDivId); - divx.style.visibility='hidden'; - divx=document.getElementById(toDivId); - divx.style.visibility='visible'; - } -</script> -<style> -span.button { - background-color: #6699CC; - color: white; - cursor:pointer; - border: thin outset black; - padding: 1px 5px; -} -div.pane { - width: 90%; - background-color: #EEEEEE; - border: thin double blue; - padding: .5cm; - font: 12px arial; -} - -.nameCol { - width: 45%; -} -.dataCol { - width: 55%; -} - -</style> - </head> - <body onload="showFU()"> - <jsp:include page="banner.jsp"/> - <script>dojo.require("dojo.widget.Editor2");</script> - <br/> - <div id="fucomponent" style="visibility:hidden;"> - <f:view> - - <ui:fileUploadTag id="TestFileuploadForm" serverLocationDir="#{FileUploadBean.uploadImageDirectory}" - postProcessingMethod="#{FileUploadBean.postProcessingMethod}" - retMimeType="text/xml" retFunction="testRetFunction" - progressBarDivId="progress" progressBarSize="40"> - <div id="pane2" class="pane" style="visibility: hidden;"> - <h:panelGrid border="0" columns="2" style="width: 100%" columnClasses="nameCol, dataCol"> - <f:facet name="header"> - <h:outputText value="Information about yourself"/> - </f:facet> - <h:outputText value="*First Name"/> - <h:inputText size="20" id="firstName"></h:inputText> - <h:outputText value="*Last Name"/> - <h:inputText size="20" id="lastName"></h:inputText> - <h:outputText value="Seller Email"/> - <h:inputText size="20" id="email"></h:inputText> - <h:outputText value="*Street"/> - <h:inputText size="20" id="street1"></h:inputText> - <h:outputText value="*City"/> - <ui:autoComplete size="20" maxlength="10" id="cityField" - completionMethod="#{AutocompleteBean.completeCity}" - value="#{AddressBean.city}" required="true" - ondisplay="function(item) { return extractCity(item); }" - onchoose="function(item) { return chooseCity(item); }" /> - <h:outputText value="*State"/> - <ui:autoComplete size="2" maxlength="10" id="stateField" - completionMethod="#{AutocompleteBean.completeState}" - value="#{AddressBean.state}" required="true" /> - <h:outputText value="*Zip Code"/> - <h:inputText size="5" id="zipField" value="#{AddressBean.zip}" required="true" /> - - <h:outputText value="Enter the text as it is shown below (case insensitive)"/> - <h:outputText /> - <h:graphicImage id="captchaImg" url="CaptchaServlet"/> - <h:inputText id="captcharesponse"></h:inputText> - <br/><span class="button" onclick="switchPanes('pane2', 'pane1');"><< Previous</span> -    <span class="button" onclick="fileuploadOnsubmit()">Submit</span> - <br/><div id="progress"></div><br/> - - </h:panelGrid> - </div> - <div class="pane"style="position:absolute; top:125px;" id="pane1"> - <h:panelGrid border="0" columns="2" style="width: 100%" columnClasses="nameCol, dataCol"> - <f:facet name="header"> - <h:outputText value="Information about your pet"/> - </f:facet> - - <h:outputText value="Category"/> - <h:selectOneMenu id="product"> - <f:selectItems value="#{FileUploadBean.products}"/> - </h:selectOneMenu> - - <h:outputText value="*Pet's Name"/> - <h:inputText size="20" id="name"></h:inputText> - - <h:outputText value="*Description (3 lines max display in catalog)"/> - - <div style="border-style:inset; border-width:thin; background-color:white"> - <textarea wrap="soft" dojoType="Editor2" widgetId="rtEditor" id="description" name="TestFileuploadForm:description" - toolbarTemplatePath="${pageContext.request.contextPath}/rteToolBar.html"></textarea> - </div> - - <h:outputText value="*Price (is US dollars)"/> - <h:inputText size="20" id="price"></h:inputText> - - <h:outputText value="*Image File"/> - <input type="file" size="20" name="fileToUpload" id="fileToUploadId"/> - - <h:outputText value="Custom Tag Keywords (separated by spaces)"/> - <h:inputText size="20" id="tags"></h:inputText> - </h:panelGrid> - <br/><span class="button" onclick="switchPanes('pane1', 'pane2');">Next >></span> - </div> - Required fields are designated by a * - </ui:fileUploadTag> - </f:view> - </div> - - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp deleted file mode 100644 index 50e3730..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp +++ /dev/null @@ -1,134 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: fileuploadstatus.jsp,v 1.8 2006/05/05 21:05:47 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Seller Photo Submit Status</title> - <style type="text/css"> - #status { background-color : #E0FFFF; - border : none; - width : 50%; - } - </style> - <script type="text/javascript"> - window.onload = function() { - var thumbfile = "${param.thumb}"; - if (thumbfile == "") { - thumbfile = "${sessionScope['fileuploadResponse'].thumbnail}"; - } - thumbpath = "http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.servletContext.contextPath}/ImageServlet/"; - thumbpath += thumbfile; - var divNode = document.getElementById("thumb"); - var imgNode = document.createElement("img"); - imgNode.setAttribute("src", thumbpath); - divNode.appendChild(imgNode); - - // initialize buttons - initButtonImage(); - } - - var imageLayerId = new Array(); - var imageLayerG = new Array(); - var imageLayerC = new Array(); - var imageText = new Array(); - function initButtonImage(){ - imageLayerId[1] ="seller" - imageLayerG[1] = "../images/seller-thumb-g.jpg"; - imageLayerC[1] = "../images/seller-thumb.jpg"; - imageLayerId[2] ="catalog" - imageLayerG[2] = "../images/catalog-thumb-g.jpg"; - imageLayerC[2] = "../images/catalog-thumb.jpg"; - imageLayerId[3] ="home" - imageLayerG[3] = "../images/index-thumb-g.jpg"; - imageLayerC[3] = "../images/index-thumb.jpg"; - - imageText[1] = "Submit another pet"; - imageText[2] = "Go to your pet page"; - imageText[3] = "Go back to PetStore home"; - } - - function highlightButton(n) { - switchButton(true, n); - } - function darkenButton(n) { - switchButton(false, n); - } - - function switchButton(highlight, n){ - var id = imageLayerId[n]; - var btn = document.getElementById(id); - if (highlight) { - btn.src = imageLayerC[n]; - popupText(imageText[n]); - } else { - btn.src = imageLayerG[n]; - popupText(null); - } - } - var Mx; - var My; - function popupText(txt) { - var pNode = document.getElementById("popupText"); - var rx; - var ry; - if (document.all) { - rx = event.clientX + document.body.scrollLeft +10; - ry = event.clientY + document.body.scrollTop -20; - } else { - rx = Mx + 10; - ry = My -20; - } - if (txt) { - pNode.style.display = "block"; - pNode.style.left = rx + "px"; - pNode.style.top = ry + "px"; - pNode.innerHTML = txt; - } else { - pNode.style.display = "none"; - pNode.innerHTML = ""; - } - } - function getMouseXY(mEvent) { - Mx = mEvent.pageX; - My = mEvent.pageY; - } - window.onmousemove = getMouseXY; - </script> - </head> - <body> - <jsp:include page="banner.jsp"/> - <center> - <div id="status"> - <h4>${param.message}</h4> - Here's the uploaded photo of your pet<br/><br/> - <div id="thumb"></div> - <br/><br/> - Would you like to :-<br/><br/> - - <div id="popupText" style="position:absolute;z-index:2;border:1px solid;padding:5px; - border-color:blue;font-size:10pt;background-color:#00ffff;color:blue;display:none"></div> - <table border="0" cellpadding="4" cellspacing="4"> - <tr> - <td><a href="fileupload.jsp" onmouseover="highlightButton(1)" onmouseout="darkenButton(1)"> - <img name="seller" id="seller" src="../images/seller-thumb-g.jpg" alt="seller" width="105" height="60" border="0"> - </a> - </td> - <td><a href="catalog.jsp?pid=${param.productId}&itemId=${param.id}" onmouseover="highlightButton(2)" onmouseout="darkenButton(2)"> - <img name="catalog" id="catalog" src="../images/catalog-thumb-g.jpg" alt="catalog" width="105" height="60" border="0"> - </a> - </td> - <td><a href="http://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.servletContext.contextPath}/index.jsp" onmouseover="highlightButton(3)" onmouseout="darkenButton(3)"> - <img name="home" id="home" src="../images/index-thumb-g.jpg" alt="index" width="105" height="60" border="0"> - </a> - </td> - </tr> - </table> - </div> - </center> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp deleted file mode 100644 index 8fda523..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: footer.jsp,v 1.10 2007/01/31 19:40:34 basler Exp $ --%> - -<hr/> -<center> - If you have any questions or suggestions, please use the <a - href="https://blueprints.dev.java.net/feedback.html" target="petstore">feedback page</a>. - <br/> - To access the latest versions of any of the BluePrints projects, please use the <a - href="https://blueprints.dev.java.net/downloads.html" target="petstore">download page</a>. - <br/> - <a href="http://blueprints.dev.java.net/" target="petstore">Java BluePrints</a> | - <a href="http://sun.com/" target="petstore">Sun Microsystems</a> © 2007 Sun Microsystems Inc. All rights reserved. Use is subject to license terms. -</center> - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg deleted file mode 100644 index 734f0ba..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg deleted file mode 100644 index 1d6b615..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg deleted file mode 100644 index d50fc6f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg deleted file mode 100644 index 77fb082..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg deleted file mode 100644 index 93a3832..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg deleted file mode 100644 index b7c7c3b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg deleted file mode 100644 index 0c9ce17..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg deleted file mode 100644 index caaf6a7..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg deleted file mode 100644 index 6c7d06e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg deleted file mode 100644 index f7daf7a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg deleted file mode 100644 index 2794a4b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg deleted file mode 100644 index 57175e3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg deleted file mode 100644 index d1b3610..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg deleted file mode 100644 index dd57db1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg deleted file mode 100644 index 2f14c53..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg deleted file mode 100644 index 334a0f8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg deleted file mode 100644 index 6bec9fa..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg deleted file mode 100644 index 6219a97..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg deleted file mode 100644 index 61b9b59..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg deleted file mode 100644 index d4a91e0..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg deleted file mode 100644 index 9c7c4ab..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg deleted file mode 100644 index 93eb9da..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg deleted file mode 100644 index cacb8f6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg deleted file mode 100644 index f1da9d8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg deleted file mode 100644 index a999838..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg deleted file mode 100644 index e3eeb3e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg deleted file mode 100644 index bf3aa59..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg deleted file mode 100644 index 990e44b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg deleted file mode 100644 index 873beb5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg deleted file mode 100644 index e9f2fbb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg deleted file mode 100644 index 4119ae3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg deleted file mode 100644 index efa8fa8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg deleted file mode 100644 index 6ac0c46..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg deleted file mode 100644 index 1ab033b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg deleted file mode 100644 index 4b75817..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg deleted file mode 100644 index 0bbad05..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg deleted file mode 100644 index f63f01a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg deleted file mode 100644 index 10f22cc..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg deleted file mode 100644 index e18660f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg deleted file mode 100644 index e651619..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg deleted file mode 100644 index 3f93502..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg deleted file mode 100644 index d33f856..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg deleted file mode 100644 index 43cd251..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg deleted file mode 100644 index aa0820c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg deleted file mode 100644 index 8b73de1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg deleted file mode 100644 index 248ca28..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg deleted file mode 100644 index 0c3fb87..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg deleted file mode 100644 index ff93f90..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg deleted file mode 100644 index 4571a4b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg deleted file mode 100644 index 647323b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg deleted file mode 100644 index e870f66..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg deleted file mode 100644 index 23dd110..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg deleted file mode 100644 index 3355eaa..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg deleted file mode 100644 index 531ec1e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg deleted file mode 100644 index 9cd85f5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg deleted file mode 100644 index 72377b5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg deleted file mode 100644 index 2788d06..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg deleted file mode 100644 index 2b836df..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg deleted file mode 100644 index 9ef87c3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg deleted file mode 100644 index 753d1e9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg deleted file mode 100644 index 29953c4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg deleted file mode 100644 index a4a0247..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg deleted file mode 100644 index 7caf368..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg deleted file mode 100644 index 9f18ed6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg deleted file mode 100644 index 65bc52f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg deleted file mode 100644 index b0f299d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg deleted file mode 100644 index d1e9cc3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg deleted file mode 100644 index 862c6f8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg deleted file mode 100644 index 5c7b519..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg deleted file mode 100644 index 079b2fa..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg deleted file mode 100644 index 2a1a88a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg deleted file mode 100644 index 4d1ed42..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg deleted file mode 100644 index 87ea286..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg deleted file mode 100644 index 7b76088..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg deleted file mode 100644 index 8005ff3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg deleted file mode 100644 index 4b21f49..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg deleted file mode 100644 index 88a889c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg deleted file mode 100644 index 8adf561..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg deleted file mode 100644 index c262965..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif deleted file mode 100644 index 85de81a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif deleted file mode 100644 index 06f1abe..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif deleted file mode 100644 index 9601f1c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif deleted file mode 100644 index f48a7ec..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif deleted file mode 100644 index eaaa3e5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif deleted file mode 100644 index 9f440f1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif deleted file mode 100644 index affd8e0..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif deleted file mode 100644 index 8b14629..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg deleted file mode 100644 index 8c54af1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg deleted file mode 100644 index ccdea14..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg deleted file mode 100644 index b3f1d09..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg deleted file mode 100644 index d3dcfd7..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg deleted file mode 100644 index a4b48da..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg deleted file mode 100644 index 5a172c5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg deleted file mode 100644 index 40303af..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg deleted file mode 100644 index 83d74d2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg deleted file mode 100644 index 004dfe3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg deleted file mode 100644 index 3e77142..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg deleted file mode 100644 index 4c260e8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg deleted file mode 100644 index b146396..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg deleted file mode 100644 index 742336f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg deleted file mode 100644 index e5bbc24..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif deleted file mode 100644 index 1fd4d1c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif deleted file mode 100644 index 8bc7f6c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif deleted file mode 100644 index a51bc96..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif deleted file mode 100644 index e594c67..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif deleted file mode 100644 index 6ac8718..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif deleted file mode 100644 index 4716f5d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif deleted file mode 100644 index 0793e3f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif deleted file mode 100644 index 2d289ba..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif deleted file mode 100644 index 2ea6132..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif deleted file mode 100644 index 159ba6a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif deleted file mode 100644 index a9ed7c9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif deleted file mode 100644 index 02faffb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg deleted file mode 100644 index 1a13b11..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg deleted file mode 100644 index d6148de..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif deleted file mode 100644 index db70d7d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif deleted file mode 100644 index 83b8761..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg deleted file mode 100644 index 84e4e89..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg deleted file mode 100644 index 5830e57..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg deleted file mode 100644 index bb91e94..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg deleted file mode 100644 index 9e8d17d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif deleted file mode 100644 index 3c517f3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg deleted file mode 100644 index 575a854..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg deleted file mode 100644 index 9c2dc57..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif deleted file mode 100644 index 92e71b5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif deleted file mode 100644 index e581980..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif deleted file mode 100644 index 9baa503..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif deleted file mode 100644 index 9124427..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif deleted file mode 100644 index 3f1690e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif deleted file mode 100644 index 2bf1380..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif deleted file mode 100644 index b13e5b9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg deleted file mode 100644 index ff83a16..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg deleted file mode 100644 index 814dab1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg deleted file mode 100644 index 2623f3c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg deleted file mode 100644 index ccf10a2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg deleted file mode 100644 index 7a7a59e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg deleted file mode 100644 index 1f65136..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg deleted file mode 100644 index 4709e19..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg deleted file mode 100644 index 76a7ff1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg deleted file mode 100644 index 13194bd..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg deleted file mode 100644 index cd8ad6e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif deleted file mode 100644 index 4d9916c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif deleted file mode 100644 index 258489d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif deleted file mode 100644 index d3e39e1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif deleted file mode 100644 index 730c813..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg deleted file mode 100644 index cbe5030..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg deleted file mode 100644 index 11954df..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif deleted file mode 100644 index 4bf637f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg deleted file mode 100644 index 097b144..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg deleted file mode 100644 index ec5d64b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg deleted file mode 100644 index 31bb43c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg deleted file mode 100644 index 70cdc2a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg deleted file mode 100644 index a6646c7..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg deleted file mode 100644 index 262659a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg deleted file mode 100644 index ea0c069..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg deleted file mode 100644 index 828bba2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg deleted file mode 100644 index 5b28bd0..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg deleted file mode 100644 index 3c4d322..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg deleted file mode 100644 index c7c1486..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg deleted file mode 100644 index 6003c8c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg deleted file mode 100644 index a538759..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg deleted file mode 100644 index 2369c90..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg deleted file mode 100644 index 13c3f9b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg deleted file mode 100644 index 61d877b..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg deleted file mode 100644 index 4303498..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg deleted file mode 100644 index 37ebbe9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg deleted file mode 100644 index a42ddb4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg deleted file mode 100644 index 571475a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif deleted file mode 100644 index 6da716a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif deleted file mode 100644 index 31d0ada..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg deleted file mode 100644 index d4144da..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg deleted file mode 100644 index fe37700..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg deleted file mode 100644 index d83d3f9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg deleted file mode 100644 index ba460be..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg deleted file mode 100644 index 7afa021..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg deleted file mode 100644 index f7fa2b2..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg deleted file mode 100644 index 8c06c3d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg deleted file mode 100644 index 84e82f5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg deleted file mode 100644 index 72a724f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg deleted file mode 100644 index ae9054e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif deleted file mode 100644 index 46b3630..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif deleted file mode 100644 index f50cbed..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg deleted file mode 100644 index 620c826..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg deleted file mode 100644 index 2a52e80..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg deleted file mode 100644 index 7b77428..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg deleted file mode 100644 index b3748ae..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif deleted file mode 100644 index 665c4d6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif deleted file mode 100644 index 2e59d89..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif deleted file mode 100644 index 6dca58f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg deleted file mode 100644 index cef3163..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg deleted file mode 100644 index 7e97d51..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg deleted file mode 100644 index a95ff80..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg deleted file mode 100644 index b7ae026..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg deleted file mode 100644 index 7acf48e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg deleted file mode 100644 index 140a325..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg deleted file mode 100644 index 4b96d8d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg deleted file mode 100644 index 5e3b381..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg deleted file mode 100644 index f2f1848..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg deleted file mode 100644 index a68cd9e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif deleted file mode 100644 index da05f30..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg deleted file mode 100644 index 35387ca..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg deleted file mode 100644 index 7365af9..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg deleted file mode 100644 index 0e6a1a5..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg deleted file mode 100644 index 950c84e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif deleted file mode 100644 index 8408264..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg deleted file mode 100644 index dea6b6d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg deleted file mode 100644 index 0f0ac10..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg deleted file mode 100644 index 3c7618a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg deleted file mode 100644 index e765076..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg deleted file mode 100644 index 7c7d897..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg deleted file mode 100644 index 4cdb8bb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg deleted file mode 100644 index f38af83..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg deleted file mode 100644 index bec9ee6..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg deleted file mode 100644 index 9bb9a17..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg deleted file mode 100644 index c91be8e..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg deleted file mode 100644 index f4ce9ec..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg deleted file mode 100644 index b599c76..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg deleted file mode 100644 index cae1408..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg deleted file mode 100644 index 57e02ff..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg deleted file mode 100644 index 758ed35..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg deleted file mode 100644 index 3aec8c4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg deleted file mode 100644 index 13164b8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg deleted file mode 100644 index fbd5412..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg deleted file mode 100644 index 148006d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg deleted file mode 100644 index f25a814..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg deleted file mode 100644 index 2d9c2b1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg deleted file mode 100644 index 3573943..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg deleted file mode 100644 index 9be6e41..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg deleted file mode 100644 index 0559845..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg deleted file mode 100644 index d4521a3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg deleted file mode 100644 index 370e4fd..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg deleted file mode 100644 index 5b89061..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg deleted file mode 100644 index efff187..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg deleted file mode 100644 index 93af55f..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg deleted file mode 100644 index d751856..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg deleted file mode 100644 index 9c72270..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg deleted file mode 100644 index 9003e0c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif deleted file mode 100644 index 0ee4c52..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif deleted file mode 100644 index 89e7ba1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg deleted file mode 100644 index 16d1692..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg deleted file mode 100644 index f183f1c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg deleted file mode 100644 index 005d708..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg deleted file mode 100644 index e82c87d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg deleted file mode 100644 index 508edb1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg deleted file mode 100644 index 870c2f3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg deleted file mode 100644 index a18e30a..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg deleted file mode 100644 index febadd3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg deleted file mode 100644 index c7329f4..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg deleted file mode 100644 index 3753577..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg deleted file mode 100644 index a9c45e8..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg deleted file mode 100644 index 2b7adf1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg deleted file mode 100644 index 93e78ee..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg deleted file mode 100644 index cdbb5fb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif deleted file mode 100644 index cdae47c..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg deleted file mode 100644 index 6c1e407..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg deleted file mode 100644 index 991392d..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg deleted file mode 100644 index 49898fb..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg deleted file mode 100644 index eb43a52..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg deleted file mode 100644 index c918e36..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg deleted file mode 100644 index f5063e3..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif deleted file mode 100644 index 39fa7ba..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif deleted file mode 100644 index 52bc595..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif deleted file mode 100644 index 0393bc1..0000000 Binary files a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif and /dev/null differ diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp deleted file mode 100644 index 9ce0b8d..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp +++ /dev/null @@ -1,239 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: index.jsp,v 1.17 2007/03/15 23:19:46 basler Exp $ --%> -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> - -<% -try { - CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); - List<Tag> tags=cf.getTagsInChunk(0, 12); - // since top 20 come from database or desending refCount order, need to reorder by tag name - Collections.sort(tags, new Comparator() { - public int compare(Object one, Object two) { - int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); - return (cc < 0 ? 1 : cc > 0 ? -1 : 0); - } - }); -%> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > - <title>Java Pet Store Reference Application</title> - <script type="text/javascript" src="./common.js"></script> - <link type="text/css" rel="stylesheet" href="./tag.css"/> - <script type="text/javascript"> - //var djConfig = {isDebug: true }; - </script> - </head> - <body> - - <jsp:include page="banner.jsp" /> - <script> - dojo.require("dojo.widget.FisheyeList"); - dojo.require("dojo.io.*"); - dojo.require("dojo.io.ScriptSrcIO"); - //transport: "ScriptSrcTransport", - //url: "http://localhost:8080/petstore/downloadAd.json", - - function browse(category) { - window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; - - } - - - function debugProperties(namex) { - var listx=""; - var ob=namex; - for(xx in ob) { - listx += xx + " = " + ob[xx] + "<br/>" - } - //document.write(listx); - alert(listx); - } - - function checkAdPage() { - var bindArgs = { - //url: "https://blueprints.dev.java.net/petstore/downloadAd.json", - //url: "http://localhost:8080/petstore/downloadAd.json", - url: "http://search.yahooapis.com/ImageSearchService/V1/imageSearch?appid=YahooDe…", - transport: "ScriptSrcTransport", - jsonParamName: "callback", - mimetype: "text/json", - load: function(type, data, event, kwArgs) { - /* type will be "load", data will be response data, event will null, and kwArgs are the keyword arguments used in the dojo.io.bind call. */ - alert("load = " + data.ResultSet.totalResultsAvailable); - //debugProperties(data); - //document.getElementById("downloadAds").innerHTML=data.downloadxx; - - - }, - error: function(type, data, event, kwArgs) { - /* type will be "error", data will be response data, event will null, and kwArgs are the keyword arguments used in the dojo.io.bind call. */ - alert("error"); - }, - timeout: function() { - /* Called if there is a timeout */ - alert("timeout"); - }, - timeoutSeconds: 10}; - // dispatch the request - dojo.io.bind(bindArgs); - } - - function callback() { - alert("callback"); - } - - function returnFunctionx(type, data, evt) { - // statically setup popup for simple case - // check return of the dojo call to make sure it is valid - if (evt.readyState == 4) { - if (evt.status == 200) { - alert("data = " + data.downloadxx); - //document.getElementById("downloadAds").innerHTML=data; - document.getElementById("downloadAds").innerHTML=data.downloadxx; - } - } - } - - function testit() { - testx={download:"test", textx:"it"}; - alert("test = " + testx.download); - } - - - </script> - <span onclick="checkAdPage();">test it</span> - - - <table bgcolor="white"> - <tr> - <td valign="top"> - <div class="outerbar" style="width: 200px"> - - <div dojoType="FisheyeList" - itemWidth="170" itemHeight="50" - itemMaxWidth="340" itemMaxHeight="100" - orientation="vertical" - effectUnits="2" - itemPadding="10" - attachEdge="top" - labelEdge="bottom" - enableCrappySvgSupport="false"> - - <div dojoType="FisheyeListItem" onClick="browse('Dogs');" - iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Cats');" - iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Birds');" - iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Fish');" - iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" - iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> - </div> - </div> - - </div> - </td> - <td valign="top" style="width: 400px"> - <div id="bodyCenter"> - <table valign="top" id="bodyTable" border="0"> - <tr> - <td> - <map name="petmap"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="72,2,280,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" - alt="Fish" - coords="2,180,72,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" - alt="Dogs" - coords="60,250,130,320"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" - alt="Reptiles" - coords="140,270,210,340"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" - alt="Cats" - coords="225,240,295,310"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="280,180,350,250"> - </map> - - <img src="${pageContext.request.contextPath}/images/splash.gif" - alt="Pet Selection Map" - usemap="#petmap" - width="350" - height="355" - border="0"> - </td> - </tr> - </table> - - </div> - </td> - <td style="vertical-align:top;"> - <div style="border-style: double; width:100%;"> - <table border="0"> - <tr> - <th colspan="2" style="text-align:center">Most Popular Tags</th> - </tr> - <tr> -<% - String style=null; - int refx=0, ii=0; - for(Tag tag : tags) { - refx=tag.getRefCount() / 5; - if(refx >= 3) { - style="xxlarge"; - } else if(refx == 2) { - style="xlarge"; - } else if(refx == 1) { - style="large"; - } else { - style="medium"; - } - - if((ii % 2) == 0) out.println("</tr>\n<tr>"); - out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + - tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); - ii++; - } -%> - </tr> - </table> - </div> - </td> - <td valign="top" style="vertical-align:top; width:250px;"> - <div id="downloadAds"> - <jsp:include page="download.jsp" /> - </div> - </td> - </tr> - </table> - - <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> - <table id="completeTable" class="popupTable" ></table> - </div> - - <br/><br/> - <jsp:include page="footer.jsp" /> - </body> -</html> -<% - } catch(Exception e) { - e.printStackTrace(); - } -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html deleted file mode 100644 index 8c5ca1b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html +++ /dev/null @@ -1,117 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> - <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> - <title>Java Pet Store Reference Application, 2.0 Early Access</title> -</head> -<body> -<hr> -<h1>Java Pet Store Reference Application, 2.0 Early Access</h1> -<h2><a href="./faces/index.jsp">Enter the Store</a></h2> -The Java Pet Store Reference Application is a sample application -brought to -you by the <a href="http://blueprints.dev.java.net/">Java BluePrints</a> -program at <a href="http://sun.com">Sun Microsystems</a>. -This application is designed to illustrate how the Java EE 5 Platform -can be used to develop an AJAX-enabled Web 2.0 application. The -application comes with full source-code available under a  -BSD-style license, so you can experiment with it and use it in your own -applications. <br> -<br> -<a href="#try">Try the Petstore Demo</a><br> -<a href="#learn">Learn more about features in Java Petstore</a><br> -<a href="#contributors">Show appreciation for Pet Store image -contributors</a><br> -<a href="#about">About BluePrints</a> -<h2><a name="try"></a>Try the Pet Store Demo</h2> -Now that you have the application deployed, you can use it and try out -the features. You can browse the catalog of pets for sale, sell your -own pets on the store, search for pets by location using Google maps, -view the RSS news bar for BluePrints news, and more.<a - href="./faces/index.jsp">Enter the Store</a> -<h2><a name="features"></a>Learn More About Features in Java Petstore</h2> -<p>Here are some of the features of this application. For a detailed -description of  the features in the Java Pet -Store Reference application, please  refer to the article at <a - href="http://java.sun.com/developer/technicalArticles/J2EE/petstore/">http://java.sun.com/developer/technicalArticles/J2EE/petstore/</a><a - href="http://java.sun.com/developer/technicalArticles/J2EE/petstore/"></a><b> -</b></p> -<ol> - <li>Using AJAX for single-page interactive Web applications: The -application is designed to be a single-page application where the user -never leaves the page. Different sections of the page are dynamically -loaded based on the user actions. These sections are loaded -asynchronously to avoid any browser refreshes, and to give a richer -interactive user-experience. </li> - <li>Mash-ups with Google maps: The petstore uses a mashup with -Google's Map service, alongwith Yahoo's Geo-coder service to allow -users to see the available pets in a neighborhood. </li> - <li>Community-created content: The application allows a user to add a -pet for sale or adoption on the Website. The seller uploads </li> - <ol> - <li>Using Captchas to discourage spam in the community created -content: Whenever a website allows its users to add content, it needs -to build mechanisms to discourage placement of spurious content on its -Website through automated mechanisms. We demonstrate how captchas can -be used for this purpose. </li> - <li>Community rated content: Each item in the petstore website can -be rated by the users </li> - <li>Payments through PayPal: The application provides a meeting -ground for -buyers and sellers of pets. The application uses the PayPal service to -allow sellers to accept payments.</li> - </ol> - <li>Integration of an RSS feed: The website integrates an RSS feed of -news items coming out the Java BluePrints website. The </li> - <li>Integration of  a search engine: The application integrates -Apache Lucene search engine to handle all website searches. </li> -</ol> -This application also demonstrate the use of various features of  -the Java EE 5 platform such as: <br> -<ol> - <li>JavaServer Faces: Many of the AJAX features are implemented as -reusable JavaServer Faces components. </li> - <li>Java Persistence API: The application uses Java Persistence APIs -to create an object/relational mapping layer. </li> - <li>Dependency Injection: The application uses dependency injection -instead of deployment descriptors.</li> -</ol> -See the <a - href="https://blueprints.dev.java.net/petstore/architecture.html">Pet -Store Architecure document</a> for more detail. -<h2><a name="contributors"></a>Show Appreciation for Pet Store Image -Contributors</h2> -<p>For many images in the Java Petstore, some organizations and people -were kind enough to give us permission to photograph their animals or -even give us photos to use in the Java Petstore. See the <a - href="https://blueprints.dev.java.net/petstore/imagecontributors.html"> -image contributors </a> page for a more detail on these friends of the -animals.  -</p> -<h2><a name="about"></a>About Java BluePrints</h2> -<p>The Java BluePrints program defines the application programming -model for the Java EE™ platform. It provides best practice guidelines -and -architectural recommendations for real-world application scenarios to -enable developers to build portable, scalable, and robust applications -using the Java EE technologies.<br> -<br> -Some other popular projects from Java BluePrints are <a - href="http://blueprints.dev.java.net/bpcatalog/">Java BluePrints -Solutions Catalog</a>,  <a target="_blank" - href="https://blueprints.dev.java.net/adventurebuilder/">Java -Adventure Builder Reference</a> application, <a target="_blank" - href="http://java.sun.com/blueprints/guidelines/designing_webservices/">Designing -Web Services with the J2EE(TM) 1.4 Platform : JAX-RPC, SOAP, and XML -Technologies</a> book, and the <a target="_blank" - href="http://java.sun.com/blueprints/guidelines/designing_enterprise_applications…"><span - class="body"><span class="title">Designing -Enterprise Applications with the J2EE Platform, Second Edition</span></span></a> -book. You can access these projects and other content from Java -BluePrints by visiting the <a target="_blank" - href="http://java.sun.com/reference/blueprints/index.html">Java -BluePrints website</a>. </p> -<hr noshade="noshade">Copyright © 2007 Sun Microsystems, -Inc. All Rights Reserved. -</body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp deleted file mode 100644 index ab59139..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp +++ /dev/null @@ -1,164 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: index.jsp,v 1.20 2007/03/16 20:18:59 basler Exp $ --%> -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> - -<% -try { - CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); - List<Tag> tags=cf.getTagsInChunk(0, 12); - // since top 20 come from database or desending refCount order, need to reorder by tag name - Collections.sort(tags, new Comparator() { - public int compare(Object one, Object two) { - int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); - return (cc < 0 ? 1 : cc > 0 ? -1 : 0); - } - }); -%> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > - <title>Java Pet Store Reference Application</title> - <link type="text/css" rel="stylesheet" href="./tag.css"/> - </head> - <body> - - <jsp:include page="banner.jsp" /> - <script> - dojo.require("dojo.widget.FisheyeList"); - function browse(category) { - window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; - } - </script> - <table bgcolor="white"> - <tr> - <td valign="top"> - <div class="outerbar" style="width: 200px"> - - <div dojoType="FisheyeList" - itemWidth="170" itemHeight="50" - itemMaxWidth="340" itemMaxHeight="100" - orientation="vertical" - effectUnits="2" - itemPadding="10" - attachEdge="top" - labelEdge="bottom" - enableCrappySvgSupport="false"> - - <div dojoType="FisheyeListItem" onClick="browse('Dogs');" - iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Cats');" - iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Birds');" - iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Fish');" - iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" - iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> - </div> - </div> - - </div> - </td> - <td valign="top" style="width: 400px"> - <div id="bodyCenter"> - <table valign="top" id="bodyTable" border="0"> - <tr> - <td> - <map name="petmap"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="72,2,280,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" - alt="Fish" - coords="2,180,72,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" - alt="Dogs" - coords="60,250,130,320"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" - alt="Reptiles" - coords="140,270,210,340"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" - alt="Cats" - coords="225,240,295,310"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="280,180,350,250"> - </map> - - <img src="${pageContext.request.contextPath}/images/splash.gif" - alt="Pet Selection Map" - usemap="#petmap" - width="350" - height="355" - border="0"> - </td> - </tr> - </table> - - </div> - </td> - <td style="vertical-align:top;"> - <div style="border-style: double; width:100%;"> - <table border="0"> - <tr> - <th colspan="2" style="text-align:center">Most Popular Tags</th> - </tr> - <tr> -<% - String style=null; - int refx=0, ii=0; - for(Tag tag : tags) { - refx=tag.getRefCount() / 5; - if(refx >= 3) { - style="xxlarge"; - } else if(refx == 2) { - style="xlarge"; - } else if(refx == 1) { - style="large"; - } else { - style="medium"; - } - - if((ii % 2) == 0) out.println("</tr>\n<tr>"); - out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + - tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); - ii++; - } -%> - </tr> - </table> - </div> - </td> - <td style="vertical-align:top; width:300px; text-align:right;"> - <div id="downloadAds"> - <jsp:include page="download.jsp" /> - </div> - </td> - </tr> - </table> - - <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> - <table id="completeTable" class="popupTable" ></table> - </div> - - <br/><br/> - <jsp:include page="footer.jsp" /> - - </body> -</html> -<% - } catch(Exception e) { - e.printStackTrace(); - } -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp deleted file mode 100644 index 54f30ce..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp +++ /dev/null @@ -1,194 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: index.jsp,v 1.18 2007/03/16 15:29:15 basler Exp $ --%> -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> - -<% -try { - CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); - List<Tag> tags=cf.getTagsInChunk(0, 12); - // since top 20 come from database or desending refCount order, need to reorder by tag name - Collections.sort(tags, new Comparator() { - public int compare(Object one, Object two) { - int cc=((Tag)two).getTag().compareTo(((Tag)one).getTag()); - return (cc < 0 ? 1 : cc > 0 ? -1 : 0); - } - }); -%> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > - <title>Java Pet Store Reference Application</title> - <link type="text/css" rel="stylesheet" href="./tag.css"/> - <script type="text/javascript" src="https://blueprints.dev.java.net/petstore/downloadAd.js"></script> - </head> - <body onload="alterDownloadAd()"> - - <jsp:include page="banner.jsp" /> - <script> - dojo.require("dojo.widget.FisheyeList"); - function browse(category) { - window.location.href="${pageContext.request.contextPath}/faces/catalog.jsp?catid=" + category; - } - - function alterDownloadAd() { - if(typeof checkAdPage != "undefined") { - var textx=checkAdPage(); - if(typeof textx != "undefined") { - document.getElementById("downloadAds").innerHTML=textx; - } - } - } - - - </script> - <table bgcolor="white"> - <tr> - <td valign="top"> - <div class="outerbar" style="width: 200px"> - - <div dojoType="FisheyeList" - itemWidth="170" itemHeight="50" - itemMaxWidth="340" itemMaxHeight="100" - orientation="vertical" - effectUnits="2" - itemPadding="10" - attachEdge="top" - labelEdge="bottom" - enableCrappySvgSupport="false"> - - <div dojoType="FisheyeListItem" onClick="browse('Dogs');" - iconsrc="${pageContext.request.contextPath}/images/dogs_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Cats');" - iconsrc="${pageContext.request.contextPath}/images/cats_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Birds');" - iconsrc="${pageContext.request.contextPath}/images/birds_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Fish');" - iconsrc="${pageContext.request.contextPath}/images/fish_icon.gif"> - </div> - - <div dojoType="FisheyeListItem" onClick="browse('Reptiles');" - iconsrc="${pageContext.request.contextPath}/images/reptiles_icon.gif"> - </div> - </div> - - </div> - </td> - <td valign="top" style="width: 400px"> - <div id="bodyCenter"> - <table valign="top" id="bodyTable" border="0"> - <tr> - <td> - <map name="petmap"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="72,2,280,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Fish')" - alt="Fish" - coords="2,180,72,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Dogs')" - alt="Dogs" - coords="60,250,130,320"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Reptiles')" - alt="Reptiles" - coords="140,270,210,340"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Cats')" - alt="Cats" - coords="225,240,295,310"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="browse('Birds')" - alt="Birds" - coords="280,180,350,250"> - </map> - - <img src="${pageContext.request.contextPath}/images/splash.gif" - alt="Pet Selection Map" - usemap="#petmap" - width="350" - height="355" - border="0"> - </td> - </tr> - </table> - - </div> - </td> - <td style="vertical-align:top;"> - <div style="border-style: double; width:100%;"> - <table border="0"> - <tr> - <th colspan="2" style="text-align:center">Most Popular Tags</th> - </tr> - <tr> -<% - String style=null; - int refx=0, ii=0; - for(Tag tag : tags) { - refx=tag.getRefCount() / 5; - if(refx >= 3) { - style="xxlarge"; - } else if(refx == 2) { - style="xlarge"; - } else if(refx == 1) { - style="large"; - } else { - style="medium"; - } - - if((ii % 2) == 0) out.println("</tr>\n<tr>"); - out.println("<td class='tagCell' style='text-align: center'><a href='./tag.jsp?tag=" + - tag.getTag() + "'><span class='" + style +"'>" + tag.getTag() + "</span></a></td>"); - ii++; - } -%> - </tr> - </table> - </div> - </td> - <td style="vertical-align:top; width:250px; text-align:right;"> - <div id="downloadAds"> - <div id="downloadAds" style="text-align:center; border-style:none; width:100%;"> - <table style="width:100%"> - <tr> - <td style="text-align:center;"> - <a href="http://java.sun.com/javaee/downloads/index.jsp" target="downloads"><img style="border:none" src="./images/ad-sdk.jpg" alt="Download Java EE 5 SDK"/></a> - </td> - </tr> - <tr> - <td style="text-align:center;"> - <a href="http://www.netbeans.org/downloads/index.html" target="downloads"><img style="border:none" src="./images/ad-netbeans.jpg" alt="Download Netbeans IDE"/></a> - </td> - </tr> - <tr> - <td style="text-align:center;"> - <a href="http://java.com/en/download/index.jsp" target="downloads"><img style="border:none" src="./images/ad-jre.jpg" alt="Download Java SE"/></a> - </td> - </tr> - </table> - </div> - </div> - </td> - </tr> - </table> - - <div style="position: absolute; visibility: hidden;z-index:5" id="menu-popup"> - <table id="completeTable" class="popupTable" ></table> - </div> - - <br/><br/> - <jsp:include page="footer.jsp" /> - - </body> -</html> -<% - } catch(Exception e) { - e.printStackTrace(); - } -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp deleted file mode 100644 index d2fd4c5..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp +++ /dev/null @@ -1,53 +0,0 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>JSON Test Page</title> - <script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> - - <script type="text/javascript"> - function getJSON() { - // get data and send to controller servlet - var bindArgs = { - url: "${pageContext.request.contextPath}/catalog?command=items&pid=feline01&start=0&length=2&format=json", - mimetype: "text/json", - error: function(){ alert("error")}, - load: callbackx - }; - - dojo.io.bind(bindArgs); - } - - function callbackx(type, data, evt) { - // check successful response - if (evt.readyState == 4) { - if (evt.status == 200) { - var prodsx=data.products; - rep="Products:<br\>"; - for(ii=0; ii < prodsx.length; ii++) { - rep += prodsx[ii].name + "<br/>"; - } - rep+="<br\>"; - document.getElementById("testResult").innerHTML=rep; - } - } - } - - </script> - - </head> - <body> - - <h1>JSON Test Page</h1> - <span onclick="getJSON();"> GET DATA </span><br/><br/> - - <div id="testResult"> - This should be populated with result. If not, look at the error console for errors. - </div> - - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp deleted file mode 100644 index b634b42..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: lookup.jsp,v 1.7 2007/01/19 21:47:31 basler Exp $ --%> - -<%@page contentType="text/xml"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item"%> - -<% - String itemId=request.getParameter("itemId"); - String popupView=request.getParameter("popupView"); - - try { - ServletContext context=config.getServletContext(); - CatalogFacade cf=(CatalogFacade)context.getAttribute("CatalogFacade"); - Item item=cf.getItem(itemId); - - if(itemId != null) { - out.println("<response>"); - out.println("<name>" + item.getName() + "</name>"); - String tmp=null; - if(popupView != null && popupView.equals("2")) { - tmp=item.getAddress().addressToString(); - } else { - tmp=item.getDescription(); - } - out.println("<description><![CDATA[" + tmp + "]]></description>"); - out.println("<price>" + java.text.NumberFormat.getCurrencyInstance(java.util.Locale.US).format(item.getPrice()) + "</price>"); - out.println("<image>" + request.getContextPath() + "/ImageServlet/" + item.getImageThumbURL() + "</image>"); - out.println("</response>"); - out.flush(); - } - } catch(Exception ee) { - ee.printStackTrace(); - } - -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf deleted file mode 100644 index b207a5a..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf +++ /dev/null @@ -1,36 +0,0 @@ - - - <table valign="top" id="bodyTable" border="0"> - <tr> - <td> - <map name="petmap"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('BIRDS')" - alt="Birds" - coords="72,2,280,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('FISH')" - alt="Fish" - coords="2,180,72,250"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('DOGS')" - alt="Dogs" - coords="60,250,130,320"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('REPTILES')" - alt="Reptiles" - coords="140,270,210,340"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('CATS')" - alt="Cats" - coords="225,240,295,310"> - <area onmouseover="javascript:this.style.cursor='pointer';" onclick="loadCategory('BIRDS')" - alt="Birds" - coords="280,180,350,250"> - </map> - - <img src="images/splash.gif" - alt="Pet Selection Map" - usemap="#petmap" - width="350" - height="355" - border="0"> - </td> - </tr> - </table> \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js deleted file mode 100644 index b8de8fc..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: main.js,v 1.9 2006/05/03 22:00:33 inder Exp $ */ - -var isIE; -var bodyRowText; - -dojo.require("dojo.widget.FisheyeList"); -init(); - -function browse(category) { - window.location.href="catalog.jsp?catid=" + category; -} - -function loadPetstore() { - init(); - showMain(); -} - -function init() { - if (navigator.userAgent.indexOf("IE") != -1) isIE = true; -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp deleted file mode 100644 index c2673c9..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp +++ /dev/null @@ -1,143 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: map.jsp,v 1.20 2006/11/02 00:34:49 basler Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item, com.sun.javaee.blueprints.petstore.mapviewer.MapBean, com.sun.javaee.blueprints.components.ui.mapviewer.MapMarker"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Map Display</title> - </head> - <body> - <jsp:include page="banner.jsp" /> - <br> - <center> - <table border="1" cellspacing="5px" cellpadding="5px" - style="border-style:double; border-color:darkgreen; padding:5px"> - <tr> - <td valign="top" align="center" width="200px"> - <table border="0"> - <c:if test="${!empty sessionScope.MapBean.locations}"> - <tr> - <th> - <u>${sessionScope.MapBean.locationCount} Items Displayed</u> - </th> - </tr> - <tr> - <td> - <ul> -<% - try { - // need to use scriptlet to preform the reconciliation of items to map coords - // this way I don't have to create a new wrapper object - MapBean mapBean=(MapBean)session.getAttribute("MapBean"); - MapMarker[] mapMarkers=(MapMarker[])mapBean.getLocations(); - java.util.List<Item> items=mapBean.getItems(); - Item itemxx=null; - String popupOptions=null; - for(int ii=0; ii < mapMarkers.length; ii++) { - - //System.out.println("loop - " + ii + " - " + mapBean.getCenterAddress()); - if(mapBean.getCenterAddress() != null && !mapBean.getCenterAddress().equals("")) { - // center point is set to the first mapMarker, items are off by one - if(ii > 0) { - // reconcile correct mapMarkers with items list - itemxx=items.get(ii - 1); - popupOptions="onmouseover=\"bpui.popup.show('pop1', event, '" + itemxx.getItemID() + "')\" onmouseout=\"bpui.popup.hide('pop1')\""; - } else { - // first item of mapMarker is centerpoint, so no corresponding item, also no popup on mouseover - itemxx=null; - popupOptions=""; - } - } else { - // no center point items should be 1-to-1 with mappedMarkers - itemxx=items.get(ii); - popupOptions="onmouseover=\"bpui.popup.show('pop1', event, '" + itemxx.getItemID() + "')\" onmouseout=\"bpui.popup.hide('pop1')\""; - } -%> - <li> - <a href="javascript:mapViewerx.openInfoWindowHtml(new GPoint(<%= mapMarkers[ii].getLongitude() %>,<%= mapMarkers[ii].getLatitude() %>), '<%= mapMarkers[ii].getMarkup() %>');" <%= popupOptions %>> - <%= mapBean.changeSpaces((itemxx == null) ? mapMarkers[ii].getMarkup() : "<b>" + itemxx.getName() + "</b>") %> - </a> -<% - if(itemxx != null) { - // remove these links for center point entry -%> - <a href="${pageContext.request.contextPath}/faces/catalog.jsp?pid=<%= itemxx.getProductID() %>&itemId=<%= itemxx.getItemID() %>" alt="Go to Detailed Catalog Page"> - <i>(detail)</i> - </a> - - <br/> - <a href="javascript:mapViewerx.openInfoWindowHtml(new GPoint(<%= mapMarkers[ii].getLongitude() %>, <%= mapMarkers[ii].getLatitude() %>), '<%= mapMarkers[ii].getMarkup() %>');" <%= popupOptions %>> - <font size="-1"><%= mapBean.changeSpaces((itemxx == null) ? mapMarkers[ii].getMarkup() : itemxx.getAddress().addressToString()) %></font> - </a> -<% - } -%> - </li> - <% - } - } catch(Exception ee) { - ee.printStackTrace(); - - } - %> - </ul> - <td> - </tr> - </c:if> - </table> - </td> - <td valign="top"> - <f:view> - <ui:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?itemId=" - elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> -  - <img id="spaceImage" height="10px" width="12px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> - <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> - <tr> - <td align="left" valign="top"><b>Name:</b> - <span id="value1">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Description:</b> - <span id="value2">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Price:</b> - <span id="value3">Loading Data...</span></td> - </tr> - <tr> - <td colspan="2" align="center"><img name="image" id="imageId" src="" - alt="[Loading Image...]" border="2"/><br/><br/></td> - </tr> - </table> - </ui:popupTag> - - - <ui:mapViewer id="mapViewerx" center="#{MapBean.mapPoint}" info="#{MapBean.mapMarker}" - markers="#{MapBean.locations}" zoomLevel="#{MapBean.zoomLevel}" style="height: 500px; width: 700px"/> - - </f:view> - </td> - </tr> - </table> - <script type="text/javascript"> - bpui.mapviewer.createMapControl = function() { - return new GLargeMapControl(); - } - - </script> - <br/><br/> - </center> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp deleted file mode 100644 index a3ae6dc..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp +++ /dev/null @@ -1,65 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: mapAll.jsp,v 1.14 2006/12/06 22:44:37 basler Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Map Viewer Page</title> - </head> - <body> - <jsp:include page="banner.jsp" /> - <center> - <f:view> - - <h:form id="form1"> - <table border="1" cellpadding="5" cellspacing="5" style="border-style:double; width:600px; border-color:darkgreen; padding:5px"> - <tr> - <td colspan=3> - <i>Select the category whose items will be displayed in a Google map based on the Seller's address. - Optionally, enter a "Center Point Address" and "Area" to limit the search to a specific - area around the center point.</i> - </td> - </tr> - <tr> - <th align="right">Select Category to Map:</th> - <td align="center" colspan=2> - <h:selectOneRadio value="#{MapBean.category}" required="true"> - <f:selectItems value="#{MapBean.categories}"/> - </h:selectOneRadio> - </td> - </tr> - <tr> - <th align="right">Center Point Address:</th> - <td> - <h:inputText id="centerAddress" value="#{MapBean.centerAddress}" size="70"/> - <br/><small><i>For example: 4140 Network Circle, Santa Clara, CA, 95054</i></small> - </td> - </tr> - <tr> - <th align="right">Area (in Miles):</th> - <td> - <h:inputText id="radius" value="#{MapBean.radius}" size="5"/> - </td> - </tr> - <tr> - <td colspan="2" align="center"> - <h:commandButton action="#{MapBean.findAllByCategory}" id="submitCat" type="submit" value="Map Category"/> - </td> - </tr> - - </table> - <h:messages/> - </h:form> - </f:view> -     - </center> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js deleted file mode 100644 index 5bcac34..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js +++ /dev/null @@ -1,190 +0,0 @@ - -dojo.require("dojo.io.*"); -dojo.require("dojo.event.*"); - -var bpuinews; -if (typeof bpuinews == "undefined") { - bpuinews = new Object(); -} - -bpuinews.RSS = function() { - var currentItem = 0; - var limitCharNum = 75; - var itemNum=0; - var rssData = null; - var prev; - var next; - var prevHit=false; - - this.getRssInJson = function (method, uri) { - prev = document.getElementById("previous"); - next = document.getElementById("next"); - dojo.event.connect(prev, "onclick", function(evt) {showPrevious();}); - dojo.event.connect(next, "onclick", function (evt) {showNext();}); - prev.disabled=true; - - var encodedURI = encodeURI(method + "?style=json&itemCount=0&url="+uri); - var bindArgs = { - url: encodedURI, - mimetype: "text/json", - load: function (type, data, http) { - handleJsonRss(data); - }, - error: function (t, e) { - dojo.debug("ERROR : " + e.message); - } - } - dojo.io.bind(bindArgs); - return false; - } - - function handleJsonRss(json) { - rssData = json; - itemNum = json.channel.item.length; - showNext(); - } - - function createUl(skip) { - var i; - var cp="<ul>\n"; - for (i = currentItem; i<currentItem + skip; i++) { - cp += "<li><b>"+decodeURL(rssData.channel.item[i].title)+"</b>\n"; - cp += "<p>" + decodeURL(rssData.channel.item[i].description) + "</p>\n</li>\n"; - } - cp += "</ul>\n"; - return cp; - } - - // Following funcs(showNext, showPrevious) should be connected to the button - // by dojo.event.connect. - function showNext() { - var skip = 5; - if (prevHit) { - currentItem = currentItem + skip; - prevHit = false; - } - var nextCurrentItem = currentItem + skip; - if (nextCurrentItem >= itemNum) { - skip = itemNum - currentItem; - // deactivate "next" button - next.disabled=true; - nextCurrentItem = currentItem; - } - // activate "previous" button - if (currentItem != 0) { - prev.disabled=false; - } - var cp = createUl(skip); - var elm = document.getElementById("news"); - elm.innerHTML = cp; - currentItem = nextCurrentItem; - } - - function showPrevious() { - prevHit = true; - var skip = 5; - currentItem = currentItem - skip; - if (currentItem <= 0) { - currentItem = 0; - // deactivate "previous" button - prev.disabled=true; - } - next.disabled=false; - var cp = createUl(skip); - var elm = document.getElementById("news"); - elm.innerHTML = cp; - } - - - /* Compatible function to java.net.URLDecoder.decode(). - * (decodeURI() is not compatible) - */ - function decodeURL(str){ - var targetStr=""; - var s, tmpStr, unicode, f; - // take a look at every char in the source str - var i, j; - for (i = 0; i < str.length; i++) { - s = str.charAt(i); - // handle WS, which is the most common char - if (s == "+") { - targetStr += " "; - } else { - if (s != "%") { - // Non-encoded char - targetStr += s; - } else{ - // encoding begin - unicode = 0; // uncode representation - f = 1; // flag to specify the escape sequence - while (true) { - tmpStr = ""; - // get the two HEX chars and put that in the temp string. If no char, that is not a HEX. - for (j = 0; j < 2; j++ ) { - tmptmpStr = str.charAt(++i); - if (((tmptmpStr >= "0") && (tmptmpStr <= "9")) || - ((tmptmpStr >= "a") && (tmptmpStr <= "f")) || - ((tmptmpStr >= "A") && (tmptmpStr <= "F"))) { - tmpStr += tmptmpStr; - } else { - --i; - break; - } - } - /* parse the HEX - * <= 0x7f : Single byte - * >=0xc0 && <=0xdf : Two bytes - * >=0xe0 && <=0xef : Three bytes - * >=0xf0 && <=0xf7 : Four bytes - * >=0x80 && <=0xbf : may not occur - just shift it - * <=1 : sequence terminated - */ - var byte = parseInt(tmpStr, 16); - if (byte <= 0x7f) {unicode = byte; f = 1;} - if ((byte >= 0xc0) && (byte <= 0xdf)) {unicode = byte & 0x1f; f = 2;} - if ((byte >= 0xe0) && (byte <= 0xef)) {unicode = byte & 0x0f; f = 3;} - if ((byte >= 0xf0) && (byte <= 0xf7)) {unicode = byte & 0x07; f = 4;} - if ((byte >= 0x80) && (byte <= 0xbf)) {unicode = (unicode << 6) + (byte & 0x3f); --f;} - if (f <= 1) { - break; - } - if (str.charAt(i + 1) == "%") { - i++ ; - } else { - // Error. should not occur - break; - } - } - targetStr += String.fromCharCode(unicode); - } - } - } - return targetStr; - } - - /* Cut the string at the WS so that it's shorter than the limitCharNum. - */ - function cutStringatWs(str, limitCharNum) { - var tmpStr = str; - var cnum = 0; - while (true) { - cnum = tmpStr.lastIndexOf(" "); - // no occurance of WS - if (cnum < 0) { - // if str is still longer than limit - if (tmpStr.length >= limitCharNum) { - tmpStr = tmpStr.substring(0, limitCharNum); - } - break; - } else { - tmpStr = tmpStr.substring(0, cnum); - if (cnum <= limitCharNum) { - break; - } - } - } - return tmpStr; - } - -} - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp deleted file mode 100644 index b57de0b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp +++ /dev/null @@ -1,51 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. -All rights reserved. You may not modify, use, reproduce, or distribute -this software except in compliance with the terms of the License at: -http://developer.sun.com/berkeley_license.html -$Id: news.jsp,v 1.2 2006/12/14 01:04:50 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>BluePrints News Page</title> - <script type="text/javascript" src="${pageContext.request.contextPath}/faces/static/META-INF/dojo/bpcatalog/dojo.js"></script> - <script type="text/javascript" src="${pageContext.request.contextPath}/news.js"></script> - - <style> - p { - width : 70%; - background-color : #FFEFD5; - font-size : 80% - } - </style> - - </head> - <script type="text/javascript"> - var news = new bpuinews.RSS(); - dojo.addOnLoad(function(){news.getRssInJson('${pageContext.request.contextPath}/faces/dynamic/bpui_rssfeedhandler/getRssfeed', 'https://blueprints.dev.java.net/servlets/ProjectRSS?type=news');}); - </script> - <body> - <jsp:include page="banner.jsp" /> - <h2><a href="http://blueprints.dev.java.net">BluePrints News</a></h2> - <center> - <table border="0" width="95%"> - <tr> - <td> - <button id="previous" type="button"><< Previous</button> - </td> - <td> - <button id="next" type="button">Next &gt&gt</button> - </td> - </tr> - </table> - </center> - <div id="news"></div> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp deleted file mode 100644 index 923739b..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp +++ /dev/null @@ -1,21 +0,0 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>jsonp test page</title> - <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/bp_petstorelist.css"></link> - <script type="text/javascript" src="${pageContext.request.contextPath}/bp_petstorelist.js"></script> - <script type="text/javascript"> - var petstoreList; - function init() { - petstoreList=new bpui.petstoreList.createPetstoreList("petstoreListDiv"); - } - </script> - </head> - <body onload="init()"> - <h1>jsonp test page</h1> - - <div id="petstoreListDiv"></div> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js deleted file mode 100644 index 66700d3..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js +++ /dev/null @@ -1,110 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: rss.js,v 1.3 2006/05/31 19:13:03 basler Exp $ */ - -dojo.require("dojo.io.*"); - -if (bpui = 'undefined') { - bpui = new Object(); -} - -bpui.RSS = function() { - var jsonData = null; - var rssItemNum = 0; - var currentItem = 0; - var rssTimeout = null; - var itemIntervalMsec = 2000; - var rssFadeoutCounter = 110; - var rssFadeinCounter = 110; - var itemIntervalId = 0; - - this.getRssInJson = function (uri, number) { - rssItemNum = number; - var encodedURI = encodeURI(bpui.contextRoot + "/faces/dynamic/bpui_rssfeedhandler/getRssfeed?style=json&itemNumber="+number+"&url="+uri); - //alert("encoded url=" + encodedURI); - var bindArgs = { - url: encodedURI, - mimetype: "text/json", - load: function (type, data, http) { - handleJsonRss(data); - for (var key in data.channel.item) { - dojo.debug("ITEM Title ", key, ":", data.channel.item[key].title); - dojo.debug("ITEM LInk ", key, ":", data.channel.item[key].link); - } - }, - error: function (t, e) { - dj_debug("ERROR : " + e.message); - } - } - dojo.io.bind(bindArgs); - return false; - } - - function handleJsonRss(json) { - jsonData = json; - // setting top title and link - generateHref(json.channel.title, json.channel.link, "rss-channel"); - // setting items - generateHref(json.channel.item[0].title, json.channel.item[0].link, "rss-item"); - var aNodes = document.getElementById("rss-item").getElementsByTagName("a"); - dojo.event.connect(aNodes[0], "onmouseover", "pauseCycle"); - dojo.event.connect(aNodes[0], "onmouseout", "resumeCycle"); - cycleRss(); - } - - function generateHref (title, link, nodeId) { - var node = document.getElementById(nodeId); - var aNode = document.createElement("a"); - aNode.setAttribute("href", link); - aNode.appendChild(document.createTextNode(title)); - if (node.hasChildNodes()) { - node.removeChild(node.firstChild); - } - node.appendChild(aNode); - } - - function cycleRss () { - itemIntervalId = setTimeout(replaceItem, itemIntervalMsec); - } - - - function replaceItem() { - if (itemIntervalId) { - clearTimeout(itemIntervalId); - } - // fadeout the current item and pop the next one in. - var cItem = document.getElementById("rss-item"); - dojo.fx.html.fadeOut(cItem.getElementsByTagName('a')[0], 500); - var waitId = setTimeout(function(waitId) { - clearTimeout(waitId); - //cItem.removeChild(cItem.firstChild); - if (currentItem < (rssItemNum -1)) { - currentItem += 1; - } else { - currentItem = 0; - } - generateHref(jsonData.channel.item[currentItem].title, jsonData.channel.item[currentItem].link, "rss-item"); - // attach event for onmouseover(pause) and onmouseout(resume) - var aNodes = cItem.getElementsByTagName("a"); - dojo.event.connect(aNodes[0], "onmouseover", "pauseCycle"); - dojo.event.connect(aNodes[0], "onmouseout", "resumeCycle"); - cycleRss();}, 500); - } - - function pauseCycle(evt) { - if (itemIntervalId) { - clearTimeout(itemIntervalId); - } - } - - function resumeCycle (evt) { - cycleRss(); - } - - bpui.getContextRoot = function() { - var urlArray=window.location.toString().split("/", 4); - return "/" + urlArray[3]; - } - - bpui.contextRoot = bpui.getContextRoot(); -} - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp deleted file mode 100644 index e57e4dc..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp +++ /dev/null @@ -1,33 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: rss.jsp,v 1.2 2006/05/03 22:00:34 inder Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - -<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> -<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>RSS</title> - </head> - <body> - - <h1>RSS test</h1> - <f:view> - <ui:rssreader> - <ui:rsscategory title="JavaEE 5"> - <ui:rssfeed title="BluePrints" url="https://blueprints.dev.java.net/servlets/ProjectRSS?type=news"></ui:rssfeed> - <ui:rssfeed title="GlassFish" url="http://blogs.sun.com/roller/rss/theaquarium"></ui:rssfeed> - </ui:rsscategory> - <ui:rsscategory title="Yahoo!"> - <ui:rssfeed title="World" url="http://rss.news.yahoo.com/rss/world"></ui:rssfeed> - <ui:rssfeed title="US" url="http://rss.news.yahoo.com/rss/us"></ui:rssfeed> - </ui:rsscategory> - </ui:rssreader> - - </f:view> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp deleted file mode 100644 index 6f9c2f9..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: rssbar.jsp,v 1.7 2006/05/06 01:44:59 yutayoshida Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> - -<%@taglib prefix="f" uri="http://java.sun.com/jsf/core"%> -<%@taglib prefix="h" uri="http://java.sun.com/jsf/html"%> -<%@taglib prefix="ui" uri="http://java.sun.com/blueprints/ui" %> - - - - <f:view> - <ui:rssBar url="https://blueprints.dev.java.net/servlets/ProjectRSS?type=news" - itemCount="4" - title="News from BluePrints" - speed="6000" - backgroundImage="no" - color="#00ffff" hoverColor="#ff00ff"></ui:rssBar> - </f:view> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html deleted file mode 100644 index 9cc8c0a..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html +++ /dev/null @@ -1,60 +0,0 @@ -<div class="EditorToolbarDomNode EditorToolbarSmallBg"> - <table cellpadding="1" cellspacing="0" border="0"> - <tbody> - <tr valign="top" align="left"> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="bold"> - <span title="Toggle Bold (Ctrl-B)" class="dojoE2TBIcon dojoE2TBIcon_Bold"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="italic"> - <span title="Toggle Italic (Ctrl-I)" class="dojoE2TBIcon dojoE2TBIcon_Italic"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="underline"> - <span title="Toggle Underline (Ctrl-U)" class="dojoE2TBIcon dojoE2TBIcon_Underline"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="strikethrough"> - <span title="Toggle Strike-Through" -class="dojoE2TBIcon dojoE2TBIcon_StrikeThrough"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="inserthorizontalrule"> - <span title="Insert Horizontal Rule" class="dojoE2TBIcon dojoE2TBIcon_HorizontalLine "> </span> - </span> - </td> - <td isSpacer="true"> -  - <span class="iconContainer"> - <span class="dojoE2TBIcon dojoE2TBIcon_Sep" style="width: 5px; min-width: 5px;"></span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="forecolor"> - <span title="Change Text Color" class="dojoE2TBIcon dojoE2TBIcon_TextColor" -unselectable="on"> </span> - </span> - </td> - <td> -  - <span class="iconContainer dojoEditorToolbarItem" dojoETItemName="hilitecolor"> - <span title="Change Background Color" class="dojoE2TBIcon dojoE2TBIcon_BackgroundColor" -unselectable="on"> </span> - </span> - </td> - <td width="*"> </td> - </tr> - </tbody> - </table> -</div> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css deleted file mode 100644 index 151df6d..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css +++ /dev/null @@ -1 +0,0 @@ -.slider { border-width:1px; border-style:solid; border-color:black; background:#404040; } .tile { position: absolute; top:0px; left:0px; cursor:pointer; border-width:1px; border-style:solid; border-color:black; visibility:hidden; z-index:1; background:white; opacity: .99; } .tileImage { width: 94; height: 70; } .nav { cursor:pointer; position: absolute; vertical-align:bottom; z-index:11; opacity: .85; } .infopane { z-index:0; width:475px; position: absolute; border-width:1px; border-style:solid; border-color:black; background:black; opacity: .65; } .infopaneDescription { color:white; font-size:12px; } .infopaneShortDescription { color:white; font-size:16px; } .infopanePrice { color:white; text-align: center; height:20px; } .infopanePayPal{ vertical-valign: bottom; text-align: right; height:20px; } .infopaneRating{ vertical-valign: top; text-align: center; width:125px; height:15px; color:white; opacity: .95; } .infopaneTitle { width:255px; height:15px; color:white; font-size:18px; } \ No newline at end of file diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js deleted file mode 100644 index 1f72578..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js +++ /dev/null @@ -1,643 +0,0 @@ -/* Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: scroller.js,v 1.32 2007/01/17 18:00:09 basler Exp $ */ - -/** -* ImageScroller - A multipurpose item brower -* @ Author: Greg Murray -* -*/ - -function getApplicationContextRoot() { - var urlArray=window.location.toString().split("/", 4); - return "/" + urlArray[3]; -} - -var applicationContextRoot=getApplicationContextRoot(); - - -function ImageScroller() { - var _this = this; - var initialized = false; - // default sizes - - var VIEWPORT_WIDTH = 500; - // all sizes are realitive the the viewport width - var IMAGEPANE_WIDTH = VIEWPORT_WIDTH; - var IMAGEPANE_HEIGHT = Math.round(VIEWPORT_WIDTH / 1.49); - var INFOPANE_DEFAULT_HEIGHT = Math.round(VIEWPORT_WIDTH / 6.67); - var INFOPANE_EXPAND_HEIGHT = Math.round(VIEWPORT_WIDTH / 2.86); - var THUMB_WIDTH = Math.round(VIEWPORT_WIDTH / 5);; - var THUMB_HEIGHT = Math.round(VIEWPORT_WIDTH / 6.67); - - var CHUNK_SIZE = 7; - var PREFETCH_THRESHHOLD = 5; - - var IMAGE_PANE_ID = "imagePane"; - var IMAGE_PANE_BUFFER_ID = "imageBufferPane"; - - var PADDING = 3; - - var MINIMIZE_IMG_URI = applicationContextRoot + "/images/minimize.gif"; - var MAXIMIZE_IMG_URI = applicationContextRoot + "/images/maximize.gif"; - var INDICATOR_IMG_URI = applicationContextRoot + "/images/indicator-black.gif"; - var MAXIMIZE_IMG_TOOLTIP = "Show Details"; - var MINIMIZE_IMG_TOOLTIP = "Show Less Details"; - - // this is an array of the tiles which are divs for each thumb - var tiles = []; - - var injectionPoint; - - // for scrolling - - var SCROLL_INCREMENT = 5; - var INFOPANE_INCREMENT = 3; - var tileY; - var tileX; - // this is the index of the image tile on the far left - var index = 0; - // keeps track how for the scroll has gone - var offset = 0; - - var timeout = 30; // in ms - var isScrollingRight = false; - var isScrollingLeft = false; - - // large image pane - var imagePane; - var imageLoadingPane; - var loadingPane; - // images - var minimizeImage; - - var indicatorImage; - var leftButton; - var rightButton; - - // infopane - var infoPane; - var infoTableMinimize; - var indicatorCell; - var minimizeLink; - var infoPaneLoop = 0; - var maximizing = false; - var minimizing = false; - var maximized = false; - - // prefetch thresh-hold - var prefetchThreshold = 2; - - // a growing list of items; - var items = []; - // cached chunks that are already in the items array - var loadedChunks = []; - - // used for debugging when debug is true - var debug = false; - var statusDiv; - var status2Div; - - var showingBuffer = false; - var imageBuffer; - var imageReloadTries = 0; - var IMG_RELOAD_RETRY_MAX = 30; - // used for url book marking - - - var pid; - var currentChunk; - // this map contains all the items - var map; - // this is the main container div - var containerDiv; - - this.getItems = function() { - return map; - } - - this.getScrollerItems = function() { - return items; - } - - - this.getGroupId = function() { - return pid; - } - - this.reset = function() { - resetTitles() - tiles = []; - index = 0; - offset = 0; - currentChunk = 0; - items = []; - loadedChunks = []; - } - - function resetTitles() { - for (var l = 0; l < tiles.length; l++) { - tiles[l].parentNode.removeChild(tiles[l]); - } - } - - // event bound to the mouseOut event of both scroll buttons - function scrollDone() { - isScrollingLeft = false; - isScrollingRight = false; - } - - // looping method for time out - function scroll() { - if (isScrollingRight) scrollRight(); - else if (isScrollingLeft) scrollLeft(); - } - - - // do the value list pre-emptive fetching - function prefetch() { - //printDebug("** scoller index = " + index); - if (isScrollingRight && (index + PREFETCH_THRESHHOLD) % CHUNK_SIZE == 0) { - - if ((Math.round(index / CHUNK_SIZE)) >= currentChunk) { - currentChunk = Math.round(index / CHUNK_SIZE) + 1; - // fire an event - dojo.event.topic.publish("/catalog", {type:"getChunk", id: pid, index: index, currentChunk: currentChunk}); - } - } - } - - this.setGroupId = function(id) { - pid = id; - } - - this.containsChunk = function(chunkId) { - printDebug("containsChunk = " + loadedChunks); - ret=false; - for(ii=0; ii < loadedChunks.length; ii++) { - if(chunkId == loadedChunks[ii]) { - ret=true; - break; - } - } - return ret; - } - - this.addChunk = function(chunkId) { - loadedChunks.push(chunkId); - } - - this.addItems = function(inItems) { - for (var loop=0; loop < inItems.length ; loop++) { - items.push(inItems[loop]); - map.put(inItems[loop].id, inItems[loop]); - createTile(inItems[loop]); - if (loop == 0 && !loadImage) { - showImage(inItems[loop].id); - } - - } - drawTiles(); - rightButton.style.visibility="visible"; - _this.hideProgressIndicator(); - } - - this.showProgressIndicator = function() { - if (indicatorImage) { - indicatorImage.style.visibility = "visible"; - } - } - - this.hideProgressIndicator = function() { - indicatorImage.style.visibility = "hidden"; - } - - function postImageLoad(loadIntoBuffer) { - if (debug) { - status2Div.innerHTML = "Try " + imageReloadTries + " " + url + " image.complete=" + imageBuffer.complete; - } - // keep calling this funtion until imageReloadTries < IMG_RELOAD_RETRY_MAX - if (!imageBuffer.complete) { - if (imageReloadTries < IMG_RELOAD_RETRY_MAX) { - setTimeout(function(){this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer);},500); - } else { - this.hideProgressIndicator(); - } - imageReloadTries = imageReloadTries + 1; - return; - } - var id; - - _this.hideProgressIndicator(); - if (loadIntoBuffer) { - imageLoadingPane.src = imageBuffer.src; - } else { - imagePane.src = imageBuffer.src; - - } - // do a cross fade as long as the images aren't the same - if (imageLoadingPane.src != imagePane.src) { - crossFade(0,loadIntoBuffer ); - } - } - - - this.showImage = function(itemId) { - - _this.showProgressIndicator(); - //setTimeout(this.showProgressIndicator,0); - var i = map.get(itemId); - - if (!i) { - return; - } - dojo.event.topic.publish("/catalog", {type:"showingItem", id: itemId, rating: i.rating}); - // create the image pane and append the description nodes - // asumption is that if the imagePane is not set neigher are the info children - if (typeof imagePane == 'undefined') { - imagePane = document.createElement("img"); - imagePane.style.width = IMAGEPANE_WIDTH + "px"; - imagePane.style.height = IMAGEPANE_HEIGHT + "px"; - imagePane.id = IMAGE_PANE_ID; - - var targetElement = document.getElementById("bodySpace"); - imageLoadingPane = document.createElement("img"); - imageLoadingPane.style.position = "absolute"; - imageLoadingPane.style.visibility = "hidden"; - imageLoadingPane.style.width = IMAGEPANE_WIDTH + "px"; - imageLoadingPane.style.height = IMAGEPANE_HEIGHT + "px"; - imageLoadingPane.id = IMAGE_PANE_BUFFER_ID; - targetElement.appendChild(imagePane); - targetElement.appendChild(imageLoadingPane); - imageLoadingPane.style.left = tileX + "px"; - - loadImage(i.image, false); - } else { - imageLoadingPane.style.visibility = "visible"; - if (showingBuffer) { - showingBuffer = false; - } else { - showingBuffer = true; - } - loadImage(i.image, showingBuffer); - } - } - - function loadImage(url, loadIntoBuffer) { - imageReloadTries = 0; - imageBuffer = new Image(); - if (loadIntoBuffer) { - imageBuffer.src = url; - imageLoadingPane.onLoad = setTimeout(function(){this.url=url;this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer,url);},0); - } else { - imageBuffer.src = url; - imageBuffer.onLoad = setTimeout(function(){this.url = url;this.loadIntoBuffer = loadIntoBuffer;postImageLoad(loadIntoBuffer,url);},0); - } - } - - function setOpacity(opacity, id) { - var target = document.getElementById(id); - if (typeof target.style.filter != 'undefined') { - target.style.filter = "alpha(opacity:" + opacity + ")"; - } else { - target.style.opacity = opacity/100; - } - } - - function crossFade(count,loadIntoBuffer) { - var percentage = Number(count); - if (loadIntoBuffer) { - setOpacity(100 - percentage, IMAGE_PANE_ID); - setOpacity(percentage, IMAGE_PANE_BUFFER_ID); - } else { - setOpacity(100 - percentage, IMAGE_PANE_BUFFER_ID); - setOpacity(percentage, IMAGE_PANE_ID); - - } - if (percentage < 100) { - percentage = percentage + 10; - setTimeout(function(){this.loadIntoBuffer = loadIntoBuffer;this.percentage = percentage;crossFade(percentage,loadIntoBuffer);}, 25); - } - } - - - // calling this function will result in the maximizing event being fired - // if the pane is maximized it will asume the event want to minimize - this.doMaximize = function() { - if (!maximizing && !minimizing && !maximized) { - infoPaneLoop = INFOPANE_DEFAULT_HEIGHT; - maximizing = true; - minimizing = false; - } else if (!maximizing && !minimizing) { - minimizing = true; - maximizing = false; - } - setTimeout(changeInfoPane, 0); - } - - // will handle either minimizing or maximing but not both - // this method is called recursively until the maximinging - // or minimizing is done. - function changeInfoPane() { - if (maximizing) { - maxmizeInfoPane(); - } else if (minimizing) { - minimizeInfoPane(); - } - } - - function maxmizeInfoPane() { - if (infoPaneLoop < INFOPANE_EXPAND_HEIGHT) { - infoPaneLoop = infoPaneLoop + INFOPANE_INCREMENT; - var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ infoPaneLoop +'px,' + 0 + 'px)'; - infoPane.style.clip = clipMe; - infoPane.style.height = infoPaneLoop; - infoPane.style.top = (tileY + (PADDING *2) + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT) - infoPaneLoop; - setTimeout(changeInfoPane, 5); - } else { - minimizeImage.src= MINIMIZE_IMG_URI; - minimizeLink.title = MINIMIZE_IMG_TOOLTIP; - maximized = true; - maximizing = false; - minimizing = false; - } - } - - function minimizeInfoPane() { - if (infoPaneLoop > INFOPANE_DEFAULT_HEIGHT) { - infoPaneLoop = infoPaneLoop - INFOPANE_INCREMENT; - var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ infoPaneLoop +'px,' + 0 + 'px)'; - infoPane.style.clip = clipMe; - infoPane.style.height = infoPaneLoop; - infoPane.style.top = (tileY + (PADDING *2) + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT) - infoPaneLoop; - if (debug) { - status2Div.innerHTML = "minimize infoPaneLoop =" + infoPaneLoop + " infopane.top=" + infoPane.style.top; - } - setTimeout(changeInfoPane, 5); - } else { - minimizeImage.src= MAXIMIZE_IMG_URI; - minimizeLink.title = MAXIMIZE_IMG_TOOLTIP; - maximizing = false; - minimizing = false; - maximized = false; - } - } - - function scrollRight() { - isScrollingRight = true; - if ( (index + 4) >= tiles.length) { - // hide the rightButton - rightButton.style.visibility="hidden"; - return; - } else { - leftButton.style.visibility="visible"; - } - offset = offset - SCROLL_INCREMENT; - drawTiles(); - setTimeout(scroll, timeout); - } - - function getNext() { - isScrollingRight = true; - setTimeout(scroll, timeout); - } - - - function getPrevious () { - isScrollingLeft = true; - setTimeout(scroll, timeout); - } - - function scrollLeft() { - if (offset >= 0) { - leftButton.style.visibility="hidden"; - return; - } else { - leftButton.style.visibility="visible"; - } - offset = offset + SCROLL_INCREMENT; - drawTiles(); - setTimeout(scroll, timeout); - } - - function drawTiles() { - // draw the first one if its off the screen - // check if the far right image is out view - var overHang; - var temp = offset; - index = Math.floor((offset)/THUMB_WIDTH); - overHang = offset % THUMB_WIDTH; - if (overHang < 0) { - overHang = overHang * -1; - } - if (index < 0) { - index = index * -1; - } - // check for next set of images - prefetch(); - var startIndex = index; - if (overHang > 0 && index >0) { - startIndex = index -1; - } - var stopIndex = index + Math.round(VIEWPORT_WIDTH / THUMB_WIDTH); - if (stopIndex > tiles.length) { - stopIndex = tiles.length; - } - var displayX = 0; - for (var tl=startIndex; tl < stopIndex; tl++) { - if (debug) { - statusDiv.innerHTML = "overhang=" + overHang + " startIndex=" + startIndex + " stopIndex=" + stopIndex + " offset=" + offset + " displayX=" + displayX; - } - if (overHang > 0 && tl == startIndex) { - rightButton.style.visibility="visible"; - // clip: rect(top right bottom left) - borders of the clipped area - // clip the left - var clipMe = 'rect(' + '0px,' + THUMB_WIDTH + 'px,'+ THUMB_HEIGHT +'px,' + overHang + 'px)'; - tiles[tl].style.clip = clipMe; - tiles[tl].style.left = (tileX - overHang) + "px"; - displayX = displayX + (THUMB_WIDTH - overHang); - } else if (tl == stopIndex -1) { - var underHang = VIEWPORT_WIDTH - displayX ; - if (underHang > 0 && underHang) { - var clipMe = 'rect(' + '0px,' + (underHang) + "px," + THUMB_HEIGHT +'px,' + 0 + 'px)'; - tiles[tl].style.clip = clipMe; - tiles[tl].style.left = tileX + (offset + (tl * THUMB_WIDTH)) + 'px'; - tiles[tl].style.visibility = "visible"; - // resize the previous one to its real length - } else if (underHang < 0 && tl > 0) { - var clipMe = 'rect(' + '0px,' + (THUMB_WIDTH + underHang) + "px," + THUMB_HEIGHT +'px,' + 0 + 'px)'; - tiles[tl-1].style.clip = clipMe; - tiles[tl-1].style.visibility = "visible"; - tiles[tl-1].style.left = tileX + (offset + ((tl -1) * THUMB_WIDTH)) + 'px'; - } else { - tiles[tl].style.left = '0px'; - tiles[tl].style.visibility = "hidden"; - } - } else { - displayX = displayX + THUMB_WIDTH; - tiles[tl].style.left = tileX + (offset + (tl * THUMB_WIDTH)) + 'px'; - tiles[tl].style.visibility = "visible"; - } - } - if (stopIndex < tiles.length) { - tiles[stopIndex].style.visibility = "hidden"; - tiles[stopIndex].style.left = "0px"; - } - } - - - this.load = function () { - map = new Map(); - dojo.event.connect(window, "onresize", layout); - var loadImage; - - var targetRow = document.getElementById("targetRow"); - injectionPoint = document.getElementById("injection_point"); - - // for status output - statusDiv = document.getElementById("status"); - status2Div = document.getElementById("status_2"); - - initLayout(); - initialized = true; - } - - function initLayout() { - containerDiv = document.getElementById("CatalogBrowser"); - rightButton = document.getElementById("right_button"); - leftButton = document.getElementById("left_button"); - layout(); - leftButton.style.visibility="hidden"; - if (typeof rightButton.attachEvent != 'undefined') { - rightButton.attachEvent('onmouseover',function(e){scrollDone();getNext();}); - rightButton.attachEvent('onmouseout',function(e){scrollDone();}); - leftButton.attachEvent('onmouseover',function(e){scrollDone();getPrevious();}); - leftButton.attachEvent('onmouseout',function(e){scrollDone();}); - } else if (typeof rightButton.addEventListener != 'undefined') { - rightButton.addEventListener('mouseover',function(e){scrollDone();getNext();}, false); - rightButton.addEventListener('mouseout',function(e){scrollDone();}, false); - leftButton.addEventListener('mouseover',function(e){scrollDone();getPrevious();}, false); - leftButton.addEventListener('mouseout',function(e){scrollDone();}, false); - } - createInfoPane(); - } - - function layout() { - var ua = navigator.userAgent.toLowerCase(); - - // this will need to be made generic depending on the thumb height - tileY = findY(containerDiv); - tileX = findX(containerDiv) + 4; - var rightX = tileX + VIEWPORT_WIDTH - 20; - rightButton.style.left = rightX + "px"; - var buttonY = tileY + IMAGEPANE_HEIGHT + INFOPANE_DEFAULT_HEIGHT + 12; - rightButton.style.top = buttonY + "px"; - leftButton.style.top = buttonY + "px"; - - if (ua.indexOf('ie') != -1) { - isIE = true; - } else if (ua.indexOf('safari') != -1) { - tileX = tileX + 8; - timeout = 20; - } - drawTiles(); - if (infoPane) { - infoPane.style.left = tileX + "px"; - if (maximized) { - - infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2) - infoPane.style.height) + "px"; - } else { - infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2)) + "px"; - } - if (maximized) { - infoPaneLoop = infoPane.style.height; - } else { - infoPaneLoop = INFOPANE_DEFAULT_HEIGHT; - } - } - if (typeof imageLoadingPane != 'undefined') { - imageLoadingPane.style.left = tileX; - imageLoadingPane.style.top = tileY; - } - } - - function createInfoPane() { - infoPane = document.getElementById("infopane"); - infoPane.style.width = VIEWPORT_WIDTH + "px"; - // give room for 4 pixels above and below - infoPane.style.height = (INFOPANE_DEFAULT_HEIGHT) + "px"; - // give 3px padding for a border - infoPane.style.top = (tileY + IMAGEPANE_HEIGHT + (PADDING*2)) + "px"; - infoPane.style.left = tileX + "px"; - infoTableMinimize = document.getElementById("infopaneDetailsIcon"); - indicatorCell = document.getElementById("infopaneIndicator"); - indicatorCell.style.width = (10) + "px"; - indicatorImage = document.createElement("img"); - indicatorImage.className = "infopaneIndicator"; - indicatorImage.src = INDICATOR_IMG_URI; - indicatorImage.style.visibility = "hidden"; - indicatorCell.appendChild(indicatorImage); - minimizeLink = document.createElement("a"); - minimizeLink.className = "infopaneLink"; - minimizeLink.title = MAXIMIZE_IMG_TOOLTIP; - minimizeImage = document.createElement("img"); - minimizeImage.src= MAXIMIZE_IMG_URI; - minimizeLink.appendChild(minimizeImage); - infoTableMinimize.appendChild(minimizeLink); - - if (typeof minimizeLink.attachEvent != 'undefined') { - minimizeLink.attachEvent("onclick",function(e){_this.doMaximize();}); - } else { - minimizeLink.addEventListener("click",function(e){_this.doMaximize();}, true); - } - var clipMe = 'rect(' + '0px,' + VIEWPORT_WIDTH + 'px,'+ INFOPANE_DEFAULT_HEIGHT +'px,' + 0 + 'px)'; - infoPane.style.clip = clipMe; - } - - function createTile(i) { - var div = document.createElement("div"); - div.className = "tile"; - div.id = i.id; - var link = document.createElement("a"); - var img = document.createElement("img"); - img.title = i.name; - img.src = i.thumbnail; - img.className = "tileImage"; - link.appendChild(img); - link.setAttribute("id", i.id); - if (typeof div.attachEvent != 'undefined') { - div.attachEvent('onclick',function(e){this.id = div.id; _this.showImage(this.id, false);}); - } else { - link.addEventListener('click',function(e){this.id = div.id; _this.showImage(this.id, false);}, true); - } - div.appendChild(link); - injectionPoint.appendChild(div); - div.style.top = tileY + INFOPANE_DEFAULT_HEIGHT + IMAGEPANE_HEIGHT + (PADDING * 3) + "px"; - tiles.push(div); - } - - - function findY(element) { - var t = 0; - if (element.offsetParent) { - while (element.offsetParent) { - t += element.offsetTop - element = element.offsetParent; - } - } else if (element.y) { - t += element.y; - } - return t; - } - - function findX(element) { - var l = 0; - if (element.offsetParent) { - while (element.offsetParent) { - l += element.offsetLeft - element = element.offsetParent; - } - } else if (element.x) - l += element.x; - return l; - } -} diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp deleted file mode 100644 index e12d666..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp +++ /dev/null @@ -1,290 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: search.jsp,v 1.28 2006/12/04 21:34:10 basler Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.search.*"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui5" uri="http://java.sun.com/blueprints/ui" %> - - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Search Page</title> - <style> - .itemTable { - padding: 0.3cm; - width: 800px; - border-style: double; - border-color: darkgreen; - } - .itemCell { - border-style: solid; - border-color: darkgreen; - border-width: thin; - padding: 5px - } - .tagDiv { - border-style: groove; - border-color: darkgreen; - background-color: white; - border-width: thick; - padding: 5px; - visibility: hidden; - position:absolute; - left:0px; - top:0px; - z-index: 3; - } - </style> - <script type="text/javascript" src="common.js"></script> - </head> - <body> - <jsp:include page="banner.jsp" /> - <center> - - <script type="text/javascript"> - function checkAll() { - var elems=dojo.byId("resultsForm").elements; - for(ii=0; ii < elems.length; ii++) { - if(elems[ii].name.indexOf("mapSelectedItems") >= 0) { - elems[ii].checked=true; - } - } - return false; - } - - function uncheckAll() { - var elems=dojo.byId("resultsForm").elements; - for(ii=0; ii < elems.length; ii++) { - if(elems[ii].name.indexOf("mapSelectedItems") >= 0) { - elems[ii].checked=false; - } - } - return false; - } - - function addTags(eventx, namex, itemIdx) { - var xx=0; - var yy=0; - if (!eventx) var eventx=window.event; - if (eventx.pageX || eventx.pageY){ - xx=eventx.pageX; - yy=eventx.pageY; - } else if (eventx.clientX || eventx.clientY) { - xx=eventx.clientX + document.body.scrollLeft; - yy=eventx.clientY + document.body.scrollTop; - } - divId="addTags"; - document.getElementById("addTagsItemId").value=itemIdx; - document.getElementById("addTagsTags").value=""; - document.getElementById("addTagsTitle").innerHTML="<b>Add Tags to '" + namex + "'</b>"; - document.getElementById(divId).style.left=(xx - 170) + "px"; - document.getElementById(divId).style.top=(yy - 140) + "px"; - document.getElementById(divId).style.visibility='visible'; - document.getElementById("addTagsTags").focus(); - } - - function saveAddTags() { - // get data and send to controller servlet - itemIdx=document.getElementById("addTagsItemId").value; - tagsx=document.getElementById("addTagsTags").value; - var bindArgs = { - url: "../TagServlet?itemId=" + escape(itemIdx) + "&tags=" + escape(tagsx), - mimetype: "text/xml", - error: ajaxBindError, - load: function(type, data, evt){ - // check successful response - if (evt.readyState == 4) { - if (evt.status == 200) { - // get results and replace dom elements - var resultx=data.getElementsByTagName("response")[0]; - itemIdx=resultx.getElementsByTagName("itemId")[0].childNodes[0].nodeValue; - - // change DOM data - document.getElementById("ITEMID_TAGS_" + itemIdx).innerHTML=resultx.getElementsByTagName("tags")[0].childNodes[0].nodeValue; - - } else if (evt.status == 204){ - alert("204 return"); - } - } - } - }; - - dojo.io.bind(bindArgs); - // make sure it was updated - - // show messages if error - - // hide popup - document.getElementById(divId).style.visibility='hidden'; - } - - function cancelAddTags() { - // hide popup - document.getElementById(divId).style.visibility='hidden'; - } - - </script> - - <f:view> - - <ui5:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?popupView=2&itemId=" - elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> -  - <img id="spaceImage" height="10px" width="3px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> - <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> - <tr> - <td align="left" valign="top"><b>Name:</b> - <span id="value1">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Seller Address:</b> - <span id="value2">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Price:</b> - <span id="value3">Loading Data...</span></td> - </tr> - <tr> - <td colspan="2" align="center"><img name="image" id="imageId" src="" - alt="[Loading Image...]" border="2"/><br/><br/></td> - </tr> - </table> - </ui5:popupTag> - - <h1>Search Page</h1> - <h:form id="searchForm"> - <table class="itemTable" style="width: 700px"> - <tr> - <th class="itemCell">Search String</th> - <td class="itemCell"> - <h:inputText size="50" id="searchString" value="#{SearchBean.searchString}"/> -    Also Search Tags:<h:selectBooleanCheckbox id="searchTags" value="#{SearchBean.searchTags}"/> - </td> - </tr> - <tr> - <td class="itemCell" align="center" colspan="2"> - <h:commandButton action="#{SearchBean.searchAction}" id="searchSubmit" type="submit" value="Submit"/> - <h:commandButton id="searchReset" type="reset" value="Reset"/> - </td> - </tr> - </table> - <h:messages/> - </h:form> - <br/> - - - - <h:form id="resultsForm" rendered="#{SearchBean.showResults}"> - <table class="itemTable"> - <tr> - <th class="itemCell"> - Map - <br/> - <img src="../images/check_all.gif" onclick="return checkAll()"/><img src="../images/uncheck_all.gif" onclick="return uncheckAll()"/> - </th> - <th class="itemCell">Name</th> - <th class="itemCell">Description</th> - <th class="itemCell">Tags</th> - <th class="itemCell">Price</th> - </tr> -<% -SearchBean searchBean=(SearchBean)session.getAttribute("SearchBean"); -if(searchBean != null) { - List<IndexDocument> hits=searchBean.getHits(); - if(hits != null) { - for(IndexDocument indexDoc : hits) { -%> - <tr> - <td class="itemCell"> - <input type="checkbox" name="mapSelectedItems" value="<%= indexDoc.getUID() %>"/> - </td> - <td class="itemCell"> - <a href="${pageContext.request.contextPath}/faces/catalog.jsp?pid=<%= indexDoc.getProduct() %>&itemId=<%= indexDoc.getUID() %>" - onmouseover="bpui.popup.show('pop1', event, '<%= indexDoc.getUID() %>')" onmouseout="bpui.popup.hide('pop1')"> - <%= indexDoc.getTitle() %> - </a> - </td> - <td class="itemCell"> - <%= indexDoc.getSummary() %> - </td> - <td class="itemCell"> - <span id="ITEMID_TAGS_<%= indexDoc.getUID() %>"><%= (indexDoc.getTag().equals("") ? " " : indexDoc.getTag()) %></span> - <br/><input type="button" value="Add Tags" onclick="addTags(event, '<%= indexDoc.getTitle() %>', '<%= indexDoc.getUID() %>')"/> - </td> - <td class="itemCell"> - <%= indexDoc.getPriceDisplay() %> - </td> - </tr> -<% - } - } -} -%> - <tr> - <td colspan="5"> - <br/> - <center> - <table class="itemTable"> - <tr> - <th align="right">Center Point Address:</th> - <td> - <h:inputText id="centerAddress" value="#{MapBean.centerAddress}" size="50"/> - <br/><small><i>For example: 4140 Network Circle, Santa Clara, CA, 95054</i></small> - </td> - </tr> - <tr> - <th align="right">Area (in Miles):</th> - <td> - <h:inputText id="radius" value="#{MapBean.radius}" size="5"/> - </td> - </tr> - <tr> - <td align="center" colspan="2"> - <h:commandButton action="#{MapBean.findAllByIDs}" id="mapSubmit" type="submit" - value="Map Checked Item(s)" rendered="#{SearchBean.showResults}"/> - </td> - </tr> - </table> - </center> - <br/> - </td> - </tr> - </table> - - <h:messages/> - </h:form> - <br/><br/><br/> - <div class="tagDiv" id="addTags"> - <form> - <table> - <tr> - <td align="center"> - <span id="addTagsTitle"><b>Tag Title</b></span><br/><i>(seperated by spaces)</i> - </td> - </tr> - <tr> - <td align="center"> - <input id="addTagsTags" type="text" size="50"/> - </td> - </tr> - <tr> - <td align="center"> - <input type="button" value="Save" onclick="saveAddTags()"/>  <input type="button" value="Cancel" onclick="cancelAddTags()"/> - </td> - </tr> - </table> - <input type="hidden" id="addTagsItemId"/> - </form> - </div> - </f:view> - </center> - <jsp:include page="footer.jsp" /> - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css deleted file mode 100644 index 24ffbf9..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css +++ /dev/null @@ -1,130 +0,0 @@ - -.dojoHtmlFisheyeListBar { - cursor:pointer; - margin: 0; - width: 300px; - text-align: right; -} - -.outerbar { - background-color: white; - text-align: left; - width: 300px; -} - -.editText { - height:25; - font-size:18px; - font-weight: bold; - font-family: Arial; -} - -.plainText { - height:25; - font-size:20px; - font-weight: bold; - font-family: Arial -} - -.plainTextSelect { - height:25; - font-size:20px; - font-weight: bold; - font-family: Arial; - background: red -} - -.smallText { - height:15; - font-size:13px; - font-weight: bold; - font-family: Arial -} - -.banner { - height:35; - font-size:35; - font-weight: bold; - font-family: Arial -} - - -.menuItem { - background: white; - color: black; - text-decoration: none; - font-size: 1.4em; -} - -.menuLink { - cursor:pointer; - color: black; - text-decoration: none; - font-size: 1.3em; -} - -.menuLinkHover { - cursor:pointer; - color: black; - font-size: 1.3em; - text-decoration: underline; -} - -.autocomplete { - position:absolute; -} - -.autocompleteTable { - padding:0; - visibility: hidden; - border-spacing: 0; - border-width:1px; - border-style:solid; - border-color:black; -} - -.popupRowHover { - color: #FFFAFA; - cursor:pointer; - padding-left:3; - padding-right:3; - border-spacing: 0; - border-width:0px; - background: #7A8AFF; -} - -.popupRow { - padding-left:3; - padding-right:3; - border-spacing: 0; - border-width:0px; - background: #FFFAFA; -} - -.popupRowEven { - padding-left:3; - padding-right:3; - border-spacing: 0; - border-width:0px; - background: #FFFADA; -} - -.popupItem { - background: #FFFAFA; - color: #000000; - text-decoration: none; - font-size: 1.2em; -} - -.shadow { - top:0px; - left:0px; - position: absolute; - visibility: hidden; - width:0; - height:0; - z-index:0; - background:gray; - opacity: .5; -} - diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp deleted file mode 100644 index c7a5309..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp +++ /dev/null @@ -1,28 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: systemerror.jsp,v 1.3 2007/01/09 19:02:12 basler Exp $ --%> -<%@ page isErrorPage="true" %> -<%@ page import="com.sun.javaee.blueprints.petstore.util.PetstoreUtil, java.util.logging.Level" %> -<% -PetstoreUtil.getLogger().log(Level.INFO, "Encountered a Runtime Exception and being transferred the the systemerror page", exception); -%> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" > - <title>Java Pet Store Reference Application: System Error Page</title> - </head> - <body> - - <jsp:include page="banner.jsp" /> - - <h2>System Error !</h2> - <p>We had problems processing your request. An exception has been caught, - so perhaps your application was not set up or deployed properly.</p> - - The Exception that was thrown is:<b> <%= exception.toString() %></b>. The server log will contain the stack trace of the exception. - - <p><a href="${pageContext.request.contextPath}/faces/index.jsp">Go back to sample application home</a></p> - <br/><br/> - <jsp:include page="footer.jsp" /> - - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css deleted file mode 100644 index bfbab6e..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css +++ /dev/null @@ -1,47 +0,0 @@ - .itemTable { - padding: 0.3cm; - border-style: double; - width: 800px; - border-color: darkgreen; - } - .itemCell { - border-style: solid; - border-color: darkgreen; - border-width: thin; - padding: 5px - } - .tagCell { - padding: 0.3cm; - } - .xxlarge - { - font-size: xx-large; - color: red; - cursor: pointer; - text-decoration: underline; - } - .xlarge - { - font-size: x-large; - color: blue; - cursor: pointer; - text-decoration: underline; - } - .large - { - font-size: large; - color: green; - cursor: pointer; - text-decoration: underline; - } - .medium - { - font-size: medium; - cursor: pointer; - color: black; - text-decoration: underline; - } - .items - { - visibility: hidden; - } diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp deleted file mode 100644 index f9c74f3..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp +++ /dev/null @@ -1,158 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: tag.jsp,v 1.11 2007/01/17 18:00:09 basler Exp $ --%> - -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Tag"%> -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@taglib prefix="ui5" uri="http://java.sun.com/blueprints/ui" %> - - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Tag Page</title> - <script type="text/javascript" src="./common.js"></script> - <link type="text/css" rel="stylesheet" href="./tag.css"/> -<% -try { - CatalogFacade cf = (CatalogFacade)config.getServletContext().getAttribute("CatalogFacade"); - List<Tag> tags=cf.getTagsInChunk(0, 90); - // since top 20 come from database or desending refCount order, need to reorder by tag name - Collections.sort(tags, new Comparator() { - public int compare(Object one, Object two) { - return ((Tag)one).getTag().compareTo(((Tag)two).getTag()); - } - }); -%> - <script language="javascript"> - function retrieveItems(tag) { - var bindArgs = { - // url when using the jsp to serve the ajax request - url: "../tagItemLookup.jsp?tag=" + escape(tag), - mimetype: "text/xml", - load: returnFunctionx, - error: ajaxBindError}; - - // dispatch the request - dojo.io.bind(bindArgs); - } - - - function returnFunctionx(type, data, evt) { - // statically setup popup for simple case - var componentId="displayItems"; - // check return of the dojo call to make sure it is valid - if (evt.readyState == 4) { - if (evt.status == 200) { - // get results and replace dom elements - var itemsx=data.getElementsByTagName("item"); - display="<table class='itemTable'><tr><td class='itemCell' align='center' colspan='4'><h2>Tag: " + - data.getElementsByTagName("tag")[0].childNodes[0].nodeValue + - "</h2></td></tr><tr><th class='itemCell'>Name</th><th class='itemCell'>Description</th><th class='itemCell'>Tags</th><th class='itemCell'>Price</th></tr>" - for(ii=0; ii < itemsx.length; ii++) { - display += "<tr>"; - display +="<td class='itemCell'><a href='./catalog.jsp?pid="+ itemsx[ii].getElementsByTagName("productID")[0].childNodes[0].nodeValue +"&itemId=" + - itemsx[ii].getElementsByTagName("itemID")[0].childNodes[0].nodeValue + "' onmouseover='bpui.popup.show("pop1", event, "" + - itemsx[ii].getElementsByTagName("itemID")[0].childNodes[0].nodeValue + "")' onmouseout='bpui.popup.hide("pop1")'>" + - itemsx[ii].getElementsByTagName("name")[0].childNodes[0].nodeValue +"</a></td>"; - display +="<td class='itemCell'>" + itemsx[ii].getElementsByTagName("description")[0].childNodes[0].nodeValue +"</td>"; - display +="<td class='itemCell'>" + itemsx[ii].getElementsByTagName("tags")[0].childNodes[0].nodeValue +"</td>"; - display +="<td class='itemCell' style='text-align: right'>" + itemsx[ii].getElementsByTagName("price")[0].childNodes[0].nodeValue +"</td>"; - display +="</tr>"; - } - display += "</table>"; - document.getElementById(componentId).innerHTML=display; - document.getElementById(componentId).style.visibility='visible'; - } else if (evt.status == 204){ - alert("204 return"); - } - } - } - - - function checkQueryString() { -  - var iPos=window.location.href.indexOf("?tag="); - if(iPos > -1) { - // have tag so retrieve items - retrieveItems(window.location.href.substr(iPos + 5)); - } - } - - </script> - </head> - <body onload="checkQueryString();"> - <jsp:include page="banner.jsp" /> - <f:view> - - <ui5:popupTag id="pop1" xmlHttpRequestURL="../lookup.jsp?popupView=2&itemId=" - elementNamePairs="name=value1,description=value2,price=value3,image=imageId"> -  - <img id="spaceImage" height="10px" width="10px" src="${pageContext.request.contextPath}/faces/static/META-INF/popup/images/spacer.gif" align="left"> - <table border="0" width="270px" bgcolor="#ffffff" cellpadding="5" cellspacing="5"> - <tr> - <td align="left" valign="top"><b>Name:</b> - <span id="value1">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Seller Address:</b> - <span id="value2">Loading Data...</span></td> - </tr> - <tr> - <td align="left" valign="top"><b>Price:</b> - <span id="value3">Loading Data...</span></td> - </tr> - <tr> - <td colspan="2" align="center"><img name="image" id="imageId" src="" - alt="[Loading Image...]" border="2"/><br/><br/></td> - </tr> - </table> - </ui5:popupTag> - <center> - <h1>Tag Page</h1> - <table border="0"> - <tr> -<% - String style=null; - int refx=0, ii=0; - for(Tag tag : tags) { - refx=tag.getRefCount() / 5; - if(refx >= 3) { - style="xxlarge"; - } else if(refx == 2) { - style="xlarge"; - } else if(refx == 1) { - style="large"; - } else { - style="medium"; - } - - if((ii % 6) == 0) out.println("</tr>\n<tr>"); - //out.println("<td class='tagCell'><span onclick=\"retrieveItems('" + tag.getTag() + "')\" class='" + style +"'>" + tag.getTag() + "</span> (" + tag.getRefCount() + ")</td>"); - out.println("<td class='tagCell'><span onclick=\"retrieveItems('" + tag.getTag() + "')\" class='" + style +"'>" + tag.getTag() + "</span></td>"); - ii++; - } -%> - </tr> - </table> - <div id="displayItems" class="items"> - - </div> - </center> - </f:view> - <br/><br/><br/><br/> - <jsp:include page="footer.jsp" /> - - </body> -</html> - -<% - } catch(Exception e) { - e.printStackTrace(); - } -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp deleted file mode 100644 index 05ef352..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp +++ /dev/null @@ -1,45 +0,0 @@ -<%-- Copyright 2006 Sun Microsystems, Inc. All rights reserved. You may not modify, use, reproduce, or distribute this software except in compliance with the terms of the License at: http://developer.sun.com/berkeley_license.html -$Id: tagItemLookup.jsp,v 1.4 2007/01/19 21:47:31 basler Exp $ --%> - -<%@page contentType="text/xml"%> -<%@page pageEncoding="UTF-8"%> -<%@page import="java.util.*, java.text.NumberFormat, com.sun.javaee.blueprints.petstore.model.CatalogFacade, com.sun.javaee.blueprints.petstore.model.Item, com.sun.javaee.blueprints.petstore.model.Tag"%> - -<% - String sxTag=request.getParameter("tag"); - - try { - response.setHeader("Pragma", "No-Cache"); - response.setHeader("Cache-Control", "no-cache,no-store,max-age=0"); - response.setDateHeader("Expires", 1); - - ServletContext context=config.getServletContext(); - CatalogFacade cf=(CatalogFacade)context.getAttribute("CatalogFacade"); - Tag tag=cf.getTagWithPersistentItems(sxTag); - out.println("<response>"); - - if(tag != null) { - out.println("<tag>" + tag.getTag() + "</tag>"); - out.println("<items>"); - Collection<Item> items=tag.getItems(); - for(Item item : items) { - if(item.getDisabled() == 0) { - out.println("<item>"); - out.println("<itemID>" + item.getItemID() + "</itemID>"); - out.println("<productID>" + item.getProductID() + "</productID>"); - out.println("<name><![CDATA[" + item.getName() + "]]></name>"); - out.println("<description><![CDATA[" + item.getDescription() + "]]></description>"); - out.println("<tags><![CDATA[" + item.tagsAsString() + "]]></tags>"); - out.println("<price><![CDATA[" + NumberFormat.getCurrencyInstance(java.util.Locale.US).format(item.getPrice()) + "]]></price>"); - out.println("</item>"); - } - } - out.println("</items>"); - } - out.println("</response>"); - out.flush(); - } catch(Exception ee) { - ee.printStackTrace(); - } - -%> diff --git a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp b/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp deleted file mode 100644 index e5dd68a..0000000 --- a/etc/samples/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%@page contentType="text/html"%> -<%@page pageEncoding="UTF-8"%> -<%-- -The taglib directive below imports the JSTL library. If you uncomment it, -you must also add the JSTL library to the project. The Add Library... action -on Libraries node in Projects view can be used to add the JSTL 1.1 library. ---%> -<%-- -<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> ---%> - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> - -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>JSP Page</title> - </head> - <body> - - <h1>JSP Page</h1> - - <%-- - This example uses JSTL, uncomment the taglib directive above. - To test, display the page like this: index.jsp?sayHello=true&name=Murphy - --%> - <%-- - <c:if test="${param.sayHello}"> -  - Hello ${param.name}! - </c:if> - --%> - - </body> -</html> diff --git a/etc/samples/sample-bundle/src/main/scripts/assembly.xml b/etc/samples/sample-bundle/src/main/scripts/assembly.xml deleted file mode 100644 index 942e5f9..0000000 --- a/etc/samples/sample-bundle/src/main/scripts/assembly.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0"?> - - - -<assembly> -  - <id></id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <baseDirectory>target/bundle</baseDirectory> - <fileSets> - <fileSet> - <directory>target/bundle</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.sh</exclude> - <exclude>**/*.so</exclude> - <exclude>**/*.sl</exclude> - <exclude>**/*.dylib</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>target/bundle</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>**/*.sh</include> - <include>**/*.so</include> - <include>**/*.sl</include> - <include>**/*.dylib</include> - </includes> - <fileMode>0755</fileMode> - </fileSet> - </fileSets> -</assembly> - diff --git a/etc/samples/sample-bundle/src/main/scripts/build.xml b/etc/samples/sample-bundle/src/main/scripts/build.xml deleted file mode 100644 index fed3f16..0000000 --- a/etc/samples/sample-bundle/src/main/scripts/build.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0"?> - - - -<project name="sample-bundle" basedir="." default="build"> - - <target name="build"> - -  - <property name="tmp.dir" location="${java.io.tmpdir}/${user.name}"/> - <echo>tmp.dir="${tmp.dir}"</echo> - <mkdir dir="${tmp.dir}"/> - - <get src="http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-6.0.0.M3/jboss-a…" - dest="${tmp.dir}/jbossas.zip" - usetimestamp="true"/> - <property name="jboss.home" location="target/jbossas-petstore"/> - <echo>jboss.home="${jboss.home}"</echo> - <mkdir dir="${jboss.home}"/> - <unzip src="${tmp.dir}/jbossas.zip" dest="${jboss.home}"> - <mapper> - <globmapper from="jboss-6.0.0.20100429-M3/*" to="*"/> - </mapper> - </unzip> - -  - <delete includeemptydirs="true"> - <fileset dir="${jboss.home}/server"> - <exclude name="default/**"/> - </fileset> - </delete> - -  - <delete dir="${jboss.home}/docs"/> - <delete> - <fileset dir="${jboss.home}" includes="*.*" /> - </delete> - - <property name="jboss.config.dir" location="${jboss.home}/server/default"/> - - <echo>Copying Derby JDBC driver jar to $${jboss.home}/server/default/lib/...</echo> - <copy file="${settings.localRepository}/org/apache/derby/derbyclient/${derbyclient.version}/derbyclient-${derbyclient.version}.jar" - toDir="${jboss.config.dir}/lib" failonerror="false" verbose="true" /> - -  - <copy todir="${jboss.home}"> - <fileset dir="src/main/petstore"/> - </copy> - - <mkdir dir="target/bundle"/> - -  - <zip destfile="target/bundle/jbossas-petstore.zip" basedir="${jboss.home}"/> - -  - <copy todir="target/bundle"> - <fileset dir="src/main/bundle"/> - </copy> - - </target> - -</project> - commit 358f16a670cdba71c5fa222ee2df72d7aa252a71 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jun 28 15:40:50 2010 -0400 BZ 608597 make sure we don't send hibernate proxy classes over the wire to the agent. deep copy plugin config diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java index d692ad8..c10febc 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java @@ -29,6 +29,7 @@ import org.rhq.core.clientapi.server.discovery.DiscoveryServerService; import org.rhq.core.clientapi.server.discovery.InvalidInventoryReportException; import org.rhq.core.clientapi.server.discovery.InventoryReport; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.discovery.AvailabilityReport; import org.rhq.core.domain.discovery.MergeResourceResponse; import org.rhq.core.domain.discovery.ResourceSyncInfo; @@ -183,7 +184,11 @@ public class DiscoveryServerServiceImpl implements DiscoveryServerService { pojoResource.setResourceType(resource.getResourceType()); pojoResource.setMtime(resource.getMtime()); pojoResource.setInventoryStatus(resource.getInventoryStatus()); - pojoResource.setPluginConfiguration(resource.getPluginConfiguration()); + Configuration pcCopy = resource.getPluginConfiguration(); + if (pcCopy != null) { + pcCopy = pcCopy.deepCopy(); + } + pojoResource.setPluginConfiguration(pcCopy); pojoResource.setName(resource.getName()); pojoResource.setDescription(resource.getDescription()); pojoResource.setLocation(resource.getLocation()); commit a6b088898fe2d0d2f8ac5022f80ef8d1ff41dc09 Author: hudson auto <wnstb(a)yahoo.com> Date: Mon Jun 28 12:15:10 2010 -0400 [maven-release-plugin] prepare for next development iteration diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 6d440ef..eda9133 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index dbd8dd6..bc7965b 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 1077987..2cf950b 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 751726e..ee81a94 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 78d1f23..d177f9e 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index f6fadb5..a51f92b 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 84dd23f..92ae1d2 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 96cbc8e..e0ced84 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 0df3808..0911918 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 558b9a2..d47d4c8 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index ba389df..e1ce7ef 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index a570e19..2e58102 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index c721f21..7739177 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 9e92634..eeb7e81 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 47cb583..7aad64c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index cee7efe..bc41dc5 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index f917e15..d9f1c1c 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index c569283..8942239 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 88ef26e..8b9da9c 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 6a09d32..611eb9d 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 643d41e..798a8ca 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 3068b31..df05645 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 6cd8f92..ca1b68d 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index e908b75..1beadca 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index f01ec85..0c529ba 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index a3e6434..783942c 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index bdef75c..aa880be 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index c3fc4fa..3b0dbb8 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 5e0a013..33966bd 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 57e79e7..605267f 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 1feb631..910b617 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index a4d9ed6..2ea73ee 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-webservices</artifactId> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index c2acfe1..2c98817 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index aee0070..3fd11e8 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 6956e3c..bf15866 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 4f2650b..9e7bb24 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index b05532d..dd5bc18 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 988e2e3..c0973f3 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index b9f3d0c..a62fee8 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 8a0c7c9..3193539 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index bf7fe01..e69bfbc 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 466b99a..ca33bb7 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index b743122..af75153 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 97c50f4..09839b8 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 8abb60d..73f405e 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index ce9b430..4c44f10 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 86a21ef..0033d1b 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index b83824c..61965f2 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b8bba65..7451668 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index a53f3ad..0ac61d3 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index ab30954..5a78451 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 8b6a170..2b16f4a 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 9a96ab0..e4ab9b2 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 3a96e6d..a6cba32 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 8bcdcea..9c7cc74 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 2dce331..ebdd3da 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 3fd87f6..06c8981 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 7ecbbad..aa278b8 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index cadb656..0cc2084 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 8df64c1..14738d0 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 031c90d..d056f74 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index ba37942..28dc9b1 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 762f318..a0721a9 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index e17c9d8..5d327ee 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 7006ed8..c37598e 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 851c129..cc160c9 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index f2682e9..b4f9208 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index a6f56dc..915106a 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 1e8011a..d920440 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 6ee0662..d5aaad5 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 7d98f84..30889f7 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 05ac956..b79645d 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 1c68b9b..f7cf265 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 35fd599..acb08ef 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index eddd3ed..7dd0fde 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 5d79625..65fa7b8 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 7e17c2b..853c020 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index ceb58be..a0ade77 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 54536d9..b9ed2b3 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index f276b7d..b3846fa 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index f1aa8f9..443e524 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 6bc1bfa..ac9885a 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index e488d56..d0c9053 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 37d84af..06ae2ae 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 75a1aff..1acdb0f 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 4e78da5..39c75da 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 87ba78d..97b83b0 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 4873dae..85d6105 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 1e95ca3..283ab6a 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index daf3133..5a4466c 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b0c26a5..a190dcd 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 98333bb..8f4e675 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index d0d0d63..0d41574 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 7189f74..7719b14 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index fdb421d..2d9d715 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 9c38247..3579496 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 7932012..41df1b8 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 03e2df8..205d5b0 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index cab4269..e299efa 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 4f886fd..b3d5e87 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 9a28ce8..bc96ae3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 07130df..2235687 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index efc840d..95b0dc6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 5f6ee45fc5195e90bac314de6cc918eb071e3e09 Author: hudson auto <wnstb(a)yahoo.com> Date: Mon Jun 28 12:13:23 2010 -0400 [maven-release-plugin] prepare release RHQ_3_0_0_GA_QA diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index eda9133..6d440ef 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index bc7965b..dbd8dd6 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 2cf950b..1077987 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index ee81a94..751726e 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index d177f9e..78d1f23 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index a51f92b..f6fadb5 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 92ae1d2..84dd23f 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index e0ced84..96cbc8e 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 0911918..0df3808 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index d47d4c8..558b9a2 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index e1ce7ef..ba389df 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 2e58102..a570e19 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 7739177..c721f21 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index eeb7e81..9e92634 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 7aad64c..47cb583 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index bc41dc5..cee7efe 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index d9f1c1c..f917e15 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 8942239..c569283 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 8b9da9c..88ef26e 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 611eb9d..6a09d32 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 798a8ca..643d41e 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index df05645..3068b31 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index ca1b68d..6cd8f92 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 1beadca..e908b75 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 0c529ba..f01ec85 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 783942c..a3e6434 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index aa880be..bdef75c 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 3b0dbb8..c3fc4fa 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 33966bd..5e0a013 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 605267f..57e79e7 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 910b617..1feb631 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 2ea73ee..a4d9ed6 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>rhq-remoting-webservices</artifactId> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 2c98817..c2acfe1 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 3fd11e8..aee0070 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index bf15866..6956e3c 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 9e7bb24..4f2650b 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index dd5bc18..b05532d 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index c0973f3..988e2e3 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index a62fee8..b9f3d0c 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 3193539..8a0c7c9 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index e69bfbc..bf7fe01 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index ca33bb7..466b99a 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index af75153..b743122 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 09839b8..97c50f4 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 73f405e..8abb60d 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 4c44f10..ce9b430 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 0033d1b..86a21ef 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 61965f2..b83824c 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 7451668..b8bba65 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 0ac61d3..a53f3ad 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 5a78451..ab30954 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 2b16f4a..8b6a170 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index e4ab9b2..9a96ab0 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index a6cba32..3a96e6d 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 9c7cc74..8bcdcea 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index ebdd3da..2dce331 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 06c8981..3fd87f6 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index aa278b8..7ecbbad 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 0cc2084..cadb656 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 14738d0..8df64c1 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index d056f74..031c90d 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 28dc9b1..ba37942 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index a0721a9..762f318 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 5d327ee..e17c9d8 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index c37598e..7006ed8 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index cc160c9..851c129 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index b4f9208..f2682e9 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 915106a..a6f56dc 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index d920440..1e8011a 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index d5aaad5..6ee0662 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 30889f7..7d98f84 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index b79645d..05ac956 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index f7cf265..1c68b9b 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index acb08ef..35fd599 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 7dd0fde..eddd3ed 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 65fa7b8..5d79625 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 853c020..7e17c2b 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index a0ade77..ceb58be 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index b9ed2b3..54536d9 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index b3846fa..f276b7d 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 443e524..f1aa8f9 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index ac9885a..6bc1bfa 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index d0c9053..e488d56 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 06ae2ae..37d84af 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 1acdb0f..75a1aff 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 39c75da..4e78da5 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 97b83b0..87ba78d 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 85d6105..4873dae 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 283ab6a..1e95ca3 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 5a4466c..daf3133 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index a190dcd..b0c26a5 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 8f4e675..98333bb 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 0d41574..d0d0d63 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 7719b14..7189f74 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 2d9d715..fdb421d 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 3579496..9c38247 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 41df1b8..7932012 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 205d5b0..03e2df8 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index e299efa..cab4269 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index b3d5e87..4f886fd 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index bc96ae3..9a28ce8 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 2235687..07130df 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 95b0dc6..efc840d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> <packaging>pom</packaging> <name>RHQ</name> commit 7829f810ed242a7d61e89493ecc4c135106df90a Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Mon Jun 28 11:09:34 2010 -0400 fix db used by tag-rhq-release job diff --git a/release.sh b/release.sh index e9ed4ce..2722eda 100755 --- a/release.sh +++ b/release.sh @@ -261,15 +261,15 @@ cat <<EOF >"${MAVEN_SETTINGS_FILE}" <profile> <id>release</id> <properties> - <rhq.test.ds.connection-url>jdbc:postgresql://jon03.qa.atl2.redhat.com:5432/rhq_release</rhq.test.ds.connection-url> + <rhq.test.ds.server-name>hudson-qe.rhq.rdu.redhat.com</rhq.test.ds.server-name> + <rhq.test.ds.port>5432</rhq.test.ds.port> + <rhq.test.ds.db-name>rhq_release_tag</rhq.test.ds.db-name> + <rhq.test.ds.connection-url>jdbc:postgresql://hudson-qe.rhq.rdu.redhat.com:5432/rhq_release_tag</rhq.test.ds.connection-url> <rhq.test.ds.user-name>rhqadmin</rhq.test.ds.user-name> <rhq.test.ds.password>rhqadmin</rhq.test.ds.password> <rhq.test.ds.type-mapping>PostgreSQL</rhq.test.ds.type-mapping> <rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class> <rhq.test.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.test.ds.xa-datasource-class> - <rhq.test.ds.server-name>jon03.qa.atl2.redhat.com</rhq.test.ds.server-name> - <rhq.test.ds.port>5432</rhq.test.ds.port> - <rhq.test.ds.db-name>rhq_release</rhq.test.ds.db-name> <rhq.test.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.test.ds.hibernate-dialect>  <rhq.test.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.test.quartz.driverDelegateClass> commit 0c86996f5f6e969e04960d6c61d19b30bbbd8a1e Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 28 15:19:35 2010 +0200 BZ 608064 - Postgres discovery doesn't fail if not able to connect to the server, enhanced the host and version detection to be read out of the configuration file or using the executable respectively. diff --git a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java index 825a4a3..b02d764 100644 --- a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java +++ b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java @@ -25,7 +25,12 @@ import org.jetbrains.annotations.Nullable; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.*; +import org.rhq.core.pluginapi.util.ProcessExecutionUtility; +import org.rhq.core.system.ProcessExecution; +import org.rhq.core.system.ProcessExecutionResults; import org.rhq.core.system.ProcessInfo; +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; import org.rhq.core.util.jdbc.JDBCUtil; import org.rhq.plugins.postgres.util.PostgresqlConfFile; @@ -42,6 +47,8 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @author Greg Hinkle @@ -62,7 +69,7 @@ public class PostgresDiscoveryComponent implements ResourceDiscoveryComponent, M private static final String PGDATA_ENV_VAR = "PGDATA"; private static final String DEFAULT_RESOURCE_DESCRIPTION = "Postgres relational database server"; private static final String POSTGRES_DEFAULT_DATABASE_NAME = "postgres"; - + private static final Pattern VERSION_FROM_COMMANDLINE = Pattern.compile("\\d+(?:\\.\\d+)*"); public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) { Set<DiscoveredResourceDetails> servers = new LinkedHashSet<DiscoveredResourceDetails>(); @@ -118,6 +125,14 @@ public class PostgresDiscoveryComponent implements ResourceDiscoveryComponent, M // Override the default (5432) from the descriptor. pluginConfig.put(new PropertySimple(PORT_CONFIGURATION_PROPERTY, port)); } + List<String> listenAddresses = confFile.getPropertyList("listen_addresses"); + if (listenAddresses.size() > 0) { + String listenAddress = listenAddresses.get(0).trim(); + if ("*".equals(listenAddress)) { + listenAddress = "127.0.0.1"; + } + pluginConfig.put(new PropertySimple(HOST_CONFIGURATION_PROPERTY, listenAddress)); + } } DiscoveredResourceDetails resourceDetails = createResourceDetails(context, pluginConfig, procInfo); @@ -149,7 +164,7 @@ public class PostgresDiscoveryComponent implements ResourceDiscoveryComponent, M String key = buildUrl(pluginConfiguration); Connection conn = getConnection(pluginConfiguration); String name = getServerResourceName(pluginConfiguration, conn); - String version = getVersion(pluginConfiguration, conn); + String version = getVersion(pluginConfiguration, processInfo, discoveryContext.getSystemInformation(), conn); JDBCUtil.safeClose(conn); return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, version, DEFAULT_RESOURCE_DESCRIPTION, pluginConfiguration, processInfo); @@ -163,7 +178,7 @@ public class PostgresDiscoveryComponent implements ResourceDiscoveryComponent, M return url; } - protected static String getVersion(Configuration config, Connection conn) { + protected static String getVersion(Configuration config, ProcessInfo processInfo, SystemInfo systemInfo, Connection conn) { String version = null; try { if (conn != null) { @@ -171,9 +186,27 @@ public class PostgresDiscoveryComponent implements ResourceDiscoveryComponent, M } } catch (SQLException e) { // TODO GH: How to put this back to the server while inventorying this resource in an unconfigured state - log.info("Exception detecting postgres instance", e); + log.info("Exception detecting postgres instance version.", e); } + //now try to extract the version information by asking the server executable itself + if (version == null && processInfo != null) { + try { + String postgresExe = processInfo.getExecutable().getName(); + ProcessExecution execution = new ProcessExecution(postgresExe); + execution.setArguments(new String[] { "--version" }); + execution.setCaptureOutput(true); + ProcessExecutionResults results = systemInfo.executeProcess(execution); + String versionInfo = results.getCapturedOutput(); + Matcher m = VERSION_FROM_COMMANDLINE.matcher(versionInfo); + if (m.find()) { + version = versionInfo.substring(m.start(), m.end()); + } + } catch (Exception e) { + log.info("Failed to obtain Postgres version information from the executable file.", e); + } + } + return version; } @@ -271,6 +304,9 @@ public class PostgresDiscoveryComponent implements ResourceDiscoveryComponent, M private static List<String> getDatabaseNames(Configuration config, Connection conn) { Statement statement = null; ResultSet resultSet = null; + + if (conn == null) return Collections.emptyList(); + try { List<String> ret = new ArrayList<String>(); diff --git a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/util/PostgresqlConfFile.java b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/util/PostgresqlConfFile.java index bf67db8..d4b06dd 100644 --- a/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/util/PostgresqlConfFile.java +++ b/modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/util/PostgresqlConfFile.java @@ -26,12 +26,16 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.rhq.core.util.jdbc.JDBCUtil; @@ -93,6 +97,24 @@ public class PostgresqlConfFile { return this.properties.get(paramName); } + @NotNull + public List<String> getPropertyList(String propertyName) { + String prop = getProperty(propertyName); + + if (prop == null) return Collections.emptyList(); + + return Arrays.asList(stripQuotes(prop).split(",")); + } + + @NotNull + public static String stripQuotes(@NotNull String value) { + if (value.startsWith("'") && value.endsWith("'")) { + return value.substring(1, value.length() - 1); + } + + return value; + } + @Nullable public String getPort() { return getProperty("port"); commit a4f49968b6950dad76564d8d7fda6d474bcc72e9 Merge: 9b91e02... 7621d76... Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com> Date: Mon Jun 28 14:10:50 2010 +0200 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit 9b91e02941d99a8e3b98541cb42f980c8198a442 Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com> Date: Wed Jun 16 16:04:13 2010 +0200 BZ 601880 - JBossAS5 Plugin - ApplicationServerOperationsDelegate uses old plugin configuration after plugin configuration was updated. diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java index e4a0ec9..e21153e 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java @@ -190,7 +190,7 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer public void start(ResourceContext resourceContext) { this.resourceContext = resourceContext; - + this.operationDelegate = new ApplicationServerOperationsDelegate(this); // Connect to the JBAS instance's Profile Service and JMX MBeanServer. connectToProfileService(); initializeEmsConnection(); @@ -486,10 +486,7 @@ public class ApplicationServerComponent implements ResourceComponent, ProfileSer public OperationResult invokeOperation(String name, Configuration parameters) throws InterruptedException, Exception { - if (this.operationDelegate == null) { - this.operationDelegate = new ApplicationServerOperationsDelegate(this, this.resourceContext - .getSystemInformation()); - } + ApplicationServerSupportedOperations operation = Enum.valueOf(ApplicationServerSupportedOperations.class, name .toUpperCase()); return this.operationDelegate.invoke(operation, parameters); diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java index 643c9cc..5f7ae4f 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java @@ -37,7 +37,6 @@ import org.mc4j.ems.connection.bean.parameter.EmsParameter; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; -import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.core.pluginapi.util.ProcessExecutionUtility; import org.rhq.core.system.ProcessExecution; @@ -94,25 +93,13 @@ public class ApplicationServerOperationsDelegate { */ private ApplicationServerComponent serverComponent; - private Configuration pluginConfig; - - private ResourceContext resourceContext; - private File configPath; - /** - * Passed in from the resource context for making process calls. - */ - private SystemInfo systemInfo; - // Constructors -------------------------------------------- public ApplicationServerOperationsDelegate( - ApplicationServerComponent serverComponent, SystemInfo systemInfo) { + ApplicationServerComponent serverComponent) { this.serverComponent = serverComponent; - this.resourceContext = serverComponent.getResourceContext(); - this.pluginConfig = this.resourceContext.getPluginConfiguration(); - this.systemInfo = systemInfo; } // Public -------------------------------------------- @@ -172,7 +159,7 @@ public class ApplicationServerOperationsDelegate { result.setErrorMessage("The server is already started."); return result; } - + Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); File startScriptFile = getStartScriptPath(); validateScriptFile( startScriptFile, @@ -233,7 +220,8 @@ public class ApplicationServerOperationsDelegate { if (log.isDebugEnabled()) { log.debug("About to execute the following process: [" + processExecution + "]"); } - ProcessExecutionResults results = this.systemInfo + SystemInfo systemInfo = serverComponent.getResourceContext().getSystemInformation(); + ProcessExecutionResults results = systemInfo .executeProcess(processExecution); logExecutionResults(results); @@ -258,6 +246,7 @@ public class ApplicationServerOperationsDelegate { } private String getConfigurationSet() { + Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); configPath = resolvePathRelativeToHomeDir(getRequiredPropertyValue( pluginConfig, ApplicationServerPluginConfigurationProperties.SERVER_HOME_DIR)); @@ -311,6 +300,7 @@ public class ApplicationServerOperationsDelegate { return result; } + Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); ApplicationServerShutdownMethod shutdownMethod = Enum .valueOf( ApplicationServerShutdownMethod.class, @@ -343,6 +333,7 @@ public class ApplicationServerOperationsDelegate { validateScriptFile( shutdownScriptFile, ApplicationServerPluginConfigurationProperties.SHUTDOWN_SCRIPT_CONFIG_PROP); + Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); String prefix = pluginConfig .getSimple( ApplicationServerPluginConfigurationProperties.SCRIPT_PREFIX_CONFIG_PROP) @@ -386,7 +377,8 @@ public class ApplicationServerOperationsDelegate { log.debug("About to execute the following process: [" + processExecution + "]"); } - ProcessExecutionResults results = this.systemInfo + SystemInfo systemInfo = serverComponent.getResourceContext().getSystemInformation(); + ProcessExecutionResults results = systemInfo .executeProcess(processExecution); logExecutionResults(results); @@ -413,6 +405,7 @@ public class ApplicationServerOperationsDelegate { * @return success message if no errors are encountered */ private String shutdownViaJmx() { + Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); String mbeanName = pluginConfig .getSimple( ApplicationServerPluginConfigurationProperties.SHUTDOWN_MBEAN_CONFIG_PROP) @@ -604,13 +597,15 @@ public class ApplicationServerOperationsDelegate { */ @Nullable public File getJavaHomePath() { - String javaHomePath = this.pluginConfig.getSimpleValue(ApplicationServerPluginConfigurationProperties.JAVA_HOME, + Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); + String javaHomePath = pluginConfig.getSimpleValue(ApplicationServerPluginConfigurationProperties.JAVA_HOME, null); File javaHome = (javaHomePath != null) ? new File(javaHomePath) : null; return javaHome; } void validateJavaHomePathProperty() { + Configuration pluginConfig = serverComponent.getResourceContext().getPluginConfiguration(); String javaHome = pluginConfig.getSimple( ApplicationServerPluginConfigurationProperties.JAVA_HOME) .getStringValue(); commit 7621d7695a05b2839b1c266a92566a56dc6cd76b Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jun 28 10:55:05 2010 +0200 BZ 583833 - re-show the Events icon in the MICA section. diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/view.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/view.xhtml index 8709643..8e997ef 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/view.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/view.xhtml @@ -33,31 +33,31 @@ </f:facet> <h:panelGrid columns="2" styleClass="general-props-table" columnClasses="general-prop-cell"> - + <h:panelGroup layout="block"> <b>Name: </b> #{ResourceGroupUIBean.name} </h:panelGroup> - + <h:panelGroup layout="block"> <b>Date Created: </b> <h:outputText value="#{ResourceGroupUIBean.ctime}"> <f:converter converterId="UserDateTimeConverter" /> </h:outputText> </h:panelGroup> - + <h:panelGroup layout="block"> <h:outputText value="Description: " styleClass="BoldText"/> <h:outputText value="#{ResourceGroupUIBean.description}" rendered="#{!empty ResourceGroupUIBean.description}"/> <h:outputText value="none" style="font-style: italic" rendered="#{empty ResourceGroupUIBean.description}"/> </h:panelGroup> - + <h:panelGroup layout="block"> <b>Date Last Modified: </b> <h:outputText value="#{ResourceGroupUIBean.mtime}"> <f:converter converterId="UserDateTimeConverter" /> </h:outputText> </h:panelGroup> - + <h:panelGroup layout="block"> <b>Category: </b> #{ResourceGroupUIBean.groupCategoryName} </h:panelGroup> @@ -70,8 +70,8 @@ <h:panelGroup layout="block"> <b>Recursive: </b> #{ResourceGroupUIBean.recursive} </h:panelGroup> - - <h:panelGroup layout="block" rendered="#{!empty ResourceGroupUIBean.groupDefinition and + + <h:panelGroup layout="block" rendered="#{!empty ResourceGroupUIBean.groupDefinition and GlobalPermissionsUIBean.inventory}" > <b>Group Definition: </b> <h:outputLink value="/rhq/definition/group/view.xhtml"> @@ -79,7 +79,7 @@ <h:outputText value="#{ResourceGroupUIBean.groupDefinition.name}"/> </h:outputLink> </h:panelGroup> - + </h:panelGrid> <h:form id="viewGeneralPropertiesForm"> @@ -117,13 +117,13 @@ <rich:dataGrid id="resourceTypeCounts" columns="#{ListResourceGroupMembersUIBean.numberOfColumns}" - value="#{ListResourceGroupMembersUIBean.resourceTypeCounts}" + value="#{ListResourceGroupMembersUIBean.resourceTypeCounts}" var="resourceTypeCountTuple"> <h:panelGroup layout="block" width="45%"> <h:outputText value="#{resourceTypeCountTuple.lefty}" /> (<h:outputText value="#{resourceTypeCountTuple.righty}" />) </h:panelGroup> - + </rich:dataGrid> </rich:panel> @@ -145,8 +145,8 @@ <h:outputLabel for="showRecursiveMembers" value="Show Recursive Members: " /> <h:selectBooleanCheckbox id="showRecursiveMembers" value="#{ListResourceGroupMembersUIBean.showRecursiveMembers}" > <a4j:support event="onclick" - status="commonStatus" - reRender="resourceTypeCounts, resourceGroupMembersDataTable, resourceGroupMembersDataTableScroller" + status="commonStatus" + reRender="resourceTypeCounts, resourceGroupMembersDataTable, resourceGroupMembersDataTableScroller" actionListener="#{ListResourceGroupMembersUIBean.clearDataModel}" /> </h:selectBooleanCheckbox> </h:panelGrid> @@ -173,7 +173,7 @@ <f:facet name="header"> <onc:allSelect target="selectedResources" /> </f:facet> - + <onc:select name="selectedResources" value="#{resourceWithAvailability.original.resource.id}" rendered="#{resourceWithAvailability.original.explicit}"/> </rich:column> @@ -187,36 +187,41 @@ <f:param name="id" value="#{resourceWithAvailability.original.resource.id}"/> <onc:icon name="Monitor" - url="/rhq/resource/monitor/graphs.xhtml" + url="/rhq/resource/monitor/graphs.xhtml" alt="Monitor" visible="#{monitorEnabled}"> </onc:icon> <onc:icon name="Inventory" - url="/rhq/resource/inventory/view.xhtml" + url="/rhq/resource/inventory/view.xhtml" alt="Inventory"/> <onc:icon name="Alert" - url="/rhq/resource/alert/listAlertDefinitions.xhtml" - alt="Alerts" + url="/rhq/resource/alert/listAlertDefinitions.xhtml" + alt="Alerts" visible="#{monitorEnabled}"/> <onc:icon name="Configure" - url="/rhq/resource/configuration/view.xhtml" - alt="Configure" + url="/rhq/resource/configuration/view.xhtml" + alt="Configure" visible="#{resourceWithAvailability.original.resourceFacets.configuration}"/> <onc:icon name="Operation" - url="/rhq/resource/operation/resourceOperationScheduleNew.xhtml" - alt="Operations" + url="/rhq/resource/operation/resourceOperationScheduleNew.xhtml" + alt="Operations" visible="#{resourceWithAvailability.original.resourceFacets.operation}"/> - <onc:icon name="Content" - url="/rhq/resource/content/view.xhtml" + <onc:icon name="Events" + url="/rhq/resource/events/history.xhtml" + alt="Events" + visible="#{resourceWithAvailability.original.resourceFacets.event}"/> + + <onc:icon name="Content" + url="/rhq/resource/content/view.xhtml" alt="Content" visible="#{resourceWithAvailability.original.resourceFacets.content}"/> - -  + +  <f:param name="mode" value="list"/> </onc:quickNav> @@ -267,19 +272,19 @@ <f:facet name="footer"> <rich:columnGroup> <rich:column colspan="8" width="100%"> - + <h:commandButton action="#{ListResourceGroupMembersUIBean.addNewResources}" value="ADD TO GROUP" - styleClass="on-pager-button buttonsmall" + styleClass="on-pager-button buttonsmall" rendered="#{GlobalPermissionsUIBean.inventory and !ResourceGroupUIBean.clusterGroup}" /> <onc:selectCommandButton action="#{DeleteResourcesFromGroupUIBean.removeSelectedResources}" value="REMOVE FROM GROUP" target="selectedResources" - styleClass="on-pager-button buttonsmall" + styleClass="on-pager-button buttonsmall" rendered="#{GlobalPermissionsUIBean.inventory and !ResourceGroupUIBean.clusterGroup}" /> - + <ui:param name="paginationDataTableName" value="resourceGroupMembersDataTable"/> <ui:param name="paginationDataModel" value="#{resourceGroupMembersDataModel}"/> <ui:param name="paginationPageControl" value="#{PageControl.ResourceGroupMemberList}"/> diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml index 491c13a..869b9dc 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml @@ -27,7 +27,7 @@ <ui:param name="pageTitle" value="Browse Groups"/> <ui:param name="selectedTabName" value="Groups.#{param.subtab}"/> <ui:define name="content"> - + <a4j:keepAlive beanName="BrowseGroupsUIBean"/> <a4j:form> @@ -37,7 +37,7 @@ </a4j:form> <h:form id="browseGroupsForm"> <input type="hidden" name="subtab" value="${param.subtab}"/> - + <p/> <h:panelGrid columns="3"> <h:outputText value="Search: " /> @@ -47,7 +47,7 @@ <ui:param name="defaultSearchText" value="#{param.search}" /> </ui:include> - <a4j:commandButton id="searchButtonJSF" value="GO" + <a4j:commandButton id="searchButtonJSF" value="GO" reRender="browseGroupsDataTable, browseGroupsDataTableScroller" status="commonStatus" actionListener="#{BrowseGroupsUIBean.clearDataModel}" @@ -89,38 +89,38 @@ <onc:quickNav> <ui:remove></ui:remove> <f:param name="groupId" value="#{item.resourceGroup.id}"/> - + <ui:remove>  </ui:remove> - + <onc:icon name="Monitor" url="/rhq/group/monitor/graphs.xhtml" alt="Monitor" visible="#{monitorEnabled and item.category.name eq 'COMPATIBLE'}"> <f:param name="category" value="#{item.category.name}"/> </onc:icon> - + <onc:icon name="Inventory" url="/rhq/group/inventory/view.xhtml" alt="Inventory"> <f:param name="category" value="#{item.category.name}"/> </onc:icon> - + <onc:icon name="Alert" url="/rhq/group/alert/listGroupAlertDefinitions.xhtml" alt="Alert" visible="#{monitorEnabled and item.category.name eq 'COMPATIBLE'}"/> - + <onc:icon name="Configure" url="/rhq/group/configuration/viewCurrent.xhtml" alt="Configure" visible="#{item.category.name eq 'COMPATIBLE' and item.resourceFacets.configuration}"> <f:param name="category" value="#{item.category.name}"/> </onc:icon> - + <onc:icon name="Operation" url="/rhq/group/operation/groupOperationScheduleNew.xhtml" alt="Operations" visible="#{item.category.name eq 'COMPATIBLE' and item.resourceFacets.operation}"> <f:param name="category" value="#{item.category.name}"/> </onc:icon> - + <onc:icon name="Events" url="/rhq/resource/events/history.xhtml" alt="Events" - visible="#{false and item.category.name eq 'COMPATIBLE' and + visible="#{item.category.name eq 'COMPATIBLE' and item.resourceFacets.event}"/> <onc:icon name="Content" url="/rhq/resource/content/view.xhtml" alt="Content" @@ -152,7 +152,7 @@ <h:outputText value="#{item.resourceGroup.resourceType.name}" /> </rich:column> - + <rich:column> <f:facet name="header"> <onc:sortableColumnHeader sort="resourceType.plugin"> @@ -162,7 +162,7 @@ <h:outputText value="#{item.resourceGroup.resourceType.plugin}" /> </rich:column> - + <rich:column> <f:facet name="header"> <onc:sortableColumnHeader sort="description"> @@ -180,7 +180,7 @@ </onc:sortableColumnHeader> </f:facet> - <h:outputText value="#{item.explicitFormatted}" + <h:outputText value="#{item.explicitFormatted}" escape="false" /> </rich:column> @@ -191,7 +191,7 @@ </onc:sortableColumnHeader> </f:facet> - <h:outputText value="#{item.implicitFormatted}" + <h:outputText value="#{item.implicitFormatted}" escape="false" /> </rich:column> commit 2d3f784933a13f1049b78186adacf3a88ae60e58 Author: Joseph Marques <joseph(a)redhat.com> Date: Sun Jun 27 18:15:39 2010 -0400 BZ-608057: improve performance of measurement schedules updates * refactor workflow to batch updates per agent, not per resource ** if X resources across Y agents, fix yields (X-Y) LESS roundtrips to DB ** if X resources across Y agents, fix yields (X-Y) LESS roundtrips between server and agent diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java index 5a5a829..546a020 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java @@ -242,6 +242,7 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage return findSchedulesByResourcesAndDefinitions(subject, resourceIds, new int[] { definitionId }); } + @SuppressWarnings("unchecked") public List<MeasurementSchedule> findSchedulesByResourceIdsAndDefinitionIds(int[] resourceIds, int[] definitionIds) { Query query = entityManager.createNamedQuery(MeasurementSchedule.FIND_BY_RESOURCE_IDS_AND_DEFINITION_IDS); query.setParameter("definitionIds", ArrayUtils.wrapInList(definitionIds)); @@ -250,7 +251,6 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage return results; } - @SuppressWarnings("unchecked") private List<MeasurementSchedule> findSchedulesByResourcesAndDefinitions(Subject subject, int[] resourceIds, int[] definitionIds) { for (int resourceId : resourceIds) { @@ -303,55 +303,6 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage return; } - // callers to this method need to perform authorization - private void disableSchedule(Subject subject, int resourceId, int[] measurementDefinitionIds) { - Resource resource = resourceManager.getResourceById(subject, resourceId); - - List<MeasurementSchedule> measurementSchedules = findSchedulesByResourceIdAndDefinitionIds(subject, resourceId, - measurementDefinitionIds); - ResourceMeasurementScheduleRequest resourceMeasurementScheduleRequest = new ResourceMeasurementScheduleRequest( - resourceId); - for (MeasurementSchedule measurementSchedule : measurementSchedules) { - measurementSchedule.setEnabled(false); - MeasurementScheduleRequest measurementScheduleRequest = new MeasurementScheduleRequest(measurementSchedule); - resourceMeasurementScheduleRequest.addMeasurementScheduleRequest(measurementScheduleRequest); - } - - Set<ResourceMeasurementScheduleRequest> resourceMeasurementScheduleRequests = new HashSet<ResourceMeasurementScheduleRequest>(); - resourceMeasurementScheduleRequests.add(resourceMeasurementScheduleRequest); - boolean synced = sendUpdatedSchedulesToAgent(resource.getAgent(), resourceMeasurementScheduleRequests); - if (!synced) { - resource.setAgentSynchronizationNeeded(); - } - entityManager.merge(resource); - - return; - } - - // callers to this method need to perform authorization - private void enableSchedule(Subject subject, int resourceId, int[] measurementDefinitionIds) { - Resource resource = resourceManager.getResourceById(subject, resourceId); - List<MeasurementSchedule> measurementSchedules = findSchedulesByResourceIdAndDefinitionIds(subject, resourceId, - measurementDefinitionIds); - ResourceMeasurementScheduleRequest resourceMeasurementScheduleRequest = new ResourceMeasurementScheduleRequest( - resourceId); - for (MeasurementSchedule measurementSchedule : measurementSchedules) { - measurementSchedule.setEnabled(true); - MeasurementScheduleRequest measurementScheduleRequest = new MeasurementScheduleRequest(measurementSchedule); - resourceMeasurementScheduleRequest.addMeasurementScheduleRequest(measurementScheduleRequest); - } - - Set<ResourceMeasurementScheduleRequest> resourceMeasurementScheduleRequests = new HashSet<ResourceMeasurementScheduleRequest>(); - resourceMeasurementScheduleRequests.add(resourceMeasurementScheduleRequest); - boolean synced = sendUpdatedSchedulesToAgent(resource.getAgent(), resourceMeasurementScheduleRequests); - if (!synced) { - resource.setAgentSynchronizationNeeded(); - } - entityManager.merge(resource); - - return; - } - @RequiredPermissions( { @RequiredPermission(Permission.MANAGE_INVENTORY), @RequiredPermission(Permission.MANAGE_SETTINGS) }) public void disableAllDefaultCollections(Subject subject) { @@ -546,6 +497,213 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage } } + public int updateSchedulesForContext(Subject subject, EntityContext context, int[] measurementDefinitionIds, + long collectionInterval) { + collectionInterval = verifyMinimumCollectionInterval(collectionInterval); + + String measurementScheduleSubQuery = getMeasurementScheduleSubQueryForContext(subject, context, + measurementDefinitionIds); + + String updateQuery = "" // + + "UPDATE MeasurementSchedule " // + + " SET interval = :interval, " // + + " enabled = true " // + + " WHERE id IN ( " + measurementScheduleSubQuery + " ) "; + + Query query = entityManager.createQuery(updateQuery); + query.setParameter("interval", collectionInterval); + int affectedRows = query.executeUpdate(); + + notifyAgentsOfScheduleUpdates(context, measurementScheduleSubQuery); + + return affectedRows; + } + + public int enableSchedulesForContext(Subject subject, EntityContext context, int[] measurementDefinitionIds) { + String measurementScheduleSubQuery = getMeasurementScheduleSubQueryForContext(subject, context, + measurementDefinitionIds); + + String updateQuery = "" // + + "UPDATE MeasurementSchedule " // + + " SET enabled = true " // + + " WHERE id IN ( " + measurementScheduleSubQuery + " ) "; + + Query query = entityManager.createQuery(updateQuery); + int affectedRows = query.executeUpdate(); + + notifyAgentsOfScheduleUpdates(context, measurementScheduleSubQuery); + + return affectedRows; + } + + public int disableSchedulesForContext(Subject subject, EntityContext context, int[] measurementDefinitionIds) { + String measurementScheduleSubQuery = getMeasurementScheduleSubQueryForContext(subject, context, + measurementDefinitionIds); + + String updateQuery = "" // + + "UPDATE MeasurementSchedule " // + + " SET enabled = false " // + + " WHERE id IN ( " + measurementScheduleSubQuery + " ) "; + + Query query = entityManager.createQuery(updateQuery); + int affectedRows = query.executeUpdate(); + + notifyAgentsOfScheduleUpdates(context, measurementScheduleSubQuery); + + return affectedRows; + } + + @SuppressWarnings("unchecked") + private void notifyAgentsOfScheduleUpdates(EntityContext context, String measurementScheduleSubQuery) { + + List<Integer> agentIds = new ArrayList<Integer>(); + try { + String agentsQueryString = "" // + + "SELECT DISTINCT ms.resource.agent.id " // + + " FROM MeasurementSchedule ms " // + + " WHERE ms.id IN ( " + measurementScheduleSubQuery + " ) "; + log.info("agentsQueryString: " + agentsQueryString); + Query agentsQuery = entityManager.createQuery(agentsQueryString); + agentIds = agentsQuery.getResultList(); + } catch (Throwable t) { + log.error("Could not notify agents of updates", t); + } + + // use composite query -- won't load managed entities, requires minimal wire transfer + String scheduleRequestQueryString = "" // + + "SELECT ms.resource.id, " // + + " ms.id, " // + + " ms.definition.name, " // + + " ms.interval, " // + + " ms.enabled, " // + + " ms.definition.dataType, " // + + " ms.definition.rawNumericType " // + + " FROM MeasurementSchedule ms " // + + " WHERE ms.id IN ( " + measurementScheduleSubQuery + " ) " // + + " AND ms.resource.agent.id = :agentId"; + log.info("scheduleRequestQueryString: " + scheduleRequestQueryString); + Query scheduleRequestQuery = entityManager.createQuery(scheduleRequestQueryString); + + Map<Integer, ResourceMeasurementScheduleRequest> agentRequests = new HashMap<Integer, ResourceMeasurementScheduleRequest>(); + for (int nextAgentId : agentIds) { + scheduleRequestQuery.setParameter("agentId", nextAgentId); + List<Object[]> scheduleRequests = scheduleRequestQuery.getResultList(); + for (Object[] nextScheduleDataSet : scheduleRequests) { + int resourceId = (Integer) nextScheduleDataSet[0]; + ResourceMeasurementScheduleRequest resourceRequest = agentRequests.get(resourceId); + if (resourceRequest == null) { + resourceRequest = new ResourceMeasurementScheduleRequest(resourceId); + agentRequests.put(resourceId, resourceRequest); + } + + MeasurementScheduleRequest requestData = new MeasurementScheduleRequest( // + (Integer) nextScheduleDataSet[1], // scheduleId + (String) nextScheduleDataSet[2], // definitionName, + (Long) nextScheduleDataSet[3], // interval, + (Boolean) nextScheduleDataSet[4], // enabled, + (DataType) nextScheduleDataSet[5], // dataType, + (NumericType) nextScheduleDataSet[6]); // awNumericType + resourceRequest.addMeasurementScheduleRequest(requestData); + } + + boolean markResources = false; + try { + Agent nextAgent = agentManager.getAgentByID(nextAgentId); + AgentClient agentClient = agentManager.getAgentClient(nextAgent); + + boolean couldPing = agentClient.ping(2000); // see if agent is up for sending + if (couldPing) { + Set<ResourceMeasurementScheduleRequest> requestsToSend = new HashSet<ResourceMeasurementScheduleRequest>( + agentRequests.values()); + agentClient.getMeasurementAgentService().scheduleCollection(requestsToSend); + } else { + log.error("Could not send measurement schedule updates to agent[id=" + nextAgentId + + "], marking resources for update; agent ping failed"); + markResources = true; + } + } catch (Throwable t) { + log.error("Could not send measurement schedule updates to agent[id=" + nextAgentId + + "], marking resources for update", t); + markResources = true; + } + + if (markResources) { + markResources(context, nextAgentId); + } + } + } + + private void markResources(EntityContext context, int agentId) { + ResourceCriteria criteria = new ResourceCriteria(); + if (context.category == EntityContext.Category.Resource) { + criteria.addFilterId(context.resourceId); + } else if (context.category == EntityContext.Category.ResourceGroup) { + criteria.addFilterImplicitGroupIds(context.groupId); + } else if (context.category == EntityContext.Category.AutoGroup) { + criteria.addFilterParentResourceId(context.parentResourceId); + criteria.addFilterResourceTypeId(context.resourceTypeId); + } + criteria.addFilterAgentId(agentId); + + try { + CriteriaQueryGenerator generator = new CriteriaQueryGenerator(criteria); + generator.alterProjection("resource.id"); + String resourceSubQuery = generator.getParameterReplacedQuery(false); + + String markResourceQueryString = "" // + + "UPDATE Resource res " // + + " SET res.mtime = :now " // + + " WHERE res.id IN ( " + resourceSubQuery + " ) "; + log.info("markResourceQueryString: " + markResourceQueryString); + + Query markResourceQuery = entityManager.createQuery(markResourceQueryString); + markResourceQuery.setParameter("now", System.currentTimeMillis()); + int affectedRows = markResourceQuery.executeUpdate(); + log.info("Marked " + affectedRows + " for future measurement scheudle update"); + } catch (Throwable t) { + log.error("Could not notify agents of updates", t); + } + } + + public String getMeasurementScheduleSubQueryForContext(Subject subject, EntityContext context, + int[] measurementDefinitionIds) { + if (context.category == EntityContext.Category.Resource) { + if (authorizationManager.hasResourcePermission(subject, Permission.MANAGE_MEASUREMENTS, context.resourceId) == false) { + throw new PermissionException("User [" + subject.getName() + + "] does not have permission to manage schedules for resource[id=" + context.resourceId + "]"); + } + } else if (context.category == EntityContext.Category.ResourceGroup) { + if (authorizationManager.hasGroupPermission(subject, Permission.MANAGE_MEASUREMENTS, context.groupId) == false) { + throw new PermissionException("User [" + subject.getName() + + "] does not have permission to manage schedules for resourceGroup[id=" + context.groupId + "]"); + } + } else if (context.category == EntityContext.Category.AutoGroup) { + if (authorizationManager.hasAutoGroupPermission(subject, Permission.MANAGE_MEASUREMENTS, + context.parentResourceId, context.resourceTypeId) == false) { + throw new PermissionException("User [" + subject.getName() + + "] does not have permission to manage schedules for autoGroup[parentResourceId=" + + context.parentResourceId + ", resourceTypeId=" + context.resourceTypeId + "]"); + } + } + + MeasurementScheduleCriteria criteria = new MeasurementScheduleCriteria(); + if (context.category == EntityContext.Category.Resource) { + criteria.addFilterResourceId(context.resourceId); + } else if (context.category == EntityContext.Category.ResourceGroup) { + criteria.addFilterResourceGroupId(context.groupId); + } else if (context.category == EntityContext.Category.AutoGroup) { + criteria.addFilterAutoGroupParentResourceId(context.parentResourceId); + criteria.addFilterAutoGroupResourceTypeId(context.resourceTypeId); + } + criteria.addFilterDefinitionIds(ArrayUtils.wrapInArray(measurementDefinitionIds)); + + CriteriaQueryGenerator generator = new CriteriaQueryGenerator(criteria); + generator.alterProjection("measurementschedule.id"); + String measurementScheduleSubQuery = generator.getParameterReplacedQuery(false); + + return measurementScheduleSubQuery; + } + private void setAgentSynchronizationNeededByDefinitionsForAgent(int agentId, List<Integer> measurementDefinitionIds) { String updateSQL = "" // + "UPDATE Resource res " // @@ -562,93 +720,23 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage log.info("" + updateCount + " resources mtime fields were updated as a result of this metric template update"); } - public void updateSchedules(Subject subject, int resourceId, int[] measurementDefinitionIds, long collectionInterval) { - collectionInterval = verifyMinimumCollectionInterval(collectionInterval); - Resource resource = resourceManager.getResourceById(subject, resourceId); - if (!authorizationManager.hasResourcePermission(subject, Permission.MANAGE_MEASUREMENTS, resourceId)) { - throw new PermissionException("User[" + subject.getName() - + "] does not have permission to change metric collection schedules for resource[id=" + resourceId - + "]"); - } - - List<MeasurementSchedule> measurementSchedules = findSchedulesByResourceIdAndDefinitionIds(subject, resourceId, - measurementDefinitionIds); - ResourceMeasurementScheduleRequest resourceMeasurementScheduleRequest = new ResourceMeasurementScheduleRequest( - resourceId); - for (MeasurementSchedule measurementSchedule : measurementSchedules) { - measurementSchedule.setEnabled(true); - measurementSchedule.setInterval(collectionInterval); - MeasurementScheduleRequest measurementScheduleRequest = new MeasurementScheduleRequest(measurementSchedule); - resourceMeasurementScheduleRequest.addMeasurementScheduleRequest(measurementScheduleRequest); - } - - Set<ResourceMeasurementScheduleRequest> resourceMeasurementScheduleRequests = new HashSet<ResourceMeasurementScheduleRequest>(); - resourceMeasurementScheduleRequests.add(resourceMeasurementScheduleRequest); - boolean synced = sendUpdatedSchedulesToAgent(resource.getAgent(), resourceMeasurementScheduleRequests); - if (!synced) { - resource.setAgentSynchronizationNeeded(); - } - entityManager.merge(resource); - - return; - } - - /** - * Enables all collection schedules attached to the given auto group whose schedules are based off the given - * definitions. This does not enable the "templates" (aka definitions). If the passed group does not exist an - * Exception is thrown. - * - * @param subject Subject of the caller - * @param measurementDefinitionIds the definitions on which the schedules to update are based - * @param parentResourceId the Id of the parent resource - * @param childResourceType the ID of the {@link ResourceType} of the children that form the autogroup - * @param collectionInterval the new interval - * - * @see org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal#updateSchedulesForAutoGroup(org.rhq.core.domain.auth.Subject, - * int[], int, int, long) - */ public void updateSchedulesForAutoGroup(Subject subject, int parentResourceId, int childResourceType, int[] measurementDefinitionIds, long collectionInterval) { // don't verify minimum collection interval here, it will be caught by updateMeasurementSchedules callee - List<Resource> resources = resourceGroupManager.findResourcesForAutoGroup(subject, parentResourceId, - childResourceType); - for (Resource resource : resources) { - updateSchedules(subject, resource.getId(), measurementDefinitionIds, collectionInterval); - } + updateSchedulesForContext(subject, EntityContext.forAutoGroup(parentResourceId, childResourceType), + measurementDefinitionIds, collectionInterval); } - /** - * Disable the measurement schedules for the passed definitions of the rsource ot the passed auto group. - * - * @param subject - * @param measurementDefinitionIds - * @param parentResourceId - * @param childResourceType - */ public void disableSchedulesForAutoGroup(Subject subject, int parentResourceId, int childResourceType, int[] measurementDefinitionIds) { - List<Resource> resources = resourceGroupManager.findResourcesForAutoGroup(subject, parentResourceId, - childResourceType); - for (Resource resource : resources) { - disableSchedulesForResource(subject, resource.getId(), measurementDefinitionIds); - } + disableSchedulesForContext(subject, EntityContext.forAutoGroup(parentResourceId, childResourceType), + measurementDefinitionIds); } - /** - * Enable the measurement schedules for the passed definitions of the rsource ot the passed auto group. - * - * @param subject - * @param measurementDefinitionIds - * @param parentResourceId - * @param childResourceType - */ public void enableSchedulesForAutoGroup(Subject subject, int parentResourceId, int childResourceType, int[] measurementDefinitionIds) { - List<Resource> resources = resourceGroupManager.findResourcesForAutoGroup(subject, parentResourceId, - childResourceType); - for (Resource resource : resources) { - enableSchedulesForResource(subject, resource.getId(), measurementDefinitionIds); - } + enableSchedulesForContext(subject, EntityContext.forAutoGroup(parentResourceId, childResourceType), + measurementDefinitionIds); } /** @@ -687,7 +775,7 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage agentClient.getMeasurementAgentService().updateCollection(resourceMeasurementScheduleRequest); return true; // successfully sync'ed schedules down to the agent } catch (Throwable t) { - log.error("Error updating MeasurementSchedules for Agent[id=" + agent.getId() + "]: " + t); + log.error("Error updating MeasurementSchedules for Agent[id=" + agent.getId() + "]: ", t); } return false; // catch all and presume the live sync failed } @@ -998,31 +1086,11 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage } public void disableSchedulesForResource(Subject subject, int resourceId, int[] measurementDefinitionIds) { - if (!authorizationManager.hasResourcePermission(subject, Permission.MANAGE_MEASUREMENTS, resourceId)) { - throw new PermissionException("User[" + subject.getName() - + "] does not have permission to disable metric collection schedules for resource[id=" + resourceId - + "]"); - } - - disableSchedule(subject, resourceId, measurementDefinitionIds); - - return; + disableSchedulesForContext(subject, EntityContext.forResource(resourceId), measurementDefinitionIds); } - /** - * Disable the measurement schedules for the passed definitions for the resources of the passed compatible group. - */ public void disableSchedulesForCompatibleGroup(Subject subject, int groupId, int[] measurementDefinitionIds) { - if (!authorizationManager.hasGroupPermission(subject, Permission.MANAGE_MEASUREMENTS, groupId)) { - throw new PermissionException("User[" + subject.getName() - + "] does not have permission to disable metric collection schedules for resourceGroup[id=" + groupId - + "]"); - } - - List<Integer> explicitIds = resourceManager.findExplicitResourceIdsByResourceGroup(groupId); - for (Integer resourceId : explicitIds) { - disableSchedule(subject, resourceId, measurementDefinitionIds); - } + disableSchedulesForContext(subject, EntityContext.forGroup(groupId), measurementDefinitionIds); } public void disableMeasurementTemplates(Subject subject, int[] measurementDefinitionIds) { @@ -1030,29 +1098,11 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage } public void enableSchedulesForResource(Subject subject, int resourceId, int[] measurementDefinitionIds) { - if (!authorizationManager.hasResourcePermission(subject, Permission.MANAGE_MEASUREMENTS, resourceId)) { - throw new PermissionException("User[" + subject.getName() - + "] does not have permission to enable metric collection schedules for resource[id=" + resourceId - + "]"); - } - - enableSchedule(subject, resourceId, measurementDefinitionIds); + enableSchedulesForContext(subject, EntityContext.forResource(resourceId), measurementDefinitionIds); } - /** - * Enable the measurement schedules for the passed definitions for the resources of the passed compatible group. - */ public void enableSchedulesForCompatibleGroup(Subject subject, int groupId, int[] measurementDefinitionIds) { - if (!authorizationManager.hasGroupPermission(subject, Permission.MANAGE_MEASUREMENTS, groupId)) { - throw new PermissionException("User[" + subject.getName() - + "] does not have permission to enable metric collection schedules for resourceGroup[id=" + groupId - + "]"); - } - - List<Integer> explicitIds = resourceManager.findExplicitResourceIdsByResourceGroup(groupId); - for (Integer resourceId : explicitIds) { - enableSchedule(subject, resourceId, measurementDefinitionIds); - } + enableSchedulesForContext(subject, EntityContext.forGroup(groupId), measurementDefinitionIds); } public void enableMeasurementTemplates(Subject subject, int[] measurementDefinitionIds) { @@ -1078,7 +1128,8 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage public void updateSchedulesForResource(Subject subject, int resourceId, int[] measurementDefinitionIds, long collectionInterval) { - updateSchedules(subject, resourceId, measurementDefinitionIds, collectionInterval); + updateSchedulesForContext(subject, EntityContext.forResource(resourceId), measurementDefinitionIds, + collectionInterval); } /** @@ -1097,10 +1148,8 @@ public class MeasurementScheduleManagerBean implements MeasurementScheduleManage public void updateSchedulesForCompatibleGroup(Subject subject, int groupId, int[] measurementDefinitionIds, long collectionInterval) { // don't verify minimum collection interval here, it will be caught by updateMeasurementSchedules callee - List<Integer> explicitIds = resourceManager.findExplicitResourceIdsByResourceGroup(groupId); - for (Integer resourceId : explicitIds) { - updateSchedules(subject, resourceId, measurementDefinitionIds, collectionInterval); - } + updateSchedulesForContext(subject, EntityContext.forGroup(groupId), measurementDefinitionIds, + collectionInterval); } public void updateMeasurementTemplates(Subject subject, int[] measurementDefinitionIds, long collectionInterval) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java index 12c7358..1ef3012 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java @@ -257,6 +257,13 @@ public interface MeasurementScheduleManagerLocal { PageList<MeasurementScheduleComposite> getMeasurementScheduleCompositesByContext(Subject subject, EntityContext context, PageControl pc); + int updateSchedulesForContext(Subject subject, EntityContext context, int[] measurementDefinitionIds, + long collectionInterval); + + int enableSchedulesForContext(Subject subject, EntityContext context, int[] measurementDefinitionIds); + + int disableSchedulesForContext(Subject subject, EntityContext context, int[] measurementDefinitionIds); + // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // // The following are shared with the Remote Interface commit 942920432369b0be766ae653325678d312cda0a9 Author: Joseph Marques <joseph(a)redhat.com> Date: Sun Jun 27 18:09:40 2010 -0400 BZ-608461: fix units for Hibernate statistics service "query execution max time" metric diff --git a/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml index 555d5d1..ad8a9cf 100644 --- a/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml @@ -51,7 +51,7 @@ <metric displayName="Query Execution Max Time" property="QueryExecutionMaxTime" description="The amount of time taken by the slowest recorded query since the statistics were reset" - category="performance" displayType="summary"/> + category="performance" displayType="summary" units="milliseconds" /> <metric displayName="Entity Update Count" property="EntityUpdateCount" description="The global number of entity updates since the statistics were reset" commit b54e2cab7d36311929e596afd1bc0b8f6647db2c Author: Joseph Marques <joseph(a)redhat.com> Date: Sun Jun 27 18:08:39 2010 -0400 add the ability to filter ResourceCriteria by owning agent as well as gorup membership diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java index 2a1d55d..ad52f4c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java @@ -22,6 +22,9 @@ */ package org.rhq.core.domain.criteria; +import java.util.Arrays; +import java.util.List; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; @@ -30,12 +33,8 @@ import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; -import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageOrdering; -import java.util.Arrays; -import java.util.List; - /** * @author Joseph Marques */ @@ -59,10 +58,13 @@ public class ResourceCriteria extends TaggedCriteria { private String filterParentResourceName; // needs overrides private Integer filterParentResourceTypeId; // needs overrides private String filterAgentName; // needs overrides + private Integer filterAgentId; // needs overrides private AvailabilityType filterCurrentAvailability; // needs overrides private Long filterStartItime; private Long filterEndItime; private List<Integer> filterIds; // needs overrides + private List<Integer> filterExplicitGroupIds; // requires overrides + private List<Integer> filterImplicitGroupIds; // requires overrides private boolean fetchResourceType; private boolean fetchChildResources; @@ -107,10 +109,21 @@ public class ResourceCriteria extends TaggedCriteria { filterOverrides.put("parentResourceName", "parentResource.name like ?"); filterOverrides.put("parentResourceTypeId", "parentResource.resourceType.id = ?"); filterOverrides.put("agentName", "agent.name like ?"); + filterOverrides.put("agentId", "agent.id = ?"); filterOverrides.put("currentAvailability", "currentAvailability.availabilityType = ?"); filterOverrides.put("startItime", "itime >= ?"); filterOverrides.put("endItime", "itime <= ?"); filterOverrides.put("ids", "id IN ( ? )"); + filterOverrides.put("explicitGroupIds", "" // + + "id IN ( SELECT ires.id " // + + " FROM Resource ires " // + + " JOIN ires.explicitGroups explicitGroup " // + + " WHERE explicitGroup.id IN ( ? ) )"); + filterOverrides.put("implicitGroupIds", "" // + + "id IN ( SELECT ires.id " // + + " FROM Resource ires " // + + " JOIN ires.implicitGroups implicitGroup " // + + " WHERE implicitGroup.id IN ( ? ) )"); sortOverrides.put("resourceTypeName", "resourceType.name"); sortOverrides.put("resourceCategory", "resourceType.category"); @@ -176,11 +189,15 @@ public class ResourceCriteria extends TaggedCriteria { public void addFilterParentResourceTypeId(int filterParentResourceTypeId) { this.filterParentResourceTypeId = filterParentResourceTypeId; } - + public void addFilterAgentName(String filterAgentName) { this.filterAgentName = filterAgentName; } + public void addFilterAgentId(Integer filterAgentId) { + this.filterAgentId = filterAgentId; + } + public void addFilterCurrentAvailability(AvailabilityType filterCurrentAvailability) { this.filterCurrentAvailability = filterCurrentAvailability; } @@ -197,6 +214,13 @@ public class ResourceCriteria extends TaggedCriteria { this.filterIds = Arrays.asList(filterIds); } + public void addFilterExplicitGroupIds(Integer... filterExplicitGroupIds) { + this.filterExplicitGroupIds = Arrays.asList(filterExplicitGroupIds); + } + + public void addFilterImplicitGroupIds(Integer... filterImplicitGroupIds) { + this.filterImplicitGroupIds = Arrays.asList(filterImplicitGroupIds); + } public void fetchResourceType(boolean fetchResourceType) { this.fetchResourceType = fetchResourceType; commit 0c05256ee75798d6f859dbf2a506f50fc42c63b2 Author: Joseph Marques <joseph(a)redhat.com> Date: Sun Jun 27 18:07:53 2010 -0400 add some debugging statements to InventoryManager, useful for testing "modified" resource sync logic diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java index 929a5b6..0c86f8f 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java @@ -2151,6 +2151,12 @@ public class InventoryManager extends AgentService implements ContainerService, log.info("Got unknown resource: " + syncInfo.getId()); } else { Resource resource = container.getResource(); + if (log.isDebugEnabled()) { + log.debug("Local Resource: id=" + resource.getId() + ", status=" + resource.getInventoryStatus() + + ", mtime=" + resource.getMtime()); + log.debug("Sync Resource: " + syncInfo.getId() + ", status=" + syncInfo.getInventoryStatus() + + ", mtime=" + syncInfo.getMtime()); + } if (resource.getInventoryStatus() != InventoryStatus.COMMITTED && syncInfo.getInventoryStatus() == InventoryStatus.COMMITTED) { commit 284a8fd0655a573cdc7425de35fddaf6bffc8cf7 Author: Joseph Marques <joseph(a)redhat.com> Date: Sun Jun 27 18:07:23 2010 -0400 add the ability to check if all members of some autogroup have a specified Permission diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java index 31119fa..477a128 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java @@ -111,6 +111,19 @@ import org.rhq.core.domain.util.Recordizable; + "FROM Resource res, IN (res.implicitGroups) g, IN (g.roles) r, IN (r.subjects) s, IN (r.permissions) p " + "WHERE s = :subject AND res.id = :resourceId AND p = :permission"), + @NamedQuery(name = Subject.QUERY_HAS_AUTO_GROUP_PERMISSION, query = "" // + + "SELECT COUNT(res.id) " // + + " FROM Resource res " // + + " WHERE res.parentResource.id = :parentResourceId " // + + " AND res.resourceType.id = :resourceTypeId " // + + " AND ( :subjectId = -1 OR res.id IN ( SELECT ires " // + + " FROM Resource ires " // + + " JOIN ires.implicitGroups g " // + + " JOIN g.roles r " // + + " JOIN r.permissions p " // + + " JOIN r.subjects s " // + + " WHERE s.id = :subjectId and p = :permission ) ) "), + @NamedQuery(name = Subject.QUERY_CAN_VIEW_RESOURCE, query = "SELECT COUNT(res) " + "FROM Resource res, IN (res.implicitGroups) g, IN (g.roles) r, IN (r.subjects) s " + "WHERE s = :subject AND res.id = :resourceId"), @@ -198,6 +211,7 @@ public class Subject implements Serializable, Recordizable { public static final String QUERY_HAS_GLOBAL_PERMISSION = "Subject.hasGlobalPermission"; public static final String QUERY_HAS_GROUP_PERMISSION = "Subject.hasGroupPermission"; public static final String QUERY_HAS_RESOURCE_PERMISSION = "Subject.hasResourcePermission"; + public static final String QUERY_HAS_AUTO_GROUP_PERMISSION = "Subject.hasAutoGroupPermission"; public static final String QUERY_CAN_VIEW_RESOURCE = "Subject.canViewResource"; public static final String QUERY_CAN_VIEW_RESOURCES = "Subject.canViewResources"; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java index dccedaa..d675177 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java @@ -138,6 +138,31 @@ public class AuthorizationManagerBean implements AuthorizationManagerLocal { return (count != 0); } + public boolean hasAutoGroupPermission(Subject subject, Permission permission, int parentResourceId, + int resourceTypeId) { + if (isInventoryManager(subject)) { + return true; + } + + Query query = entityManager.createNamedQuery(Subject.QUERY_HAS_AUTO_GROUP_PERMISSION); + query.setParameter("permission", permission); + query.setParameter("parentResourceId", parentResourceId); + query.setParameter("resourceTypeId", resourceTypeId); + + query.setParameter("subject", -1); + long baseCount = (Long) query.getSingleResult(); + + query.setParameter("subject", subject); + long subjectCount = (Long) query.getSingleResult(); + + /* + * an auto-group is viewable if the count of resources with parent/type filters is identical + * to the count of those same resources additionally filtered by standard authorization + * + */ + return (baseCount == subjectCount); + } + public boolean canViewResource(Subject subject, int resourceId) { if (isInventoryManager(subject)) { return true; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java index cbf8cc4..5f04458 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java @@ -120,6 +120,20 @@ public interface AuthorizationManagerLocal { boolean hasGroupPermission(Subject subject, Permission permission, int groupId); /** + * Returns true if the current user possesses either: 1) the specified resource permission for the specified + * auto-group, or 2) the global MANAGE_INVENTORY permission which, by definition, gives full access to the + * inventory (all resources and all groups) + * + * @param subject the current subject or caller + * @param permission a resource permission (i.e. permission.getTarget() == Permission.Target.RESOURCE) + * @param parentResourceId the id of the parent resource of the auto-group to check permissions against + * @param parentResourceId the id of the resource type filter of the auto-group to check permissions against + * + * @return true if the current user possesses the specified resource permission for the specified auto-group + */ + boolean hasAutoGroupPermission(Subject subject, Permission permission, int parentResourceId, int resourceTypeId); + + /** * Returns true if the current user possesses the specified global permission. * * @param subject the current subject or caller commit f2ba4a8dd48621dbb6ff0da1beeeadcadbaa359d Author: Joseph Marques <joseph(a)redhat.com> Date: Sun Jun 27 18:06:49 2010 -0400 add method to obtain the full, parameter-replaced SQL for criteria queries diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java index 6902fad..cb10f56 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.Map; import javax.persistence.EntityManager; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.Query; import org.apache.commons.logging.Log; @@ -198,8 +200,83 @@ public final class CriteriaQueryGenerator { } } - // for testing purposes only, should use getQuery(EntityManager) or getCountQuery(EntityManager) instead + public String getParameterReplacedQuery(boolean countQuery) { + String query = getQueryString(countQuery); + + for (Map.Entry<String, Object> critField : getFilterFields(criteria).entrySet()) { + Object value = critField.getValue(); + + if (value instanceof Tag) { + Tag tag = (Tag) value; + query = query.replace(":tagNamespace", tag.getNamespace()); + query = query.replace(":tagSemantic", tag.getSemantic()); + query = query.replace(":tagName", tag.getName()); + + } else { + value = getParameterReplacedValue(value); + if (LOG.isDebugEnabled()) { + LOG.debug("Bind: (" + critField.getKey() + ", " + value + ")"); + } + query = query.replace(":" + critField.getKey(), String.valueOf(value)); + } + } + + if (null != this.authorizationPermsFragment) { + List<Permission> requiredPerms = this.criteria.getRequiredPermissions(); + String perms = requiredPerms.toString(); // [data1, data, data3] + query = query.replace(":requiredPerms", perms.subSequence(1, perms.length() - 1)); // remove first/last characters + query = query.replace(":requiredPermsSize", String.valueOf(requiredPerms.size())); + } + + return query; + } + + private String getParameterReplacedValue(Object value) { + String returnValue = null; + if (value instanceof String) { + returnValue = "'" + prepareStringBindValue((String) value) + "'"; + } else if (value instanceof Enum) { + // note: this strategy won't work for entities with multiple enums that are persisted differently + EnumType type = getPersistenceEnumType(value.getClass()); + if (type == EnumType.STRING) { + returnValue = "'" + String.valueOf(value) + "'"; + } else { + returnValue = String.valueOf(value); + } + } else if (value instanceof List<?>) { + List<?> valueList = (List<?>) value; + StringBuilder results = new StringBuilder(); + boolean first = true; + for (Object nextValue : valueList) { + if (first) { + first = false; + } else { + results.append(","); + } + results.append(getParameterReplacedValue(nextValue)); + } + returnValue = results.toString(); + } else { + returnValue = String.valueOf(value); + } + return returnValue; + } + + // calculates @Enumerated(EnumType.STRING) or @Enumerated(EnumType.ORDINAL) + private EnumType getPersistenceEnumType(Class<?> enumFieldType) { + for (Field nextField : getClass().getFields()) { + nextField.setAccessible(true); + if (nextField.getType().equals(enumFieldType)) { + Enumerated enumeratedAnnotation = nextField.getAnnotation(Enumerated.class); + if (enumeratedAnnotation != null) { + return enumeratedAnnotation.value(); + } + } + } + return EnumType.STRING; // catch-all + } + // for testing purposes only, should use getQuery(EntityManager) or getCountQuery(EntityManager) instead public String getQueryString(boolean countQuery) { StringBuilder results = new StringBuilder(); results.append("SELECT "); @@ -555,7 +632,6 @@ public final class CriteriaQueryGenerator { } private void setBindValues(Query query, boolean countQuery) { - for (Map.Entry<String, Object> critField : getFilterFields(criteria).entrySet()) { Object value = critField.getValue(); commit 31c7e5b4df28c8290af3a9ffe6c669c223daf12d Author: Joseph Marques <joseph(a)redhat.com> Date: Sun Jun 27 18:05:08 2010 -0400 add new "schedules" agent prompt command, which was useful for testing BZ-608487 diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/measurement/MeasurementAgentService.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/measurement/MeasurementAgentService.java index 522ff87..66a5524 100644 --- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/measurement/MeasurementAgentService.java +++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/measurement/MeasurementAgentService.java @@ -1,31 +1,33 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * 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 and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.clientapi.agent.measurement; +import java.util.Map; import java.util.Set; + +import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.ResourceMeasurementScheduleRequest; -import org.rhq.core.domain.measurement.DataType; /** * The interface to a JON Agent's measurement (i.e. metric collection) subsystem. @@ -74,5 +76,5 @@ public interface MeasurementAgentService { */ Set<MeasurementData> getRealTimeMeasurementValue(int resourceId, DataType dataType, String... measurementNames); - Set<Integer> getMeasurementScheduleIdsForResource(int resourceId); + Map<String, Object> getMeasurementScheduleInfoForResource(int resourceId); } \ No newline at end of file diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java index c0ff275..b58f607 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java @@ -405,7 +405,8 @@ public class MeasurementManager extends AgentService implements MeasurementAgent return Collections.emptySet(); } MeasurementFacet measurementFacet; - ResourceContainer resourceContainer = PluginContainer.getInstance().getInventoryManager().getResourceContainer(resourceId); + ResourceContainer resourceContainer = PluginContainer.getInstance().getInventoryManager().getResourceContainer( + resourceId); if (resourceContainer == null) { LOG.warn("Can not get resource container for resource with id " + resourceId); return null; @@ -520,16 +521,21 @@ public class MeasurementManager extends AgentService implements MeasurementAgent return perMinuteValue; } - public synchronized Set<Integer> getMeasurementScheduleIdsForResource(int resourceId) { - Set<Integer> ids = new HashSet<Integer>(); + public Map<String, Object> getMeasurementScheduleInfoForResource(int resourceId) { + Map<String, Object> results = null; - for (ScheduledMeasurementInfo info : scheduledRequests) { + for (ScheduledMeasurementInfo info : new PriorityQueue<ScheduledMeasurementInfo>(scheduledRequests)) { if (info.getResourceId() == resourceId) { - ids.add(info.getScheduleId()); + if (results == null) { + results = new HashMap<String, Object>(); + } + String scheduleId = String.valueOf(info.getScheduleId()); + String interval = String.valueOf(info.getInterval()) + "ms"; + results.put(scheduleId, interval); } } - return ids; + return results; } // -- MBean monitoring methods diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index b5d1223..b6ccd8b 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -120,6 +120,7 @@ import org.rhq.enterprise.agent.promptcmd.PiqlPromptCommand; import org.rhq.enterprise.agent.promptcmd.PluginContainerPromptCommand; import org.rhq.enterprise.agent.promptcmd.PluginsPromptCommand; import org.rhq.enterprise.agent.promptcmd.RegisterPromptCommand; +import org.rhq.enterprise.agent.promptcmd.SchedulesPromptCommand; import org.rhq.enterprise.agent.promptcmd.SenderPromptCommand; import org.rhq.enterprise.agent.promptcmd.SetConfigPromptCommand; import org.rhq.enterprise.agent.promptcmd.SetupPromptCommand; @@ -2959,7 +2960,8 @@ public class AgentMain { new AvailabilityPromptCommand(), new PiqlPromptCommand(), new IdentifyPromptCommand(), new LogPromptCommand(), new TimerPromptCommand(), new PingPromptCommand(), new DownloadPromptCommand(), new DumpSpoolPromptCommand(), new SenderPromptCommand(), new FailoverPromptCommand(), - new UpdatePromptCommand(), new DebugPromptCommand(), new SleepPromptCommand(), new GCPromptCommand() }; + new UpdatePromptCommand(), new DebugPromptCommand(), new SleepPromptCommand(), new GCPromptCommand(), + new SchedulesPromptCommand() }; // hold the conflicts StringBuilder conflicts = new StringBuilder(); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index 7967b47..de3acca 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -769,6 +769,21 @@ public interface AgentI18NResourceKeys { @I18NMessage("Failed to perform sender command; stack trace follows:") String SENDER_FAILURE = "PromptCommand.sender.failure"; + @I18NMessage("schedules") + String SCHEDULES = "PromptCommand.schedules"; + + @I18NMessage("Retrieves measurement schedule information for the specified resource") + String SCHEDULES_HELP = "PromptCommand.schedules.help"; + + @I18NMessage("schedules <resourceId>") + String SCHEDULES_SYNTAX = "PromptCommand.schedules.syntax"; + + @I18NMessage("This agent does not manage a resource with id {0}") + String SCHEDULES_UNKNOWN_RESOURCE = "PromptCommand.schedules.unknown-resource"; + + @I18NMessage("Failed to perform schedules command; stack trace follows:") + String SCHEDULES_FAILURE = "PromptCommand.schedules.failure"; + @I18NMessage("exit") String EXIT = "PromptCommand.exit"; diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SchedulesPromptCommand.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SchedulesPromptCommand.java new file mode 100644 index 0000000..b1c95c3 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SchedulesPromptCommand.java @@ -0,0 +1,80 @@ +package org.rhq.enterprise.agent.promptcmd; + +import java.io.PrintWriter; +import java.util.Map; + +import mazz.i18n.Msg; + +import org.rhq.core.pc.PluginContainer; +import org.rhq.core.pc.measurement.MeasurementManager; +import org.rhq.enterprise.agent.AgentMain; +import org.rhq.enterprise.agent.StringUtil; +import org.rhq.enterprise.agent.i18n.AgentI18NFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +public class SchedulesPromptCommand implements AgentPromptCommand { + private static final Msg MSG = AgentI18NFactory.getMsg(); + + /** + * @see AgentPromptCommand#getPromptCommandString() + */ + public String getPromptCommandString() { + return MSG.getMsg(AgentI18NResourceKeys.SCHEDULES); + } + + /** + * @see AgentPromptCommand#execute(AgentMain, String[]) + */ + public boolean execute(AgentMain agent, String[] args) { + PrintWriter out = agent.getOut(); + + try { + if (args.length != 2) { + out.println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax())); + } else { + try { + int resourceId = Integer.parseInt(args[1]); + MeasurementManager measurementManager = PluginContainer.getInstance().getMeasurementManager(); + Map<String, Object> nameValuePairs = measurementManager + .getMeasurementScheduleInfoForResource(resourceId); + + if (nameValuePairs == null) { + // take string value so resourceId is rendered literally, instead of numerical formatting + out.println(MSG.getMsg(AgentI18NResourceKeys.SCHEDULES_UNKNOWN_RESOURCE, String + .valueOf(resourceId))); + } else { + out.println(StringUtil.justifyKeyValueStrings(nameValuePairs)); + } + } catch (NumberFormatException nfe) { + out.println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax())); + } + } + } catch (Exception e) { + out.println(MSG.getMsg(AgentI18NResourceKeys.SCHEDULES_FAILURE)); + e.printStackTrace(out); + } + + return true; + } + + /** + * @see AgentPromptCommand#getSyntax() + */ + public String getSyntax() { + return MSG.getMsg(AgentI18NResourceKeys.SCHEDULES_SYNTAX); + } + + /** + * @see AgentPromptCommand#getHelp() + */ + public String getHelp() { + return MSG.getMsg(AgentI18NResourceKeys.SCHEDULES_HELP); + } + + /** + * @see AgentPromptCommand#getDetailedHelp() + */ + public String getDetailedHelp() { + return getHelp(); + } +} diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java index 3b0c439..b279a5a 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java @@ -21,6 +21,7 @@ package org.rhq.enterprise.server.resource.metadata.test; import java.io.FileNotFoundException; import java.net.URL; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.UUID; @@ -159,15 +160,13 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test { protected Resource getResource(ResourceCriteria resourceCriteria) { Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - PageList<Resource> results = resourceManager - .findResourcesByCriteria(overlord, resourceCriteria); + PageList<Resource> results = resourceManager.findResourcesByCriteria(overlord, resourceCriteria); if (results.size() == 0) { return null; } else if (results.size() == 1) { return results.get(0); } else { - throw new IllegalStateException("Found more than one Resource with criteria " + resourceCriteria - + "."); + throw new IllegalStateException("Found more than one Resource with criteria " + resourceCriteria + "."); } } @@ -193,8 +192,8 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test { } else { testPlugin.setVersion(descriptor.getVersion()); } - metadataManager.registerPlugin(LookupUtil.getSubjectManager().getOverlord(), testPlugin, descriptor, null, - true); + metadataManager + .registerPlugin(LookupUtil.getSubjectManager().getOverlord(), testPlugin, descriptor, null, true); } protected void registerPlugin(String pathToDescriptor) throws Exception { @@ -288,7 +287,7 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test { } - public Set<Integer> getMeasurementScheduleIdsForResource(int resourceId) { + public Map<String, Object> getMeasurementScheduleInfoForResource(int resourceId) { return null; } } @@ -296,7 +295,7 @@ public class UpdateSubsytemTestBase extends AbstractEJB3Test { protected void cleanupTest() throws Exception { try { String pathToDescriptor = COMMON_PATH_PREFIX + "/noTypes.xml"; - registerPluginInternal(pathToDescriptor, null); + registerPluginInternal(pathToDescriptor, null); /*cleanupResourceType("constraintPlatform"); cleanupResourceType("events"); diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java index b2b96d2..a02e6cf 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java @@ -20,6 +20,7 @@ package org.rhq.enterprise.server.test; import java.io.InputStream; import java.util.List; +import java.util.Map; import java.util.Set; import org.rhq.core.clientapi.agent.PluginContainerException; @@ -41,14 +42,14 @@ import org.rhq.core.clientapi.agent.operation.CancelResults; import org.rhq.core.clientapi.agent.operation.OperationAgentService; import org.rhq.core.clientapi.agent.support.SupportAgentService; import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; +import org.rhq.core.clientapi.server.content.ContentDiscoveryReport; import org.rhq.core.clientapi.server.content.DeletePackagesRequest; +import org.rhq.core.clientapi.server.content.DeployPackagesRequest; import org.rhq.core.clientapi.server.content.RetrievePackageBitsRequest; import org.rhq.core.clientapi.server.discovery.InventoryReport; import org.rhq.core.communications.command.annotation.Asynchronous; import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.clientapi.server.content.ContentDiscoveryReport; import org.rhq.core.domain.content.transfer.DeployPackageStep; -import org.rhq.core.clientapi.server.content.DeployPackagesRequest; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; import org.rhq.core.domain.discovery.AvailabilityReport; import org.rhq.core.domain.discovery.MergeResourceResponse; @@ -137,7 +138,7 @@ public class TestAgentClient implements AgentClient, BundleAgentService, Content public void updateCollection(Set<ResourceMeasurementScheduleRequest> resourceSchedules) { } - public Set<Integer> getMeasurementScheduleIdsForResource(int resourceId) { + public Map<String, Object> getMeasurementScheduleInfoForResource(int resourceId) { return null; } commit 44e97f20fd026fc660d38d819497cb843a353384 Author: Joseph Marques <joseph(a)redhat.com> Date: Sun Jun 27 18:04:02 2010 -0400 BZ-608487: fix sync logic by always sending an InventoryReport to the server diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java index 0f77b05..929a5b6 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java @@ -862,9 +862,6 @@ public class InventoryManager extends AgentService implements ContainerService, if (!configuration.isInsideAgent()) { return true; } - if (report.getAddedRoots().isEmpty()) { - return true; // nothing to do - } ResourceSyncInfo syncInfo; try { commit fde3f073e809cbda96d5ae81ff393256c6dbcdae Author: Simeon Pinder <spinder(a)redhat.com> Date: Sat Jun 26 09:38:41 2010 -0400 moving sample blob out of server jar into test. diff --git a/modules/enterprise/server/jar/src/main/resources/binary-blob-sample.jar b/modules/enterprise/server/jar/src/main/resources/binary-blob-sample.jar deleted file mode 100644 index 0a629ec..0000000 Binary files a/modules/enterprise/server/jar/src/main/resources/binary-blob-sample.jar and /dev/null differ diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java index 8745b1c..3160074 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java @@ -276,7 +276,7 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test { // contents into memory every time. //any jar should be fine. Use generated server jar - File originalBinary = new File("./src/main/resources/binary-blob-sample.jar"); + File originalBinary = new File("./src/test/resources/binary-blob-sample.jar"); //destination once pulled from db File retrieved = new File("./target/pulled.jar"); if (retrieved.exists()) { diff --git a/modules/enterprise/server/jar/src/test/resources/binary-blob-sample.jar b/modules/enterprise/server/jar/src/test/resources/binary-blob-sample.jar new file mode 100644 index 0000000..0a629ec Binary files /dev/null and b/modules/enterprise/server/jar/src/test/resources/binary-blob-sample.jar differ commit f4095c7263e34a34adec649cf04ea181aba1509c Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Jun 25 19:26:36 2010 -0400 BZ 597246: added persist. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java index f1883df..2c01712 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java @@ -1235,6 +1235,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe PackageVersion newPackageVersion = new PackageVersion(existingPackage, version, architecture); newPackageVersion.setDisplayName(existingPackage.getName()); + entityManager.persist(newPackageVersion); Map<String, String> contentDetails = new HashMap<String, String>(); PackageBits bits = loadPackageBits(packageBitStream, newPackageVersion.getId(), packageName, version, null, @@ -1602,8 +1603,8 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe //associate the two if located if (pv != null) {//np check. pv.setPackageBits(bits); + entityManager.flush(); } - entityManager.flush(); // push the new package bits row to the DB bits = entityManager.find(PackageBits.class, bits.getId()); commit 8059d650aace4fcd408f476f86901b482a66b8bb Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Jun 25 18:32:44 2010 -0400 adding missing npe check, for test scenarios. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java index 6ee805e..f1883df 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java @@ -1599,8 +1599,10 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe //locate related packageVersion PackageVersion pv = entityManager.find(PackageVersion.class, packageVersionId); - //associate the two - pv.setPackageBits(bits); + //associate the two if located + if (pv != null) {//np check. + pv.setPackageBits(bits); + } entityManager.flush(); // push the new package bits row to the DB bits = entityManager.find(PackageBits.class, bits.getId()); commit 015ef23663c5fea4440e829885f601155215b1b9 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Jun 25 18:07:52 2010 -0400 unit test fix for blob test. diff --git a/modules/enterprise/server/jar/src/main/resources/binary-blob-sample.jar b/modules/enterprise/server/jar/src/main/resources/binary-blob-sample.jar new file mode 100644 index 0000000..0a629ec Binary files /dev/null and b/modules/enterprise/server/jar/src/main/resources/binary-blob-sample.jar differ diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java index 5f73b89..8745b1c 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java @@ -276,7 +276,7 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test { // contents into memory every time. //any jar should be fine. Use generated server jar - File originalBinary = new File("./target/rhq-enterprise-server.jar"); + File originalBinary = new File("./src/main/resources/binary-blob-sample.jar"); //destination once pulled from db File retrieved = new File("./target/pulled.jar"); if (retrieved.exists()) { commit efd417bb1ba4278c8be08293afd403c643b51f56 Author: Joseph Marques <joseph(a)redhat.com> Date: Fri Jun 25 17:52:16 2010 -0400 add method to quickly take a snapshot of all measurement-related tables diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp index 49c32af..50af6a6 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp @@ -1,5 +1,6 @@ <%@ page import="java.io.ByteArrayOutputStream" %> <%@ page import="java.io.PrintStream" %> +<%@ page import="java.util.Map" %> <%@ page import="org.rhq.core.domain.auth.Subject" %> <%@ page import="org.rhq.core.server.PersistenceUtility" %> @@ -208,6 +209,18 @@ serverPlugins.purgeServerPlugin(subjectManager.getOverlord(), key); result = "OK - you can now try to re-register a plugin with the name [" + serverPluginName + "]"; } + + else if ("snapshotMeasurementTables".equals(mode)) + { + result = "<table>"; + Map<String, Long> tableCounts = measurementTestBean.snapshotMeasurementTables(); + for (Map.Entry<String, Long> nextCount : tableCounts.entrySet()) { + String tableAlias = nextCount.getKey(); + Long tableCount = nextCount.getValue(); + result += "<tr><td>" + tableAlias + "</td><td>" + tableCount + "</td></tr>"; + } + result += "</table>"; + } else if ("typeManagerRemote".equals(mode)) { int typeId = Integer.parseInt(request.getParameter("typeId")); @@ -328,6 +341,8 @@ Send New Platform Inventory Report <a href="<c:out value="${url}"/>">Force calculation of OOBs</a></li> <li><c:url var="url" value="/admin/test/control.jsp?mode=errorCorrectSchedules"/> <a href="<c:out value="${url}"/>">Error-Correct Measurement Schedules</a></li> + <li><c:url var="url" value="/admin/test/control.jsp?mode=snapshotMeasurementTables"/> + <a href="<c:out value="${url}"/>">Snapshot Measurement Tables</a></li> </ul> <h2>Alerts</h2> diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestBean.java index ce40d90..d093f5d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestBean.java @@ -18,18 +18,31 @@ */ package org.rhq.enterprise.server.test; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.util.Calendar; import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Map; import java.util.Set; +import javax.annotation.PostConstruct; import javax.ejb.EJB; import javax.ejb.Stateless; import javax.persistence.EntityManager; import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.Query; +import javax.sql.DataSource; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.rhq.core.clientapi.server.measurement.MeasurementServerService; +import org.rhq.core.db.DatabaseType; +import org.rhq.core.db.DatabaseTypeFactory; +import org.rhq.core.db.OracleDatabaseType; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.measurement.MeasurementDataNumeric; @@ -43,6 +56,7 @@ import org.rhq.core.domain.measurement.ResourceMeasurementScheduleRequest; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.util.jdbc.JDBCUtil; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal; import org.rhq.enterprise.server.measurement.MeasurementServerServiceImpl; @@ -52,20 +66,41 @@ import org.rhq.enterprise.server.util.LookupUtil; * An EJB for testing the measurement subsystem - used by TestControl.jsp. */ @Stateless +(a)javax.annotation.Resource(name = "RHQ_DS", mappedName = RHQConstants.DATASOURCE_JNDI_NAME) public class MeasurementTestBean implements MeasurementTestLocal { + private final Log log = LogFactory.getLog(MeasurementTestBean.class); + private static final String FAKE_PLATFORM_NAME = "Fake Platform"; @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) EntityManager entityManager; + @javax.annotation.Resource(name = "RHQ_DS") + private DataSource rhqDs; + private DatabaseType databaseType; + private MeasurementServerService measurementServerService = new MeasurementServerServiceImpl(); @EJB private MeasurementScheduleManagerLocal measurementScheduleManager; + @PostConstruct + public void init() { + Connection conn = null; + try { + conn = rhqDs.getConnection(); + databaseType = DatabaseTypeFactory.getDatabaseType(conn); + } catch (Exception e) { + throw new RuntimeException(e); + } finally { + JDBCUtil.safeClose(conn); + } + } + /** * Send a test measurement report, full of lots of fake metrics, to the server. */ + @SuppressWarnings("deprecation") public void sendTestMeasurementReport() { Resource res = setupFakePlatformIfNeeded(); Set<ResourceMeasurementScheduleRequest> scheds; @@ -152,4 +187,83 @@ public class MeasurementTestBean implements MeasurementTestLocal { LookupUtil.getAlertConditionCacheManager().checkConditions(numericData); } + + public Map<String, Long> snapshotMeasurementTables() { + String snapshotQuery = "" // + + "select" // + + "(select count(*) from rhq_meas_data_num_r00) as r00," // + + "(select count(*) from rhq_meas_data_num_r01) as r01," // + + "(select count(*) from rhq_meas_data_num_r02) as r02," // + + "(select count(*) from rhq_meas_data_num_r03) as r03," // + + "(select count(*) from rhq_meas_data_num_r04) as r04," // + + "(select count(*) from rhq_meas_data_num_r05) as r05," // + + "(select count(*) from rhq_meas_data_num_r06) as r06," // + + "(select count(*) from rhq_meas_data_num_r07) as r07," // + + "(select count(*) from rhq_meas_data_num_r08) as r08," // + + "(select count(*) from rhq_meas_data_num_r09) as r09," // + + "(select count(*) from rhq_meas_data_num_r10) as r10," // + + "(select count(*) from rhq_meas_data_num_r11) as r11," // + + "(select count(*) from rhq_meas_data_num_r12) as r12," // + + "(select count(*) from rhq_meas_data_num_r13) as r13," // + + "(select count(*) from rhq_meas_data_num_r14) as r14," // + + "(select count(*) from rhq_measurement_data_num_1h) as oneHour," // + + "(select count(*) from rhq_measurement_data_num_6h) as sixHour," // + + "(select count(*) from rhq_measurement_data_num_1d) as oneDay," // + + "(select count(*) from rhq_measurement_data_trait) as trait," // + + "(select count(*) from rhq_measurement_bline) as bline," // + + "(select count(*) from rhq_measurement_oob) as oob," // + + "(select count(*) from rhq_measurement_oob_tmp) as oob_temp," // + + "(select count(*) from rhq_calltime_data_key) as callkey," // + + "(select count(*) from rhq_calltime_data_value) as calldata," // + + "(select count(ms.id) from rhq_measurement_sched ms" // + + " join rhq_measurement_def md on ms.definition = md.id" // + + " where ms.enabLed = true and md.data_type=0) as enabledMetricSchedules," // + + "(select count(ms.id) from rhq_measurement_sched ms" // + + " join rhq_measurement_def md on ms.definition = md.id" // + + " where ms.enabLed = true and md.data_type=1) as enabledTraitSchedules," // + + "(select count(ms.id) from rhq_measurement_sched ms" // + + " join rhq_measurement_def md on ms.definition = md.id" // + + " where ms.enabLed = true and md.data_type=3) as enabledCalltimeSchedules"; + + String querySuffix = ";"; + if (databaseType instanceof OracleDatabaseType) { + querySuffix = "from dual;"; + } + + Map<String, Long> results = new LinkedHashMap<String, Long>(); + + Connection conn = null; + PreparedStatement ps = null; + ResultSet rs = null; + try { + conn = rhqDs.getConnection(); + ps = conn.prepareStatement(snapshotQuery + querySuffix); + rs = ps.executeQuery(); + + String[] columnNames = { "r00", "r01", "r02", "r03", "r04", "r05", "r06", "r07", "r08", "r09", "r10", + "r11", "r12", "r13", "r14", "oneHour", "sixHour", "oneDay", "trait", "bline", "oob", "oob_temp", + "callkey", "calldata", "enabledMetricSchedules", "enabledTraitSchedules", "enabledCalltimeSchedules" }; + if (rs.next()) { + for (String nextColumn : columnNames) { + Long nextValue = rs.getLong(nextColumn); + results.put(nextColumn, nextValue); + } + } + } catch (Throwable t) { + log.error("Could not snapshot measurement tables", t); + } finally { + JDBCUtil.safeClose(conn, ps, rs); + } + + return results; + } + + public static void main(String[] args) { + Map<String, Long> results = new MeasurementTestBean().snapshotMeasurementTables(); + for (Map.Entry<String, Long> nextCount : results.entrySet()) { + String tableAlias = nextCount.getKey(); + Long tableCount = nextCount.getValue(); + + } + } } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestLocal.java index 1ed6b64..616bcbe 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestLocal.java @@ -18,10 +18,12 @@ */ package org.rhq.enterprise.server.test; +import java.util.Map; + import javax.ejb.Local; /** - * An EJB for testing the measurement subsystem - used by TestControl.jsp. + * An EJB for testing the measurement subsystem - used by control.jsp */ @Local public interface MeasurementTestLocal { @@ -30,4 +32,6 @@ public interface MeasurementTestLocal { void addProblemResource(); void setAgentCurrentlyScheduledMetrics(double value); + + Map<String, Long> snapshotMeasurementTables(); } \ No newline at end of file commit ac9f562c813923aff0b07fbac50ad5d07d3aa34e Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jun 25 17:44:31 2010 -0400 do not require user to pass in rhq.deploy.id prop; print a friendly error message if user does not pass in the rhq.deploy.dir prop diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntMain.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntMain.java index 84e6649..8c00839 100644 --- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntMain.java +++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntMain.java @@ -612,6 +612,10 @@ public class AntMain implements org.apache.tools.ant.launch.AntMain { } // RHQ + String deployIdString = definedProps.getProperty(DeployPropertyNames.DEPLOY_ID); + if (deployIdString == null) { + definedProps.setProperty(DeployPropertyNames.DEPLOY_ID, "0"); + } DeploymentPhase[] lifecycle = getLifecycle(); for (DeploymentPhase phase : lifecycle) { System.out.println("***** Executing " + phase + " phase *****..."); @@ -666,6 +670,11 @@ public class AntMain implements org.apache.tools.ant.launch.AntMain { private DeploymentPhase[] getLifecycle() { String deployDirString = definedProps.getProperty(DeployPropertyNames.DEPLOY_DIR); + if (deployDirString == null) { + throw new BuildException("Required system property '" + DeployPropertyNames.DEPLOY_DIR + + "' was not specified. Please set this property to the directory where the bundle should be installed (e.g. -D" + + DeployPropertyNames.DEPLOY_DIR + "=/opt/yourapp)."); + } File deployDir = new File(deployDirString); DeploymentsMetadata deployMetadata = new DeploymentsMetadata(deployDir); boolean isRedeploy = deployMetadata.isManaged(); @@ -748,6 +757,7 @@ public class AntMain implements org.apache.tools.ant.launch.AntMain { proxySetup.enableProxies(); } + // RHQ NOTE: Besides parsing the build file, this will also execute the implicit ("") target. ProjectHelper.configureProject(project, buildFile); } finally { // put back the original security manager commit 6f4eb034b12085258f98c92713af8a499ea78261 Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Jun 25 15:53:16 2010 -0400 unit test fix for blob. diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java index 7fae6e0..5f73b89 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java @@ -284,7 +284,7 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test { } FileInputStream fos = new FileInputStream(originalBinary); - contentManager.updateBlobStream(fos, packageBits); + contentManager.updateBlobStream(fos, packageBits, null); packageBits = em.find(PackageBits.class, packageBits.getId()); // test that the bits are available and stored in the DB: Reading the Blob commit 17b0f8bb1a60583a0d1ea24bd894cc9a3dbd5c42 Merge: 863201f... bfd6f7d... Author: Simeon Pinder <spinder(a)redhat.com> Date: Fri Jun 25 15:50:49 2010 -0400 Merge branch 'release-3.0.0' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit bfd6f7dbff8de49c9ad47712499f106945002127 Merge: 14cad58... eb5d619... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jun 25 15:47:19 2010 -0400 Merge branch 'release-3.0.0' into release-3.0.0-jay commit 14cad58515eb7b4787e607df428d01702f31468c Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jun 25 15:46:21 2010 -0400 [BZ 600543] An interim solution that hopefully will bridge the gap until we impl BZ 608135. Try to ensure that all plugin config updates in a group update get a chance to complete (barring a server loss). diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/job/AbstractGroupConfigurationUpdateJob.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/job/AbstractGroupConfigurationUpdateJob.java index 2efe429..7b92b40 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/job/AbstractGroupConfigurationUpdateJob.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/job/AbstractGroupConfigurationUpdateJob.java @@ -82,7 +82,15 @@ public abstract class AbstractGroupConfigurationUpdateJob implements Job { } for (Integer childUpdateId : pagedChildUpdateIds) { - executeConfigurationUpdate(configurationManager, childUpdateId, subject); + // failing one update request is not reason to fail all of the remaining updates + // so, wrap in a try catch and gather up the errors to subsequently fail the group update. This + // will especially benefit group plugin config, which currently executes synchronously. + try { + executeConfigurationUpdate(configurationManager, childUpdateId, subject); + } catch (Exception e) { + errorMessages = appendErrorMessages(errorMessages, "Failed Member Update Id=" + childUpdateId, + e.toString()); + } } rowsProcessed += pagedChildUpdateIds.size(); @@ -93,12 +101,18 @@ public abstract class AbstractGroupConfigurationUpdateJob implements Job { pc.setPageNumber(pc.getPageNumber() + 1); } } catch (Exception e) { - errorMessages = ThrowableUtil.getAllMessages(e); + errorMessages = appendErrorMessages(errorMessages, "Failed Group Update Id=" + groupConfigurationUpdateId, + ThrowableUtil.getAllMessages(e)); } finally { completeGroupConfigurationUpdate(configurationManager, groupConfigurationUpdateId, errorMessages); } } + private String appendErrorMessages(String currentMessages, String header, String newMessages) { + currentMessages = (null == currentMessages) ? "" : currentMessages + "\n"; + return currentMessages.concat(" [" + header + ": " + newMessages); + } + private static String createUniqueJobName(ResourceGroup group, Subject subject, String jobNamePrefix) { return createJobGroupName(group, jobNamePrefix) + "-" + subject.getName().hashCode() + "-" + System.currentTimeMillis(); commit eb5d619298ef5aa1d38c10cf308cca8e119403d3 Author: Joseph Marques <joseph(a)redhat.com> Date: Fri Jun 25 15:07:25 2010 -0400 BZ-535671: remove compatible group constructs if dynagroup recalculation converts compat->mixed diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java index b944b6e..5e7707d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java @@ -91,7 +91,6 @@ import org.rhq.enterprise.server.operation.GroupOperationSchedule; import org.rhq.enterprise.server.operation.OperationManagerLocal; import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; -import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; import org.rhq.enterprise.server.util.QueryUtility; @@ -252,35 +251,6 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso ResourceGroupDeleteException { ResourceGroup group = getResourceGroupById(subject, groupId, null); - // for compatible groups, first recursively remove any referring backing groups for auto-clusters - if (group.getGroupCategory() == GroupCategory.COMPATIBLE) { - for (ResourceGroup referringGroup : group.getClusterBackingGroups()) { - deleteResourceGroup(subject, referringGroup.getId()); - } - } - - // unschedule all jobs for this group (only compatible groups have operations, mixed do not) - if (group.getGroupCategory() == GroupCategory.COMPATIBLE) { - Subject overlord = subjectManager.getOverlord(); - try { - List<GroupOperationSchedule> ops = operationManager.findScheduledGroupOperations(overlord, groupId); - - for (GroupOperationSchedule schedule : ops) { - try { - operationManager.unscheduleGroupOperation(overlord, schedule.getJobId().toString(), groupId); - } catch (UnscheduleException e) { - log.warn("Failed to unschedule job [" + schedule + "] for a group being deleted [" + group - + "]", e); - } - } - } catch (Exception e) { - log.warn("Failed to get jobs for a group being deleted [" + group - + "]; will not attempt to unschedule anything", e); - } - } - - groupAlertDefinitionManager.purgeAllGroupAlertDefinitions(subject, groupId); - for (Role doomedRoleRelationship : group.getRoles()) { group.removeRole(doomedRoleRelationship); entityManager.merge(doomedRoleRelationship); @@ -289,20 +259,64 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso // remove all resources in the group resourceGroupManager.removeAllResourcesFromGroup(subject, groupId); + if (group.getGroupCategory() == GroupCategory.COMPATIBLE) { + removeCompatibleGroupConstructs(subject, group); + } + // break resource and plugin configuration update links in order to preserve individual change history Query q = null; q = entityManager.createNamedQuery(ResourceConfigurationUpdate.QUERY_DELETE_GROUP_UPDATES_FOR_GROUP); - q.setParameter("groupId", groupId); + q.setParameter("groupId", group.getId()); q.executeUpdate(); q = entityManager.createNamedQuery(PluginConfigurationUpdate.QUERY_DELETE_GROUP_UPDATES_FOR_GROUP); - q.setParameter("groupId", groupId); + q.setParameter("groupId", group.getId()); q.executeUpdate(); entityManager.remove(group); } + /* + * TODO: Deletion of all associated group data (except implicit/explicit resource members) should be moved here. + * in other words, we don't want Hibernate cascade annotations to remove that history upon deletion of an + * entity anymore because there are now two cases where group constructs need to be destroyed: + * + * 1) compatible group deletion - a group is deleted, all history removed, entity is gone from the system + * 2) dynagroup recomputation - a group definition is recalculation, a compatible group turns into a mixed + * group, compatible constructs need to be removed, but the entity survives + * + * For now, this implementation should suffice for -- https://bugzilla.redhat.com/show_bug.cgi?id=535671 + */ + private void removeCompatibleGroupConstructs(Subject subject, ResourceGroup group) + throws ResourceGroupDeleteException { + + // for compatible groups, first recursively remove any referring backing groups for auto-clusters + for (ResourceGroup referringGroup : group.getClusterBackingGroups()) { + deleteResourceGroup(subject, referringGroup.getId()); + } + + Subject overlord = subjectManager.getOverlord(); + try { + List<GroupOperationSchedule> ops = operationManager.findScheduledGroupOperations(overlord, group.getId()); + + for (GroupOperationSchedule schedule : ops) { + try { + operationManager.unscheduleGroupOperation(overlord, schedule.getJobId().toString(), group.getId()); + } catch (UnscheduleException e) { + log + .warn("Failed to unschedule job [" + schedule + "] for a group being deleted [" + group + "]", + e); + } + } + } catch (Exception e) { + log.warn("Failed to get jobs for a group being deleted [" + group + + "]; will not attempt to unschedule anything", e); + } + + groupAlertDefinitionManager.purgeAllGroupAlertDefinitions(subject, group.getId()); + } + public ResourceGroup getResourceGroupById(Subject user, int id, GroupCategory category) throws ResourceGroupNotFoundException { ResourceGroup group = entityManager.find(ResourceGroup.class, id); @@ -909,7 +923,7 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso } @SuppressWarnings("unchecked") - public void setResourceType(int resourceGroupId) { + public void setResourceType(int resourceGroupId) throws ResourceGroupDeleteException { Query query = entityManager.createNamedQuery(ResourceType.QUERY_GET_EXPLICIT_RESOURCE_TYPE_COUNTS_BY_GROUP); query.setParameter("groupId", resourceGroupId); @@ -921,16 +935,14 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso Object[] info = (Object[]) results.get(0); int resourceTypeId = (Integer) info[0]; - try { - ResourceType type = resourceTypeManager.getResourceTypeById(overlord, resourceTypeId); - - resourceGroup.setResourceType(type); - } catch (ResourceTypeNotFoundException rtnfe) { - // we just got the resourceTypeId from the database, so it will exist - // but let's set some reasonable implementation anyway - resourceGroup.setResourceType(null); - } + ResourceType flyWeightType = new ResourceType(); + flyWeightType.setId(resourceTypeId); + resourceGroup.setResourceType(flyWeightType); } else { + if (resourceGroup.getResourceType() != null) { + // converting compatible group to mixed group, remove all corresponding compatible constructs + removeCompatibleGroupConstructs(overlord, resourceGroup); + } resourceGroup.setResourceType(null); } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerLocal.java index afac418..5975099 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerLocal.java @@ -93,7 +93,7 @@ public interface ResourceGroupManagerLocal { ResourceGroup getByGroupDefinitionAndGroupByClause(int groupDefinitionId, String groupByClause); - void setResourceType(int resourceGroupId); + void setResourceType(int resourceGroupId) throws ResourceGroupDeleteException; int getExplicitGroupMemberCount(int resourceGroupId); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index ee0dae9..9a11216 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -52,6 +52,7 @@ import org.rhq.enterprise.server.authz.PermissionException; import org.rhq.enterprise.server.authz.RequiredPermission; import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.resource.group.RecursivityChangeType; +import org.rhq.enterprise.server.resource.group.ResourceGroupDeleteException; import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; import org.rhq.enterprise.server.resource.group.ResourceGroupUpdateException; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionAlreadyExistsException; @@ -254,8 +255,9 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { @RequiredPermission(Permission.MANAGE_INVENTORY) @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) // required for the recalculation thread - public void calculateGroupMembership(Subject subject, int groupDefinitionId) throws GroupDefinitionDeleteException, - GroupDefinitionNotFoundException, InvalidExpressionException, ResourceGroupUpdateException { + public void calculateGroupMembership(Subject subject, int groupDefinitionId) throws ResourceGroupDeleteException, + GroupDefinitionDeleteException, GroupDefinitionNotFoundException, InvalidExpressionException, + ResourceGroupUpdateException { /* * even though this method declares to throw it, it should never generate an InvalidExpressionException because * the definition's expression set was validated before it was persisted. conceivably, if the group definition @@ -329,7 +331,8 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { @RequiredPermission(Permission.MANAGE_INVENTORY) @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public Integer calculateGroupMembership_helper(Subject overlord, int groupDefinitionId, - ExpressionEvaluator.Result result) throws GroupDefinitionNotFoundException, GroupDefinitionNotFoundException { + ExpressionEvaluator.Result result) throws ResourceGroupDeleteException, GroupDefinitionNotFoundException, + GroupDefinitionNotFoundException { long startTime = System.currentTimeMillis(); GroupDefinition groupDefinition = getById(groupDefinitionId); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java index b57a35e..d83c77c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java @@ -25,6 +25,7 @@ import org.rhq.core.domain.criteria.ResourceGroupDefinitionCriteria; import org.rhq.core.domain.resource.group.GroupDefinition; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.server.resource.group.ResourceGroupDeleteException; import org.rhq.enterprise.server.resource.group.ResourceGroupUpdateException; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionAlreadyExistsException; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionCreateException; @@ -48,11 +49,11 @@ public interface GroupDefinitionManagerLocal { throws GroupDefinitionAlreadyExistsException, GroupDefinitionUpdateException, InvalidExpressionException, ResourceGroupUpdateException; - void calculateGroupMembership(Subject subject, int groupDefinitionId) throws GroupDefinitionDeleteException, - GroupDefinitionNotFoundException, InvalidExpressionException; + void calculateGroupMembership(Subject subject, int groupDefinitionId) throws ResourceGroupDeleteException, + GroupDefinitionDeleteException, GroupDefinitionNotFoundException, InvalidExpressionException; Integer calculateGroupMembership_helper(Subject subject, int groupDefinitionId, ExpressionEvaluator.Result result) - throws GroupDefinitionNotFoundException, GroupDefinitionNotFoundException; + throws ResourceGroupDeleteException, GroupDefinitionNotFoundException, GroupDefinitionNotFoundException; PageList<GroupDefinition> getGroupDefinitions(Subject subject, PageControl pc); commit 749156f88d2e834ab5ec835eec4eb4ce3d68aedb Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jun 25 13:27:50 2010 -0400 make sure augeas 0.0.2 jar, not 0.0.1 jar, is copied into plugin jar's lib dir diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 531df2c..915106a 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -17,6 +17,10 @@ <name>RHQ Augeas Plugin</name> <description>An abstract plugin for configuring resources via Augeas</description> + <properties> + <augeas.version>0.0.2</augeas.version> + </properties> + <dependencies> <dependency> @@ -30,11 +34,13 @@ <artifactId>rhq-platform-plugin</artifactId> <version>${project.version}</version> </dependency> - <dependency> + + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>1.4</version> </dependency> + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> @@ -45,7 +51,7 @@ <dependency> <groupId>net.augeas</groupId> <artifactId>augeas</artifactId> - <version>0.0.2</version> + <version>${augeas.version}</version> </dependency> <dependency> @@ -79,7 +85,7 @@ <artifactItem> <groupId>net.augeas</groupId> <artifactId>augeas</artifactId> - <version>0.0.1</version> + <version>${augeas.version}</version> </artifactItem> </artifactItems> @@ -122,7 +128,6 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> commit 7d42b8feaa0bd3071cf36cf79ea58b07bf7673c9 Merge: ed7b01a... d79a2a8... Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Jun 25 13:25:49 2010 -0400 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit d79a2a881d4a5c7356ce1cef41845c0612cfab4b Merge: e0efd15... 3617607... Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jun 25 18:13:35 2010 +0200 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit e0efd154e0eac23bb2299b6d0f2241a84fe79522 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Fri Jun 25 18:12:10 2010 +0200 BZ 583833 - re-show the Events icon in the MICA section. diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml index d492ad6..ea8017a 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml @@ -27,7 +27,7 @@ <ui:param name="pageTitle" value="Browse Resources"/> <ui:param name="selectedTabName" value="Resources.#{param.subtab}" /> <ui:define name="content"> - + <a4j:keepAlive beanName="BrowseResourcesUIBean"/> <a4j:form> @@ -37,7 +37,7 @@ </a4j:form> <h:form id="browseResourcesForm"> <input type="hidden" name="subtab" value="${param.subtab}" /> - + <p/> <h:panelGrid columns="3"> <h:outputText value="Search: " /> @@ -48,7 +48,7 @@ <ui:param name="defaultSavedSearchPattern" value="#{param.searchId}" /> </ui:include> - <a4j:commandButton id="searchButtonJSF" value="GO" + <a4j:commandButton id="searchButtonJSF" value="GO" reRender="browseResourcesDataTable, browseResourcesDataTableScroller" status="commonStatus" actionListener="#{BrowseResourcesUIBean.clearDataModel}" @@ -85,42 +85,47 @@ <onc:select name="selectedItems" value="#{item.original.resource.id}" /> </rich:column> - + <rich:column> <onc:quickNav> <f:param name="id" value="#{item.original.resource.id}"/> - + <onc:icon name="Monitor" - url="/rhq/resource/monitor/graphs.xhtml" + url="/rhq/resource/monitor/graphs.xhtml" alt="Monitor" visible="#{monitorEnabled}"> </onc:icon> - + <onc:icon name="Inventory" - url="/rhq/resource/inventory/view.xhtml" + url="/rhq/resource/inventory/view.xhtml" alt="Inventory"/> - + <onc:icon name="Alert" - url="/rhq/resource/alert/listAlertDefinitions.xhtml" - alt="Alerts" + url="/rhq/resource/alert/listAlertDefinitions.xhtml" + alt="Alerts" visible="#{monitorEnabled}"/> - + <onc:icon name="Configure" - url="/rhq/resource/configuration/view.xhtml" - alt="Configure" + url="/rhq/resource/configuration/view.xhtml" + alt="Configure" visible="#{item.original.resourceFacets.configuration}"/> - + <onc:icon name="Operation" - url="/rhq/resource/operation/resourceOperationScheduleNew.xhtml" - alt="Operations" + url="/rhq/resource/operation/resourceOperationScheduleNew.xhtml" + alt="Operations" visible="#{item.original.resourceFacets.operation}"/> - - <onc:icon name="Content" - url="/rhq/resource/content/view.xhtml" + + <onc:icon name="Events" + url="/rhq/resource/events/history.xhtml" + alt="Events" + visible="#{item.original.resourceFacets.event}"/> + + <onc:icon name="Content" + url="/rhq/resource/content/view.xhtml" alt="Content" visible="#{item.original.resourceFacets.content}"/> - -  + +  <f:param name="mode" value="list"/> </onc:quickNav> </rich:column> @@ -132,10 +137,10 @@ </onc:sortableColumnHeader> </f:facet> - <onc:disambiguatedResourceName resourceName="#{item.original.resource.name}" + <onc:disambiguatedResourceName resourceName="#{item.original.resource.name}" resourceId="#{item.original.resource.id}" disambiguationReport="#{item}"/> </rich:column> - <echo>Deploying the latest agent update binary and renaming it rhq-enterprise-agent-${rhq.version}.jar</echo> @@ -366,6 +367,13 @@ verbose="true" failonerror="false"/> +  + <echo>Deploying the latest command-line bundle deployer</echo> + <copy file="${settings.localRepository}/org/rhq/rhq-ant-bundle-common/${rhq.version}/rhq-ant-bundle-common-${rhq.version}.zip" + tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/bundle-deployer/rhq-bundle-deployer-${rhq.version}.zip" + verbose="true" + failonerror="false"/> +  <antcall target="package-connectors" /> commit 31ae5bb82c7c47f807e6c9bb209dbe649d97ea3b Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jun 24 22:26:33 2010 -0400 remove unnecessary reloading of the group definition during updates diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index ebfeccd..ee0dae9 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -269,6 +269,7 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { long startTime = System.currentTimeMillis(); GroupDefinition groupDefinition = getById(groupDefinitionId); + groupDefinition.setLastCalculationTime(System.currentTimeMillis()); // we're calculating now ExpressionEvaluator evaluator = new ExpressionEvaluator(); for (String expression : groupDefinition.getExpressionAsList()) { @@ -320,10 +321,6 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { groupDefinitionManager.removeManagedResource_helper(subject, groupDefinitionId, doomedGroupId); } - // re-attach the group, because it was cleared from the session during the callout to the helper - groupDefinition = getById(groupDefinitionId); - groupDefinition.setLastCalculationTime(System.currentTimeMillis()); - long endTime = System.currentTimeMillis(); log.debug("calculateGroupMembership took " + (endTime - startTime) + " millis"); commit 5705abb4352b142bfe840c0dc55e6d02d82de761 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jun 24 18:22:40 2010 -0400 BZ-601240: more graceful handling of exceptional conditions when loading SearchSuggestions diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java index 435e073..34eed0e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java @@ -358,6 +358,14 @@ public class SearchAssistManager { public List<SearchSuggestion> getSuggestions(String expression, int caretPos) { List<SearchSuggestion> results = new ArrayList<SearchSuggestion>(); + if (subject == null) { + // likely a client's misuse of the API, but gracefully return no saved searches if the user is not found + SearchSuggestion footerMessage = new SearchSuggestion(Kind.InstructionalTextComment, + "Error retrieving saved searches, please refresh page"); + results.add(footerMessage); + return results; + } + try { if (expression == null) { expression = ""; commit e2d53dc7bc6b28181bf93392229a49b8df516f71 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jun 24 17:22:00 2010 -0400 get rid of massive (now obsolete) native SQL solution for retrieving ResourceGroupComposites for some GroupDefinition diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java index d4c7ada..48e35cd 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/GroupDefinition.java @@ -52,10 +52,6 @@ import org.rhq.core.domain.util.StringUtils; + "SELECT gd " // + " FROM GroupDefinition AS gd " // + " WHERE LOWER(gd.name) = LOWER(:name)"), // - @NamedQuery(name = GroupDefinition.QUERY_FIND_MEMBERS_count, query = "" // - + "SELECT COUNT(rg) " // - + " FROM ResourceGroup rg " // - + " WHERE rg.groupDefinition.id = :groupDefinitionId "), // @NamedQuery(name = GroupDefinition.QUERY_FIND_ALL_MEMBERS, query = "" // + "SELECT rg " // + " FROM ResourceGroup rg " // @@ -96,66 +92,12 @@ public class GroupDefinition implements Serializable { public static final String QUERY_FIND_ALL = "GroupDefinition.findAll"; public static final String QUERY_FIND_BY_NAME = "GroupDefinition.findByName"; public static final String QUERY_FIND_MEMBERS = "GroupDefinition.findMembers"; - public static final String QUERY_FIND_MEMBERS_count = "GroupDefinition.findMembers_count"; public static final String QUERY_FIND_ALL_MEMBERS = "GroupDefinition.findAllMembers_admin"; public static final String QUERY_FIND_MANAGED_RESOURCE_GROUP_IDS_ADMIN = "GroupDefinition.findManagedResourceGroupIds_admin"; public static final String QUERY_FIND_MANAGED_RESOURCE_GROUP_SIZE_ADMIN = "GroupDefinition.findManagedResourceGroupSize_admin"; public static final String QUERY_FIND_IDS_FOR_RECALCULATION = "GroupDefinition.findIdsForRecalculation_admin"; public static final String QUERY_FIND_ALL_RECALCULATING = "GroupDefinition.findAllRecalculating_admin"; - public static final String QUERY_NATIVE_FIND_MEMBERS = "" // - + " SELECT " - + " ( SELECT COUNT(eresAvail.ID) " - + " FROM rhq_resource_avail eresAvail " - + " INNER JOIN rhq_resource eres " - + " ON eresAvail.resource_id = eres.id " - + " INNER JOIN rhq_resource_group_res_exp_map expMap " - + " ON eres.id = expMap.resource_id " - + " WHERE expMap.resource_group_id = rg.id " - + " ) as explicitCount, " - + "" // - + " ( SELECT AVG(eresAvail.availability_type) " - + " FROM rhq_resource_avail eresAvail " - + " INNER JOIN rhq_resource eres " - + " ON eresAvail.resource_id = eres.id " - + " INNER JOIN rhq_resource_group_res_exp_map expMap " - + " ON eres.id = expMap.resource_id " - + " WHERE expMap.resource_group_id = rg.id " - + " ) as explicitAvail, " - + "" // - + " ( SELECT COUNT(iresAvail.ID) " - + " FROM rhq_resource_avail iresAvail " - + " INNER JOIN rhq_resource ires " - + " ON iresAvail.resource_id = ires.id " - + " INNER JOIN rhq_resource_group_res_imp_map impMap " - + " ON ires.id = impMap.resource_id " - + " WHERE impMap.resource_group_id = rg.id " - + " ) as implicitCount, " - + "" // - + " ( SELECT AVG(iresAvail.availability_type) " - + " FROM rhq_resource_avail iresAvail " - + " INNER JOIN rhq_resource ires " - + " ON iresAvail.resource_id = ires.id " - + " INNER JOIN rhq_resource_group_res_imp_map impMap " - + " ON ires.id = impMap.resource_id " - + " WHERE impMap.resource_group_id = rg.id " - + " ) as implicitAvail, " - + "" // - + " rg.id as groupId, " - + " rg.name as groupName, " - + " rg.category as groupCategory, " - + " rg.group_by as groupedBy " - + "" // - + " FROM rhq_resource_group rg " - + "LEFT OUTER JOIN rhq_resource_group_res_imp_map memberMap " - + " ON rg.id = memberMap.resource_group_id " - + "LEFT OUTER JOIN rhq_resource res " - + " ON memberMap.resource_id = res.id " - + "LEFT OUTER JOIN rhq_resource_avail resAvail " - + " ON res.id = resAvail.resource_id " - + " WHERE rg.group_definition_id = ? " - + " GROUP BY rg.id, rg.category, rg.name, rg.group_by "; - @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.AUTO, generator = "id") @Id diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java index 9dc3430..ebfeccd 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java @@ -18,18 +18,12 @@ */ package org.rhq.enterprise.server.resource.group.definition; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; -import javax.annotation.PostConstruct; import javax.ejb.EJB; import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; @@ -38,39 +32,25 @@ import javax.persistence.EntityManager; import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.Query; -import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.rhq.core.db.DatabaseType; -import org.rhq.core.db.DatabaseTypeFactory; -import org.rhq.core.db.H2DatabaseType; -import org.rhq.core.db.OracleDatabaseType; -import org.rhq.core.db.PostgresqlDatabaseType; -import org.rhq.core.db.SQLServerDatabaseType; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.criteria.ResourceGroupDefinitionCriteria; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.domain.resource.composite.ResourceFacets; import org.rhq.core.domain.resource.group.GroupDefinition; import org.rhq.core.domain.resource.group.ResourceGroup; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; -import org.rhq.core.domain.util.OrderingField; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.server.PersistenceUtility; import org.rhq.core.util.collection.ArrayUtils; -import org.rhq.core.util.jdbc.JDBCUtil; import org.rhq.enterprise.server.RHQConstants; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.authz.AuthorizationManagerLocal; import org.rhq.enterprise.server.authz.PermissionException; import org.rhq.enterprise.server.authz.RequiredPermission; import org.rhq.enterprise.server.resource.ResourceManagerLocal; -import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; import org.rhq.enterprise.server.resource.group.RecursivityChangeType; import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; import org.rhq.enterprise.server.resource.group.ResourceGroupUpdateException; @@ -88,17 +68,12 @@ import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; @Stateless -(a)javax.annotation.Resource(name = "RHQ_DS", mappedName = RHQConstants.DATASOURCE_JNDI_NAME) public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { private final Log log = LogFactory.getLog(GroupDefinitionManagerBean.class); @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager; - @javax.annotation.Resource(name = "RHQ_DS") - private DataSource rhqDs; - private DatabaseType dbType; - @EJB private GroupDefinitionManagerLocal groupDefinitionManager; // self, for xactional purposes @@ -106,9 +81,6 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { private ResourceGroupManagerLocal resourceGroupManager; @EJB - private ResourceTypeManagerLocal resourceTypeManager; - - @EJB private ResourceManagerLocal resourceManager; @EJB @@ -117,19 +89,6 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { @EJB private AuthorizationManagerLocal authorizationManager; - @PostConstruct - public void init() { - Connection conn = null; - try { - conn = rhqDs.getConnection(); - dbType = DatabaseTypeFactory.getDatabaseType(conn); - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - JDBCUtil.safeClose(conn); - } - } - @SuppressWarnings("unchecked") @RequiredPermission(Permission.MANAGE_INVENTORY) public void recalculateDynaGroups(Subject subject) { @@ -370,7 +329,6 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { log.debug("calculateGroupMembership took " + (endTime - startTime) + " millis"); } - @SuppressWarnings("unchecked") @RequiredPermission(Permission.MANAGE_INVENTORY) @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public Integer calculateGroupMembership_helper(Subject overlord, int groupDefinitionId, @@ -418,9 +376,6 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { resourceGroupManager.setResourceType(resourceGroupId); - entityManager.flush(); - entityManager.clear(); - long endTime = System.currentTimeMillis(); log.debug("calculateGroupMembership_helper took " + (endTime - startTime) + " millis"); @@ -428,122 +383,6 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { return resourceGroupId; } - @SuppressWarnings("unchecked") - private Map<Integer, ResourceGroup> getIdGroupMap(List<Integer> groupIds) { - if (groupIds == null || groupIds.size() == 0) { - return new HashMap<Integer, ResourceGroup>(); - } - - Query query = entityManager.createNamedQuery(ResourceGroup.QUERY_FIND_BY_IDS_admin); - query.setParameter("ids", groupIds); - List<ResourceGroup> groups = query.getResultList(); - - Map<Integer, ResourceGroup> results = new HashMap<Integer, ResourceGroup>(); - for (ResourceGroup group : groups) { - results.put(group.getId(), group); - } - return results; - } - - @RequiredPermission(Permission.MANAGE_INVENTORY) - public PageList<ResourceGroupComposite> getManagedResourceGroups(Subject subject, int groupDefinitionId, - PageControl pc) throws GroupDefinitionException { - - pc.initDefaultOrderingField("groupName"); - pc.truncateOrderingFields(1); // remove all but the primary sort - OrderingField primary = pc.getOrderingFields().get(0); - String field = primary.getField(); - if (field.endsWith("Avail")) { - String prefix = field.substring(0, field.length() - 5); - String secondaryField = prefix + "Count"; - pc.addDefaultOrderingField(secondaryField, primary.getOrdering()); - } - if (field.equals("groupName") == false) { - pc.addDefaultOrderingField("groupName"); - } - - Connection conn = null; - PreparedStatement stmt = null; - ResultSet rs = null; - - List<Object[]> rawResults = new ArrayList<Object[]>(); - try { - conn = rhqDs.getConnection(); - - String query = GroupDefinition.QUERY_NATIVE_FIND_MEMBERS; - - if (this.dbType instanceof PostgresqlDatabaseType) { - query = PersistenceUtility.addPostgresNativePagingSortingToQuery(query, pc); - } else if (this.dbType instanceof OracleDatabaseType) { - query = PersistenceUtility.addOracleNativePagingSortingToQuery(query, pc); - } else if (this.dbType instanceof H2DatabaseType) { - query = PersistenceUtility.addH2NativePagingSortingToQuery(query, pc); - } else if (this.dbType instanceof SQLServerDatabaseType) { - query = PersistenceUtility.addSQLServerNativePagingSortingToQuery(query, pc); - } else { - throw new RuntimeException("Unknown database type: " + this.dbType); - } - - stmt = conn.prepareStatement(query); - stmt.setInt(1, groupDefinitionId); - - rs = stmt.executeQuery(); - while (rs.next()) { - long explicitCount = rs.getLong(1); - double explicitAvail = rs.getDouble(2); - long implicitCount = rs.getLong(3); - double implicitAvail = rs.getDouble(4); - int groupId = rs.getInt(5); - Object[] next = new Object[] { explicitCount, explicitAvail, implicitCount, implicitAvail, groupId }; - rawResults.add(next); - } - } catch (Throwable t) { - throw new GroupDefinitionException(t); - } finally { - JDBCUtil.safeClose(conn, stmt, rs); - } - - //Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, GroupDefinition.QUERY_FIND_MEMBERS, pc); - Query queryCount = entityManager.createNamedQuery(GroupDefinition.QUERY_FIND_MEMBERS_count); - - //query.setParameter("groupDefinitionId", groupDefinitionId); - queryCount.setParameter("groupDefinitionId", groupDefinitionId); - - //List<Object[]> rawResults = (List<Object[]>) query.getResultList(); - long count = (Long) queryCount.getSingleResult(); - - List<Integer> groupIds = new ArrayList<Integer>(); - for (Object[] row : rawResults) { - groupIds.add(((Number) row[4]).intValue()); - } - Map<Integer, ResourceGroup> groupMap = getIdGroupMap(groupIds); - - List<ResourceGroupComposite> results = new ArrayList<ResourceGroupComposite>(rawResults.size()); - int i = 0; - for (Object[] row : rawResults) { - long explicitCount = (Long) row[0]; - double explicitAvail = (Double) row[1]; - long implicitCount = (Long) row[2]; - double implicitAvail = (Double) row[3]; - - ResourceGroup group = groupMap.get(groupIds.get(i++)); - ResourceType type = group.getResourceType(); - ResourceFacets facets; - if (type == null) { - // mixed group - facets = ResourceFacets.NONE; - } else { - // compatible group - facets = resourceTypeManager.getResourceFacets(group.getResourceType().getId()); - } - ResourceGroupComposite composite = new ResourceGroupComposite(explicitCount, explicitAvail, implicitCount, - implicitAvail, group, facets); - results.add(composite); - } - - return new PageList<ResourceGroupComposite>(results, (int) count, pc); - } - @SuppressWarnings( { "unchecked" }) public PageList<GroupDefinition> getGroupDefinitions(Subject subject, PageControl pc) { pc.initDefaultOrderingField("gd.name"); @@ -560,7 +399,8 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { } } - public PageList<GroupDefinition> findGroupDefinitionsByCriteria(Subject subject, ResourceGroupDefinitionCriteria criteria) { + public PageList<GroupDefinition> findGroupDefinitionsByCriteria(Subject subject, + ResourceGroupDefinitionCriteria criteria) { CriteriaQueryGenerator generator = new CriteriaQueryGenerator(criteria); if (authorizationManager.isInventoryManager(subject) == false) { if (criteria.isInventoryManagerRequired()) { @@ -569,7 +409,8 @@ public class GroupDefinitionManagerBean implements GroupDefinitionManagerLocal { } } - CriteriaQueryRunner<GroupDefinition> queryRunner = new CriteriaQueryRunner(criteria, generator, entityManager); + CriteriaQueryRunner<GroupDefinition> queryRunner = new CriteriaQueryRunner<GroupDefinition>(criteria, + generator, entityManager); return queryRunner.execute(); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java index 4738625..b57a35e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java @@ -23,14 +23,12 @@ import javax.ejb.Local; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.ResourceGroupDefinitionCriteria; import org.rhq.core.domain.resource.group.GroupDefinition; -import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.server.resource.group.ResourceGroupUpdateException; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionAlreadyExistsException; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionCreateException; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionDeleteException; -import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionException; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionNotFoundException; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionUpdateException; import org.rhq.enterprise.server.resource.group.definition.framework.ExpressionEvaluator; @@ -56,9 +54,6 @@ public interface GroupDefinitionManagerLocal { Integer calculateGroupMembership_helper(Subject subject, int groupDefinitionId, ExpressionEvaluator.Result result) throws GroupDefinitionNotFoundException, GroupDefinitionNotFoundException; - PageList<ResourceGroupComposite> getManagedResourceGroups(Subject subject, int groupDefinitionId, PageControl pc) - throws GroupDefinitionException; - PageList<GroupDefinition> getGroupDefinitions(Subject subject, PageControl pc); PageList<GroupDefinition> findGroupDefinitionsByCriteria(Subject subject, ResourceGroupDefinitionCriteria criteria); commit 47ea32f7c32a1c7d0fd89b04862e49ef9a69fb69 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jun 24 17:20:35 2010 -0400 re-implement group definition detailed view using ResourceGroupCriteria with groupDef filter diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/GroupDefinitionUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/GroupDefinitionUIBean.java index add5a08..2a2aa52 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/GroupDefinitionUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/GroupDefinitionUIBean.java @@ -18,14 +18,14 @@ */ package org.rhq.enterprise.gui.definition.group; -import javax.faces.model.DataModel; import javax.faces.application.FacesMessage; +import javax.faces.model.DataModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jetbrains.annotations.NotNull; -import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.criteria.ResourceGroupCriteria; import org.rhq.core.domain.resource.group.GroupDefinition; import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite; import org.rhq.core.domain.util.PageControl; @@ -35,7 +35,7 @@ import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; import org.rhq.enterprise.gui.common.paging.PageControlView; import org.rhq.enterprise.gui.common.paging.PagedListDataModel; import org.rhq.enterprise.gui.legacy.ParamConstants; -import org.rhq.enterprise.server.resource.group.definition.GroupDefinitionManagerLocal; +import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal; import org.rhq.enterprise.server.resource.group.definition.exception.GroupDefinitionException; import org.rhq.enterprise.server.util.LookupUtil; @@ -46,8 +46,7 @@ public class GroupDefinitionUIBean extends PagedDataTableUIBean { private GroupDefinition groupDefinition; - public GroupDefinitionUIBean() throws GroupDefinitionException - { + public GroupDefinitionUIBean() throws GroupDefinitionException { this.groupDefinition = lookupGroupDefinition(); } @@ -110,6 +109,8 @@ public class GroupDefinitionUIBean extends PagedDataTableUIBean { return dataModel; } + private ResourceGroupManagerLocal resourceGroupManager = LookupUtil.getResourceGroupManager(); + private class ListGroupDefinitionMembersDataModel extends PagedListDataModel<ResourceGroupComposite> { public ListGroupDefinitionMembersDataModel(PageControlView view, String beanName) { super(view, beanName); @@ -117,17 +118,16 @@ public class GroupDefinitionUIBean extends PagedDataTableUIBean { @Override public PageList<ResourceGroupComposite> fetchPage(PageControl pc) { - Subject user = getSubject(); - int groupDefinitionId = groupDefinition.getId(); - - GroupDefinitionManagerLocal groupDefinitionManager = LookupUtil.getGroupDefinitionManager(); + ResourceGroupCriteria criteria = new ResourceGroupCriteria(); + criteria.addFilterGroupDefinitionId(groupDefinition.getId()); + criteria.setPageControl(pc); try { - return groupDefinitionManager.getManagedResourceGroups(user, groupDefinitionId, pc); - } catch (GroupDefinitionException gde) { + return resourceGroupManager.findResourceGroupCompositesByCriteria(getSubject(), criteria); + } catch (Throwable t) { FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to retrieve managed groups: " - + gde.getMessage()); - log.error("Failed to retrieve managed groups", gde); + + t.getMessage()); + log.error("Failed to retrieve managed groups", t); return new PageList<ResourceGroupComposite>(); } } diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/definition/group/view.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/definition/group/view.xhtml index 512dc82..4ecffef 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/definition/group/view.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/definition/group/view.xhtml @@ -151,7 +151,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="groupName"> + <onc:sortableColumnHeader sort="name"> <h:outputText styleClass="headerText" value="Name" /> </onc:sortableColumnHeader> </f:facet> @@ -175,7 +175,7 @@ <rich:column> <f:facet name="header"> - <onc:sortableColumnHeader sort="groupedBy"> + <onc:sortableColumnHeader sort="groupByClause"> <h:outputText styleClass="headerText" value="Grouped By" /> </onc:sortableColumnHeader> </f:facet> @@ -186,7 +186,7 @@ <rich:column styleClass="resource-availability-cell"> <f:facet name="header"> <h:panelGroup> - <onc:sortableColumnHeader sort="explicitAvail"> + <onc:sortableColumnHeader sort="1"><ui:remove>Use zero-based positional ordinal</ui:remove> <h:outputText value="Children" /> </onc:sortableColumnHeader> </h:panelGroup> @@ -199,7 +199,7 @@ <rich:column styleClass="resource-availability-cell"> <f:facet name="header"> <h:panelGroup> - <onc:sortableColumnHeader sort="implicitAvail"> + <onc:sortableColumnHeader sort="3"><ui:remove>Use zero-based positional ordinal</ui:remove> <h:outputText value="Descendents" /> </onc:sortableColumnHeader> </h:panelGroup> commit 50e8098383a1d0fe5f25e503584e20e3457e2dc7 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jun 24 17:19:41 2010 -0400 add the ability to filter ResourceGroupCriteria by its parent group definition add additional authorization check in ResourceGroupManager.find...ByCriteria method diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java index bbefbb3..eee833e 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java @@ -54,6 +54,7 @@ public class ResourceGroupCriteria extends TaggedCriteria { private ResourceCategory filterExplicitResourceCategory; // requires overrides private Integer filterExplicitResourceTypeId; // requires overrides private String filterExplicitResourceTypeName; // requires overrides + private Integer filterGroupDefinitionId; // requires overrides private boolean fetchExplicitResources; private boolean fetchImplicitResources; @@ -105,6 +106,7 @@ public class ResourceGroupCriteria extends TaggedCriteria { + " FROM Resource res " // + " JOIN res.explicitGroups explicitGroup " // + " WHERE resourcegroup.id = explicitGroup.id AND NOT res.resourceType.name = ? )"); + filterOverrides.put("groupDefinitionId", "groupDefinition.id = ?"); sortOverrides.put("resourceTypeName", "resourceType.name"); } @@ -184,6 +186,10 @@ public class ResourceGroupCriteria extends TaggedCriteria { this.filterExplicitResourceTypeName = filterExplicitResourceTypeName; } + public void addFilterGroupDefinitionId(Integer filterGroupDefinitionId) { + this.filterGroupDefinitionId = filterGroupDefinitionId; + } + public void fetchExplicitResources(boolean fetchExplicitResources) { this.fetchExplicitResources = fetchExplicitResources; } @@ -227,8 +233,15 @@ public class ResourceGroupCriteria extends TaggedCriteria { } /** subclasses should override as necessary */ + @Override public boolean isSecurityManagerRequired() { return this.fetchRoles; } + @Override + public boolean isInventoryManagerRequired() { + // presently only inventory managers can view/manage group definitions + return this.filterGroupDefinitionId != null; + } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java index 16bfb39..b944b6e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java @@ -1388,6 +1388,12 @@ public class ResourceGroupManagerBean implements ResourceGroupManagerLocal, Reso + "] requires SecurityManager permission for requested query criteria."); } + if (criteria.isInventoryManagerRequired() + && !authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_INVENTORY)) { + throw new PermissionException("Subject [" + subject.getName() + + "] requires InventoryManager permission for requested query criteria."); + } + if (authorizationManager.isInventoryManager(subject) == false) { generator.setAuthorizationResourceFragment(CriteriaQueryGenerator.AuthorizationTokenType.GROUP, null, subject.getId()); commit 50294ebe870e04f3673cf075dbf0420dcd083d62 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jun 24 16:16:49 2010 -0400 BZ-607548: prevent NPE when use operation-based alert notifications diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java index 4d5c1f0..27da614 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java @@ -225,6 +225,9 @@ public class AlertNotification implements Serializable { } public boolean equalsData(AlertNotification other) { + if (other == null) { + return false; + } boolean results = compare(configuration, other.configuration); if (results) { results = compare(extraConfiguration, other.extraConfiguration); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java index 82a1e50..dc65e73 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java @@ -216,7 +216,7 @@ public class AlertNotificationsUIBean extends EnterpriseFacesContextUIBean { */ reloadAlertNotifications(); for (AlertNotification nextNotification : this.alertNotifications) { - if (notificationWithLatestData.equalsData(nextNotification)) { + if (nextNotification.equalsData(notificationWithLatestData)) { this.activeNotification = nextNotification; this.selectedNotifications.clear(); this.selectedNotifications.add(this.activeNotification); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java index 324a3de..1d9da88 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java @@ -108,6 +108,8 @@ public class CustomContentUIBean extends EnterpriseFacesContextUIBean { if (customBackingBean.getExtraParameters() != null) { notification.setExtraConfiguration(customBackingBean.getExtraParameters()); + } else { + notification.setExtraConfiguration(null); } int alertDefinitionId = Integer.parseInt(customBackingBean.getContextId()); alertNotificationManager.updateAlertNotification(getSubject(), alertDefinitionId, notification); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java index 612a5fa..0e4f47d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java @@ -18,9 +18,6 @@ */ package org.rhq.enterprise.server.plugin.pc.alert; -import java.util.Arrays; - -import org.rhq.core.domain.alert.notification.AlertNotification; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; @@ -164,15 +161,4 @@ public class CustomAlertSenderBackingBean { return ret; } - final protected void deleteExtraParameters() { - Subject overlord = LookupUtil.getSubjectManager().getOverlord(); - AlertNotification notification = LookupUtil.getAlertNotificationManager().getAlertNotification(overlord, - alertNotificationId); - Configuration extraParameters = notification.getExtraConfiguration(); - notification.setExtraConfiguration(null); - LookupUtil.getAlertNotificationManager().updateAlertNotification(overlord, - notification.getAlertDefinition().getId(), notification); - LookupUtil.getConfigurationManager().deleteConfigurations(Arrays.asList(extraParameters.getId())); - } - } diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationInfo.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationInfo.java index 0241db5..5d81bd0 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationInfo.java +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationInfo.java @@ -55,7 +55,9 @@ public class OperationInfo { String descendantName, String operationId, Configuration arguments) { ResourceSelectionMode selectionMode = null; try { - selectionMode = ResourceSelectionMode.valueOf(mode); + if (mode != null) { + selectionMode = ResourceSelectionMode.valueOf(mode); + } } catch (Throwable t) { } this.mode = selectionMode; diff --git a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java index 0bf47fa..1552256 100644 --- a/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java +++ b/modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java @@ -230,7 +230,8 @@ public class OperationsBackingBean extends CustomAlertSenderBackingBean { if (operationDefinitionId != null && !operationDefinitionId.equals("none") && argumentsConfiguration != null) { extraParameters = persistConfiguration(argumentsConfiguration); } else { - deleteExtraParameters(); + extraParameters = null; + //deleteExtraParameters(); } alertParameters = persistConfiguration(alertParameters); commit e8e51188a5f48d8e722700a89e6335654d869c22 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Jun 24 16:06:24 2010 -0400 provide a new "gc" agent prompt command that lets you examine the heap/non-heap stats and lets you free up some memory/invoke the garbage collector diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java index ce49fc4..b5d1223 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java @@ -107,6 +107,7 @@ import org.rhq.enterprise.agent.promptcmd.DownloadPromptCommand; import org.rhq.enterprise.agent.promptcmd.DumpSpoolPromptCommand; import org.rhq.enterprise.agent.promptcmd.ExitPromptCommand; import org.rhq.enterprise.agent.promptcmd.FailoverPromptCommand; +import org.rhq.enterprise.agent.promptcmd.GCPromptCommand; import org.rhq.enterprise.agent.promptcmd.GetConfigPromptCommand; import org.rhq.enterprise.agent.promptcmd.HelpPromptCommand; import org.rhq.enterprise.agent.promptcmd.IdentifyPromptCommand; @@ -2958,7 +2959,7 @@ public class AgentMain { new AvailabilityPromptCommand(), new PiqlPromptCommand(), new IdentifyPromptCommand(), new LogPromptCommand(), new TimerPromptCommand(), new PingPromptCommand(), new DownloadPromptCommand(), new DumpSpoolPromptCommand(), new SenderPromptCommand(), new FailoverPromptCommand(), - new UpdatePromptCommand(), new DebugPromptCommand(), new SleepPromptCommand() }; + new UpdatePromptCommand(), new DebugPromptCommand(), new SleepPromptCommand(), new GCPromptCommand() }; // hold the conflicts StringBuilder conflicts = new StringBuilder(); diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java index d520904..7967b47 100644 --- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java @@ -1619,6 +1619,31 @@ public interface AgentI18NResourceKeys { @I18NMessage("days") String UNITS_DAYS = "units.days"; + @I18NMessage("gc") + String GC = "PromptCommand.gc"; + + @I18NMessage("gc [--dump] [--free] [--verbose={true|false}]") + String GC_SYNTAX = "PromptCommand.gc.syntax"; + + @I18NMessage("Helps free up memory by invoking the garbage collector") + String GC_HELP = "PromptCommand.gc.help"; + + @I18NMessage("Provides an interface to the garbage collector and memory subsystem.\\n\\\n" + + "\\ -d, --dump : prints out information on current memory usage\\n\\\n" + + "\\ -f, --free : attempts to free up memory and invokes the garbage collector\\n\\\n" + + "\\ -v, --verbose={true|false} : enables/disables verbose gc messages") + String GC_DETAILED_HELP = "PromptCommand.gc.detailed-help"; + + @I18NMessage("Invoking the garbage collector") + String GC_INVOKE = "PromptCommand.gc.invoke"; + + @I18NMessage("{0} ({1}):\\n\\\n" // + + "\\ init={2}\\n\\\n" // + + "\\ max={3}\\n\\\n" // + + "\\ used={4} ({5,number,##}% of committed)\\n\\\n" // + + "\\ commit={6} ({7,number,##}% of max)") + String GC_MEM_USAGE = "PromptCommand.gc.mem-usage"; + @I18NMessage("native") String NATIVE = "PromptCommand.native"; diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/GCPromptCommand.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/GCPromptCommand.java new file mode 100644 index 0000000..1f2de30 --- /dev/null +++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/GCPromptCommand.java @@ -0,0 +1,213 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.agent.promptcmd; + +import gnu.getopt.Getopt; +import gnu.getopt.LongOpt; + +import java.beans.Introspector; +import java.io.PrintWriter; +import java.lang.management.ManagementFactory; +import java.lang.management.MemoryMXBean; +import java.lang.management.MemoryPoolMXBean; +import java.lang.management.MemoryType; +import java.lang.management.MemoryUsage; +import java.util.List; + +import mazz.i18n.Msg; + +import org.apache.commons.logging.LogFactory; + +import org.rhq.enterprise.agent.AgentMain; +import org.rhq.enterprise.agent.i18n.AgentI18NFactory; +import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys; + +/** + * Provides a way to help the agent clean up memory. + * + * @author John Mazzitelli + */ +public class GCPromptCommand implements AgentPromptCommand { + private static final Msg MSG = AgentI18NFactory.getMsg(); + + /** + * @see AgentPromptCommand#getPromptCommandString() + */ + public String getPromptCommandString() { + return MSG.getMsg(AgentI18NResourceKeys.GC); + } + + /** + * @see AgentPromptCommand#execute(AgentMain, String[]) + */ + public boolean execute(AgentMain agent, String[] args) { + processArguments(agent, args); + return true; + } + + /** + * @see AgentPromptCommand#getSyntax() + */ + public String getSyntax() { + return MSG.getMsg(AgentI18NResourceKeys.GC_SYNTAX); + } + + /** + * @see AgentPromptCommand#getHelp() + */ + public String getHelp() { + return MSG.getMsg(AgentI18NResourceKeys.GC_HELP); + } + + /** + * @see AgentPromptCommand#getDetailedHelp() + */ + public String getDetailedHelp() { + return MSG.getMsg(AgentI18NResourceKeys.GC_DETAILED_HELP); + } + + private void processArguments(AgentMain agent, String[] args) { + PrintWriter out = agent.getOut(); + + String sopts = "dfv:"; + LongOpt[] lopts = { new LongOpt("verbose", LongOpt.REQUIRED_ARGUMENT, null, 'v'), + new LongOpt("dump", LongOpt.NO_ARGUMENT, null, 'd'), new LongOpt("free", LongOpt.NO_ARGUMENT, null, 'f') }; + + Getopt getopt = new Getopt(getPromptCommandString(), args, sopts, lopts); + int code; + Boolean verbose = null; + Boolean free = null; + Boolean dump = null; + + while ((code = getopt.getopt()) != -1) { + switch (code) { + case ':': + case '?': + case 1: { + out.println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax())); + break; + } + + case 'v': { + String verboseOpt = getopt.getOptarg(); + verbose = Boolean.valueOf(Boolean.parseBoolean(verboseOpt)); + break; + } + + case 'd': { + dump = Boolean.TRUE; + break; + } + + case 'f': { + free = Boolean.TRUE; + break; + } + } + } + + if ((getopt.getOptind() + 1) < args.length) { + out.println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax())); + } + + if (Boolean.TRUE.equals(dump)) { + printCurrentMemoryUsage(out); + } + + if (verbose != null) { + setVerbosity(verbose.booleanValue()); + } + + if (Boolean.TRUE.equals(free)) { + freeMemory(out); + } + + return; + } + + private void setVerbosity(boolean verbose) { + final MemoryMXBean memoryMxBean = ManagementFactory.getMemoryMXBean(); + memoryMxBean.setVerbose(verbose); + } + + private void freeMemory(PrintWriter out) { + final MemoryMXBean memoryMxBean = ManagementFactory.getMemoryMXBean(); + + printGlobalMemoryUsage(out, memoryMxBean); + + // free up some global static caches + Introspector.flushCaches(); + LogFactory.releaseAll(); + + // invoke the garbage collector + out.println(MSG.getMsg(AgentI18NResourceKeys.GC_INVOKE)); + memoryMxBean.gc(); + + printGlobalMemoryUsage(out, memoryMxBean); + return; + } + + private void printCurrentMemoryUsage(PrintWriter out) { + final MemoryMXBean memoryMxBean = ManagementFactory.getMemoryMXBean(); + printGlobalMemoryUsage(out, memoryMxBean); + + List<MemoryPoolMXBean> poolMxBeans = ManagementFactory.getMemoryPoolMXBeans(); + if (poolMxBeans != null) { + for (MemoryPoolMXBean bean : poolMxBeans) { + if (bean.isValid()) { + String name = bean.getName(); + MemoryType type = bean.getType(); + MemoryUsage usage = bean.getUsage(); + printMemoryUsage(out, name, type, usage); + } + } + } + + return; + } + + private void printGlobalMemoryUsage(PrintWriter out, final MemoryMXBean memoryMxBean) { + printMemoryUsage(out, "GLOBAL", MemoryType.HEAP, memoryMxBean.getHeapMemoryUsage()); + printMemoryUsage(out, "GLOBAL", MemoryType.NON_HEAP, memoryMxBean.getNonHeapMemoryUsage()); + } + + private void printMemoryUsage(PrintWriter out, String name, MemoryType type, MemoryUsage memUsage) { + long init = memUsage.getInit(); + long max = memUsage.getMax(); + long used = memUsage.getUsed(); + long committed = memUsage.getCommitted(); + + String typeStr; + switch (type) { + case HEAP: + typeStr = "Heap"; + break; + case NON_HEAP: + typeStr = "Non-heap"; + break; + default: + typeStr = "?"; + } + + double usedPercentage = (used * 100.0) / committed; + double committedPercentage = (committed * 100.0) / max; + out.println(MSG.getMsg(AgentI18NResourceKeys.GC_MEM_USAGE, name, typeStr, init, max, used, usedPercentage, + committed, committedPercentage)); + } +} \ No newline at end of file commit 8bbfe126b897a21135b21987aefcce1b45e76cb3 Author: Simeon Pinder <spinder(a)redhat.com> Date: Thu Jun 24 14:33:18 2010 -0400 refactoring BZ-597246 a little. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java index 634ebeb..17ad568 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java @@ -95,14 +95,20 @@ public class PackageBits implements Serializable { * return <code>null</code>. In this case, the content is probably stored somewhere else on a local file system. * When <code>null</code> is returned, it is assumed that who ever needs the content can know where to find it based * on the {@link PackageVersion} details. + * + * For large file contents, you should use ContentManager.updateBlobStream() to write and + * ContentManager.writeBlobOutToStream() to read/direct file contents into as no byte[] is used. */ @XmlTransient public byte[] getBits() { return bits; } + /** For large file contents, you should use ContentManager.updateBlobStream() to write and + * ContentManager.writeBlobOutToStream() to read/direct file contents into as no byte[] is used. + * + */ public void setBits(byte[] bits) { this.bits = bits; } - } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java index 5bae392..b2cac05 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java @@ -939,7 +939,6 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe try { PackageBits bits = entityManager.find(PackageBits.class, packageBits.getId()); - // bits.setBits(StreamUtil.slurp(bitStream)); String pkgName = "(set packageName)"; if ((packageVersion != null) && (packageVersion.getGeneralPackage() != null)) { //update it to whatever package name is if we can get to it. @@ -947,7 +946,6 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe } bits = loadPackageBits(bitStream, packageVersion.getId(), pkgName, packageVersion.getVersion(), bits); - // bits.setBits(StreamUtil.slurp(bitStream)); entityManager.merge(bits); } finally { @@ -1237,31 +1235,14 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe PackageVersion newPackageVersion = new PackageVersion(existingPackage, version, architecture); newPackageVersion.setDisplayName(existingPackage.getName()); - // PackageBits bits = loadPackageBits(packageBitStream); PackageBits bits = loadPackageBits(packageBitStream, newPackageVersion.getId(), packageName, version, null); - // // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING - // // Write the content into the newly created package version. This may eventually move, but for now we'll just - // // use the byte array in the package version to store the bits. - // byte[] packageBits; - // try { - // packageBits = StreamUtil.slurp(packageBitStream); - // } catch (RuntimeException re) { - // throw new RuntimeException("Error reading in the package file", re); - // } - // - // PackageBits bits = new PackageBits(); - // try { - // bits.setBits(packageBits); - // } catch (Exception e) { - // log.error("Error saving the package.", e); - // } newPackageVersion.setPackageBits(bits); + //TODO: write down to file system to calculate length and calculate hash. newPackageVersion.setFileSize((long) bits.getBits().length); try { newPackageVersion.setSHA256(new MessageDigestGenerator(MessageDigestGenerator.SHA_256) .calcDigestString(bits.getBits())); - // .calcDigestString(packageBits)); } catch (IOException e) { newPackageVersion.setSHA256(null); } @@ -1579,23 +1560,6 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe //get the data PackageBits bits = loadPackageBits(packageBitStream, packageVersion.getId(), packageName, version, null); - // // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING - // // Write the content into the newly created package version. This may eventually move, but for now we'll just - // // use the byte array in the package version to store the bits. - // byte[] packageBits; - // try { - // packageBits = StreamUtil.slurp(packageBitStream); - // } catch (RuntimeException re) { - // throw new RuntimeException("Error reading in the package file", re); - // } - // - // PackageBits bits = new PackageBits(); - // // bits = new PackageBits(); - // try { - // bits.setBits(packageBits); - // } catch (Exception e) { - // log.error("Error savinf the package.", e); - // } packageVersion.setPackageBits(bits); @@ -1643,10 +1607,8 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe bits = entityManager.find(PackageBits.class, bits.getId()); - Subject user = null; - //write data from stream into db using Hibernate Blob mechanism - updateBlobStream(user, packageBitStream, bits); + updateBlobStream(packageBitStream, bits); return bits; } @@ -1656,19 +1618,7 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe * * @param stream */ - public void updateBlobStream(Subject user, InputStream stream, PackageBits bits) { - - // int resourceId = -1; - // if (bits != null) { - // resourceId = bits.getId(); - // } - // log.info("Updating data for PackageBits [" + bits + "] with resource ID [" + resourceId + "]"); - // - // // Check permissions first - // if (!authorizationManager.hasResourcePermission(user, Permission.MANAGE_CONTENT, resourceId)) { - // throw new PermissionException("User [" + user.getName() - // + "] does not have permission to update packageBits " + bits + " with resource ID [" + resourceId + "]"); - // } + public void updateBlobStream(InputStream stream, PackageBits bits) { //TODO: are there any db specific limits that we should check/verify here before stuffing // the contents of a stream into the db? Should we just let the db complain and take care of @@ -1747,24 +1697,11 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe * * @param stream non null stream where contents to be written to. */ - public void writeBlobOutToStream(Subject user, OutputStream stream, PackageBits bits, boolean closeStreams) { - - // int resourceId = -1; - // if (bits != null) { - // resourceId = bits.getId(); - // } - // log.info("Reading data for PackageBits [" + bits + "] with resource ID [" + resourceId + "]"); - // - // // Check permissions first - // if (!authorizationManager.hasResourcePermission(user, Permission.MANAGE_CONTENT, resourceId)) { - // throw new PermissionException("User [" + user.getName() + "] does not have permission to read packageBits " - // + bits + " with resource ID [" + resourceId + "]"); - // } + public void writeBlobOutToStream(OutputStream stream, PackageBits bits, boolean closeStreams) { if (stream == null) { return; // no locate to write to } - // if ((bits == null) || (bits.getId() <= 0) || bits.getBits() == null) { if ((bits == null) || (bits.getId() <= 0)) { //then PackageBits instance passed in is insufficiently initialized. log.warn("PackageBits insufficiently initialized. No data to write out."); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java index 83c0037..65b0365 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java @@ -347,8 +347,8 @@ public interface ContentManagerLocal { byte[] getPackageBytes(Subject user, int resourceId, int installedPackageId); - void writeBlobOutToStream(Subject user, OutputStream stream, PackageBits bits, boolean closeStreams); + void writeBlobOutToStream(OutputStream stream, PackageBits bits, boolean closeStreams); - void updateBlobStream(Subject user, InputStream stream, PackageBits bits); + void updateBlobStream(InputStream stream, PackageBits bits); } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java index c8ac4e3..7fae6e0 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java @@ -29,7 +29,6 @@ import org.apache.commons.logging.LogFactory; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.content.Architecture; import org.rhq.core.domain.content.Package; import org.rhq.core.domain.content.PackageBits; @@ -285,8 +284,7 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test { } FileInputStream fos = new FileInputStream(originalBinary); - Subject empty = null; - contentManager.updateBlobStream(empty, fos, packageBits); + contentManager.updateBlobStream(fos, packageBits); packageBits = em.find(PackageBits.class, packageBits.getId()); // test that the bits are available and stored in the DB: Reading the Blob @@ -298,7 +296,7 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test { assert composite.isPackageBitsInDatabase(); FileOutputStream outputStream = new FileOutputStream(retrieved); - contentManager.writeBlobOutToStream(empty, outputStream, packageBits, false); + contentManager.writeBlobOutToStream(outputStream, packageBits, false); //Check that db content equal to file system content String originalDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256) commit 408bc20049ff0f06738e70b2dbafdbbd83366fdb Author: Simeon Pinder <spinder(a)redhat.com> Date: Thu Jun 24 11:03:02 2010 -0400 BZ-597246: changed StreamUtil.slurp to use Hibernate Blob mechanism, and added unit test for read/write Blob data. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java index 2bf059c..634ebeb 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java @@ -104,4 +104,5 @@ public class PackageBits implements Serializable { public void setBits(byte[] bits) { this.bits = bits; } + } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java index 244478e..5bae392 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java @@ -24,8 +24,11 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; +import java.sql.Blob; import java.sql.Connection; import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -936,7 +939,15 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe try { PackageBits bits = entityManager.find(PackageBits.class, packageBits.getId()); - bits.setBits(StreamUtil.slurp(bitStream)); + // bits.setBits(StreamUtil.slurp(bitStream)); + String pkgName = "(set packageName)"; + if ((packageVersion != null) && (packageVersion.getGeneralPackage() != null)) { + //update it to whatever package name is if we can get to it. + pkgName = packageVersion.getGeneralPackage().getName(); + } + bits = loadPackageBits(bitStream, packageVersion.getId(), pkgName, packageVersion.getVersion(), + bits); + // bits.setBits(StreamUtil.slurp(bitStream)); entityManager.merge(bits); } finally { @@ -1227,28 +1238,30 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe newPackageVersion.setDisplayName(existingPackage.getName()); // PackageBits bits = loadPackageBits(packageBitStream); - // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING - // Write the content into the newly created package version. This may eventually move, but for now we'll just - // use the byte array in the package version to store the bits. - byte[] packageBits; - try { - packageBits = StreamUtil.slurp(packageBitStream); - } catch (RuntimeException re) { - throw new RuntimeException("Error reading in the package file", re); - } - - PackageBits bits = new PackageBits(); - try { - bits.setBits(packageBits); - } catch (Exception e) { - log.error("Error saving the package.", e); - } + PackageBits bits = loadPackageBits(packageBitStream, newPackageVersion.getId(), packageName, version, null); + // // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING + // // Write the content into the newly created package version. This may eventually move, but for now we'll just + // // use the byte array in the package version to store the bits. + // byte[] packageBits; + // try { + // packageBits = StreamUtil.slurp(packageBitStream); + // } catch (RuntimeException re) { + // throw new RuntimeException("Error reading in the package file", re); + // } + // + // PackageBits bits = new PackageBits(); + // try { + // bits.setBits(packageBits); + // } catch (Exception e) { + // log.error("Error saving the package.", e); + // } newPackageVersion.setPackageBits(bits); newPackageVersion.setFileSize((long) bits.getBits().length); try { newPackageVersion.setSHA256(new MessageDigestGenerator(MessageDigestGenerator.SHA_256) - .calcDigestString(packageBits)); + .calcDigestString(bits.getBits())); + // .calcDigestString(packageBits)); } catch (IOException e) { newPackageVersion.setSHA256(null); } @@ -1564,24 +1577,25 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe entityManager.persist(packageVersion); } - //get the data and persist/merge packageVersion - // PackageBits bits = loadPackageBits(packageBitStream); - // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING - // Write the content into the newly created package version. This may eventually move, but for now we'll just - // use the byte array in the package version to store the bits. - byte[] packageBits; - try { - packageBits = StreamUtil.slurp(packageBitStream); - } catch (RuntimeException re) { - throw new RuntimeException("Error reading in the package file", re); - } - - PackageBits bits = new PackageBits(); - try { - bits.setBits(packageBits); - } catch (Exception e) { - log.error("Error savinf the package.", e); - } + //get the data + PackageBits bits = loadPackageBits(packageBitStream, packageVersion.getId(), packageName, version, null); + // // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING + // // Write the content into the newly created package version. This may eventually move, but for now we'll just + // // use the byte array in the package version to store the bits. + // byte[] packageBits; + // try { + // packageBits = StreamUtil.slurp(packageBitStream); + // } catch (RuntimeException re) { + // throw new RuntimeException("Error reading in the package file", re); + // } + // + // PackageBits bits = new PackageBits(); + // // bits = new PackageBits(); + // try { + // bits.setBits(packageBits); + // } catch (Exception e) { + // log.error("Error savinf the package.", e); + // } packageVersion.setPackageBits(bits); @@ -1604,26 +1618,177 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe /** Pulls in package bits from the stream. Currently inefficient. * * @param packageBitStream + * @param packageVersionId * @return PackageBits ref populated. */ - private PackageBits loadPackageBits(InputStream packageBitStream) { + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + private PackageBits loadPackageBits(InputStream packageBitStream, int packageVersionId, String packageName, + String packageVersion, PackageBits existingPkgBits) { PackageBits bits = null; - // TODO: THIS IS VERY BAD - MUST FIX - DO NOT SLURP THE ENTIRE FILE IN MEMORY - USE JDBC STREAMING - // Write the content into the newly created package version. This may eventually move, but for now we'll just - // use the byte array in the package version to store the bits. - byte[] packageBits; - try { - packageBits = StreamUtil.slurp(packageBitStream); - } catch (RuntimeException re) { - throw new RuntimeException("Error reading in the package file", re); + + //use or instantiate PackageBits instance. + if (existingPkgBits == null) { + bits = new PackageBits(); + entityManager.persist(bits); + } else { + bits = existingPkgBits; } - bits = new PackageBits(); + //locate related packageVersion + PackageVersion pv = entityManager.find(PackageVersion.class, packageVersionId); + + //associate the two + pv.setPackageBits(bits); + entityManager.flush(); // push the new package bits row to the DB + + bits = entityManager.find(PackageBits.class, bits.getId()); + + Subject user = null; + + //write data from stream into db using Hibernate Blob mechanism + updateBlobStream(user, packageBitStream, bits); + + return bits; + } + + /** Takes an input stream and copies it into the PackageBits table using Hibernate + * Blob mechanism with PreparedStatements. As all content into Bits are not stored as type OID, t + * + * @param stream + */ + public void updateBlobStream(Subject user, InputStream stream, PackageBits bits) { + + // int resourceId = -1; + // if (bits != null) { + // resourceId = bits.getId(); + // } + // log.info("Updating data for PackageBits [" + bits + "] with resource ID [" + resourceId + "]"); + // + // // Check permissions first + // if (!authorizationManager.hasResourcePermission(user, Permission.MANAGE_CONTENT, resourceId)) { + // throw new PermissionException("User [" + user.getName() + // + "] does not have permission to update packageBits " + bits + " with resource ID [" + resourceId + "]"); + // } + + //TODO: are there any db specific limits that we should check/verify here before stuffing + // the contents of a stream into the db? Should we just let the db complain and take care of + // input validation? + if (stream == null) { + return; // no stream content to update. + } + if (bits == null) { + bits = new PackageBits(); + } + + //persist to db if not already + if (bits.getId() <= 0) { + entityManager.persist(this); + } + + //locate the existing PackageBits instance + bits = entityManager.find(PackageBits.class, bits.getId()); + + ///initialize Bits field so non-empty. + bits.setBits(new String("a").getBytes()); + entityManager.merge(bits); + entityManager.flush(); + + //Create prepared statements to work with Blobs and hibernate. + Connection conn = null; + PreparedStatement ps = null; + PreparedStatement ps2 = null; + DataSource ds = null; try { - bits.setBits(packageBits); + + conn = dataSource.getConnection(); + + //we are loading the PackageBits saved in the previous step + //we need to lock the row which will be updated so we are using FOR UPDATE + ps = conn.prepareStatement("SELECT BITS FROM " + PackageBits.TABLE_NAME + " WHERE ID = ? FOR UPDATE"); + ps.setInt(1, bits.getId()); + ResultSet rs = ps.executeQuery(); + if (rs != null) { + while (rs.next()) { + + //We can not create a blob directly because BlobImpl from Hibernate is not acceptable + //for oracle and Connection.createBlob is not working on postgres. + //This blob will be not empty because we saved there a bytes from String("a"). + Blob blb = rs.getBlob(1); + + //copy the stream to the Blob + long transferred = StreamUtil.copy(stream, blb.setBinaryStream(1), false); + stream.close(); + + //populate the prepared statement for update + ps2 = conn.prepareStatement("UPDATE " + PackageBits.TABLE_NAME + " SET bits = ? where id = ?"); + ps2.setBlob(1, blb); + ps2.setInt(2, bits.getId()); + + //initiate the update. + if (ps2.execute()) { + throw new Exception("Unable to upload the package bits to the DB:"); + } + ps2.close(); + } + } + ps.close(); + conn.close(); } catch (Exception e) { - log.error("Error saving the package.", e); + log.error("An error occurred while updating Blob with stream for PackageBits[" + bits.getId() + "], " + + e.getMessage()); + e.printStackTrace(); + } + + entityManager.merge(bits); + entityManager.flush(); + } + + /**Writes the contents of a the Blob out to the stream passed in. + * + * @param stream non null stream where contents to be written to. + */ + public void writeBlobOutToStream(Subject user, OutputStream stream, PackageBits bits, boolean closeStreams) { + + // int resourceId = -1; + // if (bits != null) { + // resourceId = bits.getId(); + // } + // log.info("Reading data for PackageBits [" + bits + "] with resource ID [" + resourceId + "]"); + // + // // Check permissions first + // if (!authorizationManager.hasResourcePermission(user, Permission.MANAGE_CONTENT, resourceId)) { + // throw new PermissionException("User [" + user.getName() + "] does not have permission to read packageBits " + // + bits + " with resource ID [" + resourceId + "]"); + // } + + if (stream == null) { + return; // no locate to write to + } + // if ((bits == null) || (bits.getId() <= 0) || bits.getBits() == null) { + if ((bits == null) || (bits.getId() <= 0)) { + //then PackageBits instance passed in is insufficiently initialized. + log.warn("PackageBits insufficiently initialized. No data to write out."); + return; + } + try { + //open connection + Connection conn = dataSource.getConnection(); + + //prepared statement for retrieval of Blob.bits + PreparedStatement ps = conn + .prepareStatement("SELECT BITS FROM " + PackageBits.TABLE_NAME + " WHERE ID = ?"); + ps.setInt(1, bits.getId()); + ResultSet results = ps.executeQuery(); + if (results.next()) { + // results.next(); + //retrieve the Blob + Blob blob = results.getBlob(1); + //now copy the contents to the stream passed in + StreamUtil.copy(blob.getBinaryStream(), stream, closeStreams); + } + } catch (Exception ex) { + log.error("An error occurred while writing Blob contents out to stream :" + ex.getMessage()); + ex.printStackTrace(); } - return bits; } -} +} \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java index fc128a4..83c0037 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.server.content; import java.io.InputStream; +import java.io.OutputStream; import java.util.List; import java.util.Map; import java.util.Set; @@ -32,6 +33,7 @@ import org.rhq.core.domain.content.Architecture; import org.rhq.core.domain.content.ContentServiceRequest; import org.rhq.core.domain.content.InstalledPackage; import org.rhq.core.domain.content.Package; +import org.rhq.core.domain.content.PackageBits; import org.rhq.core.domain.content.PackageDetailsKey; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.PackageVersion; @@ -211,9 +213,8 @@ public interface ContentManagerLocal { PackageVersion createPackageVersion(String packageName, int packageTypeId, String version, int architectureId, InputStream packageBitStream); - PackageVersion getUploadedPackageVersion(String packageName, int packageTypeId, String version, - int architectureId, InputStream packageBitStream, Map<String, String> packageUploadDetails, - int newResourceTypeId); + PackageVersion getUploadedPackageVersion(String packageName, int packageTypeId, String version, int architectureId, + InputStream packageBitStream, Map<String, String> packageUploadDetails, int newResourceTypeId); /** * Very simple method that persists the given package version within its own transaction. @@ -346,4 +347,8 @@ public interface ContentManagerLocal { byte[] getPackageBytes(Subject user, int resourceId, int installedPackageId); + void writeBlobOutToStream(Subject user, OutputStream stream, PackageBits bits, boolean closeStreams); + + void updateBlobStream(Subject user, InputStream stream, PackageBits bits); + } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java index b83695f..c8ac4e3 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java @@ -18,6 +18,10 @@ */ package org.rhq.enterprise.server.content.test; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; + import javax.persistence.EntityManager; import org.apache.commons.logging.Log; @@ -25,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.content.Architecture; import org.rhq.core.domain.content.Package; import org.rhq.core.domain.content.PackageBits; @@ -32,7 +37,9 @@ import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.PackageVersion; import org.rhq.core.domain.content.composite.LoadedPackageBitsComposite; import org.rhq.core.domain.resource.Resource; +import org.rhq.core.util.MessageDigestGenerator; import org.rhq.enterprise.server.auth.SubjectManagerLocal; +import org.rhq.enterprise.server.content.ContentManagerLocal; import org.rhq.enterprise.server.content.ContentUIManagerLocal; import org.rhq.enterprise.server.test.AbstractEJB3Test; import org.rhq.enterprise.server.util.LookupUtil; @@ -52,6 +59,7 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test { private ContentUIManagerLocal contentUIManager; private SubjectManagerLocal subjectManager; + private ContentManagerLocal contentManager; // Setup -------------------------------------------- @@ -59,6 +67,7 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test { public void setupBeforeClass() throws Exception { contentUIManager = LookupUtil.getContentUIManager(); subjectManager = LookupUtil.getSubjectManager(); + contentManager = LookupUtil.getContentManager(); } // Test Cases -------------------------------------------- @@ -214,4 +223,94 @@ public class ContentUIManagerBeanTest extends AbstractEJB3Test { getTransactionManager().rollback(); } } + + @Test(enabled = ENABLE_TESTS) + public void testPackageBitsBlobStream() throws Throwable { + LoadedPackageBitsComposite composite; + + getTransactionManager().begin(); + + try { + EntityManager em = getEntityManager(); + Resource resource = SessionTestHelper.createNewResource(em, "testPkgBitsLargeResource"); + PackageType pkgType = new PackageType("testPkgBitsLargePT", resource.getResourceType()); + org.rhq.core.domain.content.Package pkg = new Package("testPkgBitsLargeP", pkgType); + Architecture arch = new Architecture("testPkgLargeArch"); + PackageVersion pkgVer = new PackageVersion(pkg, "1", arch); + + em.persist(pkgType); + em.persist(pkg); + em.persist(arch); + em.persist(pkgVer); + em.flush(); + + // test that no bits are available right now + composite = contentUIManager.getLoadedPackageBitsComposite(pkgVer.getId()); + assert composite != null; + assert composite.getPackageVersionId() == pkgVer.getId(); + assert composite.getPackageBitsId() == null; + assert !composite.isPackageBitsAvailable(); + assert !composite.isPackageBitsInDatabase(); + + // pretend we loaded the bits, but we stored them somewhere other then the DB + PackageBits packageBits = new PackageBits(); + em.persist(packageBits); + pkgVer.setPackageBits(packageBits); + pkgVer = em.merge(pkgVer); + em.flush(); + + // test that the bits are available, but are not stored in the DB + composite = contentUIManager.getLoadedPackageBitsComposite(pkgVer.getId()); + assert composite != null; + assert composite.getPackageVersionId() == pkgVer.getId(); + assert composite.getPackageBitsId() == packageBits.getId(); + assert composite.isPackageBitsAvailable(); + assert !composite.isPackageBitsInDatabase(); + + // let's make sure there really is no data in the DB + packageBits = em.find(PackageBits.class, packageBits.getId()); + assert packageBits != null; + assert packageBits.getBits() == null; + + // now lets store some bits in the DB using PreparedStatements and BLOB mechanism + // to simulate large file transfers where streaming is used instead of reading entire + // contents into memory every time. + + //any jar should be fine. Use generated server jar + File originalBinary = new File("./target/rhq-enterprise-server.jar"); + //destination once pulled from db + File retrieved = new File("./target/pulled.jar"); + if (retrieved.exists()) { + assertTrue("Unable to delete ./target/pulled.jar for test cleanup.", retrieved.delete()); + } + FileInputStream fos = new FileInputStream(originalBinary); + + Subject empty = null; + contentManager.updateBlobStream(empty, fos, packageBits); + packageBits = em.find(PackageBits.class, packageBits.getId()); + + // test that the bits are available and stored in the DB: Reading the Blob + composite = contentUIManager.getLoadedPackageBitsComposite(pkgVer.getId()); + assert composite != null; + assert composite.getPackageVersionId() == pkgVer.getId(); + assert composite.getPackageBitsId() == packageBits.getId(); + assert composite.isPackageBitsAvailable(); + assert composite.isPackageBitsInDatabase(); + + FileOutputStream outputStream = new FileOutputStream(retrieved); + contentManager.writeBlobOutToStream(empty, outputStream, packageBits, false); + + //Check that db content equal to file system content + String originalDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256) + .calcDigestString(originalBinary); + String newDigest = new MessageDigestGenerator(MessageDigestGenerator.SHA_256).calcDigestString(retrieved); + assertEquals("Uploaded and retrieved digests differ:", originalDigest, newDigest); + + } catch (Throwable t) { + t.printStackTrace(); + throw t; + } finally { + getTransactionManager().rollback(); + } + } } \ No newline at end of file commit d9c7b5f73abdf141dce71b4c938e6b4718954e18 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jun 24 10:39:21 2010 -0400 BZ-607672: support upgrading alert notification history diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java index 6fd0415..4e2f328 100644 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java @@ -23,6 +23,8 @@ import java.sql.SQLException; import java.util.List; import org.rhq.core.db.DatabaseType; +import org.rhq.core.db.OracleDatabaseType; +import org.rhq.core.db.PostgresqlDatabaseType; /** * The introduction of custom alert senders brought with it the denormalization of the AlertNotification schema. @@ -57,6 +59,13 @@ public class CustomAlertSenderUpgradeTask implements DatabaseUpgradeTask { this.databaseType = databaseType; this.connection = connection; + // upgrade the notification audit trail + upgradeSubjectNotificationLogs(); + upgradeRoleNotificationLogs(); + upgradeEmailNotificationLogs(); + upgradeOperationNotificationLogs(); + + // upgrade the notification rules upgradeSubjectNotifications(); upgradeRoleNotifications(); upgradeEmailNotifications(); @@ -64,6 +73,130 @@ public class CustomAlertSenderUpgradeTask implements DatabaseUpgradeTask { upgradeOperationNotifications(); } + private void upgradeSubjectNotificationLogs() throws SQLException { + /* + * alert.alertNotificationLog.sender = "System Users" + * alert.alertNotificationLog.result_state = "DEFERRED_EMAIL" + * alert.alertNotificationLog.message = "Sending to subjects: [<alert.alertNotificationLog.subjects>]" + */ + String field = "notif.subjects"; + String message = concat("'Sending to subjects: '", field); + String insertSQL = getNotificationLogConversionSQL("'System Users'", "'DEFERRED_EMAIL'", message, field); + System.out.println("Executing: " + insertSQL); + databaseType.executeSql(connection, insertSQL); + } + + private void upgradeRoleNotificationLogs() throws SQLException { + /* + * alert.alertNotificationLog.sender = "System Roles" + * alert.alertNotificationLog.result_state = "DEFERRED_EMAIL" + * alert.alertNotificationLog.message = "Sending to roles: [<alert.alertNotificationLog.roles>]" + */ + String field = "notif.roles"; + String message = concat("'Sending to roles: '", field); + String insertSQL = getNotificationLogConversionSQL("'System Roles'", "'DEFERRED_EMAIL'", message, field); + System.out.println("Executing: " + insertSQL); + databaseType.executeSql(connection, insertSQL); + } + + private void upgradeEmailNotificationLogs() throws SQLException { + /* + * alert.alertNotificationLog.sender = "Direct Emails" + * alert.alertNotificationLog.result_state = "DEFERRED_EMAIL" + * alert.alertNotificationLog.message = "Sending to subjects: [<alert.alertNotificationLog.emails>]" + */ + String field = "notif.emails"; + String message = concat("'Sending to addresses: '", field); + String insertSQL = getNotificationLogConversionSQL("'Direct Emails'", "'DEFERRED_EMAIL'", message, field); + System.out.println("Executing: " + insertSQL); + databaseType.executeSql(connection, insertSQL); + } + + private String getNotificationLogConversionSQL(String sender, String resultState, String message, + String notNullField) { + if (databaseType instanceof PostgresqlDatabaseType) { + return "INSERT INTO rhq_alert_notif_log ( id, alert_id, sender, result_state, message )" // + + " SELECT nextval('RHQ_ALERT_NOTIF_LOG_ID_SEQ'), " // + + " notif.alert_id AS notifAlertId, " // + + " " + sender + " AS notifSender, "// + + " " + resultState + " AS notifResultState, " // + + " " + message + " AS notifMessage "// + + " FROM rhq_alert_notif_log notif " // + + " WHERE " + notNullField + " IS NOT NULL"; + } else if (databaseType instanceof OracleDatabaseType) { + return "INSERT INTO rhq_alert_notif_log ( id, alert_id, sender, result_state, message )" // + + " SELECT RHQ_ALERT_NOTIF_LOG_ID_SEQ.nextval, " // + + " notifAlertId, notifSender, notifResultState, notifMessage " + + " FROM ( SELECT notif.alert_id AS notifAlertId, " // + + " " + sender + " AS notifSender, "// + + " " + resultState + " AS notifResultState, " // + + " " + message + " AS notifMessage "// + + " FROM rhq_alert_notif_log notif " // + + " WHERE " + notNullField + " IS NOT NULL )"; + } else { + throw new IllegalStateException(this.getClass().getSimpleName() + " does not support upgrades for " + + databaseType.getName()); + } + } + + private void upgradeOperationNotificationLogs() throws SQLException { + /* + * alert.alertNotificationLog.sender = "Resource Operations" + * alert.alertNotificationLog.result_state = "SUCCESS" + * alert.alertNotificationLog.message = "Executed '<alert.triggeredOperation>' on this resource" + */ + String field = "alert.triggered_operation"; + String message = concat("'Executed \"'", field, "'\" on this resource'"); + String insertSQL = getNotificationLogInsertionSQL("'Resource Operations'", "'SUCCESS'", message, field); + System.out.println("Executing: " + insertSQL); + databaseType.executeSql(connection, insertSQL); + } + + private String getNotificationLogInsertionSQL(String sender, String resultState, String message, String notNullField) { + if (databaseType instanceof PostgresqlDatabaseType) { + return "INSERT INTO rhq_alert_notif_log ( id, alert_id, sender, result_state, message )" // + + " SELECT nextval('RHQ_ALERT_NOTIF_LOG_ID_SEQ'), " // + + " alert.id AS notifAlertId, " // + + " " + sender + " AS notifSender, "// + + " " + resultState + " AS notifResultState, " // + + " " + message + " AS notifMessage "// + + " FROM rhq_alert alert " // + + " WHERE " + notNullField + " IS NOT NULL"; + } else if (databaseType instanceof OracleDatabaseType) { + return "INSERT INTO rhq_alert_notif_log ( id, alert_id, sender, result_state, message )" // + + " SELECT RHQ_ALERT_NOTIF_LOG_ID_SEQ.nextval, " // + + " notifAlertId, notifSender, notifResultState, notifMessage " + + " FROM ( SELECT alert.id AS notifAlertId, " // + + " " + sender + " AS notifSender, "// + + " " + resultState + " AS notifResultState, " // + + " " + message + " AS notifMessage "// + + " FROM rhq_alert alert " // + + " WHERE " + notNullField + " IS NOT NULL )"; + } else { + throw new IllegalStateException(this.getClass().getSimpleName() + " does not support upgrades for " + + databaseType.getName()); + } + } + + private String concat(String... elements) { + StringBuilder builder = new StringBuilder(); + if (databaseType instanceof PostgresqlDatabaseType || databaseType instanceof OracleDatabaseType) { + boolean first = true; + for (String next : elements) { + if (first) { + first = false; + } else { + builder.append("||"); + } + builder.append(next); + } + } else { + throw new IllegalStateException(this.getClass().getSimpleName() + " does not support upgrades for " + + databaseType.getName()); + } + return builder.toString(); + } + private void upgradeSubjectNotifications() throws SQLException { String dataMapSQL = "" // + " SELECT notif.alert_definition_id, notif.subject_id "// diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index d10dcf9..1d3bd04 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2082,6 +2082,20 @@ </schema-directSQL> </schemaSpec> <schemaSpec version="2.70.2"> + <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="SENDER" columnType="VARCHAR2" precision="200" /> + <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="RESULT_STATE" columnType="VARCHAR2" precision="20" /> + <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="MESSAGE" columnType="VARCHAR2" precision="4000" /> + <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="ALL_EMAILS" columnType="VARCHAR2" precision="4000" /> + <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="EMAILS_FAILED" columnType="VARCHAR2" precision="4000" /> + </schemaSpec> + <schemaSpec version="2.70.3"> + <schema-directSQL> + <statement desc="Dropping unique index RHQ_ALERT_IDX_ALERT"> + DROP INDEX RHQ_ALERT_IDX_ALERT + </statement> + </schema-directSQL> + </schemaSpec> + <schemaSpec version="2.70.4">  <schema-alterColumn table="RHQ_ALERT_NOTIFICATION" column="NOTIFICATION_TYPE" nullable="TRUE" /> <schema-javaTask className="CustomAlertSenderUpgradeTask" /> @@ -2092,7 +2106,7 @@ </schema-directSQL> <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="NOTIFICATION_TYPE" /> </schemaSpec> - <schemaSpec version="2.70.3"> + <schemaSpec version="2.70.5">  <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="snmp_host" /> <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="snmp_port" /> @@ -2100,25 +2114,17 @@ <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="email_address" /> <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="role_id" /> <schema-deleteColumn table="RHQ_ALERT_NOTIFICATION" column="subject_id" /> + <schema-deleteColumn table="RHQ_ALERT_DEFINITION" column="operation_def_id" /> </schemaSpec> - <schemaSpec version="2.70.4"> + <schemaSpec version="2.70.6"> <schema-deleteColumn table="RHQ_ALERT_NOTIF_LOG" column="roles" /> <schema-deleteColumn table="RHQ_ALERT_NOTIF_LOG" column="subjects" /> <schema-deleteColumn table="RHQ_ALERT_NOTIF_LOG" column="emails" /> + <schema-deleteColumn table="RHQ_ALERT" column="triggered_operation" /> </schemaSpec> - <schemaSpec version="2.70.5"> - <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="SENDER" columnType="VARCHAR2" precision="200" /> - <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="RESULT_STATE" columnType="VARCHAR2" precision="20" /> - <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="MESSAGE" columnType="VARCHAR2" precision="4000" /> - <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="ALL_EMAILS" columnType="VARCHAR2" precision="4000" /> - <schema-addColumn table="RHQ_ALERT_NOTIF_LOG" column="EMAILS_FAILED" columnType="VARCHAR2" precision="4000" /> - </schemaSpec> - <schemaSpec version="2.70.6"> + <schemaSpec version="2.70.7"> <schema-directSQL> - <statement> - DROP INDEX RHQ_ALERT_IDX_ALERT - </statement> - <statement> + <statement desc="Recreating RHQ_ALERT_IDX_ALERT as non-unique index"> CREATE INDEX RHQ_ALERT_IDX_ALERT ON RHQ_ALERT_NOTIF_LOG (alert_id) </statement> </schema-directSQL> diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java index 593f223..72d705d 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java @@ -238,10 +238,6 @@ public class Alert implements Serializable { @OneToMany(mappedBy = "alert", cascade = CascadeType.ALL) private List<AlertNotificationLog> alertNotificationLogs = new ArrayList<AlertNotificationLog>(); - @Deprecated - @Column(name = "TRIGGERED_OPERATION", nullable = true) - private String triggeredOperation; - /* * recoveryId and willRecover==true are mutually exclusive * @@ -283,9 +279,6 @@ public class Alert implements Serializable { // and unnecessary for creating the link // alertDefinition.addAlert(this); this.ctime = ctime; - if (alertDefinition.getOperationDefinition() != null) { - setTriggeredOperation(alertDefinition.getOperationDefinition().getDisplayName()); - } } public int getId() { @@ -325,14 +318,6 @@ public class Alert implements Serializable { this.alertNotificationLogs.add(log); } - public String getTriggeredOperation() { - return triggeredOperation; - } - - public void setTriggeredOperation(String triggeredOperation) { - this.triggeredOperation = triggeredOperation; - } - public Long getAcknowledgeTime() { return acknowledgeTime; } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java index 07739cf..a64de62 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java @@ -54,7 +54,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; import org.rhq.core.domain.alert.notification.AlertNotification; -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.resource.group.ResourceGroup; @@ -361,10 +360,6 @@ public class AlertDefinition implements Serializable { @org.hibernate.annotations.Cascade(org.hibernate.annotations.CascadeType.DELETE_ORPHAN) private List<AlertNotification> alertNotifications = new ArrayList<AlertNotification>(); - @JoinColumn(name = "OPERATION_DEF_ID", nullable = true) - @ManyToOne - private OperationDefinition operationDefinition; - /* * As of Sept 29, 2007 there is no reason to expose this at the java layer. However, this is required if we want to * be able to cascade delete the AlertDampeningEvents when an AlertDefinition is removed from the db, due to @@ -409,7 +404,7 @@ public class AlertDefinition implements Serializable { /* * Don't copy the id, ctime, or mtime. */ - this.name = alertDef.name; + setName(alertDef.name); this.description = alertDef.description; this.priority = alertDef.priority; this.enabled = alertDef.enabled; @@ -456,8 +451,6 @@ public class AlertDefinition implements Serializable { } this.removeAllAlertNotifications(); this.getAlertNotifications().addAll(copiedNotifications); - - this.operationDefinition = alertDef.operationDefinition; } public int getId() { @@ -686,14 +679,6 @@ public class AlertDefinition implements Serializable { this.alertNotifications.clear(); } - public OperationDefinition getOperationDefinition() { - return operationDefinition; - } - - public void setOperationDefinition(OperationDefinition operationDefinition) { - this.operationDefinition = operationDefinition; - } - public Set<AlertDampeningEvent> getAlertDampeningEvents() { return alertDampeningEvents; } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java index 30454a7..01d4bc3 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java @@ -45,7 +45,6 @@ import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.alert.notification.AlertNotificationLog; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.measurement.DataType; -import org.rhq.core.domain.measurement.MeasurementCategory; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.gui.legacy.AttrConstants; @@ -117,7 +116,7 @@ public class ViewAlertAction extends TilesAction { true); } catch (Exception e) { // check if this is Calltime data - if (definition.getDataType()== DataType.CALLTIME) + if (definition.getDataType() == DataType.CALLTIME) firedValue = condLog.getValue(); else firedValue = "??"; @@ -142,11 +141,6 @@ public class ViewAlertAction extends TilesAction { request.setAttribute("aNotifLogs", notificationLogs); - request.setAttribute("controlEnabled", true); // always display control result, even if it's "none" - if (av.getTriggeredOperation() != null) { - request.setAttribute("controlAction", av.getTriggeredOperation()); - } - int recoveryAlertDefId = adv.getRecoveryId(); if (recoveryAlertDefId != 0) { String recoveryAlertName = getRecoveryAlertName(recoveryAlertDefId, subject); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionAction.java index ac19df3..6d080ef 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionAction.java @@ -103,8 +103,6 @@ public class EditDefinitionControlActionAction extends BaseAction { operationDefinition = operationManager.getOperationDefinition(subject, operationId); } - alertDefinition.setOperationDefinition(operationDefinition); - try { if (context == FormContext.Type) { alertTemplateManager.updateAlertTemplate(subject, alertDefinition, false); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionFormPrepareAction.java index 10fa84e..1086314 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionFormPrepareAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionFormPrepareAction.java @@ -82,12 +82,14 @@ public class EditDefinitionControlActionFormPrepareAction extends TilesAction { List<OptionItem> operationNames = AlertDefUtil.getControlActions(subject, id, formContext); // drop-downs + /* replaced by custom alert senders operationsForm.setControlActions(operationNames); if (alertDefinition.getOperationDefinition() != null) { Integer operationId = alertDefinition.getOperationDefinition().getId(); operationsForm.setControlAction(String.valueOf(operationId)); } + */ // properties // AlertDefinition alertDef = AlertDefUtil.getAlertDefinition(request, sessionID, eb); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java index 4c395fd..1657d08 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java @@ -68,10 +68,6 @@ public class ViewDefinitionAction extends TilesAction { request.setAttribute("recoveryAlertName", recoveryAlertName); } - if (alertDef.getOperationDefinition() != null) { - request.setAttribute("controlAction", alertDef.getOperationDefinition().getDisplayName()); - } - // enablement AlertDefUtil.setAlertDampeningRequestAttributes(request, alertDef); commit 4e2823ce36628041c3626d8e131ff2f8f9a3b94d Merge: b324404... 6dc2bab... Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jun 24 14:52:30 2010 +0200 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit b324404ad3b91849f12afa57fcd5417521274fd2 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jun 24 14:51:20 2010 +0200 BZ 607580 for traits don't try to parse numeric values and just show the conditions raw value (like for call time data). diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java index b3dbb3b..30454a7 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java @@ -128,6 +128,8 @@ public class ViewAlertAction extends TilesAction { || (category == AlertConditionCategory.EVENT)) { // TODO: jmarques - add validation to make sure condition is a valid regex Pattern alertCondBean.setActualValue(condLog.getValue()); + } else if (category == AlertConditionCategory.TRAIT) { + alertCondBean.setActualValue(condLog.getValue()); } else { alertCondBean.setActualValue("??"); } diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java index 208ab29..ca1cd5a 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java @@ -223,7 +223,8 @@ public class SubsystemAlertHistoryUIBean extends SubsystemView { String firedValue = log.getValue(); if (condition.getMeasurementDefinition() != null) { - if (condition.getMeasurementDefinition().getDataType()== DataType.CALLTIME) + DataType type = condition.getMeasurementDefinition().getDataType(); + if (type == DataType.CALLTIME || type == DataType.TRAIT) firedValue = log.getValue(); else firedValue = MeasurementConverter.format(Double.valueOf(log.getValue()), condition commit 3beb63086a3e383b11b5de1f438cb5f7629ec1ec Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Thu Jun 24 14:17:39 2010 +0200 If this is calltime data, fall back to show the raw codition log and don't try to parse a numeric value. diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java index 892b071..208ab29 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java @@ -28,11 +28,13 @@ import javax.faces.model.DataModel; import javax.faces.model.SelectItem; import javax.servlet.http.HttpServletRequest; +import org.rhq.core.db.DatabaseType; import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertConditionCategory; import org.rhq.core.domain.alert.AlertConditionLog; import org.rhq.core.domain.alert.composite.AlertHistoryComposite; import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; @@ -221,8 +223,11 @@ public class SubsystemAlertHistoryUIBean extends SubsystemView { String firedValue = log.getValue(); if (condition.getMeasurementDefinition() != null) { - firedValue = MeasurementConverter.format(Double.valueOf(log.getValue()), condition - .getMeasurementDefinition().getUnits(), true); + if (condition.getMeasurementDefinition().getDataType()== DataType.CALLTIME) + firedValue = log.getValue(); + else + firedValue = MeasurementConverter.format(Double.valueOf(log.getValue()), condition + .getMeasurementDefinition().getUnits(), true); } history.setConditionText(displayText); commit 6dc2bab0cc29ff28f82b8a63cb6c4b07222ff17c Author: hudson auto <wnstb(a)yahoo.com> Date: Thu Jun 24 02:54:16 2010 -0400 [maven-release-plugin] prepare for next development iteration diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 6d440ef..eda9133 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index dbd8dd6..bc7965b 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 1077987..2cf950b 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 751726e..ee81a94 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 78d1f23..d177f9e 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index f6fadb5..a51f92b 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 84dd23f..92ae1d2 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 96cbc8e..e0ced84 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 0df3808..0911918 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 558b9a2..d47d4c8 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index ba389df..e1ce7ef 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index a570e19..2e58102 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index c721f21..7739177 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 9e92634..eeb7e81 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 47cb583..7aad64c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index cee7efe..bc41dc5 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index f917e15..d9f1c1c 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index c569283..8942239 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 88ef26e..8b9da9c 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 6a09d32..611eb9d 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 643d41e..798a8ca 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 3068b31..df05645 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 6cd8f92..ca1b68d 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index e908b75..1beadca 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index f01ec85..0c529ba 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index a3e6434..783942c 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index bdef75c..aa880be 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index c3fc4fa..3b0dbb8 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 5e0a013..33966bd 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 57e79e7..605267f 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 1feb631..910b617 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index a4d9ed6..2ea73ee 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-webservices</artifactId> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index c2acfe1..2c98817 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index aee0070..3fd11e8 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 6956e3c..bf15866 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 4f2650b..9e7bb24 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index b05532d..dd5bc18 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 988e2e3..c0973f3 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index b9f3d0c..a62fee8 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 8a0c7c9..3193539 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index bf7fe01..e69bfbc 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 466b99a..ca33bb7 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index b743122..af75153 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 97c50f4..09839b8 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 8abb60d..73f405e 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index ce9b430..4c44f10 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 86a21ef..0033d1b 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index b83824c..61965f2 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b8bba65..7451668 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index a53f3ad..0ac61d3 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index ab30954..5a78451 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 8b6a170..2b16f4a 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 9a96ab0..e4ab9b2 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 3a96e6d..a6cba32 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 8bcdcea..9c7cc74 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 2dce331..ebdd3da 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 3fd87f6..06c8981 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 7ecbbad..aa278b8 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index cadb656..0cc2084 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 8df64c1..14738d0 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 031c90d..d056f74 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index ba37942..28dc9b1 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 762f318..a0721a9 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index e17c9d8..5d327ee 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 7006ed8..c37598e 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 851c129..cc160c9 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index f2682e9..b4f9208 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 48651cb..963223b 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 1e8011a..d920440 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 6ee0662..d5aaad5 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 7d98f84..30889f7 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 05ac956..b79645d 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 1c68b9b..f7cf265 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 35fd599..acb08ef 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index eddd3ed..7dd0fde 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 5d79625..65fa7b8 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 7e17c2b..853c020 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index ceb58be..a0ade77 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 54536d9..b9ed2b3 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index f276b7d..b3846fa 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index f1aa8f9..443e524 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 6bc1bfa..ac9885a 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index e488d56..d0c9053 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 37d84af..06ae2ae 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 75a1aff..1acdb0f 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 4e78da5..39c75da 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 87ba78d..97b83b0 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 4873dae..85d6105 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 1e95ca3..283ab6a 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index daf3133..5a4466c 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b0c26a5..a190dcd 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 98333bb..8f4e675 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index d0d0d63..0d41574 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 7189f74..7719b14 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index fdb421d..2d9d715 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 9c38247..3579496 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 7932012..41df1b8 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 03e2df8..205d5b0 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index cab4269..e299efa 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 4f886fd..b3d5e87 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 9a28ce8..bc96ae3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 07130df..2235687 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index efc840d..95b0dc6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name> commit 647a602bece9c1fae7c083d600a314914245bfe7 Author: hudson auto <wnstb(a)yahoo.com> Date: Thu Jun 24 02:53:18 2010 -0400 [maven-release-plugin] prepare release RHQ_3_0_0_GA_QA diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index eda9133..6d440ef 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index bc7965b..dbd8dd6 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 2cf950b..1077987 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index ee81a94..751726e 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index d177f9e..78d1f23 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index a51f92b..f6fadb5 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 92ae1d2..84dd23f 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index e0ced84..96cbc8e 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 0911918..0df3808 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index d47d4c8..558b9a2 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index e1ce7ef..ba389df 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 2e58102..a570e19 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 7739177..c721f21 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index eeb7e81..9e92634 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 7aad64c..47cb583 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index bc41dc5..cee7efe 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index d9f1c1c..f917e15 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 8942239..c569283 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 8b9da9c..88ef26e 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 611eb9d..6a09d32 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 798a8ca..643d41e 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index df05645..3068b31 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index ca1b68d..6cd8f92 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 1beadca..e908b75 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 0c529ba..f01ec85 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 783942c..a3e6434 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index aa880be..bdef75c 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 3b0dbb8..c3fc4fa 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 33966bd..5e0a013 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 605267f..57e79e7 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 910b617..1feb631 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 2ea73ee..a4d9ed6 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>rhq-remoting-webservices</artifactId> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 2c98817..c2acfe1 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 3fd11e8..aee0070 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index bf15866..6956e3c 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 9e7bb24..4f2650b 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index dd5bc18..b05532d 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index c0973f3..988e2e3 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index a62fee8..b9f3d0c 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 3193539..8a0c7c9 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index e69bfbc..bf7fe01 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index ca33bb7..466b99a 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index af75153..b743122 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 09839b8..97c50f4 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 73f405e..8abb60d 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 4c44f10..ce9b430 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 0033d1b..86a21ef 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 61965f2..b83824c 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 7451668..b8bba65 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 0ac61d3..a53f3ad 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 5a78451..ab30954 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 2b16f4a..8b6a170 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index e4ab9b2..9a96ab0 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index a6cba32..3a96e6d 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 9c7cc74..8bcdcea 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index ebdd3da..2dce331 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 06c8981..3fd87f6 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index aa278b8..7ecbbad 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 0cc2084..cadb656 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 14738d0..8df64c1 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index d056f74..031c90d 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index 28dc9b1..ba37942 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index a0721a9..762f318 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 5d327ee..e17c9d8 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index c37598e..7006ed8 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index cc160c9..851c129 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index b4f9208..f2682e9 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 963223b..48651cb 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index d920440..1e8011a 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index d5aaad5..6ee0662 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 30889f7..7d98f84 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index b79645d..05ac956 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index f7cf265..1c68b9b 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index acb08ef..35fd599 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 7dd0fde..eddd3ed 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 65fa7b8..5d79625 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 853c020..7e17c2b 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index a0ade77..ceb58be 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index b9ed2b3..54536d9 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index b3846fa..f276b7d 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 443e524..f1aa8f9 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index ac9885a..6bc1bfa 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index d0c9053..e488d56 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 06ae2ae..37d84af 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 1acdb0f..75a1aff 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 39c75da..4e78da5 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 97b83b0..87ba78d 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 85d6105..4873dae 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 283ab6a..1e95ca3 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 5a4466c..daf3133 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index a190dcd..b0c26a5 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 8f4e675..98333bb 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 0d41574..d0d0d63 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 7719b14..7189f74 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 2d9d715..fdb421d 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 3579496..9c38247 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 41df1b8..7932012 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 205d5b0..03e2df8 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index e299efa..cab4269 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index b3d5e87..4f886fd 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index bc96ae3..9a28ce8 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 2235687..07130df 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index 95b0dc6..efc840d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>3.0.0.GA_QA</version> <packaging>pom</packaging> <name>RHQ</name> commit f37dc284ddc937639b093a3fd0b0f65ecc5d99dd Merge: ef60a84... 27c3aca... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 18:51:05 2010 -0400 Merge branch 'release-3.0.0' into release-3.0.0-jay commit ef60a8450186e8ed588cc729112f039874c9fc22 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 17:50:59 2010 -0400 remove troublesome imports. add the ws test code to eclipse source diff --git a/.classpath b/.classpath index 59d7a95..a3d9d09 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="modules/common/jboss-as/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/remoting/webservices/src/test/java"/> <classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/> <classpathentry kind="src" path="modules/common/ant-bundle/src/test/java"/> <classpathentry kind="src" path="modules/common/filetemplate-bundle/src/main/java"/> diff --git a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java index 82fbff9..541d961 100644 --- a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java +++ b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java @@ -22,16 +22,8 @@ */ package org.rhq.enterprise.server.ws.test; -import java.util.List; - import org.testng.annotations.Test; -import org.rhq.enterprise.server.ws.Advisory; -import org.rhq.enterprise.server.ws.AdvisoryCVE; -import org.rhq.enterprise.server.ws.Cve; -import org.rhq.enterprise.server.ws.PageControl; -import org.rhq.enterprise.server.ws.Subject; - /** * Web service tests for the advisory manager services. * @@ -40,81 +32,81 @@ import org.rhq.enterprise.server.ws.Subject; @Test(groups = "ws") public class WsAdvisoryManagerTest extends WsUnitTestBase { -// Currently no WS interface - -// private static final boolean TESTS_ENABLED = true; -// -// @Test(enabled = TESTS_ENABLED) -// public void createGetDeleteAdvisory() throws Exception { -// -// // Setup -// String label = "WsAdvisoryManagerTest.createGetDeleteAdvisory.label"; -// String synopsis = "WsAdvisoryManagerTest.createGetDeleteAdvisory.synopsis"; -// String type = "bugfix"; -// -// Subject admin = subjectUtil.admin(); -// -// // Test -// Advisory created = service.createAdvisory(admin, label, type, synopsis); -// -// assert created != null; -// -// Advisory retrieved = service.getAdvisoryByName(label); -// -// service.deleteAdvisoryByAdvId(admin, created.getId()); -// -// // Verify -// assert label.equals(created.getAdvisory()) : "Found: " + created.getAdvisory(); -// assert synopsis.equals(created.getSynopsis()) : "Found: " + created.getAdvisoryName(); -// assert type.equals(created.getAdvisoryType()) : "Found: " + created.getAdvisoryType(); -// -// assert retrieved != null; -// assert label.equals(retrieved.getAdvisory()) : "Found: " + retrieved.getAdvisory(); -// assert synopsis.equals(retrieved.getSynopsis()) : "Found: " + retrieved.getAdvisoryName(); -// assert type.equals(retrieved.getAdvisoryType()) : "Found: " + retrieved.getAdvisoryType(); -// -// retrieved = service.getAdvisoryByName(label); -// -// assert retrieved == null; -// } -// -// @Test(enabled = TESTS_ENABLED) -// public void createMapDeleteCve() throws Exception { -// -// // Setup -// String advLabel = "WsAdvisoryManagerTest.createMapDeleteCve.label"; -// String advSynopsis = "WsAdvisoryManagerTest.createMapDeleteCve.synopsis"; -// String advType = "bugfix"; -// -// String cveName = "WsAdvisoryManagerTest.createMapDeleteCve.name"; -// -// Subject admin = subjectUtil.admin(); -// -// PageControl pc = objectFactory.createPageControl(); -// -// // Test & Verify -// Advisory createdAdvisory = service.createAdvisory(admin, advLabel, advType, advSynopsis); -// assert createdAdvisory != null; -// -// Cve createdCve = service.createCVE(admin, cveName); -// assert createdCve != null; -// -// AdvisoryCVE createdMapping = service.createAdvisoryCVE(admin, createdAdvisory, createdCve); -// assert createdMapping != null; -// -// assert advLabel.equals(createdMapping.getAdvisory().getAdvisory()); -// -// List<AdvisoryCVE> cveList = service.getAdvisoryCVEByAdvId(admin, createdAdvisory.getId(), pc); -// assert cveList.size() == 1 : "Found: " + cveList.size(); -// -// service.deleteAdvisoryCVE(admin, createdAdvisory.getId()); -// -// List<AdvisoryCVE> deletedMappings = service.getAdvisoryCVEByAdvId(admin, createdAdvisory.getId(), pc); -// assert deletedMappings != null; -// assert deletedMappings.size() == 0; -// -// // Cleanup -// service.deleteCVE(admin, createdCve.getId()); -// service.deleteAdvisoryByAdvId(admin, createdAdvisory.getId()); -// } + // Currently no WS interface + + // private static final boolean TESTS_ENABLED = true; + // + // @Test(enabled = TESTS_ENABLED) + // public void createGetDeleteAdvisory() throws Exception { + // + // // Setup + // String label = "WsAdvisoryManagerTest.createGetDeleteAdvisory.label"; + // String synopsis = "WsAdvisoryManagerTest.createGetDeleteAdvisory.synopsis"; + // String type = "bugfix"; + // + // Subject admin = subjectUtil.admin(); + // + // // Test + // Advisory created = service.createAdvisory(admin, label, type, synopsis); + // + // assert created != null; + // + // Advisory retrieved = service.getAdvisoryByName(label); + // + // service.deleteAdvisoryByAdvId(admin, created.getId()); + // + // // Verify + // assert label.equals(created.getAdvisory()) : "Found: " + created.getAdvisory(); + // assert synopsis.equals(created.getSynopsis()) : "Found: " + created.getAdvisoryName(); + // assert type.equals(created.getAdvisoryType()) : "Found: " + created.getAdvisoryType(); + // + // assert retrieved != null; + // assert label.equals(retrieved.getAdvisory()) : "Found: " + retrieved.getAdvisory(); + // assert synopsis.equals(retrieved.getSynopsis()) : "Found: " + retrieved.getAdvisoryName(); + // assert type.equals(retrieved.getAdvisoryType()) : "Found: " + retrieved.getAdvisoryType(); + // + // retrieved = service.getAdvisoryByName(label); + // + // assert retrieved == null; + // } + // + // @Test(enabled = TESTS_ENABLED) + // public void createMapDeleteCve() throws Exception { + // + // // Setup + // String advLabel = "WsAdvisoryManagerTest.createMapDeleteCve.label"; + // String advSynopsis = "WsAdvisoryManagerTest.createMapDeleteCve.synopsis"; + // String advType = "bugfix"; + // + // String cveName = "WsAdvisoryManagerTest.createMapDeleteCve.name"; + // + // Subject admin = subjectUtil.admin(); + // + // PageControl pc = objectFactory.createPageControl(); + // + // // Test & Verify + // Advisory createdAdvisory = service.createAdvisory(admin, advLabel, advType, advSynopsis); + // assert createdAdvisory != null; + // + // Cve createdCve = service.createCVE(admin, cveName); + // assert createdCve != null; + // + // AdvisoryCVE createdMapping = service.createAdvisoryCVE(admin, createdAdvisory, createdCve); + // assert createdMapping != null; + // + // assert advLabel.equals(createdMapping.getAdvisory().getAdvisory()); + // + // List<AdvisoryCVE> cveList = service.getAdvisoryCVEByAdvId(admin, createdAdvisory.getId(), pc); + // assert cveList.size() == 1 : "Found: " + cveList.size(); + // + // service.deleteAdvisoryCVE(admin, createdAdvisory.getId()); + // + // List<AdvisoryCVE> deletedMappings = service.getAdvisoryCVEByAdvId(admin, createdAdvisory.getId(), pc); + // assert deletedMappings != null; + // assert deletedMappings.size() == 0; + // + // // Cleanup + // service.deleteCVE(admin, createdCve.getId()); + // service.deleteAdvisoryByAdvId(admin, createdAdvisory.getId()); + // } } diff --git a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java index c1f5496..1902fbc 100644 --- a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java +++ b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java @@ -24,10 +24,6 @@ package org.rhq.enterprise.server.ws.test; import org.testng.annotations.Test; -import org.rhq.enterprise.server.ws.Distribution; -import org.rhq.enterprise.server.ws.DistributionType; -import org.rhq.enterprise.server.ws.Subject; - /** * Web service tests for the distribution manager service. * @@ -36,57 +32,57 @@ import org.rhq.enterprise.server.ws.Subject; @Test(groups = "ws") public class WsDistributionManagerTest extends WsUnitTestBase { -// Currently no WS interface - -// private static final boolean TESTS_ENABLED = true; -// -// @Test(enabled = TESTS_ENABLED) -// public void createGetDeleteDistribution() throws Exception { -// -// // Setup -// Subject admin = subjectUtil.admin(); -// String label = "WsDistributionManagerTest.createGetDeleteDistribution.label"; -// String path = "WsDistributionManagerTest.createGetDeleteDistribution.path"; -// -// DistributionType type = objectFactory.createDistributionType(); -// type.setName("WsDistributionManagerTest.createGetDeleteDistribution.type"); -// type.setDescription("WsDistributionManagerTest.createGetDeleteDistribution.desc"); -// -// // Test -// Distribution created = service.createDistribution(admin, label, path, type); -// -// assert created != null; -// -// Distribution byLabel = service.getDistributionByLabel(label); -// Distribution byPath = service.getDistributionByPath(path); -// -// DistributionType typeByName = service.getDistributionTypeByName(type.getName()); -// -// service.deleteDistributionByDistId(admin, created.getId()); -// -// // Verify -// assert byLabel != null; -// assert label.equals(byLabel.getLabel()); -// assert path.equals(byLabel.getBasePath()); -// assert type.getName().equals(byLabel.getDistributionType().getName()); -// -// assert byPath != null; -// assert label.equals(byPath.getLabel()); -// assert path.equals(byPath.getBasePath()); -// assert type.getName().equals(byPath.getDistributionType().getName()); -// -// assert typeByName != null; -// assert type.getName().equals(typeByName.getName()); -// assert type.getDescription().equals(typeByName.getDescription()); -// -// Distribution afterDelete = service.getDistributionByLabel(label); -// assert afterDelete == null; -// -// // Cleanup -// service.deleteDistributionTypeByName(admin, type.getName()); -// DistributionType typeAfterDelete = service.getDistributionTypeByName(type.getName()); -// -// assert typeAfterDelete == null; -// } + // Currently no WS interface + + // private static final boolean TESTS_ENABLED = true; + // + // @Test(enabled = TESTS_ENABLED) + // public void createGetDeleteDistribution() throws Exception { + // + // // Setup + // Subject admin = subjectUtil.admin(); + // String label = "WsDistributionManagerTest.createGetDeleteDistribution.label"; + // String path = "WsDistributionManagerTest.createGetDeleteDistribution.path"; + // + // DistributionType type = objectFactory.createDistributionType(); + // type.setName("WsDistributionManagerTest.createGetDeleteDistribution.type"); + // type.setDescription("WsDistributionManagerTest.createGetDeleteDistribution.desc"); + // + // // Test + // Distribution created = service.createDistribution(admin, label, path, type); + // + // assert created != null; + // + // Distribution byLabel = service.getDistributionByLabel(label); + // Distribution byPath = service.getDistributionByPath(path); + // + // DistributionType typeByName = service.getDistributionTypeByName(type.getName()); + // + // service.deleteDistributionByDistId(admin, created.getId()); + // + // // Verify + // assert byLabel != null; + // assert label.equals(byLabel.getLabel()); + // assert path.equals(byLabel.getBasePath()); + // assert type.getName().equals(byLabel.getDistributionType().getName()); + // + // assert byPath != null; + // assert label.equals(byPath.getLabel()); + // assert path.equals(byPath.getBasePath()); + // assert type.getName().equals(byPath.getDistributionType().getName()); + // + // assert typeByName != null; + // assert type.getName().equals(typeByName.getName()); + // assert type.getDescription().equals(typeByName.getDescription()); + // + // Distribution afterDelete = service.getDistributionByLabel(label); + // assert afterDelete == null; + // + // // Cleanup + // service.deleteDistributionTypeByName(admin, type.getName()); + // DistributionType typeAfterDelete = service.getDistributionTypeByName(type.getName()); + // + // assert typeAfterDelete == null; + // } } commit 27c3aca4240c7fcbb5e2685c0970b3ff7c764c63 Author: Joseph Marques <joseph(a)redhat.com> Date: Wed Jun 23 17:42:57 2010 -0400 BZ-586131: upon subject/role deletion, graceful removal of data from affected AlertNotification diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java index d827f9e..6fd0415 100644 --- a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java +++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java @@ -158,21 +158,23 @@ public class CustomAlertSenderUpgradeTask implements DatabaseUpgradeTask { definitionId = nextDefinitionId; if (buffer.length() != 0) { // buffer will be 0 the very first time, since definitionId is initially -1 - int configId = persistConfiguration(propertyName, buffer.toString()); + int configId = persistConfiguration(propertyName, "|" + buffer.toString() + "|"); persistNotification(definitionId, configId, sender); } buffer = new StringBuilder(); // reset for the next definitionId } if (buffer.length() != 0) { - // elements are already in the list - buffer.append(','); + // elements are already in the list, always add '|' separator between them + buffer.append('|'); } buffer.append(nextData); } if (buffer.length() != 0) { - int configId = persistConfiguration(propertyName, buffer.toString()); + // always add '|' separator to both side of the buffer + // this will enable searches for data using the JPQL fragment notification.configuration.value = '|<data>|' + int configId = persistConfiguration(propertyName, "|" + buffer.toString() + "|"); persistNotification(definitionId, configId, sender); } } diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java index d7001fc..4d5c1f0 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java @@ -49,7 +49,33 @@ import org.rhq.core.domain.configuration.Property; @NamedQueries( { @NamedQuery(name = AlertNotification.DELETE_BY_ID, query = "DELETE FROM AlertNotification an WHERE an.id IN ( :ids )"), @NamedQuery(name = AlertNotification.QUERY_DELETE_BY_RESOURCES, query = "DELETE FROM AlertNotification an WHERE an.alertDefinition IN ( SELECT ad FROM AlertDefinition ad WHERE ad.resource.id IN ( :resourceIds ) )"), - @NamedQuery(name = AlertNotification.QUERY_DELETE_ORPHANED, query = "DELETE FROM AlertNotification an WHERE an.alertDefinition IS NULL") }) + @NamedQuery(name = AlertNotification.QUERY_DELETE_ORPHANED, query = "DELETE FROM AlertNotification an WHERE an.alertDefinition IS NULL"), + @NamedQuery(name = AlertNotification.QUERY_CLEANSE_PARAMETER_VALUE_FOR_ALERT_SENDER, query = "" // + + "UPDATE Property property" // + + " SET stringValue = (" // + + " concat(" // + + " substring(" // + + " stringValue," // + + " 0," // + + " locate(:paramValue,stringValue)" // + + " )," // + + " substring(" // + + " stringValue," // + + " locate(:paramValue,stringValue)+length(:paramValue)-1," // + + " length(stringValue)-(locate(:paramValue,stringValue)+length(:paramValue)-2)" // + + " )" // + + " )" // + + " )" // + + " WHERE id IN (" // + + " SELECT notifParam.id" // + + " FROM AlertNotification notif" // + + " JOIN notif.configuration.properties notifParam" // + + " WHERE notif.senderName = :senderName" // + + " AND notifParam.name = :propertyName" // + + " AND locate(:paramValue,notifParam.stringValue) <> 0" // + + ")" + + ) }) @SequenceGenerator(name = "RHQ_ALERT_NOTIFICATION_ID_SEQ", sequenceName = "RHQ_ALERT_NOTIFICATION_ID_SEQ") @Table(name = "RHQ_ALERT_NOTIFICATION") public class AlertNotification implements Serializable { @@ -59,6 +85,8 @@ public class AlertNotification implements Serializable { public static final String DELETE_BY_ID = "AlertNotification.deleteById"; public static final String QUERY_DELETE_BY_RESOURCES = "AlertNotification.deleteByResources"; public static final String QUERY_DELETE_ORPHANED = "AlertNotification.deleteOrphaned"; + public static final String QUERY_DELETE_BY_ROLE_ID = "AlertNotification.deleteByRoleId"; + public static final String QUERY_CLEANSE_PARAMETER_VALUE_FOR_ALERT_SENDER = "AlertNotification.cleanseParameterValueForAlertSender"; @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.AUTO, generator = "RHQ_ALERT_NOTIFICATION_ID_SEQ") diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java index 4419c51..1a1ae19 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java @@ -296,4 +296,21 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc return notification; } + public int cleanseAlertNotificationBySubject(int subjectId) { + return cleanseParmaeterValueForAlertSender("System Users", "subjectId", String.valueOf(subjectId)); + } + + public int cleanseAlertNotificationByRole(int roleId) { + return cleanseParmaeterValueForAlertSender("System Roles", "roleId", String.valueOf(roleId)); + } + + private int cleanseParmaeterValueForAlertSender(String senderName, String propertyName, String valueToCleanse) { + Query query = entityManager.createNamedQuery(AlertNotification.QUERY_CLEANSE_PARAMETER_VALUE_FOR_ALERT_SENDER); + query.setParameter("senderName", senderName); + query.setParameter("propertyName", propertyName); + query.setParameter("paramValue", "|" + valueToCleanse + "|"); // wrap with fence-delimiter for search + int affectedRows = query.executeUpdate(); + return affectedRows; + } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java index 2597f03..8a137e0 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java @@ -97,4 +97,8 @@ public interface AlertNotificationManagerLocal { String getBackingBeanNameForSender(String shortName); AlertNotification getAlertNotification(Subject user, int alertNotificationId); + + int cleanseAlertNotificationBySubject(int subjectId); + + int cleanseAlertNotificationByRole(int roleId); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java index 06302a2..17be000 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java @@ -38,6 +38,7 @@ import javax.security.auth.login.LoginContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.annotation.IgnoreDependency; import org.jboss.security.Util; import org.jboss.security.auth.callback.UsernamePasswordHandler; @@ -51,6 +52,7 @@ import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.server.PersistenceUtility; import org.rhq.enterprise.server.RHQConstants; +import org.rhq.enterprise.server.alert.AlertNotificationManagerLocal; import org.rhq.enterprise.server.authz.AuthorizationManagerLocal; import org.rhq.enterprise.server.authz.PermissionException; import org.rhq.enterprise.server.authz.RequiredPermission; @@ -75,9 +77,14 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe @EJB private AuthorizationManagerLocal authorizationManager; + @EJB private SystemManagerLocal systemManager; + @EJB + @IgnoreDependency + private AlertNotificationManagerLocal alertNotificationManager; + private SessionManager sessionManager = SessionManager.getInstance(); /** @@ -154,7 +161,6 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe + subjectToModify.getName() + "]"); } - // Reset the roles and ldap roles according to the current settings as this method will not update them // To update assinged roles see RoleManager Subject currentSubject = entityManager.find(Subject.class, subjectToModify.getId()); @@ -529,6 +535,7 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe throw new PermissionException("You cannot delete a system root user - they must always exist"); } + alertNotificationManager.cleanseAlertNotificationBySubject(doomedSubject.getId()); entityManager.remove(doomedSubject); return; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java index 42c8353..30feae3 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java @@ -27,7 +27,6 @@ import java.util.Set; import javax.ejb.EJB; import javax.ejb.Stateless; import javax.interceptor.ExcludeDefaultInterceptors; -import javax.jws.WebParam; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.Query; @@ -35,6 +34,8 @@ import javax.persistence.Query; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.annotation.IgnoreDependency; + import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.authz.Role; @@ -45,6 +46,7 @@ import org.rhq.core.domain.util.PageList; import org.rhq.core.server.PersistenceUtility; import org.rhq.core.util.collection.ArrayUtils; import org.rhq.enterprise.server.RHQConstants; +import org.rhq.enterprise.server.alert.AlertNotificationManagerLocal; import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; @@ -69,6 +71,10 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { @EJB private AuthorizationManagerLocal authorizationManager; + @EJB + @IgnoreDependency + private AlertNotificationManagerLocal alertNotificationManager; + /** * @see org.rhq.enterprise.server.authz.RoleManagerLocal#findRolesBySubject(Subject,PageControl) */ @@ -153,6 +159,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { throw new PermissionException("You cannot delete an internal system role"); } + alertNotificationManager.cleanseAlertNotificationByRole(doomedRole.getId()); entityManager.remove(doomedRole); // there should not be any cascading - this does not touch subjects/groups } } @@ -181,7 +188,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { if (subjectToModify.getFsystem() || (authorizationManager.isSystemSuperuser(subjectToModify))) { throw new PermissionException("You cannot assign roles to user [" + subjectToModify.getName() - + "] - roles are fixed for this user"); + + "] - roles are fixed for this user"); } subjectToModify.getRoles().size(); @@ -190,7 +197,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { Role role = entityManager.find(Role.class, roleId); if (role == null) { throw new IllegalArgumentException("Tried to add role[" + roleId + "] to subject[" + subjectId - + "], but role was not found"); + + "], but role was not found"); } role.addSubject(subjectToModify); if (isLdap) { @@ -215,12 +222,12 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { Subject newSubject = entityManager.find(Subject.class, subjectId); if (newSubject == null) { throw new IllegalArgumentException("Tried to add subject[" + subjectId + "] to role[" + roleId - + "], but subject was not found"); + + "], but subject was not found"); } if (newSubject.getFsystem() || (authorizationManager.isSystemSuperuser(newSubject))) { throw new PermissionException("You cannot alter the roles for user [" + newSubject.getName() - + "] - roles are fixed for this user"); + + "] - roles are fixed for this user"); } role.addSubject(newSubject); @@ -241,7 +248,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { if (subjectToModify.getFsystem() || (authorizationManager.isSystemSuperuser(subjectToModify))) { throw new PermissionException("You cannot remove roles from user [" + subjectToModify.getName() - + "] - roles are fixed for this user"); + + "] - roles are fixed for this user"); } for (Integer roleId : roleIds) { @@ -358,7 +365,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { @RequiredPermission(Permission.MANAGE_SECURITY) @SuppressWarnings("unchecked") public PageList<Role> findAvailableRolesForSubject(Subject subject, Integer subjectId, Integer[] pendingRoleIds, - PageControl pc) { + PageControl pc) { pc.initDefaultOrderingField("r.name"); String queryName; @@ -413,7 +420,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { ResourceGroup group = entityManager.find(ResourceGroup.class, groupId); if (role == null) { throw new IllegalArgumentException("Tried to add resourceGroup[" + groupId + "] to role[" + roleId - + "], but resourceGroup was not found"); + + "], but resourceGroup was not found"); } role.addResourceGroup(group); } @@ -438,7 +445,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { ResourceGroup doomedGroup = entityManager.find(ResourceGroup.class, groupId); if (doomedGroup == null) { throw new IllegalArgumentException("Tried to remove doomedGroup[" + groupId + "] from role[" - + roleId + "], but subject was not found"); + + roleId + "], but subject was not found"); } role.removeResourceGroup(doomedGroup); } @@ -454,7 +461,6 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { currentMembers.add(group.getId()); } - List<Integer> newMembers = ArrayUtils.wrapInList(groupIds); // members needing addition newMembers.removeAll(currentMembers); if (newMembers.size() > 0) { @@ -468,7 +474,6 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { } } - private void processDependentPermissions(Role role) { /* * if you can control user/roles, then you can give yourself permissions, too; so we might as well @@ -497,7 +502,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { Subject doomedSubject = entityManager.find(Subject.class, subjectId); if (doomedSubject == null) { throw new IllegalArgumentException("Tried to remove subject[" + subjectId + "] from role[" + roleId - + "], but subject was not found"); + + "], but subject was not found"); } role.removeSubject(doomedSubject); } @@ -512,11 +517,11 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { currentMembers.add(group.getId()); } - List<Integer> newMembers = ArrayUtils.wrapInList(subjectIds); // members needing addition newMembers.removeAll(currentMembers); if (newMembers.size() > 0) { - addSubjectsToRole(subject, roleId, subjectIds); } + addSubjectsToRole(subject, roleId, subjectIds); + } List<Integer> extraMembers = new ArrayList<Integer>(currentMembers); // members needing removal extraMembers.removeAll(ArrayUtils.wrapInList(subjectIds)); @@ -525,7 +530,6 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { } } - @RequiredPermission(Permission.MANAGE_SECURITY) public void removeRolesFromResourceGroup(Subject subject, int groupId, int[] roleIds) { if ((roleIds != null) && (roleIds.length > 0)) { @@ -539,7 +543,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { Role doomedRole = entityManager.find(Role.class, roleId); if (doomedRole == null) { throw new IllegalArgumentException("Tried to remove role[" + roleId + "] from resourceGroup[" - + groupId + "], but role was not found"); + + groupId + "], but role was not found"); } group.removeRole(doomedRole); } @@ -565,7 +569,7 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { Role role = entityManager.find(Role.class, roleId); if (role == null) { throw new IllegalArgumentException("Tried to add role[" + roleId + "] to resourceGroup[" + groupId - + "], but role was not found"); + + "], but role was not found"); } group.addRole(role); } @@ -578,9 +582,9 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote { public PageList<Role> findRolesByCriteria(Subject subject, RoleCriteria criteria) { if (criteria.isSecurityManagerRequired() - && !authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_SECURITY)) { + && !authorizationManager.hasGlobalPermission(subject, Permission.MANAGE_SECURITY)) { throw new PermissionException("Subject [" + subject.getName() - + "] requires SecurityManager permission for requested query criteria."); + + "] requires SecurityManager permission for requested query criteria."); } CriteriaQueryGenerator generator = new CriteriaQueryGenerator(criteria); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java index c9a0602..02183f6 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java @@ -112,4 +112,49 @@ public abstract class AlertSender<T extends ServerPluginComponent> { } return "no preview available"; } + + /** + * Presumes the data is in the format "|a|b|c|d|e|" + * where '|' delimits all elements as well as wraps + * the entire expression. + */ + @SuppressWarnings("unchecked") + public static <T> List<T> unfence(String fencedData, Class<T> type) { + String[] elements = fencedData.split("\\|"); + List<T> results = new ArrayList<T>(elements.length); + + if (Integer.class.equals(type)) { + for (String next : elements) { + if (next.length() != 0) { + results.add((T) Integer.valueOf(next)); + } + } + } else if (String.class.equals(type)) { + for (String next : elements) { + if (next.length() != 0) { + results.add((T) next); + } + } + } else { + throw new IllegalArgumentException("No support for unfencing data of type " + type); + } + return results; + } + + /** + * Takes the list of elements e1, e2, e3 and fences + * them with '|' delimiters such that the result looks + * like "|e1|e2|e3|" + */ + public static String fence(List<?> elements) { + if (elements.size() == 0) { + return ""; + } + StringBuilder builder = new StringBuilder(); + builder.append('|'); + for (Object next : elements) { + builder.append(String.valueOf(next)).append('|'); + } + return builder.toString(); + } } diff --git a/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java b/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java index 1bcffe2..773d99a 100644 --- a/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java +++ b/modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java @@ -18,7 +18,6 @@ */ package org.rhq.enterprise.server.plugins.alertEmail; -import java.util.Arrays; import java.util.List; import org.rhq.core.domain.alert.Alert; @@ -41,14 +40,14 @@ public class EmailSender extends AlertSender { return new SenderResult(ResultState.FAILURE, "No email address given"); } - List<String> emails = Arrays.asList(emailAddressString.split(",")); + List<String> emails = AlertSender.unfence(emailAddressString, String.class); return new SenderResult(ResultState.DEFERRED_EMAIL, "Sending to addresses: " + emails, emails); } @Override public String previewConfiguration() { String emailAddressString = alertParameters.getSimpleValue("emailAddress", null); - if (emailAddressString == null) { + if (emailAddressString == null || emailAddressString.trim().length() == 0) { return "<empty>"; } return emailAddressString; diff --git a/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java b/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java index a420c23..a7f556e 100644 --- a/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java +++ b/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java @@ -18,8 +18,6 @@ */ package org.rhq.enterprise.server.plugins.alertRoles; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -27,6 +25,7 @@ import java.util.Map; import org.rhq.core.domain.authz.Role; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.util.PageControl; +import org.rhq.enterprise.server.plugin.pc.alert.AlertSender; import org.rhq.enterprise.server.plugin.pc.alert.CustomAlertSenderBackingBean; import org.rhq.enterprise.server.util.LookupUtil; @@ -52,30 +51,19 @@ public class RolesBackingBean extends CustomAlertSenderBackingBean { // get current subjects String subjectString = alertParameters.getSimpleValue(ROLE_ID, ""); - String[] subjects = subjectString.split(","); - currentRoles = new ArrayList<String>(Arrays.asList(subjects)); + currentRoles = AlertSender.unfence(subjectString, String.class); } @Override public void saveView() { - StringBuilder builder = new StringBuilder(); - boolean first = true; - for (String subjectId : currentRoles) { - if (first) { - first = false; - } else { - builder.append(","); - } - builder.append(subjectId); - } - String subjectIds = builder.toString(); + String roleIds = AlertSender.fence(currentRoles); PropertySimple p = alertParameters.getSimple(ROLE_ID); if (p == null) { - p = new PropertySimple(ROLE_ID, subjectIds); + p = new PropertySimple(ROLE_ID, roleIds); alertParameters.put(p); } else { - p.setStringValue(subjectIds); + p.setStringValue(roleIds); } alertParameters = persistConfiguration(alertParameters); diff --git a/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java b/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java index 0f88249..2846266 100644 --- a/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java +++ b/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java @@ -56,7 +56,7 @@ public class RolesSender extends AlertSender { @Override public String previewConfiguration() { List<Integer> roleIds = getRoleIdsFromConfiguration(); - if (roleIds == null) { + if (roleIds == null || roleIds.size() == 0) { return "<empty>"; } @@ -70,7 +70,9 @@ public class RolesSender extends AlertSender { List<String> results = new ArrayList<String>(); for (Integer nextRoleId : roleIds) { Role nextRole = roleManager.getRoleById(nextRoleId); - results.add(nextRole.getName()); + if (nextRole != null) { // handle unknown role ids + results.add(nextRole.getName()); + } } return results; @@ -81,10 +83,12 @@ public class RolesSender extends AlertSender { List<String> results = new ArrayList<String>(); for (Integer nextRoleId : roleIds) { Role nextRole = roleManager.getRoleById(nextRoleId); - for (Subject nextSubject : nextRole.getSubjects()) { - String nextEmail = nextSubject.getEmailAddress(); - if (nextEmail != null) { - results.add(nextEmail); + if (nextRole != null) { // handle unknown role ids + for (Subject nextSubject : nextRole.getSubjects()) { + String nextEmail = nextSubject.getEmailAddress(); + if (nextEmail != null) { + results.add(nextEmail); + } } } } @@ -103,11 +107,6 @@ public class RolesSender extends AlertSender { return null; } - String[] roleIds = roleIdString.split(","); - List<Integer> results = new ArrayList<Integer>(roleIds.length); - for (String nextRoleId : roleIds) { - results.add(Integer.parseInt(nextRoleId)); - } - return results; + return AlertSender.unfence(roleIdString, Integer.class); } } diff --git a/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsBackingBean.java b/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsBackingBean.java index 75699b0..b98bb1b 100644 --- a/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsBackingBean.java +++ b/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsBackingBean.java @@ -18,8 +18,6 @@ */ package org.rhq.enterprise.server.plugins.alertSubject; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -27,6 +25,7 @@ import java.util.Map; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.util.PageControl; +import org.rhq.enterprise.server.plugin.pc.alert.AlertSender; import org.rhq.enterprise.server.plugin.pc.alert.CustomAlertSenderBackingBean; import org.rhq.enterprise.server.util.LookupUtil; @@ -52,23 +51,12 @@ public class SubjectsBackingBean extends CustomAlertSenderBackingBean { // get current subjects String subjectString = alertParameters.getSimpleValue(SUBJECT_ID, ""); - String[] subjects = subjectString.split(","); - currentSubjects = new ArrayList<String>(Arrays.asList(subjects)); + currentSubjects = AlertSender.unfence(subjectString, String.class); } @Override public void saveView() { - StringBuilder builder = new StringBuilder(); - boolean first = true; - for (String subjectId : currentSubjects) { - if (first) { - first = false; - } else { - builder.append(","); - } - builder.append(subjectId); - } - String subjectIds = builder.toString(); + String subjectIds = AlertSender.fence(currentSubjects); PropertySimple p = alertParameters.getSimple(SUBJECT_ID); if (p == null) { diff --git a/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java b/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java index 8e67aea..13f4f32 100644 --- a/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java +++ b/modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java @@ -55,7 +55,7 @@ public class SubjectsSender extends AlertSender { @Override public String previewConfiguration() { List<Integer> subjectIds = getSubjectIdsFromConfiguration(); - if (subjectIds == null) { + if (subjectIds == null || subjectIds.size() == 0) { return "<empty>"; } @@ -69,7 +69,9 @@ public class SubjectsSender extends AlertSender { List<String> results = new ArrayList<String>(); for (Integer nextSubjectId : subjectIds) { Subject nextSubject = subjectManager.getSubjectById(nextSubjectId); - results.add(nextSubject.getName()); + if (nextSubject != null) { // handle unknown subject ids + results.add(nextSubject.getName()); + } } return results; @@ -80,9 +82,11 @@ public class SubjectsSender extends AlertSender { List<String> results = new ArrayList<String>(); for (Integer nextSubjectId : subjectIds) { Subject nextSubject = subjectManager.getSubjectById(nextSubjectId); - String nextEmail = nextSubject.getEmailAddress(); - if (nextEmail != null) { - results.add(nextEmail); + if (nextSubject != null) { // handle unknown subject ids + String nextEmail = nextSubject.getEmailAddress(); + if (nextEmail != null) { + results.add(nextEmail); + } } } @@ -100,11 +104,6 @@ public class SubjectsSender extends AlertSender { return null; } - String[] subjectIds = subjectIdString.split(","); - List<Integer> results = new ArrayList<Integer>(subjectIds.length); - for (String nextSubjectId : subjectIds) { - results.add(Integer.parseInt(nextSubjectId)); - } - return results; + return AlertSender.unfence(subjectIdString, Integer.class); } } commit 10de071f21b3fcdb5552b71c4099e49449b933ca Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 17:02:30 2010 -0400 Remove some WS tests for missing services (removed from 3.0.0 remote API) diff --git a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java index 48cf125..82fbff9 100644 --- a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java +++ b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java @@ -40,79 +40,81 @@ import org.rhq.enterprise.server.ws.Subject; @Test(groups = "ws") public class WsAdvisoryManagerTest extends WsUnitTestBase { - private static final boolean TESTS_ENABLED = true; - - @Test(enabled = TESTS_ENABLED) - public void createGetDeleteAdvisory() throws Exception { - - // Setup - String label = "WsAdvisoryManagerTest.createGetDeleteAdvisory.label"; - String synopsis = "WsAdvisoryManagerTest.createGetDeleteAdvisory.synopsis"; - String type = "bugfix"; - - Subject admin = subjectUtil.admin(); - - // Test - Advisory created = service.createAdvisory(admin, label, type, synopsis); - - assert created != null; - - Advisory retrieved = service.getAdvisoryByName(label); - - service.deleteAdvisoryByAdvId(admin, created.getId()); - - // Verify - assert label.equals(created.getAdvisory()) : "Found: " + created.getAdvisory(); - assert synopsis.equals(created.getSynopsis()) : "Found: " + created.getAdvisoryName(); - assert type.equals(created.getAdvisoryType()) : "Found: " + created.getAdvisoryType(); - - assert retrieved != null; - assert label.equals(retrieved.getAdvisory()) : "Found: " + retrieved.getAdvisory(); - assert synopsis.equals(retrieved.getSynopsis()) : "Found: " + retrieved.getAdvisoryName(); - assert type.equals(retrieved.getAdvisoryType()) : "Found: " + retrieved.getAdvisoryType(); - - retrieved = service.getAdvisoryByName(label); - - assert retrieved == null; - } - - @Test(enabled = TESTS_ENABLED) - public void createMapDeleteCve() throws Exception { - - // Setup - String advLabel = "WsAdvisoryManagerTest.createMapDeleteCve.label"; - String advSynopsis = "WsAdvisoryManagerTest.createMapDeleteCve.synopsis"; - String advType = "bugfix"; - - String cveName = "WsAdvisoryManagerTest.createMapDeleteCve.name"; - - Subject admin = subjectUtil.admin(); - - PageControl pc = objectFactory.createPageControl(); - - // Test & Verify - Advisory createdAdvisory = service.createAdvisory(admin, advLabel, advType, advSynopsis); - assert createdAdvisory != null; - - Cve createdCve = service.createCVE(admin, cveName); - assert createdCve != null; - - AdvisoryCVE createdMapping = service.createAdvisoryCVE(admin, createdAdvisory, createdCve); - assert createdMapping != null; - - assert advLabel.equals(createdMapping.getAdvisory().getAdvisory()); - - List<AdvisoryCVE> cveList = service.getAdvisoryCVEByAdvId(admin, createdAdvisory.getId(), pc); - assert cveList.size() == 1 : "Found: " + cveList.size(); - - service.deleteAdvisoryCVE(admin, createdAdvisory.getId()); - - List<AdvisoryCVE> deletedMappings = service.getAdvisoryCVEByAdvId(admin, createdAdvisory.getId(), pc); - assert deletedMappings != null; - assert deletedMappings.size() == 0; - - // Cleanup - service.deleteCVE(admin, createdCve.getId()); - service.deleteAdvisoryByAdvId(admin, createdAdvisory.getId()); - } +// Currently no WS interface + +// private static final boolean TESTS_ENABLED = true; +// +// @Test(enabled = TESTS_ENABLED) +// public void createGetDeleteAdvisory() throws Exception { +// +// // Setup +// String label = "WsAdvisoryManagerTest.createGetDeleteAdvisory.label"; +// String synopsis = "WsAdvisoryManagerTest.createGetDeleteAdvisory.synopsis"; +// String type = "bugfix"; +// +// Subject admin = subjectUtil.admin(); +// +// // Test +// Advisory created = service.createAdvisory(admin, label, type, synopsis); +// +// assert created != null; +// +// Advisory retrieved = service.getAdvisoryByName(label); +// +// service.deleteAdvisoryByAdvId(admin, created.getId()); +// +// // Verify +// assert label.equals(created.getAdvisory()) : "Found: " + created.getAdvisory(); +// assert synopsis.equals(created.getSynopsis()) : "Found: " + created.getAdvisoryName(); +// assert type.equals(created.getAdvisoryType()) : "Found: " + created.getAdvisoryType(); +// +// assert retrieved != null; +// assert label.equals(retrieved.getAdvisory()) : "Found: " + retrieved.getAdvisory(); +// assert synopsis.equals(retrieved.getSynopsis()) : "Found: " + retrieved.getAdvisoryName(); +// assert type.equals(retrieved.getAdvisoryType()) : "Found: " + retrieved.getAdvisoryType(); +// +// retrieved = service.getAdvisoryByName(label); +// +// assert retrieved == null; +// } +// +// @Test(enabled = TESTS_ENABLED) +// public void createMapDeleteCve() throws Exception { +// +// // Setup +// String advLabel = "WsAdvisoryManagerTest.createMapDeleteCve.label"; +// String advSynopsis = "WsAdvisoryManagerTest.createMapDeleteCve.synopsis"; +// String advType = "bugfix"; +// +// String cveName = "WsAdvisoryManagerTest.createMapDeleteCve.name"; +// +// Subject admin = subjectUtil.admin(); +// +// PageControl pc = objectFactory.createPageControl(); +// +// // Test & Verify +// Advisory createdAdvisory = service.createAdvisory(admin, advLabel, advType, advSynopsis); +// assert createdAdvisory != null; +// +// Cve createdCve = service.createCVE(admin, cveName); +// assert createdCve != null; +// +// AdvisoryCVE createdMapping = service.createAdvisoryCVE(admin, createdAdvisory, createdCve); +// assert createdMapping != null; +// +// assert advLabel.equals(createdMapping.getAdvisory().getAdvisory()); +// +// List<AdvisoryCVE> cveList = service.getAdvisoryCVEByAdvId(admin, createdAdvisory.getId(), pc); +// assert cveList.size() == 1 : "Found: " + cveList.size(); +// +// service.deleteAdvisoryCVE(admin, createdAdvisory.getId()); +// +// List<AdvisoryCVE> deletedMappings = service.getAdvisoryCVEByAdvId(admin, createdAdvisory.getId(), pc); +// assert deletedMappings != null; +// assert deletedMappings.size() == 0; +// +// // Cleanup +// service.deleteCVE(admin, createdCve.getId()); +// service.deleteAdvisoryByAdvId(admin, createdAdvisory.getId()); +// } } diff --git a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java index dabcae0..c1f5496 100644 --- a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java +++ b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java @@ -36,55 +36,57 @@ import org.rhq.enterprise.server.ws.Subject; @Test(groups = "ws") public class WsDistributionManagerTest extends WsUnitTestBase { - private static final boolean TESTS_ENABLED = true; - - @Test(enabled = TESTS_ENABLED) - public void createGetDeleteDistribution() throws Exception { - - // Setup - Subject admin = subjectUtil.admin(); - String label = "WsDistributionManagerTest.createGetDeleteDistribution.label"; - String path = "WsDistributionManagerTest.createGetDeleteDistribution.path"; - - DistributionType type = objectFactory.createDistributionType(); - type.setName("WsDistributionManagerTest.createGetDeleteDistribution.type"); - type.setDescription("WsDistributionManagerTest.createGetDeleteDistribution.desc"); - - // Test - Distribution created = service.createDistribution(admin, label, path, type); - - assert created != null; - - Distribution byLabel = service.getDistributionByLabel(label); - Distribution byPath = service.getDistributionByPath(path); - - DistributionType typeByName = service.getDistributionTypeByName(type.getName()); - - service.deleteDistributionByDistId(admin, created.getId()); - - // Verify - assert byLabel != null; - assert label.equals(byLabel.getLabel()); - assert path.equals(byLabel.getBasePath()); - assert type.getName().equals(byLabel.getDistributionType().getName()); - - assert byPath != null; - assert label.equals(byPath.getLabel()); - assert path.equals(byPath.getBasePath()); - assert type.getName().equals(byPath.getDistributionType().getName()); - - assert typeByName != null; - assert type.getName().equals(typeByName.getName()); - assert type.getDescription().equals(typeByName.getDescription()); - - Distribution afterDelete = service.getDistributionByLabel(label); - assert afterDelete == null; - - // Cleanup - service.deleteDistributionTypeByName(admin, type.getName()); - DistributionType typeAfterDelete = service.getDistributionTypeByName(type.getName()); - - assert typeAfterDelete == null; - } +// Currently no WS interface + +// private static final boolean TESTS_ENABLED = true; +// +// @Test(enabled = TESTS_ENABLED) +// public void createGetDeleteDistribution() throws Exception { +// +// // Setup +// Subject admin = subjectUtil.admin(); +// String label = "WsDistributionManagerTest.createGetDeleteDistribution.label"; +// String path = "WsDistributionManagerTest.createGetDeleteDistribution.path"; +// +// DistributionType type = objectFactory.createDistributionType(); +// type.setName("WsDistributionManagerTest.createGetDeleteDistribution.type"); +// type.setDescription("WsDistributionManagerTest.createGetDeleteDistribution.desc"); +// +// // Test +// Distribution created = service.createDistribution(admin, label, path, type); +// +// assert created != null; +// +// Distribution byLabel = service.getDistributionByLabel(label); +// Distribution byPath = service.getDistributionByPath(path); +// +// DistributionType typeByName = service.getDistributionTypeByName(type.getName()); +// +// service.deleteDistributionByDistId(admin, created.getId()); +// +// // Verify +// assert byLabel != null; +// assert label.equals(byLabel.getLabel()); +// assert path.equals(byLabel.getBasePath()); +// assert type.getName().equals(byLabel.getDistributionType().getName()); +// +// assert byPath != null; +// assert label.equals(byPath.getLabel()); +// assert path.equals(byPath.getBasePath()); +// assert type.getName().equals(byPath.getDistributionType().getName()); +// +// assert typeByName != null; +// assert type.getName().equals(typeByName.getName()); +// assert type.getDescription().equals(typeByName.getDescription()); +// +// Distribution afterDelete = service.getDistributionByLabel(label); +// assert afterDelete == null; +// +// // Cleanup +// service.deleteDistributionTypeByName(admin, type.getName()); +// DistributionType typeAfterDelete = service.getDistributionTypeByName(type.getName()); +// +// assert typeAfterDelete == null; +// } } diff --git a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsRegistrationManagerTest.java b/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsRegistrationManagerTest.java deleted file mode 100644 index 7886e4b..0000000 --- a/modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsRegistrationManagerTest.java +++ /dev/null @@ -1,76 +0,0 @@ -/* -* RHQ Management Platform -* Copyright (C) 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, version 2, as -* published by the Free Software Foundation, and/or the GNU Lesser -* General Public License, version 2.1, also as published by the Free -* Software Foundation. -* -* 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 and the GNU Lesser General Public License -* for more details. -* -* You should have received a copy of the GNU General Public License -* and the GNU Lesser General Public License along with this program; -* if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -package org.rhq.enterprise.server.ws.test; - -import java.util.List; - -import org.testng.annotations.Test; - -import org.rhq.enterprise.server.ws.InventoryStatus; -import org.rhq.enterprise.server.ws.Resource; -import org.rhq.enterprise.server.ws.ResourceCriteria; -import org.rhq.enterprise.server.ws.Subject; -import org.rhq.enterprise.server.ws.test.util.WsResourceUtility; -import org.rhq.enterprise.server.ws.test.util.WsSubjectUtility; - -/** - * Web service tests for the registration manager services. - * - * @author Jason Dobies - */ -@Test(groups = "ws") -public class WsRegistrationManagerTest extends WsUnitTestBase { - - private static final boolean TESTS_ENABLED = true; - - @Test(enabled = TESTS_ENABLED) - public void importPlatform() throws Exception { - - // Setup - WsResourceUtility resourceUtil = new WsResourceUtility(service); - WsSubjectUtility subjectUtil = new WsSubjectUtility(service); - Subject admin = subjectUtil.admin(); - - // Test - - // Note: randomPlatform calls #registerPlatform, which is why there's no explicit test for that - Resource created = resourceUtil.randomPlatform(); - - // Verify and Cleanup - try { - ResourceCriteria criteria = objectFactory.createResourceCriteria(); - criteria.setFilterId(created.getId()); - List<Resource> resources = service.findResourcesByCriteria(admin, criteria); - - assert resources.size() == 1 : "Incorrect number of resources returned. Found: " + resources.size(); - - Resource retrieved = resources.get(0); - - assert retrieved.getName().equals(created.getName()); - assert retrieved.getInventoryStatus().equals(InventoryStatus.COMMITTED); - } finally { - resourceUtil.deleteResource(created.getId()); - } - - } -} commit e71e170a064a93f981f0e8d773a28bccb2897484 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 16:20:03 2010 -0400 [BZ 604840] When deleting a BundleVersion make sure to cascade delete the PackageVersions for its BundleFiles. Note, this works at the moment because we generate a unique PackageVersion for each of a BundleVersions BundleFiles. The PV is versioned the same as the BV. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleFile.java b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleFile.java index 5de830d..f6b5c29 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleFile.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleFile.java @@ -24,6 +24,7 @@ package org.rhq.core.domain.bundle; import java.io.Serializable; +import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -69,8 +70,12 @@ public class BundleFile implements Serializable { @ManyToOne(fetch = FetchType.LAZY) private BundleVersion bundleVersion; + // Note, currently we cascade remove the PackageVersion because BundleVersions do not share + // PackageVersions. They create a PV versioned the same as the BV. If this approach changes in + // the future (e.e reuse of PVs if the sha256 is not different) then this will will have to change + // to reflect the fact that multiple BundleFiles could reference the same PackageVersion. @JoinColumn(name = "PACKAGE_VERSION_ID", referencedColumnName = "ID", nullable = false) - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) private PackageVersion packageVersion; public BundleFile() { diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java index 505a301..ab55bac 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java @@ -155,6 +155,7 @@ public class BundleManagerBeanTest extends UpdateSubsytemTestBase { // clean up any tests that don't already clean up after themselves // remove bundleversions which cascade remove bundlefiles and bundledeployments + // bundlefiles cascaderemove packageversions // bundledeployments cascade remove bundleresourcedeployments // bundleresourcedeployments cascade remove bundleresourcedeploymenthistory q = em.createQuery("SELECT bv FROM BundleVersion bv WHERE bv.name LIKE '" + TEST_PREFIX + "%'"); commit aca9cbdce8b971fdd4c778df15ebe66141d0cf2a Merge: 18c1614... b9ca90d... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 13:53:51 2010 -0400 Merge branch 'release-3.0.0' into release-3.0.0-jay commit 18c1614e34db3768f2bd94e389ca83d98b3dc770 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 13:52:30 2010 -0400 filter test code out of jdoc generation diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 840adfb..9e7bb24 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -638,6 +638,7 @@ Build-OS-Version=${os.version} </classpath> <fileset dir="${project.dir}" defaultexcludes="yes"> <include name="**/*Remote.java" /> + <exclude name="**/*Test*.java" /> </fileset> <link href="../domain" /> <link href="../plugin-api" /> commit b7869e17561c319ba652776fc3b71fee2bca844e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 12:12:36 2010 -0400 Trivial changes in RemoteAPI cleanup for 3.0.0 release diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java index d6f286b..05d8e2c 100644 --- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java +++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java @@ -76,7 +76,6 @@ public class RemoteClient { CallTimeDataManager(CallTimeDataManagerRemote.class), // RepoManager(RepoManagerRemote.class), // ConfigurationManager(ConfigurationManagerRemote.class), // - //ContentHelperManager(ContentHelperRemote.class), // ContentManager(ContentManagerRemote.class), // DataAccessManager(DataAccessManagerRemote.class), // DiscoveryBoss(DiscoveryBossRemote.class), // diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java index 4ae3cbc..861a591 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java @@ -30,6 +30,12 @@ import org.rhq.enterprise.server.support.SupportManagerRemote; import org.rhq.enterprise.server.system.ServerVersion; import org.rhq.enterprise.server.system.SystemManagerRemote; +/** + * The remote API supported by a WebService Interface. + * + * @author jay shaughnessy + * + */ @SOAPBinding(style = SOAPBinding.Style.DOCUMENT) @WebService(targetNamespace = ServerVersion.namespace) @Remote commit 54fa9b8b6e7b9fa350a3117b5679558681d2a57f Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 10:54:58 2010 -0400 Remove RepoGroup methods from the remote. This is not yet ready to be exposed. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java index 8635d3a..88bb16e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java @@ -213,12 +213,20 @@ public interface RepoManagerLocal { void deleteRepo(Subject subject, int repoId); /** - * @see RepoManagerRemote#createRepoGroup(Subject, RepoGroup) + * Creates a new {@link RepoGroup} in the server. + * + * @param subject represents the user creating the group + * @param repoGroup group data to create + * @return group instance populated after persisting + * @throws RepoException if a repo group already exists with this name */ RepoGroup createRepoGroup(Subject subject, RepoGroup repoGroup) throws RepoException; /** - * @see RepoManagerRemote#deleteRepoGroup(Subject, int) + * Deletes the indicated repo group. + * + * @param subject user deleting the group + * @param repoGroupId identifies the group being deleted */ void deleteRepoGroup(Subject subject, int repoGroupId); @@ -228,12 +236,20 @@ public interface RepoManagerLocal { Repo getRepo(Subject subject, int repoId); /** - * @see RepoManagerRemote#getRepoGroup(Subject, int) + * Returns the repo group with the given id; throws an error if one does not exist at that id. + * + * @param subject user whose permissions will be checked for access to the repo + * @param repoGroupId identifies the repo group to be retrieved + * @return details describing the repo group */ RepoGroup getRepoGroup(Subject subject, int repoGroupId); /** - * @see RepoManagerRemote#getRepoGroupTypeByName(Subject, String) + * Returns the repo group type with the given name. + * + * @param subject user whose permissions will be checked for access to the group type + * @param name identifies the repo group type + * @return details of the group type; <code>null</code> if no group is found with the name */ RepoGroupType getRepoGroupTypeByName(Subject subject, String name); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerRemote.java index 0acbced..0aa295c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerRemote.java @@ -27,12 +27,8 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.content.Advisory; -import org.rhq.core.domain.content.Distribution; import org.rhq.core.domain.content.PackageVersion; import org.rhq.core.domain.content.Repo; -import org.rhq.core.domain.content.RepoGroup; -import org.rhq.core.domain.content.RepoGroupType; import org.rhq.core.domain.content.transfer.SubscribedRepo; import org.rhq.core.domain.criteria.PackageVersionCriteria; import org.rhq.core.domain.criteria.RepoCriteria; @@ -76,20 +72,6 @@ public interface RepoManagerRemote { throws RepoException; /** - * Creates a new {@link RepoGroup} in the server. - * - * @param subject represents the user creating the group - * @param repoGroup group data to create - * @return group instance populated after persisting - * @throws RepoException if a repo group already exists with this name - */ - @WebMethod - RepoGroup createRepoGroup( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "repoGroup") RepoGroup repoGroup) // - throws RepoException; - - /** * Deletes the indicated repo. If this deletion orphans package versions (that is, its originating resource or * content source has been deleted), this will also purge those orphaned package versions. * @@ -102,17 +84,6 @@ public interface RepoManagerRemote { @WebParam(name = "repoId") int repoId); /** - * Deletes the indicated repo group. - * - * @param subject user deleting the group - * @param repoGroupId identifies the group being deleted - */ - @WebMethod - void deleteRepoGroup( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "repoGroupId") int repoGroupId); - - /** * Returns the repo with the given id; throws an error if one does not exist at that id. * * @param subject user whose permissions will be checked for access to the repo @@ -125,28 +96,6 @@ public interface RepoManagerRemote { @WebParam(name = "repoId") int repoId); /** - * Returns the repo group with the given id; throws an error if one does not exist at that id. - * - * @param subject user whose permissions will be checked for access to the repo - * @param repoGroupId identifies the repo group to be retrieved - * @return details describing the repo group - */ - @WebMethod - RepoGroup getRepoGroup(@WebParam(name = "subject") Subject subject, // - @WebParam(name = "repoGroupId") int repoGroupId); - - /** - * Returns the repo group type with the given name. - * - * @param subject user whose permissions will be checked for access to the group type - * @param name identifies the repo group type - * @return details of the group type; <code>null</code> if no group is found with the name - */ - @WebMethod - RepoGroupType getRepoGroupTypeByName(@WebParam(name = "subject") Subject subject, // - @WebParam(name = "name") String name); - - /** * Returns all repos that match the given criteria. * * @param subject user making the query @@ -230,6 +179,18 @@ public interface RepoManagerRemote { @WebParam(name = "pageControl") PageControl pc); /** + * Get a list of truncated Repo objects that represent the + * subscriptions for the specified resource. + * @param subject The logged in user's subject. + * @param resourceId The id of the resource. + * @return A list of repos. + */ + @WebMethod + List<SubscribedRepo> findSubscriptions( // + @WebParam(name = "subject") Subject subject, // + @WebParam(name = "resourceId") int resourceId); + + /** * Subscribes the identified resource to the set of identified repos. Once complete, the resource will be able to * access all package content from all content sources that are assigned to the given repos. * @@ -256,45 +217,7 @@ public interface RepoManagerRemote { @WebParam(name = "resourceId") int resourceId, // @WebParam(name = "repoIds") int[] repoIds); - /** - * gets a list of all associated distributions - * @param subject - * @param resourceId - * @param pc - * @return - */ - @WebMethod - PageList<Distribution> findAssociatedDistributions( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "repoId") int repoId, // - @WebParam(name = "pageControl") PageControl pc); - - /** - * gets a list of all associated advisory - * @param subject - * @param resourceId - * @param pc - * @return - */ - @WebMethod - PageList<Advisory> findAssociatedAdvisory( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "repoId") int repoId, // - @WebParam(name = "pageControl") PageControl pc); - @WebMethod int synchronizeRepos(@WebParam(name = "subject") Subject subject, @WebParam(name = "repoIds") Integer[] repoIds) throws Exception; - - /** - * Get a list of truncated Repo objects that represent the - * subscriptions for the specified resource. - * @param subject The logged in user's subject. - * @param resourceId The id of the resource. - * @return A list of repos. - */ - @WebMethod - List<SubscribedRepo> findSubscriptions( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "resourceId") int resourceId); } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java index 4664e32..cab0954 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java @@ -56,15 +56,11 @@ import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap; import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate; import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; -import org.rhq.core.domain.content.Advisory; import org.rhq.core.domain.content.Architecture; -import org.rhq.core.domain.content.Distribution; import org.rhq.core.domain.content.InstalledPackage; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.PackageVersion; import org.rhq.core.domain.content.Repo; -import org.rhq.core.domain.content.RepoGroup; -import org.rhq.core.domain.content.RepoGroupType; import org.rhq.core.domain.content.transfer.SubscribedRepo; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.AlertDefinitionCriteria; @@ -347,83 +343,6 @@ public class WebservicesManagerBean implements WebservicesRemote { //CALLTIMEDATAMANAGER: END ---------------------------------- - //REPOMANAGER: BEGIN ---------------------------------- - public void addPackageVersionsToRepo(Subject subject, int repoId, int[] packageVersionIds) { - repoManager.addPackageVersionsToRepo(subject, repoId, packageVersionIds); - } - - public Repo createRepo(Subject subject, Repo repo) throws RepoException { - return repoManager.createRepo(subject, repo); - } - - public void deleteRepo(Subject subject, int repoId) { - repoManager.deleteRepo(subject, repoId); - } - - public PageList<Repo> findRepos(Subject subject, PageControl pc) { - return repoManager.findRepos(subject, pc); - } - - public PageList<Repo> findReposByCriteria(Subject subject, RepoCriteria criteria) { - checkParametersPassedIn(subject, criteria); - return repoManager.findReposByCriteria(subject, criteria); - } - - public PageList<PackageVersion> findPackageVersionsInRepo(Subject subject, int repoId, String filter, PageControl pc) { - return repoManager.findPackageVersionsInRepo(subject, repoId, filter, pc); - } - - public PageList<PackageVersion> findPackageVersionsInRepoByCriteria(Subject subject, PackageVersionCriteria criteria) { - return repoManager.findPackageVersionsInRepoByCriteria(subject, criteria); - } - - public PageList<Resource> findSubscribedResources(Subject subject, int repoId, PageControl pc) { - return repoManager.findSubscribedResources(subject, repoId, pc); - } - - public Repo getRepo(Subject subject, int repoId) { - return repoManager.getRepo(subject, repoId); - } - - public RepoGroup createRepoGroup(Subject subject, RepoGroup repoGroup) throws RepoException { - return repoManager.createRepoGroup(subject, repoGroup); - } - - public void deleteRepoGroup(Subject subject, int repoGroupId) { - repoManager.deleteRepoGroup(subject, repoGroupId); - } - - public RepoGroup getRepoGroup(Subject subject, int repoGroupId) { - return repoManager.getRepoGroup(subject, repoGroupId); - } - - public RepoGroupType getRepoGroupTypeByName(Subject subject, String name) { - return repoManager.getRepoGroupTypeByName(subject, name); - } - - public void subscribeResourceToRepos(Subject subject, int resourceId, int[] repoIds) { - repoManager.subscribeResourceToRepos(subject, resourceId, repoIds); - } - - public void unsubscribeResourceFromRepos(Subject subject, int resourceId, int[] repoIds) { - repoManager.unsubscribeResourceFromRepos(subject, resourceId, repoIds); - } - - public Repo updateRepo(Subject subject, Repo repo) throws RepoException { - return repoManager.updateRepo(subject, repo); - } - - public PageList<PackageVersion> findPackageVersionsByCriteria(Subject subject, PackageVersionCriteria criteria) { - checkParametersPassedIn(subject, criteria); - return repoManager.findPackageVersionsInRepoByCriteria(subject, criteria); - } - - public int synchronizeRepos(Subject subject, Integer[] repoIds) throws Exception { - return repoManager.synchronizeRepos(subject, repoIds); - } - - //REPOMANAGER: END ---------------------------------- - //CONFIGURATIONMANAGER: BEGIN ---------------------------------- public Configuration getConfiguration(Subject subject, int configurationId) { return configurationManager.getConfiguration(subject, configurationId); @@ -777,6 +696,71 @@ public class WebservicesManagerBean implements WebservicesRemote { //OPERATIONMANAGER: END ---------------------------------- + //REPOMANAGER: BEGIN ---------------------------------- + public void addPackageVersionsToRepo(Subject subject, int repoId, int[] packageVersionIds) { + repoManager.addPackageVersionsToRepo(subject, repoId, packageVersionIds); + } + + public Repo createRepo(Subject subject, Repo repo) throws RepoException { + return repoManager.createRepo(subject, repo); + } + + public void deleteRepo(Subject subject, int repoId) { + repoManager.deleteRepo(subject, repoId); + } + + public PageList<Repo> findRepos(Subject subject, PageControl pc) { + return repoManager.findRepos(subject, pc); + } + + public PageList<Repo> findReposByCriteria(Subject subject, RepoCriteria criteria) { + checkParametersPassedIn(subject, criteria); + return repoManager.findReposByCriteria(subject, criteria); + } + + public PageList<PackageVersion> findPackageVersionsInRepo(Subject subject, int repoId, String filter, PageControl pc) { + return repoManager.findPackageVersionsInRepo(subject, repoId, filter, pc); + } + + public PageList<PackageVersion> findPackageVersionsInRepoByCriteria(Subject subject, PackageVersionCriteria criteria) { + return repoManager.findPackageVersionsInRepoByCriteria(subject, criteria); + } + + public PageList<Resource> findSubscribedResources(Subject subject, int repoId, PageControl pc) { + return repoManager.findSubscribedResources(subject, repoId, pc); + } + + public List<SubscribedRepo> findSubscriptions(Subject subject, int resourceId) { + return repoManager.findSubscriptions(subject, resourceId); + } + + public Repo getRepo(Subject subject, int repoId) { + return repoManager.getRepo(subject, repoId); + } + + public void subscribeResourceToRepos(Subject subject, int resourceId, int[] repoIds) { + repoManager.subscribeResourceToRepos(subject, resourceId, repoIds); + } + + public void unsubscribeResourceFromRepos(Subject subject, int resourceId, int[] repoIds) { + repoManager.unsubscribeResourceFromRepos(subject, resourceId, repoIds); + } + + public Repo updateRepo(Subject subject, Repo repo) throws RepoException { + return repoManager.updateRepo(subject, repo); + } + + public PageList<PackageVersion> findPackageVersionsByCriteria(Subject subject, PackageVersionCriteria criteria) { + checkParametersPassedIn(subject, criteria); + return repoManager.findPackageVersionsInRepoByCriteria(subject, criteria); + } + + public int synchronizeRepos(Subject subject, Integer[] repoIds) throws Exception { + return repoManager.synchronizeRepos(subject, repoIds); + } + + //REPOMANAGER: END ---------------------------------- + //RESOURCEFACTORYMANAGER: BEGIN ---------------------------------- public void createResource(Subject subject, int parentResourceId, int resourceTypeId, String resourceName, Configuration pluginConfiguration, Configuration resourceConfiguration) { @@ -1034,16 +1018,4 @@ public class WebservicesManagerBean implements WebservicesRemote { throw new IllegalArgumentException("Criteria cannot be null."); } } - - public PageList<Distribution> findAssociatedDistributions(Subject subject, int repoId, PageControl pc) { - return repoManager.findAssociatedDistributions(subject, repoId, pc); - } - - public PageList<Advisory> findAssociatedAdvisory(Subject subject, int repoId, PageControl pc) { - return repoManager.findAssociatedAdvisory(subject, repoId, pc); - } - - public List<SubscribedRepo> findSubscriptions(Subject subject, int resourceId) { - return repoManager.findSubscriptions(subject, resourceId); - } } commit 1d53e56ad10fed4467b38764879606aeff6129ec Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 10:25:43 2010 -0400 Removing RemoteInstallManagerRemote from the release. The remote is targeted for the next release/ diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java index cca5c4e..298f823 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java @@ -24,27 +24,27 @@ package org.rhq.enterprise.server.install.remote; import javax.ejb.Remote; -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.install.remote.AgentInstallInfo; -import org.rhq.core.domain.install.remote.RemoteAccessInfo; - /** + * Future Remote API... + * * @author Greg Hinkle */ @Remote public interface RemoteInstallManagerRemote { + /* To Be Updated, commented :-) and Released in next version... + * + AgentInstallInfo agentInstallCheck(Subject subject, RemoteAccessInfo remoteAccessInfo); - AgentInstallInfo agentInstallCheck(Subject subject, RemoteAccessInfo remoteAccessInfo); - - AgentInstallInfo installAgent(Subject subject, RemoteAccessInfo remoteAccessInfo, String path); + AgentInstallInfo installAgent(Subject subject, RemoteAccessInfo remoteAccessInfo, String path); - String[] remotePathDiscover(Subject subject, RemoteAccessInfo remoteAccessInfo, String parentPath); + String[] remotePathDiscover(Subject subject, RemoteAccessInfo remoteAccessInfo, String parentPath); - String startAgent(Subject subject, RemoteAccessInfo remoteAccessInfo); + String startAgent(Subject subject, RemoteAccessInfo remoteAccessInfo); - String stopAgent(Subject subject, RemoteAccessInfo remoteAccessInfo); + String stopAgent(Subject subject, RemoteAccessInfo remoteAccessInfo); - String agentStatus(Subject subject, RemoteAccessInfo remoteAccessInfo); + String agentStatus(Subject subject, RemoteAccessInfo remoteAccessInfo); + */ } commit 192be69196b696ceced55a00e80b6d122836db0c Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 10:07:46 2010 -0400 Removing unfinished RegistrationManager code. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationException.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationException.java deleted file mode 100644 index f7a3b40..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationException.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.server.registration; - -public class RegistrationException extends Exception { - private static final long serialVersionUID = -2258189843514401027L; - - public RegistrationException() { - } - - public RegistrationException(String message) { - super(message); - } - - public RegistrationException(Throwable cause) { - super(cause); - } - - public RegistrationException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerBean.java deleted file mode 100644 index 4e6dd5d..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerBean.java +++ /dev/null @@ -1,243 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.server.registration; - -import java.util.List; - -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.jboss.annotation.IgnoreDependency; - -import org.rhq.core.domain.auth.Subject; -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.content.Repo; -import org.rhq.core.domain.resource.Agent; -import org.rhq.core.domain.resource.InventoryStatus; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.enterprise.server.RHQConstants; -import org.rhq.enterprise.server.auth.SubjectManagerLocal; -import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; -import org.rhq.enterprise.server.content.RepoManagerLocal; -import org.rhq.enterprise.server.core.AgentManagerLocal; -import org.rhq.enterprise.server.resource.ResourceAlreadyExistsException; -import org.rhq.enterprise.server.resource.ResourceManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; - -@Stateless -public class RegistrationManagerBean implements RegistrationManagerLocal, RegistrationManagerRemote { - - private final Log log = LogFactory.getLog(RegistrationManagerBean.class.getName()); - - @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) - private EntityManager entityManager; - @EJB - @IgnoreDependency - private ResourceManagerLocal resourceManager; - @EJB - @IgnoreDependency - private ConfigurationManagerLocal configManager; - @EJB - private SubjectManagerLocal subjectManager; - @EJB - private AgentManagerLocal agentManager; - - /** - * Registers the platform as a resource on RHQ server - * @param user secure id user - * @param platform to be registered - * @param parentId if any. - * - */ - public void registerPlatform(Subject user, Resource platform, int parentId) { - try { - validatePlatform(platform); - } catch (RegistrationException e) { - throw new IllegalStateException(e); - } - - ResourceType resourceType = platform.getResourceType(); - ConfigurationDefinition configDefinition = configManager.getPluginConfigurationDefinitionForResourceType(user, - resourceType.getId()); - - Configuration platformConfig = null; - if (configDefinition != null) { - ConfigurationTemplate template = configDefinition.getDefaultTemplate(); - - if (template != null) { - platformConfig = template.getConfiguration(); - } - } - - platform.setPluginConfiguration(platformConfig); - platform.setInventoryStatus(InventoryStatus.COMMITTED); - - Agent agent = createFakeAgent(platform); - platform.setAgent(agent); - - try { - resourceManager.createResource(user, platform, parentId); - } catch (ResourceAlreadyExistsException e) { - throw new IllegalStateException(e); - } - - log.error("Resource " + platform + "persisted"); - - } - - /** - * Imports the registered resource into inventory and makes it a managed resource - * @param user secure id user - * @param resource to be imported - * - */ - public void importPlatform(Subject user, Resource resource) { - resource.setInventoryStatus(InventoryStatus.COMMITTED); - entityManager.persist(resource); - } - - /** - * subscribe the requested platform to a compatible base repo based on release - * and arch information. This method does a lookup in ReleaseRepoMapping - * to get the compatible base channel and tried to tie the platform to - * the repo. - * @param user secure id user - * @param platform to be imported - * @param release the release string of the client - * @param arch arch of the platform - */ - public void subscribePlatformToBaseRepo(Subject user, Resource platform, String release, String version, String arch) - throws RegistrationException { - log.debug("Trying to subscribe " + platform + " to a compatible baserepo"); - ReleaseRepoMapping rm = new ReleaseRepoMapping(release, version, arch); - String repoName = rm.getCompatibleRepo(); - try { - RepoManagerLocal repoManager = LookupUtil.getRepoManagerLocal(); - List<Repo> repos = repoManager.getRepoByName(repoName); - int[] repoIds = getIntRepoIdArray(repos); - repoManager.subscribeResourceToRepos(user, platform.getId(), repoIds); - } catch (Exception e) { - throw new RegistrationException("No Compatible Base repo Found." + e); - } - } - - /** - * Validates the sanity of the resource to be created. Also checks to see if the platform - * alreday exists. - * @param platform - * @throws RegistrationException - */ - private void validatePlatform(Resource platform) throws RegistrationException { - if (platform.getResourceType() == null) { - throw new RegistrationException("Reported resource [" + platform + "] has a null type."); - } - - if (platform.getResourceKey() == null) { - throw new RegistrationException("Reported resource [" + platform + "] has a null key."); - } - - if (platform.getInventoryStatus() == InventoryStatus.DELETED) { - throw new RegistrationException( - "Reported resource [" - + platform - + "] has an illegal inventory status of 'DELETED' - agents are not allowed to delete platforms from inventory."); - } - - //check if the resource already exists - Resource existingPlatform = checkResourceExists(platform); - - if (existingPlatform != null) { - throw new RegistrationException("Reported resource [" + platform + "] Already Exists."); - } - - } - - /** - * Checks to see if the resource already exists in rhq - * @param platform - * @return - */ - private Resource checkResourceExists(Resource platform) { - Resource existingResource = null; - - if (platform.getId() != 0) { - existingResource = entityManager.find(Resource.class, platform.getId()); - } - - if (existingResource == null) { - ResourceType resourceType = platform.getResourceType(); - existingResource = resourceManager.getResourceByParentAndKey(subjectManager.getOverlord(), platform - .getParentResource(), platform.getResourceKey(), resourceType.getPlugin(), resourceType.getName()); - if (existingResource != null) { - platform.setId(existingResource.getId()); - } else { - - if (platform.getId() != 0) { - platform.setId(0); - } - } - } - - return existingResource; - } - - /** - * Creates an agent for a given resource and persist in the db. The agents role is noop - * until its installed on the client and tied to this row in the db. - * @param resource - * @return - */ - private Agent createFakeAgent(Resource resource) { - String address = resource.getName(); - int port = 16163; - String endPoint = "socket://" + address + ":" + port + "/?rhq.communications.connector.rhqtype=agent"; - Agent agent = agentManager.getAgentByAddressAndPort(resource.getName(), 16163); - if (agent == null) { - agent = new Agent(resource.getName(), address, port, endPoint, resource.getResourceKey()); - - entityManager.persist(agent); - entityManager.flush(); - } - return agent; - - } - - private int[] getIntRepoIdArray(List<Repo> input) { - if (input == null) { - return new int[0]; - } - - int[] output = new int[input.size()]; - for (int i = 0; i < input.size(); i++) { - output[i] = Integer.valueOf(input.get(i).getId()).intValue(); - } - - return output; - } - -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerLocal.java deleted file mode 100644 index a1ef1c9..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerLocal.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.server.registration; - -import javax.ejb.Local; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.resource.Resource; - -@Local -public interface RegistrationManagerLocal { - /** - * Register the platform in the inventory - * @param user - * @param resource - */ - void registerPlatform(Subject user, Resource resource, int parentId); - - /** - * Import the inventoried resource as a managed resource object - * @param user - * @param resourceId - */ - void importPlatform(Subject user, Resource resource); - - /** - * subscribe a platform to a compatible baserepo - * @param user - * @param platform - * @param release - * @param arch - */ - void subscribePlatformToBaseRepo(Subject user, Resource platform, String release, String version, String arch) - throws RegistrationException; -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerRemote.java deleted file mode 100644 index 7ee0ac6..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerRemote.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.server.registration; - -import javax.ejb.Remote; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.resource.Resource; - -@Remote -public interface RegistrationManagerRemote { - /** - * Register the platform in the inventory - * @param user - * @param resource - */ - void registerPlatform(Subject user, Resource resource, int parentId); - - /** - * Import the inventoried resource as a managed resource object - * @param user - * @param resourceId - */ - void importPlatform(Subject user, Resource resource); - - /** - * subscribe a platform to a compatible baserepo - * @param user - * @param platform - * @param release - * @param arch - */ - void subscribePlatformToBaseRepo(Subject user, Resource platform, String release, String version, String arch) - throws RegistrationException; - -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/ReleaseRepoMapping.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/ReleaseRepoMapping.java deleted file mode 100644 index 5f98da4..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/ReleaseRepoMapping.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.server.registration; - -import java.util.HashMap; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Class representing the repo to release relationship. - * Ideally This should be persisted in the database at the sync time - * from hosted and should do a lookup in the db to extract compatible repos. - * - * Since we're still unsure if we want go the agentless route, - * Just using static mappings for now. This will be eventually replaced - * by persisting these mapping in the db. - * - * @author pkilambi - * - */ -public class ReleaseRepoMapping { - private final Log log = LogFactory.getLog(ReleaseRepoMapping.class.getName()); - private String release; - private String arch; - private String version; - - public ReleaseRepoMapping(String release, String version, String arch) { - this.release = release; - this.arch = arch; - this.version = version; //ignored for now, used for z-stream repos in future - } - - public String getCompatibleRepo() { - HashMap<String, String> repomap = generateRepoMap(); - log.debug("mapping generated " + repomap); - return repomap.get(this.release + "." + this.arch); - } - - /** - * Static mappings for base repos - * @return - */ - private HashMap<String, String> generateRepoMap() { - HashMap<String, String> hm = new HashMap<String, String>(); - - hm.put("5Server.arch", "rhel-arch-server-5"); - hm.put("5Client.arch", "rhel-arch-client-5"); - - String[] arches = { "i386", "x86_64", "ia64", "s390x", "ppc" }; - HashMap<String, String> newhm = new HashMap(); - for (String k : hm.keySet()) { - for (String arch : arches) { - newhm.put(k.replace("arch", arch), hm.get(k).replace("arch", arch)); - } - } - return newhm; - } - -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index d53cf18..3e733fd 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -136,8 +136,6 @@ import org.rhq.enterprise.server.perspective.PerspectiveManagerLocal; import org.rhq.enterprise.server.plugin.ServerPluginsBean; import org.rhq.enterprise.server.plugin.ServerPluginsLocal; import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement; -import org.rhq.enterprise.server.registration.RegistrationManagerBean; -import org.rhq.enterprise.server.registration.RegistrationManagerLocal; import org.rhq.enterprise.server.report.DataAccessManagerBean; import org.rhq.enterprise.server.report.DataAccessManagerLocal; import org.rhq.enterprise.server.resource.ProductVersionManagerBean; @@ -510,10 +508,6 @@ public final class LookupUtil { return lookupRemote(ResourceTypeManagerBean.class); } - public static RegistrationManagerLocal getRegistrationManager() { - return lookupLocal(RegistrationManagerBean.class); - } - public static RoleManagerLocal getRoleManager() { return lookupLocal(RoleManagerBean.class); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java index 52ca48e..ec0e4f7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java @@ -51,7 +51,6 @@ import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerBean; import org.rhq.enterprise.server.measurement.MeasurementProblemManagerBean; import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerBean; import org.rhq.enterprise.server.operation.OperationManagerBean; -import org.rhq.enterprise.server.registration.RegistrationManagerBean; import org.rhq.enterprise.server.report.DataAccessManagerBean; import org.rhq.enterprise.server.resource.ResourceFactoryManagerBean; import org.rhq.enterprise.server.resource.ResourceManagerBean; @@ -66,7 +65,7 @@ import org.rhq.enterprise.server.system.SystemManagerBean; public class RemoteAPIValidator { private static Class<?>[] beans = new Class[] { // - AdvisoryManagerBean.class, // + AdvisoryManagerBean.class, // AlertDefinitionManagerBean.class, // AlertManagerBean.class,// AvailabilityManagerBean.class,// @@ -89,7 +88,6 @@ public class RemoteAPIValidator { ResourceGroupManagerBean.class, // ResourceManagerBean.class, // ResourceTypeManagerBean.class, // - RegistrationManagerBean.class, // RoleManagerBean.class, // SubjectManagerBean.class, // SupportManagerBean.class, // diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/registration/test/RegistrationBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/registration/test/RegistrationBeanTest.java deleted file mode 100644 index 3dc9696..0000000 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/registration/test/RegistrationBeanTest.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.server.registration.test; - -import javax.persistence.EntityManager; - -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.resource.Agent; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceCategory; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.enterprise.server.registration.RegistrationManagerLocal; -import org.rhq.enterprise.server.registration.ReleaseRepoMapping; -import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; -import org.rhq.enterprise.server.test.AbstractEJB3Test; -import org.rhq.enterprise.server.util.LookupUtil; - -public class RegistrationBeanTest extends AbstractEJB3Test { - private RegistrationManagerLocal registrationManager; - private ResourceTypeManagerLocal resourceTypeManager; - private ResourceType platformType; - private Agent agent; - private int parentId = -1; - private Subject overlord; - - @BeforeClass - public void beforeClass() throws Exception { - this.registrationManager = LookupUtil.getRegistrationManager(); - this.resourceTypeManager = LookupUtil.getResourceTypeManager(); - this.overlord = LookupUtil.getSubjectManager().getOverlord(); - - getTransactionManager().begin(); - EntityManager em = getEntityManager(); - - platformType = new ResourceType("RegistrationBeanTest.testRegisterPlatform", - "RegistrationBeanTest.testRegisterPlatform", ResourceCategory.PLATFORM, null); - em.persist(platformType); - - getTransactionManager().commit(); - } - - @AfterClass - public void afterClass() throws Exception { - getTransactionManager().begin(); - EntityManager em = getEntityManager(); - - platformType = em.find(ResourceType.class, platformType.getId()); - em.remove(platformType); - - getTransactionManager().commit(); - } - - @Test - public void testRegisterPlatform() throws Exception { - getTransactionManager().begin(); - EntityManager em = getEntityManager(); - try { - createAgent(em); - em.flush(); - - Resource platform = new Resource("alpha", "platform", platformType); - - registrationManager.registerPlatform(overlord, platform, parentId); - - } finally { - getTransactionManager().rollback(); - } - } - - public void testReleaseRepoMap() throws Exception { - String release = "5Server"; - String version = "5.4.0"; - String arch = "x86_64"; - ReleaseRepoMapping repomap = new ReleaseRepoMapping(release, version, arch); - String repo = repomap.getCompatibleRepo(); - assert repo.equals("rhel-x86_64-server-5"); - - String release2 = "5Client"; - String arch2 = "x86_64"; - String version2 = "5.4.0"; - ReleaseRepoMapping repomap2 = new ReleaseRepoMapping(release2, version2, arch2); - String repo2 = repomap2.getCompatibleRepo(); - assert repo2.equals("rhel-x86_64-client-5"); - - } - - private void createAgent(EntityManager em) { - agent = new Agent("TestAgent-dbbt", "0.0.0.0", 1, "http://here", "tok"); - em.persist(agent); - } - -} commit 6c532a1126d2da900850bae78813c0f516af9496 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed Jun 23 09:58:05 2010 -0400 - Remove PerspectiveManagerRemote. It is not being published for the current release. - For Eclipse users remove build of the Sample Perspective from .classpath as it can no longer be built without the remote api. Leaving it as an example for future perspective endeavors. diff --git a/.classpath b/.classpath index b6ae47b..59d7a95 100644 --- a/.classpath +++ b/.classpath @@ -24,7 +24,6 @@ <classpathentry kind="src" path="modules/plugins/tomcat/src/test/java"/> <classpathentry kind="src" path="modules/plugins/jboss-cache/src/main/java"/> <classpathentry kind="src" path="modules/plugins/jboss-cache-v3/src/main/java"/> - <classpathentry kind="src" path="etc/samples/perspectives/sample-perspective/app/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/server/jar/target/generated-sources/antlr3"/> <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-subject/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-operations/src/main/java"/> diff --git a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java index 59c9c63..45437d7 100644 --- a/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java +++ b/modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java @@ -2,13 +2,15 @@ package org.rhq.enterprise.server.perspective; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jetbrains.annotations.NotNull; + import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.web.RequestParameter; import org.jboss.seam.core.Conversation; -import org.jetbrains.annotations.NotNull; + import org.rhq.core.domain.auth.Subject; import org.rhq.enterprise.client.RemoteClient; import org.rhq.enterprise.server.auth.SubjectManagerRemote; @@ -59,7 +61,7 @@ public class PerspectiveClientUIBean { } if (!this.remoteClient.isConnected()) { try { - this.remoteClient.connect(); + this.remoteClient.connect(); } catch (Exception e) { this.remoteClient = null; log.info("Ending perspective client Conversation with id " + Conversation.instance().getId() + "..."); @@ -87,7 +89,8 @@ public class PerspectiveClientUIBean { // ***NOTE***: The javassist.NotFoundException stack traces that are logged by this call can be ignored. SubjectManagerRemote subjectManager = remoteClient.getSubjectManagerRemote(); if (this.rhqSessionId != null) { - log.info("Retrieving subject for user [" + getUsername() + "] and sessionId [" + this.rhqSessionId + "]..."); + log.info("Retrieving subject for user [" + getUsername() + "] and sessionId [" + this.rhqSessionId + + "]..."); this.subject = subjectManager.getSubjectByNameAndSessionId(getUsername(), this.rhqSessionId); } else { log.info("Logging in as user [" + getUsername() + "] with password [" + getPassword() + "]..."); @@ -97,6 +100,9 @@ public class PerspectiveClientUIBean { return this.subject; } + // NOT Currently In Use as we've pulled out perspectives for the 3.0.0 release. Commenting out due to + // the use of the currently removed PerspectiveManagerRemote + /* @NotNull public String getCoreGuiBaseUrl() throws Exception { if (this.coreGuiBaseUrl == null) { @@ -107,6 +113,7 @@ public class PerspectiveClientUIBean { } return this.coreGuiBaseUrl; } + */ @NotNull private String getServerHost() { @@ -115,10 +122,10 @@ public class PerspectiveClientUIBean { this.serverHost = this.rhqServerHost; } else { return DEFAULT_SERVER_HOST; - } + } } else { if (this.rhqServerHost != null && this.serverHost.equals(this.rhqServerHost)) { - + } } return this.serverHost; diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java index 0e32ba9..d6f286b 100644 --- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java +++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java @@ -47,7 +47,6 @@ import org.rhq.enterprise.server.measurement.MeasurementDataManagerRemote; import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerRemote; import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerRemote; import org.rhq.enterprise.server.operation.OperationManagerRemote; -import org.rhq.enterprise.server.perspective.PerspectiveManagerRemote; import org.rhq.enterprise.server.report.DataAccessManagerRemote; import org.rhq.enterprise.server.resource.ResourceFactoryManagerRemote; import org.rhq.enterprise.server.resource.ResourceManagerRemote; @@ -87,7 +86,6 @@ public class RemoteClient { MeasurementDefinitionManager(MeasurementDefinitionManagerRemote.class), // MeasurementScheduleManager(MeasurementScheduleManagerRemote.class), // OperationManager(OperationManagerRemote.class), // - PerspectiveManager(PerspectiveManagerRemote.class), // ResourceManager(ResourceManagerRemote.class), // ResourceFactoryManager(ResourceFactoryManagerRemote.class), // ResourceGroupManager(ResourceGroupManagerRemote.class), // @@ -371,10 +369,6 @@ public class RemoteClient { return RemoteClientProxy.getProcessor(this, Manager.OperationManager); } - public PerspectiveManagerRemote getPerspectiveManagerRemote() { - return RemoteClientProxy.getProcessor(this, Manager.PerspectiveManager); - } - public ResourceManagerRemote getResourceManagerRemote() { return RemoteClientProxy.getProcessor(this, Manager.ResourceManager); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java index 9b6b93b..a74f993 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java @@ -50,7 +50,7 @@ import org.rhq.enterprise.server.plugin.pc.perspective.metadata.PerspectivePlugi * @author Jay Shaughnessy * @author Ian Springer */ -public class PerspectiveManagerBean implements PerspectiveManagerLocal, PerspectiveManagerRemote { +public class PerspectiveManagerBean implements PerspectiveManagerLocal { // Map of sessionId to cached menu entry. The cached menu is re-used for the same sessionId. // This should more appropriately use Subject as the key, but since Subject equality is diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java index 5ee4491..497d89c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java @@ -69,51 +69,114 @@ public interface PerspectiveManagerLocal { */ public String getUrlViaKey(int key) throws PerspectiveException; - // **************************************** - // The following shared with the Remote API - // **************************************** + // ************************************************************************************************* + // The following were previously the remote API. The perspective API is not yet ready for release + // ************************************************************************************************* /** - * #see {@link PerspectiveManagerRemote#getRootUrl()} + * Get the CoreUI context root. This can be used to assemble a url not otherwise obtainable via the API. + * This should be used with care as hardcoded paths may break in future releases of the core UI. + * + * @param subject + * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. + * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. + * @return the Core GUI root url in the format "protocol://host:port/" */ String getRootUrl(Subject subject, boolean makeExplicit, boolean makeSecure); /** - * #see {@link PerspectiveManagerRemote#getMenuUrl( Subject )} + * This method does not ensure the specified subject can actually access the requested url. + * @param subject + * @param menuItemName The name of the menuItem extension point + * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. + * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. + * @return The url for specified extension point. May return null if the extension does not specify a url + * @throws IllegalArgumentException if the extension point does not exist. */ String getMenuItemUrl(Subject subject, String menuItemName, boolean makeExplicit, boolean makeSecure); /** - * #see {@link PerspectiveManagerRemote#getResourceUrl( Subject, String )} + * This method does not ensure the specified subject can actually access the requested url. + * @param subject + * @param tabName The name of the resource tab extension point + * @param resourceId The resource id to be incorporated into the url. This method does not check the validity + * of the resourceId. + * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. + * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. + * @return The url for specified extension point. May return null if the extension does not specify a url + * @throws IllegalArgumentException if the extension point does not exist. */ String getResourceTabUrl(Subject subject, String tabName, int resourceId, boolean makeExplicit, boolean makeSecure); /** - * #see {@link PerspectiveManagerRemote#getTargetUrl(Subject, PerspectiveTarget, int, boolean, boolean)} + * This method does not ensure the specified subject can actually access the requested url. + * + * @param subject + * @param target The target of the navigation link. for example, a role. + * @param targetId The id of the specified target. for example, a roleId + * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. + * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. + * @return The url for specified target. */ String getTargetUrl(Subject subject, PerspectiveTarget target, int targetId, boolean makeExplicit, boolean makeSecure); /** - * #see {@link PerspectiveManagerRemote#getTargetUrls(Subject, PerspectiveTarget, int[], boolean, boolean)} + * When requesting the same target url for several targets this is a more efficient call than calling + * getTargetUrl() repeatedly. For example, if generating links to a list of resources. + * + * This method does not ensure the specified subject can actually access the requested urls. + * + * @param subject + * @param target The target of the navigation link. for example, a role. + * @param targetId The id of the specified target. for example, a roleId + * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. + * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. + * @return A Map of targetId to url mappings. */ Map<Integer, String> getTargetUrls(Subject subject, PerspectiveTarget target, int[] targetIds, boolean makeExplicit, boolean makeSecure); /** - * #see {@link PerspectiveManagerRemote#getResourceTargetUrl(Subject, int, PerspectiveTarget, int, boolean, boolean)} + * This method does not ensure the specified subject can actually access the requested url. + * + * @param subject + * @param resourceId The resource id of the specified target. for example, the resource on which an alert is exists + * @param target The target of the navigation link. for example, an alert. + * @param targetId The id of the specified target. for example, an alertId + * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. + * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. + * @return The url for specified target. */ String getResourceTargetUrl(Subject subject, int resourceId, PerspectiveTarget target, int targetId, boolean makeExplicit, boolean makeSecure); /** - * #see {@link PerspectiveManagerRemote#getResourceTargetUrls(Subject, int, PerspectiveTarget, int[], boolean, boolean)} + * When requesting the same target url for several resource targets this is a more efficient call than calling + * getResourceTargetUrl() repeatedly. For example, if generating links to a list of a resource's alerts. + * + * Same This method does not ensure the specified subject can actually access the requested urls. + * + * @param subject + * @param resourceId The resource id of the specified target. for example, the resource on which an alert is exists + * @param target The target of the navigation link. for example, an alert. + * @param targetId The id of the specified target. for example, an alertId + * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. + * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. + * @return A Map of targetId to url mappings. */ Map<Integer, String> getResourceTargetUrls(Subject subject, int resourceId, PerspectiveTarget target, int[] targetIds, boolean makeExplicit, boolean makeSecure); /** - * #see {@link PerspectiveManagerRemote#getTemplateTargetUrl(Subject, int, PerspectiveTarget, int, boolean, boolean)} + * This method does not ensure the specified subject can actually access the requested url. + * @param subject + * @param resourceTypeId The resourceType id of the specified target. for example, the type for an alert template + * @param target The target of the navigation link. for example, an alert template + * @param targetId The id of the specified target. for example, an alert template definition Id + * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. + * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. + * @return The url for specified target. */ String getTemplateTargetUrl(Subject subject, int resourceId, PerspectiveTarget target, int targetId, boolean makeExplicit, boolean makeSecure); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerRemote.java deleted file mode 100644 index c035702..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerRemote.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.server.perspective; - -import java.util.Map; - -import javax.ejb.Remote; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.enterprise.server.system.ServerVersion; - -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@WebService(targetNamespace = ServerVersion.namespace) -@Remote -public interface PerspectiveManagerRemote { - - /** - * Get the CoreUI context root. This can be used to assemble a url not otherwise obtainable via the API. - * This should be used with care as hardcoded paths may break in future releases of the core UI. - * - * @param subject - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return the Core GUI root url in the format "protocol://host:port/" - */ - @WebMethod - String getRootUrl( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "makeExplicit") boolean makeExplicit, // - @WebParam(name = "makeSecure") boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * @param subject - * @param menuItemName The name of the menuItem extension point - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified extension point. May return null if the extension does not specify a url - * @throws IllegalArgumentException if the extension point does not exist. - */ - @WebMethod - String getMenuItemUrl( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "menuItemName") String menuItemName, // - @WebParam(name = "makeExplicit") boolean makeExplicit, // - @WebParam(name = "makeSecure") boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * @param subject - * @param tabName The name of the resource tab extension point - * @param resourceId The resource id to be incorporated into the url. This method does not check the validity - * of the resourceId. - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified extension point. May return null if the extension does not specify a url - * @throws IllegalArgumentException if the extension point does not exist. - */ - @WebMethod - String getResourceTabUrl( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "tabName") String tabName, // - @WebParam(name = "resourceId") int resourceId, // - @WebParam(name = "makeExplicit") boolean makeExplicit, // - @WebParam(name = "makeSecure") boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * - * @param subject - * @param target The target of the navigation link. for example, a role. - * @param targetId The id of the specified target. for example, a roleId - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified target. - */ - @WebMethod - String getTargetUrl( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "target") PerspectiveTarget target, // - @WebParam(name = "targetId") int targetId, // - @WebParam(name = "makeExplicit") boolean makeExplicit, // - @WebParam(name = "makeSecure") boolean makeSecure); - - /** - * When requesting the same target url for several targets this is a more efficient call than calling - * getTargetUrl() repeatedly. For example, if generating links to a list of resources. - * - * This method does not ensure the specified subject can actually access the requested urls. - * - * @param subject - * @param target The target of the navigation link. for example, a role. - * @param targetId The id of the specified target. for example, a roleId - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return A Map of targetId to url mappings. - */ - @WebMethod - Map<Integer, String> getTargetUrls( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "target") PerspectiveTarget target, // - @WebParam(name = "targetIds") int[] targetIds, // - @WebParam(name = "makeExplicit") boolean makeExplicit, // - @WebParam(name = "makeSecure") boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * - * @param subject - * @param resourceId The resource id of the specified target. for example, the resource on which an alert is exists - * @param target The target of the navigation link. for example, an alert. - * @param targetId The id of the specified target. for example, an alertId - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified target. - */ - @WebMethod - String getResourceTargetUrl( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "resourceId") int resourceId, // - @WebParam(name = "target") PerspectiveTarget target, // - @WebParam(name = "targetId") int targetId, // - @WebParam(name = "makeExplicit") boolean makeExplicit, // - @WebParam(name = "makeSecure") boolean makeSecure); - - /** - * When requesting the same target url for several resource targets this is a more efficient call than calling - * getResourceTargetUrl() repeatedly. For example, if generating links to a list of a resource's alerts. - * - * Same This method does not ensure the specified subject can actually access the requested urls. - * - * @param subject - * @param resourceId The resource id of the specified target. for example, the resource on which an alert is exists - * @param target The target of the navigation link. for example, an alert. - * @param targetId The id of the specified target. for example, an alertId - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return A Map of targetId to url mappings. - */ - @WebMethod - Map<Integer, String> getResourceTargetUrls( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "resourceId") int resourceId, // - @WebParam(name = "target") PerspectiveTarget target, // - @WebParam(name = "targetIds") int[] targetIds, // - @WebParam(name = "makeExplicit") boolean makeExplicit, // - @WebParam(name = "makeSecure") boolean makeSecure); - - /** - * This method does not ensure the specified subject can actually access the requested url. - * @param subject - * @param resourceTypeId The resourceType id of the specified target. for example, the type for an alert template - * @param target The target of the navigation link. for example, an alert template - * @param targetId The id of the specified target. for example, an alert template definition Id - * @param makeExplicit If true ensure "protocol://host:port" prefix. Set true for remotely deployed perspectives. - * @param makeSecure If true use the secure protocol and port. Ignored if makeExplicit=false or not supported. - * @return The url for specified target. - */ - @WebMethod - String getTemplateTargetUrl( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "resourceId") int resourceId, // - @WebParam(name = "target") PerspectiveTarget target, // - @WebParam(name = "targetId") int targetId, // - @WebParam(name = "makeExplicit") boolean makeExplicit, // - @WebParam(name = "makeSecure") boolean makeSecure); - -} \ No newline at end of file commit 65bb980f1f0dfb18be2f932a6fccfb6c30576211 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 22 18:01:17 2010 -0400 Remove EntitlementStuff*, it's unused. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DummyLoader.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DummyLoader.java deleted file mode 100644 index 63dbb7b..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DummyLoader.java +++ /dev/null @@ -1,63 +0,0 @@ -/* -* RHQ Management Platform -* Copyright (C) 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, version 2, as -* published by the Free Software Foundation, and/or the GNU Lesser -* General Public License, version 2.1, also as published by the Free -* Software Foundation. -* -* 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 and the GNU Lesser General Public License -* for more details. -* -* You should have received a copy of the GNU General Public License -* and the GNU Lesser General Public License along with this program; -* if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -package org.rhq.enterprise.server.content; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; - -import org.rhq.core.domain.content.transfer.EntitlementCertificate; - -/** - * @author Jason Dobies - */ -public class DummyLoader { - - static final String dir = "/etc/pki/rhq"; - - EntitlementCertificate load(int resourceId) throws IOException { - String name = String.valueOf(resourceId); - EntitlementCertificate x509 = load("client"); - x509.setName(name); - return x509; - } - - EntitlementCertificate load(String name) throws IOException { - String key = read(name + ".key"); - String pem = read(name + ".pem"); - return new EntitlementCertificate(name, key, pem); - } - - private String read(String fn) throws IOException { - String path = dir + File.separator + fn; - File f = new File(path); - byte[] buffer = new byte[(int) f.length()]; - BufferedInputStream istr = new BufferedInputStream(new FileInputStream(f)); - istr.read(buffer); - String result = new String(buffer); - istr.close(); - return result; - } - -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerBean.java deleted file mode 100644 index 9e3e69e..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerBean.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.rhq.enterprise.server.content; - -import java.util.ArrayList; -import java.util.List; - -import javax.ejb.Stateless; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.authz.Permission; -import org.rhq.core.domain.content.transfer.EntitlementCertificate; -import org.rhq.enterprise.server.authz.RequiredPermission; - -@Stateless -public class EntitlementStuffManagerBean implements EntitlementStuffManagerLocal, EntitlementStuffManagerRemote { - - private final Log log = LogFactory.getLog(EntitlementStuffManagerBean.class); - - @RequiredPermission(Permission.MANAGE_INVENTORY) - public List<EntitlementCertificate> getCertificates(Subject subject, int resourceId) { - List<EntitlementCertificate> list = new ArrayList<EntitlementCertificate>(); - DummyLoader loader = new DummyLoader(); - try { - list.add(loader.load(resourceId)); - - } catch (Exception ex) { - log.warn("x.509 cert for: " // - + resourceId // - + " not-found in: " // - + DummyLoader.dir); - } - return list; - } - -} - diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerLocal.java deleted file mode 100644 index 7eb4f8c..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerLocal.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.rhq.enterprise.server.content; - -import java.util.List; - -import javax.ejb.Local; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.content.transfer.EntitlementCertificate; - -/** - * - * @author jortel - * - */ -@Local -public interface EntitlementStuffManagerLocal { - - /** - * Get a list of entitlement certificates for the specified resources. - * @param subject The logged in user's subject. - * @param resourceId The resource id. - * @return A list of certificates. - */ - List<EntitlementCertificate> getCertificates(Subject subject, int resourceId); -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerRemote.java deleted file mode 100644 index 6050a70..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerRemote.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.rhq.enterprise.server.content; - -import java.util.List; - -import javax.ejb.Remote; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.content.transfer.EntitlementCertificate; -import org.rhq.enterprise.server.system.ServerVersion; - -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@WebService(targetNamespace = ServerVersion.namespace) -@Remote -public interface EntitlementStuffManagerRemote { - /** - * Get a list of entitlement certificates for the specified resources. - * @param subject The logged in user's subject. - * @param resourceId The resource id. - * @return A list of certificates. - */ - @WebMethod - List<EntitlementCertificate> getCertificates( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "resourceId") int resourceId); -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java index 9367bdc..d53cf18 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java @@ -89,8 +89,6 @@ import org.rhq.enterprise.server.content.ContentUIManagerBean; import org.rhq.enterprise.server.content.ContentUIManagerLocal; import org.rhq.enterprise.server.content.DistributionManagerBean; import org.rhq.enterprise.server.content.DistributionManagerLocal; -import org.rhq.enterprise.server.content.EntitlementStuffManagerBean; -import org.rhq.enterprise.server.content.EntitlementStuffManagerLocal; import org.rhq.enterprise.server.content.RepoManagerBean; import org.rhq.enterprise.server.content.RepoManagerLocal; import org.rhq.enterprise.server.content.metadata.ContentSourceMetadataManagerBean; @@ -448,10 +446,6 @@ public final class LookupUtil { return lookupLocal(RepoManagerBean.class); } - public static EntitlementStuffManagerLocal getEntitlementManager() { - return lookupLocal(EntitlementStuffManagerBean.class); - } - public static DistributionManagerLocal getDistributionManagerLocal() { return lookupLocal(DistributionManagerBean.class); } @@ -481,8 +475,8 @@ public final class LookupUtil { } public static RemoteInstallManagerLocal getRemoteInstallManager() { - return lookupLocal(RemoteInstallManagerBean.class); - } + return lookupLocal(RemoteInstallManagerBean.class); + } public static ResourceMetadataManagerLocal getResourceMetadataManager() { return lookupLocal(ResourceMetadataManagerBean.class); @@ -572,8 +566,6 @@ public final class LookupUtil { return lookupLocal(TagManagerBean.class); } - - public static CoreServerMBean getCoreServer() { MBeanServer jBossMBeanServer = MBeanServerLocator.locateJBoss(); CoreServerMBean jonServer = (CoreServerMBean) MBeanProxyExt.create(CoreServerMBean.class, diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java index 90266d7..4664e32 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java @@ -65,7 +65,6 @@ import org.rhq.core.domain.content.PackageVersion; import org.rhq.core.domain.content.Repo; import org.rhq.core.domain.content.RepoGroup; import org.rhq.core.domain.content.RepoGroupType; -import org.rhq.core.domain.content.transfer.EntitlementCertificate; import org.rhq.core.domain.content.transfer.SubscribedRepo; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.criteria.AlertDefinitionCriteria; @@ -123,7 +122,6 @@ import org.rhq.enterprise.server.bundle.BundleManagerLocal; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.configuration.ConfigurationUpdateStillInProgressException; import org.rhq.enterprise.server.content.ContentManagerLocal; -import org.rhq.enterprise.server.content.EntitlementStuffManagerLocal; import org.rhq.enterprise.server.content.RepoException; import org.rhq.enterprise.server.content.RepoManagerLocal; import org.rhq.enterprise.server.discovery.DiscoveryBossLocal; @@ -198,7 +196,6 @@ public class WebservicesManagerBean implements WebservicesRemote { private SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager(); private SupportManagerLocal supportManager = LookupUtil.getSupportManager(); private SystemManagerLocal systemManager = LookupUtil.getSystemManager(); - private EntitlementStuffManagerLocal entitlementManager = LookupUtil.getEntitlementManager(); //ALERTMANAGER: BEGIN ------------------------------------------ public PageList<Alert> findAlertsByCriteria(Subject subject, AlertCriteria criteria) { @@ -1049,8 +1046,4 @@ public class WebservicesManagerBean implements WebservicesRemote { public List<SubscribedRepo> findSubscriptions(Subject subject, int resourceId) { return repoManager.findSubscriptions(subject, resourceId); } - - public List<EntitlementCertificate> getCertificates(Subject subject, int resourceId) { - return entitlementManager.getCertificates(subject, resourceId); - } } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java index e60adcb..4ae3cbc 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java @@ -11,7 +11,6 @@ import org.rhq.enterprise.server.authz.RoleManagerRemote; import org.rhq.enterprise.server.bundle.BundleManagerRemote; import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote; import org.rhq.enterprise.server.content.ContentManagerRemote; -import org.rhq.enterprise.server.content.EntitlementStuffManagerRemote; import org.rhq.enterprise.server.content.RepoManagerRemote; import org.rhq.enterprise.server.discovery.DiscoveryBossRemote; import org.rhq.enterprise.server.event.EventManagerRemote; @@ -41,7 +40,6 @@ public interface WebservicesRemote extends // BundleManagerRemote,// CallTimeDataManagerRemote,// RepoManagerRemote,// - EntitlementStuffManagerRemote, // ConfigurationManagerRemote,// ContentManagerRemote,// //Removed as it was problematic for WS clients. Not sure if this well be re-enabled. commit 308574874cd6f1b591f6839f329a6bb57201c529 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 22 17:28:32 2010 -0400 Remove DistributionManagerRemote and unused methods in DistributionManagerLocal. This is not ready for public exposure. diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java index 1a8259c..0e32ba9 100644 --- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java +++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java @@ -36,7 +36,6 @@ import org.rhq.enterprise.server.authz.RoleManagerRemote; import org.rhq.enterprise.server.bundle.BundleManagerRemote; import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote; import org.rhq.enterprise.server.content.ContentManagerRemote; -import org.rhq.enterprise.server.content.DistributionManagerRemote; import org.rhq.enterprise.server.content.RepoManagerRemote; import org.rhq.enterprise.server.discovery.DiscoveryBossRemote; import org.rhq.enterprise.server.event.EventManagerRemote; @@ -82,7 +81,6 @@ public class RemoteClient { ContentManager(ContentManagerRemote.class), // DataAccessManager(DataAccessManagerRemote.class), // DiscoveryBoss(DiscoveryBossRemote.class), // - DistributionManager(DistributionManagerRemote.class), // EventManager(EventManagerRemote.class), // MeasurementBaselineManager(MeasurementBaselineManagerRemote.class), // MeasurementDataManager(MeasurementDataManagerRemote.class), // @@ -349,10 +347,6 @@ public class RemoteClient { return RemoteClientProxy.getProcessor(this, Manager.DiscoveryBoss); } - public DistributionManagerRemote getDistributionManagerRemote() { - return RemoteClientProxy.getProcessor(this, Manager.DistributionManager); - } - public EventManagerRemote getEventManagerRemote() { return RemoteClientProxy.getProcessor(this, Manager.EventManager); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java index c273793..c686c3e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java @@ -26,7 +26,6 @@ import javax.ejb.Stateless; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.Query; -import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,16 +37,13 @@ import org.rhq.core.domain.content.DistributionFile; import org.rhq.core.domain.content.DistributionType; import org.rhq.core.domain.content.RepoDistribution; import org.rhq.enterprise.server.RHQConstants; -import org.rhq.enterprise.server.authz.AuthorizationManagerLocal; import org.rhq.enterprise.server.authz.RequiredPermission; -import org.rhq.enterprise.server.core.AgentManagerLocal; -import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; /** * @author Pradeep Kilambi */ @Stateless -public class DistributionManagerBean implements DistributionManagerLocal, DistributionManagerRemote { +public class DistributionManagerBean implements DistributionManagerLocal { // Attributes -------------------------------------------- @@ -56,21 +52,9 @@ public class DistributionManagerBean implements DistributionManagerLocal, Distri @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME) private EntityManager entityManager; - @javax.annotation.Resource(name = "RHQ_DS", mappedName = RHQConstants.DATASOURCE_JNDI_NAME) - private DataSource dataSource; - - @EJB - private AgentManagerLocal agentManager; - - @EJB - private AuthorizationManagerLocal authorizationManager; - @EJB private DistributionManagerLocal distributionManager; - @EJB - private ResourceTypeManagerLocal resourceTypeManager; - @RequiredPermission(Permission.MANAGE_INVENTORY) public Distribution createDistribution(Subject user, String kslabel, String basepath, DistributionType disttype) throws DistributionException { @@ -131,26 +115,6 @@ public class DistributionManagerBean implements DistributionManagerLocal, Distri } /** - * Returns a kickstarttree from the database for a given basepath - * @param basepath location on filesystem - * @return kickstarttree object from db - */ - @SuppressWarnings("unchecked") - public Distribution getDistributionByPath(String basepath) { - Query query = entityManager.createNamedQuery(Distribution.QUERY_FIND_BY_DIST_PATH); - - query.setParameter("path", basepath); - List<Distribution> results = query.getResultList(); - - if (results.size() > 0) { - return results.get(0); - } else { - return null; - } - - } - - /** * Returns a DistributionType for given name * @param name name of distribution type * @return distribution type from db @@ -193,7 +157,6 @@ public class DistributionManagerBean implements DistributionManagerLocal, Distri * deletes list of available distribution files for requested distribution * @param distId */ - @SuppressWarnings("unchecked") public void deleteDistributionFilesByDistId(Subject user, int distId) { log.debug("User [" + user + "] is deleting distribution file from distribution [" + distId + "]"); @@ -215,14 +178,6 @@ public class DistributionManagerBean implements DistributionManagerLocal, Distri } } - @RequiredPermission(Permission.MANAGE_INVENTORY) - public void deleteDistributionTypeByName(Subject subject, String name) { - Query query = entityManager.createNamedQuery(DistributionType.QUERY_DELETE_BY_NAME); - query.setParameter("name", name); - - query.executeUpdate(); - } - /** * validates a given kickstart tree object and throws a KickstartTreeException * @param kstree kickstart tree object diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerLocal.java index b3eb4df..de72eea 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerLocal.java @@ -19,14 +19,14 @@ package org.rhq.enterprise.server.content; +import java.util.List; + import javax.ejb.Local; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.content.Distribution; -import org.rhq.core.domain.content.DistributionType; import org.rhq.core.domain.content.DistributionFile; - -import java.util.List; +import org.rhq.core.domain.content.DistributionType; /** * @author Pradeep Kilambi @@ -67,36 +67,19 @@ public interface DistributionManagerLocal { Distribution getDistributionByLabel(String kslabel); /** - * get distribution tree based on base path - * @param basepath location on filesystem - * @return kstree object - */ - Distribution getDistributionByPath(String basepath); - - /** * get list of distribution files * @param distid * @return list of distro file by dist id */ List<DistributionFile> getDistributionFilesByDistId(int distid); - /** - * delete list of distribution files - * @param subject - * @param distid - * - */ - void deleteDistributionFilesByDistId(Subject subject, int distid); - /** - * Deletes all distribution types with the given name. - * <p/> - * This should only be needed for testing purposes. - * + * delete list of distribution files * @param subject - * @param name - */ - void deleteDistributionTypeByName(Subject subject, String name); + * @param distid + * + */ + void deleteDistributionFilesByDistId(Subject subject, int distid); /** * Returns a DistributionType for given name diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerRemote.java deleted file mode 100644 index 35e5361..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerRemote.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.server.content; - -import javax.ejb.Remote; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.content.Distribution; -import org.rhq.core.domain.content.DistributionType; -import org.rhq.core.domain.content.DistributionFile; -import org.rhq.enterprise.server.system.ServerVersion; - -import java.util.List; - -/** - * @author Pradeep Kilambi - */ -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@WebService(targetNamespace = ServerVersion.namespace) -@Remote -public interface DistributionManagerRemote { - /** - * Creates a new kickstart tree in the system. If the tree does not exist, it will be created. - * If a tree exists with the specified version ID, a new one will not be created and the - * existing tree will be returned. - * @param subject - * @param kslabel - * @param basepath - * @return newly created kickstart tree object - */ - @WebMethod - Distribution createDistribution( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "kslabel") String kslabel, // - @WebParam(name = "basepath") String basepath, // - @WebParam(name = "disttype") DistributionType disttype) throws DistributionException; - - /** - * Deletes a given instance of kickstart tree object. If the object does not exist - * @param subject - * @param distId - * - */ - @WebMethod - void deleteDistributionByDistId( // - @WebParam(name = "subject") Subject subject, // - @WebParam(name = "distId") int distId) throws Exception; - - /** - * get kickstart tree based on a given label - * @param kslabel kickstart tree label - * @return kickstart tree object - */ - @WebMethod - Distribution getDistributionByLabel(@WebParam(name = "kslabel") String kslabel); - - /** - * get kickstart tree based on base path - * @param basepath location on filesystem - * @return kstree object - */ - @WebMethod - Distribution getDistributionByPath(@WebParam(name = "basepath") String basepath); - - /** - * get distribution file based on distro id - * @param distid - * @return - */ - @WebMethod - List<DistributionFile> getDistributionFilesByDistId(@WebParam(name = "distid") int distid); - - /** - * delete distribution file based on distro id - * @param distid - */ - @WebMethod - void deleteDistributionFilesByDistId(@WebParam(name = "subject") Subject subject, // - @WebParam(name = "distid") int distid); - - /** - * Deletes all distribution types with the given name. - * <p/> - * This should only be needed for testing purposes. - * - * @param subject - * @param name - */ - @WebMethod - void deleteDistributionTypeByName(@WebParam(name = "subject") Subject subject, - @WebParam(name = "name") String name); - - /** - * Returns a DistributionType for given name - * @param name name of distribution type - * @return distribution type from db - */ - @WebMethod - DistributionType getDistributionTypeByName(@WebParam(name = "name") String name); - -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java index f079566..90266d7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java @@ -59,8 +59,6 @@ import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; import org.rhq.core.domain.content.Advisory; import org.rhq.core.domain.content.Architecture; import org.rhq.core.domain.content.Distribution; -import org.rhq.core.domain.content.DistributionFile; -import org.rhq.core.domain.content.DistributionType; import org.rhq.core.domain.content.InstalledPackage; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.PackageVersion; @@ -125,8 +123,6 @@ import org.rhq.enterprise.server.bundle.BundleManagerLocal; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.configuration.ConfigurationUpdateStillInProgressException; import org.rhq.enterprise.server.content.ContentManagerLocal; -import org.rhq.enterprise.server.content.DistributionException; -import org.rhq.enterprise.server.content.DistributionManagerLocal; import org.rhq.enterprise.server.content.EntitlementStuffManagerLocal; import org.rhq.enterprise.server.content.RepoException; import org.rhq.enterprise.server.content.RepoManagerLocal; @@ -185,7 +181,6 @@ public class WebservicesManagerBean implements WebservicesRemote { //removed as it is problematic for WS clients having XMLAny for Object. // private DataAccessManagerLocal dataAccessManager = LookupUtil.getDataAccessManager(); private DiscoveryBossLocal discoveryBoss = LookupUtil.getDiscoveryBoss(); - private DistributionManagerLocal distributionManager = LookupUtil.getDistributionManagerLocal(); private EventManagerLocal eventManager = LookupUtil.getEventManager(); private MeasurementBaselineManagerLocal measurementBaselineManager = LookupUtil.getMeasurementBaselineManager(); private MeasurementDataManagerLocal measurementDataManager = LookupUtil.getMeasurementDataManager(); @@ -590,43 +585,6 @@ public class WebservicesManagerBean implements WebservicesRemote { //DISCOVERYBOSS: END ------------------------------------ - //DISTRIBUTION: START ------------------------------------ - - public DistributionType getDistributionTypeByName(String name) { - return distributionManager.getDistributionTypeByName(name); - } - - public void deleteDistributionFilesByDistId(Subject subject, int distid) { - distributionManager.deleteDistributionByDistId(subject, distid); - } - - public List<DistributionFile> getDistributionFilesByDistId(int distid) { - return distributionManager.getDistributionFilesByDistId(distid); - } - - public Distribution getDistributionByPath(String basepath) { - return distributionManager.getDistributionByPath(basepath); - } - - public Distribution getDistributionByLabel(String kslabel) { - return distributionManager.getDistributionByLabel(kslabel); - } - - public void deleteDistributionByDistId(Subject subject, int distId) throws Exception { - distributionManager.deleteDistributionByDistId(subject, distId); - } - - public void deleteDistributionTypeByName(Subject subject, String name) { - distributionManager.deleteDistributionTypeByName(subject, name); - } - - public Distribution createDistribution(Subject subject, String kslabel, String basepath, DistributionType disttype) - throws DistributionException { - return distributionManager.createDistribution(subject, kslabel, basepath, disttype); - } - - //DISTRIBUTION: END ------------------------------------ - //EVENTMANAGER: BEGIN ---------------------------------- public PageList<Event> findEventsByCriteria(Subject subject, EventCriteria criteria) { checkParametersPassedIn(subject, criteria); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java index 8ff968f..e60adcb 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java @@ -11,7 +11,6 @@ import org.rhq.enterprise.server.authz.RoleManagerRemote; import org.rhq.enterprise.server.bundle.BundleManagerRemote; import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote; import org.rhq.enterprise.server.content.ContentManagerRemote; -import org.rhq.enterprise.server.content.DistributionManagerRemote; import org.rhq.enterprise.server.content.EntitlementStuffManagerRemote; import org.rhq.enterprise.server.content.RepoManagerRemote; import org.rhq.enterprise.server.discovery.DiscoveryBossRemote; @@ -48,7 +47,6 @@ public interface WebservicesRemote extends // //Removed as it was problematic for WS clients. Not sure if this well be re-enabled. // DataAccessManagerRemote,// DiscoveryBossRemote,// - DistributionManagerRemote,// EventManagerRemote,// MeasurementBaselineManagerRemote,// MeasurementDataManagerRemote,// commit baa59d4086f2ad907b552a5d6c952087bb83cb9e Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 22 17:09:31 2010 -0400 Remove empty remote Interface diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentHelperRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentHelperRemote.java deleted file mode 100644 index fda7dad..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentHelperRemote.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.server.content; - -import javax.ejb.Remote; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT) -@WebService -@Remote -public interface ContentHelperRemote { - -} \ No newline at end of file commit 278084973713411a097d7f54cdc5470dd7a95f63 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 22 17:07:47 2010 -0400 Remove remote method referring to raw config. NOt yet ready for public consumption. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java index 2854544..01adabe 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java @@ -18,18 +18,20 @@ */ package org.rhq.enterprise.server.configuration; +import java.util.List; +import java.util.Map; + +import javax.ejb.Local; + import org.jetbrains.annotations.Nullable; import org.quartz.SchedulerException; -import org.rhq.core.clientapi.agent.PluginContainerException; -import org.rhq.core.clientapi.agent.configuration.ConfigurationValidationException; import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; import org.rhq.core.domain.configuration.PluginConfigurationUpdate; -import org.rhq.core.domain.configuration.RawConfiguration; import org.rhq.core.domain.configuration.ResourceConfigurationUpdate; import org.rhq.core.domain.configuration.composite.ConfigurationUpdateComposite; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; @@ -44,11 +46,6 @@ import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.server.configuration.job.GroupPluginConfigurationUpdateJob; import org.rhq.enterprise.server.resource.ResourceNotFoundException; -import javax.ejb.Local; -import java.util.Collection; -import java.util.List; -import java.util.Map; - /** * The configuration manager which allows you to request resource configuration changes, view current resource * configuration and previous update history and view/edit plugin configuration. diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java index 74bfdc4..b25fa9d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java @@ -180,11 +180,6 @@ public interface ConfigurationManagerRemote { @XmlJavaTypeAdapter(ConfigurationAdapter.class) Configuration newConfiguration) throws ResourceNotFoundException, ConfigurationUpdateStillInProgressException; - @WebMethod - ResourceConfigurationUpdate updateStructuredOrRawConfiguration(@WebParam Subject subject, @WebParam int resourceId, - @WebParam @XmlJavaTypeAdapter(ConfigurationAdapter.class) Configuration newConfiguration, - @WebParam boolean fromStructured) throws ResourceNotFoundException, ConfigurationUpdateStillInProgressException; - /** * Get the currently live resource configuration for the {@link Resource} with the given id. This actually asks for * the up-to-date configuration directly from the agent. An exception will be thrown if communications with the diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java index d7693e4..f079566 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java @@ -509,13 +509,6 @@ public class WebservicesManagerBean implements WebservicesRemote { return configurationManager.updateResourceConfiguration(subject, resourceId, newConfiguration); } - public ResourceConfigurationUpdate updateStructuredOrRawConfiguration(Subject subject, int resourceId, - Configuration newConfiguration, boolean fromStructured) throws ResourceNotFoundException, - ConfigurationUpdateStillInProgressException { - return configurationManager.updateStructuredOrRawConfiguration(subject, resourceId, newConfiguration, - fromStructured); - } - public ConfigurationDefinition getPackageTypeConfigurationDefinition(Subject subject, int packageTypeId) { return configurationManager.getPackageTypeConfigurationDefinition(subject, packageTypeId); } commit 7b0833a7d31777c9f1d8ad4f437a34d3313f4bf0 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Jun 22 17:06:59 2010 -0400 removing AdvisoryManagerRemote. We don't want to expose any of this API right now, it's not fully cooked. diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java index 7e04253..1a8259c 100644 --- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java +++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java @@ -35,7 +35,6 @@ import org.rhq.enterprise.server.auth.SubjectManagerRemote; import org.rhq.enterprise.server.authz.RoleManagerRemote; import org.rhq.enterprise.server.bundle.BundleManagerRemote; import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote; -import org.rhq.enterprise.server.content.AdvisoryManagerRemote; import org.rhq.enterprise.server.content.ContentManagerRemote; import org.rhq.enterprise.server.content.DistributionManagerRemote; import org.rhq.enterprise.server.content.RepoManagerRemote; @@ -72,7 +71,6 @@ import org.rhq.enterprise.server.tagging.TagManagerRemote; public class RemoteClient { public enum Manager { - AdvisoryManager(AdvisoryManagerRemote.class), // AlertManager(AlertManagerRemote.class), // AlertDefinitionManager(AlertDefinitionManagerRemote.class), // AvailabilityManager(AvailabilityManagerRemote.class), // @@ -102,8 +100,7 @@ public class RemoteClient { SupportManager(SupportManagerRemote.class), // SystemManager(SystemManagerRemote.class), // RemoteInstallManager(RemoteInstallManagerRemote.class), // - TagManager(TagManagerRemote.class) - ; + TagManager(TagManagerRemote.class); private Class<?> remote; private String remoteName; @@ -312,10 +309,6 @@ public class RemoteClient { this.transport = transport; } - public AdvisoryManagerRemote getAdvisoryManagerRemote() { - return RemoteClientProxy.getProcessor(this, Manager.AdvisoryManager); - } - public AlertManagerRemote getAlertManagerRemote() { return RemoteClientProxy.getProcessor(this, Manager.AlertManager); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerBean.java index ed99367..03530e9 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerBean.java @@ -48,7 +48,7 @@ import org.rhq.enterprise.server.authz.RequiredPermission; * @author Pradeep Kilambi */ @Stateless -public class AdvisoryManagerBean implements AdvisoryManagerLocal, AdvisoryManagerRemote { +public class AdvisoryManagerBean implements AdvisoryManagerLocal { // Attributes -------------------------------------------- @@ -108,11 +108,6 @@ public class AdvisoryManagerBean implements AdvisoryManagerLocal, AdvisoryManage return advpkg; } - public CVE getCVE(Subject user, int cveId) { - CVE cve = entityManager.find(CVE.class, cveId); - return cve; - } - public void deleteCVE(Subject user, int cveId) { log.debug("User [" + user + "] is deleting CVE [" + cveId + "]"); @@ -248,7 +243,6 @@ public class AdvisoryManagerBean implements AdvisoryManagerLocal, AdvisoryManage * find list of Packages Versions associated to an advisory * @return list of PackageVersion objects */ - @SuppressWarnings("unchecked") @RequiredPermission(Permission.MANAGE_INVENTORY) public PackageVersion findPackageVersionByPkgId(Subject subject, String rpmName, PageControl pc) { Query query = entityManager.createNamedQuery(PackageVersion.QUERY_FIND_PACKAGEVERSION_BY_FILENAME); @@ -262,7 +256,6 @@ public class AdvisoryManagerBean implements AdvisoryManagerLocal, AdvisoryManage } } - @SuppressWarnings("unchecked") @RequiredPermission(Permission.MANAGE_INVENTORY) public long getPackageCountFromAdv(Subject subject, int advId) { Query countQuery = PersistenceUtility.createCountQuery(entityManager, AdvisoryPackage.FIND_PACKAGES_BY_ADV_ID); @@ -291,7 +284,6 @@ public class AdvisoryManagerBean implements AdvisoryManagerLocal, AdvisoryManage } - @SuppressWarnings("unchecked") @RequiredPermission(Permission.MANAGE_INVENTORY) public long getCVECountFromAdv(Subject subject, int advId) { Query countQuery = PersistenceUtility.createCountQuery(entityManager, AdvisoryCVE.FIND_CVE_BY_ADV_ID); @@ -326,7 +318,6 @@ public class AdvisoryManagerBean implements AdvisoryManagerLocal, AdvisoryManage * @param buginfo * @return A AdvisoryBuglist objects */ - @SuppressWarnings("unchecked") public AdvisoryBuglist getAdvisoryBuglist(Subject subject, int advId, String buginfo) { Query query = entityManager.createNamedQuery(AdvisoryBuglist.FIND_ADVISORY_BUGLIST); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerLocal.java index d44fdbc..836258c 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerLocal.java @@ -47,7 +47,7 @@ public interface AdvisoryManagerLocal { * @param advisoryType adv type * @return newly created advisory object */ - Advisory createAdvisory(Subject user, String advisory, String advisoryType, String advisoryName) + Advisory createAdvisory(Subject subject, String advisory, String advisoryType, String synopsis) throws AdvisoryException; /** @@ -57,7 +57,7 @@ public interface AdvisoryManagerLocal { * @return a CVE object * @throws AdvisoryException */ - CVE createCVE(Subject user, String cvename) throws AdvisoryException; + CVE createCVE(Subject subject, String cvename) throws AdvisoryException; /** * creates a AdvisoryCVE relationship object @@ -67,7 +67,7 @@ public interface AdvisoryManagerLocal { * @return AdvisoryCVE object * @throws AdvisoryException */ - AdvisoryCVE createAdvisoryCVE(Subject user, Advisory advisory, CVE cve) throws AdvisoryException; + AdvisoryCVE createAdvisoryCVE(Subject subject, Advisory advisory, CVE cve) throws AdvisoryException; /** * creates a AdvisoryPackage mapping object @@ -77,36 +77,29 @@ public interface AdvisoryManagerLocal { * @return AdvisoryPackage object * @throws AdvisoryException */ - AdvisoryPackage createAdvisoryPackage(Subject user, Advisory advisory, PackageVersion pkg) throws AdvisoryException; - - /** - * returns an existing CVE object - * @param user - * @param cveId - * @return - */ - CVE getCVE(Subject user, int cveId); + AdvisoryPackage createAdvisoryPackage(Subject subject, Advisory advisory, PackageVersion packageVersion) + throws AdvisoryException; /** * deletes specified cve object * @param user * @param cveId */ - void deleteCVE(Subject user, int cveId); + void deleteCVE(Subject subject, int cveId); /** * removes the AdvisoryCVE mapping * @param user * @param advId */ - void deleteAdvisoryCVE(Subject user, int advId); + void deleteAdvisoryCVE(Subject subject, int advId); /** * Deletes a given instance of advisory object. * @param user * @param advId */ - void deleteAdvisoryByAdvId(Subject user, int advId); + void deleteAdvisoryByAdvId(Subject subject, int advId); /** * find advisory by advisory name @@ -162,7 +155,7 @@ public interface AdvisoryManagerLocal { * @param user * @param advId */ - void deleteAdvisoryPackage(Subject user, int advId); + void deleteAdvisoryPackage(Subject subject, int advId); /** * find AdvisoryPackage object for given advId and packageVersion id diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerRemote.java deleted file mode 100644 index a74a81a..0000000 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerRemote.java +++ /dev/null @@ -1,214 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.enterprise.server.content; - -import java.util.List; - -import javax.ejb.Local; -import javax.jws.WebMethod; -import javax.jws.WebParam; - -import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.content.Advisory; -import org.rhq.core.domain.content.AdvisoryBuglist; -import org.rhq.core.domain.content.AdvisoryCVE; -import org.rhq.core.domain.content.AdvisoryPackage; -import org.rhq.core.domain.content.CVE; -import org.rhq.core.domain.content.PackageVersion; -import org.rhq.core.domain.util.PageControl; -import org.rhq.core.domain.util.PageList; - -/** - * @author Pradeep Kilambi - */ -@Local -public interface AdvisoryManagerRemote { - /** - * Creates a new advisory in the system. If the advisory does not exist, it will be created. - * If a advisory exists with the specified version ID, a new one will not be created and the - * existing advisory will be returned. - * @param user - * @param advisory advisory label - * @param advisoryType adv type - * @return newly created advisory object - */ - @WebMethod - Advisory createAdvisory(@WebParam(name = "subject") Subject user, @WebParam(name = "advisory") String advisory, // - @WebParam(name = "advisoryType") String advisoryType, // - @WebParam(name = "advisoryName") String synopsis) throws AdvisoryException; - - /** - * creates a cve instance for a given cve name - * @param user - * @param cvename - * @return a CVE object - * @throws AdvisoryException - */ - CVE createCVE(@WebParam(name = "subject") Subject user, // - @WebParam(name = "cvename") String cvename) throws AdvisoryException; - - /** - * creates a AdvisoryCVE relationship object - * @param user - * @param advisory - * @param cve - * @return AdvisoryCVE object - * @throws AdvisoryException - */ - AdvisoryCVE createAdvisoryCVE(@WebParam(name = "subject") Subject user, // - @WebParam(name = "advisory") Advisory advisory, // - @WebParam(name = "cve") CVE cve) throws AdvisoryException; - - /** - * creates a AdvisoryPackage mapping object - * @param user - * @param advisory - * @param pkg - * @return AdvisoryPackage object - * @throws AdvisoryException - */ - AdvisoryPackage createAdvisoryPackage(@WebParam(name = "subject") Subject user, // - @WebParam(name = "advisory") Advisory advisory, // - @WebParam(name = "pkg") PackageVersion pkg) throws AdvisoryException; - - /** - * returns an existing CVE object - * @param user - * @param cveId - * @return - */ - CVE getCVE(@WebParam(name = "subject") Subject user, - @WebParam(name = "cveId")int cveId); - - /** - * deletes specified cve object - * @param user - * @param cveId - */ - void deleteCVE(@WebParam(name = "subject") Subject user, // - @WebParam(name = "cveId") int cveId); - - /** - * removes the AdvisoryCVE mapping - * @param user - * @param advId - */ - void deleteAdvisoryCVE(@WebParam(name = "subject") Subject user, @WebParam(name = "advId") int advId); - - /** - * Deletes a given instance of advisory object. - * @param user - * @param advId - */ - @WebMethod - void deleteAdvisoryByAdvId(@WebParam(name = "subject") Subject subject, // - @WebParam(name = "advId") int advId); - - /** - * find advisory by advisory name - * @param advlabel - * @return advisory object for a given name - */ - @WebMethod - Advisory getAdvisoryByName(@WebParam(name = "advlabel") String advlabel); - - /** - * find packages associated for a given advisory - * @param subject - * @param advId - * @param pc - * @return a list of package objects - */ - @WebMethod - List<AdvisoryPackage> findPackageByAdvisory(@WebParam(name = "subject") Subject subject, // - @WebParam(name = "advId") int advId, @WebParam(name = "pc") PageControl pc); - - /** - * find packages associated for a given package - * @param subject - * @param pkgId - * @param pc - * @return a list of packageversion objects - */ - PackageVersion findPackageVersionByPkgId(@WebParam(name = "subject") Subject subject, // - @WebParam(name = "rpmName") String rpmName, @WebParam(name = "pc") PageControl pc); - - /** - * find CVEs associated to a given advisory - * @param subject - * @param advId - * @param pc - * @return CVE objects associated to a given advisory - */ - @WebMethod - PageList<AdvisoryCVE> getAdvisoryCVEByAdvId(@WebParam(name = "subject") Subject subject, // - @WebParam(name = "advId") int advId, @WebParam(name = "pc") PageControl pc); - - /** - * find bugs associated to a given advisory - * @param subject - * @param advId - * @return list of AdvisoryBuglist objects - */ - @WebMethod - List<AdvisoryBuglist> getAdvisoryBuglistByAdvId(@WebParam(name = "subject") Subject subject, // - @WebParam(name = "advId") int advId); - - /** - * Deletes a given instance of advisoryBuglist object. - * @param user - * @param advId - */ - @WebMethod - void deleteAdvisoryBugList(@WebParam(name = "subject") Subject overlord, // - @WebParam(name = "advId") int id); - - /** - * Deletes a given instance of advisoryPackage object. - * @param user - * @param advId - */ - @WebMethod - void deleteAdvisoryPackage(@WebParam(name = "subject") Subject user, // - @WebParam(name = "advId") int advId); - - /** - * find AdvisoryPackage object for given advId and packageVersion id - * @param overlord - * @param advId - * @param pkgVerId - */ - @WebMethod - AdvisoryPackage findAdvisoryPackage(@WebParam(name = "subject") Subject overlord, // - @WebParam(name = "advId") int advId, // - @WebParam(name = "pkgVerId") int pkgVerId); - - /** - * find AdvisoryBuglist object for given advId and buginfo - * @param subject - * @param advId - * @param buginfo - * @return - */ - @WebMethod - AdvisoryBuglist getAdvisoryBuglist(@WebParam(name = "subject") Subject subject, // - @WebParam(name = "advId") int advId, // - @WebParam(name = "buginfo") String buginfo); -} diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java index 98a4519..d7693e4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java @@ -57,11 +57,7 @@ import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple; import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate; import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate; import org.rhq.core.domain.content.Advisory; -import org.rhq.core.domain.content.AdvisoryBuglist; -import org.rhq.core.domain.content.AdvisoryCVE; -import org.rhq.core.domain.content.AdvisoryPackage; import org.rhq.core.domain.content.Architecture; -import org.rhq.core.domain.content.CVE; import org.rhq.core.domain.content.Distribution; import org.rhq.core.domain.content.DistributionFile; import org.rhq.core.domain.content.DistributionType; @@ -128,8 +124,6 @@ import org.rhq.enterprise.server.authz.RoleManagerLocal; import org.rhq.enterprise.server.bundle.BundleManagerLocal; import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; import org.rhq.enterprise.server.configuration.ConfigurationUpdateStillInProgressException; -import org.rhq.enterprise.server.content.AdvisoryException; -import org.rhq.enterprise.server.content.AdvisoryManagerLocal; import org.rhq.enterprise.server.content.ContentManagerLocal; import org.rhq.enterprise.server.content.DistributionException; import org.rhq.enterprise.server.content.DistributionManagerLocal; @@ -181,7 +175,6 @@ import org.rhq.enterprise.server.util.LookupUtil; public class WebservicesManagerBean implements WebservicesRemote { //Lookup the required beans as local references - private AdvisoryManagerLocal advisoryManager = LookupUtil.getAdvisoryManagerLocal(); private AlertManagerLocal alertManager = LookupUtil.getAlertManager(); private AlertDefinitionManagerLocal alertDefinitionManager = LookupUtil.getAlertDefinitionManager(); private AvailabilityManagerLocal availabilityManager = LookupUtil.getAvailabilityManager(); @@ -212,80 +205,6 @@ public class WebservicesManagerBean implements WebservicesRemote { private SystemManagerLocal systemManager = LookupUtil.getSystemManager(); private EntitlementStuffManagerLocal entitlementManager = LookupUtil.getEntitlementManager(); - //ADVISORYMANAGER: BEGIN ------------------------------------------ - - public Advisory createAdvisory(Subject subject, String advisory, String advisoryType, String advisoryName) - throws AdvisoryException { - return advisoryManager.createAdvisory(subject, advisory, advisoryType, advisoryName); - } - - public CVE createCVE(Subject subject, String cvename) throws AdvisoryException { - return advisoryManager.createCVE(subject, cvename); - } - - public AdvisoryCVE createAdvisoryCVE(Subject subject, Advisory advisory, CVE cve) throws AdvisoryException { - return advisoryManager.createAdvisoryCVE(subject, advisory, cve); - } - - public AdvisoryPackage createAdvisoryPackage(Subject subject, Advisory advisory, PackageVersion pkg) - throws AdvisoryException { - return advisoryManager.createAdvisoryPackage(subject, advisory, pkg); - } - - public CVE getCVE(Subject subject, int cveId) { - return advisoryManager.getCVE(subject, cveId); - } - - public void deleteCVE(Subject subject, int cveId) { - advisoryManager.deleteCVE(subject, cveId); - } - - public void deleteAdvisoryCVE(Subject subject, int advId) { - advisoryManager.deleteAdvisoryCVE(subject, advId); - } - - public void deleteAdvisoryByAdvId(Subject subject, int advId) { - advisoryManager.deleteAdvisoryByAdvId(subject, advId); - } - - public Advisory getAdvisoryByName(String advlabel) { - return advisoryManager.getAdvisoryByName(advlabel); - } - - public List<AdvisoryPackage> findPackageByAdvisory(Subject subject, int advId, PageControl pc) { - return advisoryManager.findPackageByAdvisory(subject, advId, pc); - } - - public PackageVersion findPackageVersionByPkgId(Subject subject, String rpmName, PageControl pc) { - return advisoryManager.findPackageVersionByPkgId(subject, rpmName, pc); - } - - public PageList<AdvisoryCVE> getAdvisoryCVEByAdvId(Subject subject, int advId, PageControl pc) { - return advisoryManager.getAdvisoryCVEByAdvId(subject, advId, pc); - } - - public List<AdvisoryBuglist> getAdvisoryBuglistByAdvId(Subject subject, int advId) { - return advisoryManager.getAdvisoryBuglistByAdvId(subject, advId); - } - - public void deleteAdvisoryBugList(Subject overlord, int id) { - advisoryManager.deleteAdvisoryBugList(overlord, id); - } - - public void deleteAdvisoryPackage(Subject subject, int advId) { - advisoryManager.deleteAdvisoryPackage(subject, advId); - } - - public AdvisoryPackage findAdvisoryPackage(Subject overlord, int advId, int pkgVerId) { - return advisoryManager.findAdvisoryPackage(overlord, advId, pkgVerId); - } - - public AdvisoryBuglist getAdvisoryBuglist(Subject subject, int advId, String buginfo) { - return advisoryManager.getAdvisoryBuglist(subject, advId, buginfo); - } - - //ADVISORYMANAGER: END ------------------------------------------ - //ALERTMANAGER: BEGIN ------------------------------------------ public PageList<Alert> findAlertsByCriteria(Subject subject, AlertCriteria criteria) { return alertManager.findAlertsByCriteria(subject, criteria); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java index eb05b9f..8ff968f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java @@ -10,7 +10,6 @@ import org.rhq.enterprise.server.auth.SubjectManagerRemote; import org.rhq.enterprise.server.authz.RoleManagerRemote; import org.rhq.enterprise.server.bundle.BundleManagerRemote; import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote; -import org.rhq.enterprise.server.content.AdvisoryManagerRemote; import org.rhq.enterprise.server.content.ContentManagerRemote; import org.rhq.enterprise.server.content.DistributionManagerRemote; import org.rhq.enterprise.server.content.EntitlementStuffManagerRemote; @@ -25,7 +24,6 @@ import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerRemote; import org.rhq.enterprise.server.measurement.MeasurementProblemManagerRemote; import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerRemote; import org.rhq.enterprise.server.operation.OperationManagerRemote; -import org.rhq.enterprise.server.registration.RegistrationManagerRemote; import org.rhq.enterprise.server.resource.ResourceFactoryManagerRemote; import org.rhq.enterprise.server.resource.ResourceManagerRemote; import org.rhq.enterprise.server.resource.ResourceTypeManagerRemote; @@ -38,7 +36,6 @@ import org.rhq.enterprise.server.system.SystemManagerRemote; @WebService(targetNamespace = ServerVersion.namespace) @Remote public interface WebservicesRemote extends // - AdvisoryManagerRemote, // AlertManagerRemote, // AlertDefinitionManagerRemote, // AvailabilityManagerRemote,//

1 0

[rhq] Branch 'release-3.0.0' - 2 commits - modules/enterprise
by Joseph Marques 02 Jul '10

02 Jul '10

modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java | 69 +++++----- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java | 8 + 2 files changed, 43 insertions(+), 34 deletions(-) New commits: commit fac71cddc3bd3965cfd4396a6f3c6fb5a6074048 Author: Joseph Marques <joseph(a)redhat.com> Date: Fri Jul 2 11:41:49 2010 -0400 BZ-610854: filter the aggregate metric counts by the appropriate entity context diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java index 704042d..15b5267 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java @@ -453,6 +453,14 @@ public class MeasurementChartsManagerBean implements MeasurementChartsManagerLoc for (int definitionId : measurementDefinitionIds) { MeasurementScheduleCriteria criteria = new MeasurementScheduleCriteria(); + if (context.category == EntityContext.Category.Resource) { + criteria.addFilterResourceId(context.resourceId); + } else if (context.category == EntityContext.Category.ResourceGroup) { + criteria.addFilterResourceGroupId(context.groupId); + } else if (context.category == EntityContext.Category.AutoGroup) { + criteria.addFilterAutoGroupParentResourceId(context.parentResourceId); + criteria.addFilterAutoGroupResourceTypeId(context.resourceTypeId); + } criteria.addFilterDefinitionIds(definitionId); PageList<MeasurementSchedule> theSchedules = scheduleManager.findSchedulesByCriteria(subject, criteria); int totalScheduleCount = theSchedules.getTotalSize(); commit 9bd087c2b141aff52b67917a604c6075ea76fb39 Author: Joseph Marques <joseph(a)redhat.com> Date: Thu Jul 1 13:49:18 2010 -0400 BZ-610163: add more resilience/tolerance to generated sortable tables for when JSF hiccups diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java index 1ed3d05..1437ae2 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/sorting/SortableColumnHeaderRenderer.java @@ -26,7 +26,6 @@ import javax.faces.component.UIData; import javax.faces.component.UIGraphic; import javax.faces.component.UIOutput; import javax.faces.component.html.HtmlOutputLabel; -import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import com.sun.faces.renderkit.html_basic.CommandLinkRenderer; @@ -45,26 +44,6 @@ public class SortableColumnHeaderRenderer extends CommandLinkRenderer { super(); } - @Override - public void decode(FacesContext context, UIComponent component) { - super.decode(context, component); - } - - @Override - public void encodeBegin(FacesContext context, UIComponent component) throws IOException { - super.encodeBegin(context, component); - } - - @Override - public void encodeEnd(FacesContext context, UIComponent component) throws IOException { - super.encodeEnd(context, component); - } - - @Override - public void encodeChildren(FacesContext context, UIComponent component) throws IOException { - super.encodeChildren(context, component); - } - /* easy trick to override and put addition attributes in the writer */ @Override protected void writeValue(UIComponent component, ResponseWriter writer) throws IOException { @@ -87,14 +66,12 @@ public class SortableColumnHeaderRenderer extends CommandLinkRenderer { children.remove(i); } - if (children.size() > i && children.get(i) instanceof UIOutput) { + if (children.get(i) instanceof UIOutput) { UIOutput output = (UIOutput) children.get(i); String value = output.getValue().toString(); - if (value.length() > 0) { - if (Character.isDigit(value.charAt(0))) { - // also remove sort index labels, they will be reconstructed below - children.remove(i); - } + if (isNumber(value)) { + // also remove sort index labels ('1', '2', '3') since they will be reconstructed below + children.remove(i); } } } @@ -140,17 +117,41 @@ public class SortableColumnHeaderRenderer extends CommandLinkRenderer { super.writeValue(component, writer); } + private boolean isNumber(String value) { + if (value == null) { + return false; + } + + value = value.trim(); + if (value.equals("")) { + return false; + } + + for (char c : value.toCharArray()) { + if (Character.isDigit(c) == false) { + return false; + } + } + + return true; + } + private PageControl getPageControl(UIComponent component) { - UIData enclosingTable = getEnclosingUIData(component); + try { + UIData enclosingTable = getEnclosingUIData(component); - UIComponent facet = enclosingTable.getFacet("PageControlView"); - String viewName = facet.getId(); + UIComponent facet = enclosingTable.getFacet("PageControlView"); + String viewName = facet.getId(); - PageControlView currentView = PageControlView.valueOf(viewName); - WebUser user = EnterpriseFacesContextUtility.getWebUser(); - WebUserPreferences preferences = user.getWebPreferences(); + PageControlView currentView = PageControlView.valueOf(viewName); + WebUser user = EnterpriseFacesContextUtility.getWebUser(); + WebUserPreferences preferences = user.getWebPreferences(); - return preferences.getPageControl(currentView); + return preferences.getPageControl(currentView); + } catch (Throwable t) { + // be tolerant of JSF + return new PageControl(0, 15); // return something reasonable + } } private UIData getEnclosingUIData(UIComponent component) {

1 0

[rhq] modules/enterprise
by Jay Shaughnessy 02 Jul '10

02 Jul '10

modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp | 208 +++++----- 1 file changed, 104 insertions(+), 104 deletions(-) New commits: commit 24133e9ab787bc2cd88bc8b8d13afadd3d4c2f3d Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jul 2 10:59:32 2010 -0400 LT commit diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp index 30df9ef..45526f7 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/config/GeneralPropertiesConfigForm.jsp @@ -1,104 +1,104 @@ -<%@ page language="java" %> -<%@ page errorPage="/common/Error.jsp" %> - -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> -<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> - -<script src="<html:rewrite page="/js/"/>functions.js" type="text/javascript"></script> -<link rel=stylesheet href="<html:rewrite page="/css/"/>win.css" type="text/css"> - -<hq:constant - classname="org.rhq.enterprise.gui.legacy.Constants" - symbol="MINUTES_LABEL" var="CONST_MINUTES" /> -<hq:constant - classname="org.rhq.enterprise.gui.legacy.Constants" - symbol="HOURS_LABEL" var="CONST_HOURS" /> -<hq:constant - classname="org.rhq.enterprise.gui.legacy.Constants" - symbol="DAYS_LABEL" var="CONST_DAYS" /> - - -<tiles:insert definition=".header.tab"> - <tiles:put name="tabKey" value="admin.settings.BaseConfigTab"/> -</tiles:insert> - - - -<table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> - <td width="45%" class="BlockLabel"><fmt:message key="admin.settings.BaseURL"/></td> - <td width="55%" class="BlockContent"><html:text size="31" property="baseUrl" /></td> - </tr> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.AgentMaxQuietTimeAllowed"/></td> - <td class="BlockContent"> - <table width="100%" cellpadding="0" cellspacing="0" border="0"> - <tr> -<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> - <td class="ErrorField"> - <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> - </td> - <td class="ErrorField" width="100%"> - <html:select property="agentMaxQuietTimeAllowed"> - <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> - </html:select> - </td> -</logic:messagesPresent> -<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> - <td class="BlockContent"> - <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> - </td> - <td class="BlockContent" width="100%"> - <html:select property="agentMaxQuietTimeAllowed"> - <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> - </html:select> - </td> -</logic:messagesNotPresent> - </tr> -<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> - <tr> - <td class="ErrorField" colspan="2"> - <span class="ErrorFieldContent"> <html:errors property="agentMaxQuietTimeAllowedVal"/></span> - </td> - </tr> -</logic:messagesPresent> -<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> - <tr> - <td class="BlockContent" colspan="2"> - </td> - </tr> -</logic:messagesNotPresent> - </table> - </td> - </tr> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.EnableAgentAutoUpdate"/></td> - <td class="BlockContent"> - <table cellpadding="0" cellspacing="4" border="0"> - <tr> - <td align="left"><html:radio property="enableAgentAutoUpdate" value="true"/><fmt:message key="yesno.true"/></td> - <td align="left"><html:radio property="enableAgentAutoUpdate" value="false"/><fmt:message key="yesno.false"/></td> - </tr> - </table> - </td> - </tr> - -<hq:authorization permission="superuser"> - <tr> - <td class="BlockLabel"><fmt:message key="admin.settings.EnableDebugMode"/></td> - <td class="BlockContent"> - <table cellpadding="0" cellspacing="4" border="0"> - <tr> - <td align="left"><html:radio property="enableDebugMode" value="true"/><fmt:message key="yesno.true"/></td> - <td align="left"><html:radio property="enableDebugMode" value="false"/><fmt:message key="yesno.false"/></td> - </tr> - </table> - </td> - </tr> -</hq:authorization> - -</table> +<%@ page language="java" %> +<%@ page errorPage="/common/Error.jsp" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-html-el" prefix="html" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-tiles" prefix="tiles" %> +<%@ taglib uri="http://jakarta.apache.org/struts/tags-logic" prefix="logic" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="/WEB-INF/tld/hq.tld" prefix="hq" %> + +<script src="<html:rewrite page="/js/"/>functions.js" type="text/javascript"></script> +<link rel=stylesheet href="<html:rewrite page="/css/"/>win.css" type="text/css"> + +<hq:constant + classname="org.rhq.enterprise.gui.legacy.Constants" + symbol="MINUTES_LABEL" var="CONST_MINUTES" /> +<hq:constant + classname="org.rhq.enterprise.gui.legacy.Constants" + symbol="HOURS_LABEL" var="CONST_HOURS" /> +<hq:constant + classname="org.rhq.enterprise.gui.legacy.Constants" + symbol="DAYS_LABEL" var="CONST_DAYS" /> + + +<tiles:insert definition=".header.tab"> + <tiles:put name="tabKey" value="admin.settings.BaseConfigTab"/> +</tiles:insert> + + + +<table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td width="45%" class="BlockLabel"><fmt:message key="admin.settings.BaseURL"/></td> + <td width="55%" class="BlockContent"><html:text size="31" property="baseUrl" /></td> + </tr> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.AgentMaxQuietTimeAllowed"/></td> + <td class="BlockContent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> +<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> + <td class="ErrorField"> + <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> + </td> + <td class="ErrorField" width="100%"> + <html:select property="agentMaxQuietTimeAllowed"> + <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> + </html:select> + </td> +</logic:messagesPresent> +<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> + <td class="BlockContent"> + <html:text size="2" property="agentMaxQuietTimeAllowedVal" /> + </td> + <td class="BlockContent" width="100%"> + <html:select property="agentMaxQuietTimeAllowed"> + <html:option value="${CONST_MINUTES}"><fmt:message key="admin.settings.Minutes"/></html:option> + </html:select> + </td> +</logic:messagesNotPresent> + </tr> +<logic:messagesPresent property="agentMaxQuietTimeAllowedVal"> + <tr> + <td class="ErrorField" colspan="2"> + <span class="ErrorFieldContent"> <html:errors property="agentMaxQuietTimeAllowedVal"/></span> + </td> + </tr> +</logic:messagesPresent> +<logic:messagesNotPresent property="agentMaxQuietTimeAllowedVal"> + <tr> + <td class="BlockContent" colspan="2"> + </td> + </tr> +</logic:messagesNotPresent> + </table> + </td> + </tr> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.EnableAgentAutoUpdate"/></td> + <td class="BlockContent"> + <table cellpadding="0" cellspacing="4" border="0"> + <tr> + <td align="left"><html:radio property="enableAgentAutoUpdate" value="true"/><fmt:message key="yesno.true"/></td> + <td align="left"><html:radio property="enableAgentAutoUpdate" value="false"/><fmt:message key="yesno.false"/></td> + </tr> + </table> + </td> + </tr> + +<hq:authorization permission="superuser"> + <tr> + <td class="BlockLabel"><fmt:message key="admin.settings.EnableDebugMode"/></td> + <td class="BlockContent"> + <table cellpadding="0" cellspacing="4" border="0"> + <tr> + <td align="left"><html:radio property="enableDebugMode" value="true"/><fmt:message key="yesno.true"/></td> + <td align="left"><html:radio property="enableDebugMode" value="false"/><fmt:message key="yesno.false"/></td> + </tr> + </table> + </td> + </tr> +</hq:authorization> + +</table>

1 0

[rhq] 2 commits - modules/core modules/plugins
by Jay Shaughnessy 02 Jul '10

02 Jul '10

modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ConfigurationFacet.java | 47 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 844 +++++----- modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JavaUtilLoggingResourceComponent.java | 12 3 files changed, 453 insertions(+), 450 deletions(-) New commits: commit 4f9387122640a9df8cbb8448b74ad086f9eaf7c9 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jul 2 10:06:26 2010 -0400 Throwing an exception here generated WARN level messages in the Agent log when in reality this is a valid (connection property) setting. This can be confusing to users. So, change to INFO logging and a null return. Also clarified possible return values for this call in ConfigurationFacet jdoc. diff --git a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ConfigurationFacet.java b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ConfigurationFacet.java index 93042e3..02b58a2 100644 --- a/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ConfigurationFacet.java +++ b/modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ConfigurationFacet.java @@ -1,25 +1,25 @@ - /* - * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, version 2, as - * published by the Free Software Foundation, and/or the GNU Lesser - * General Public License, version 2.1, also as published by the Free - * Software Foundation. - * - * 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 and the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License - * and the GNU Lesser General Public License along with this program; - * if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * 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 and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.core.pluginapi.configuration; import org.rhq.core.domain.configuration.Configuration; @@ -37,7 +37,8 @@ public interface ConfigurationFacet extends ConfigurationFacetSupport { * settings for the managed resource itself, not to be confused with the <i>plugin configuration</i> which is used * by the plugin code to connect to the managed resource. * - * @return the current configuration of the managed resource + * @return the current configuration of the managed resource. can return null if resource configuration is + * implemented but disabled (perhaps via a plugin config setting). * * @throws Exception if failed to obtain the current configuration from the resource */ diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JavaUtilLoggingResourceComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JavaUtilLoggingResourceComponent.java index 2a80f43..85b6ee6 100644 --- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JavaUtilLoggingResourceComponent.java +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JavaUtilLoggingResourceComponent.java @@ -44,12 +44,14 @@ public class JavaUtilLoggingResourceComponent extends MBeanResourceComponent { public Configuration loadResourceConfiguration() { if (getResourceContext().getPluginContainerDeployment() == PluginContainerDeployment.AGENT) { - PropertySimple configManagementEnabled = getResourceContext().getPluginConfiguration().getSimple("configManagementEnabled"); + PropertySimple configManagementEnabled = getResourceContext().getPluginConfiguration().getSimple( + "configManagementEnabled"); if (configManagementEnabled == null || !configManagementEnabled.getBooleanValue()) { - throw new RuntimeException("Configuration management is currently disabled for the " - + getResourceContext().getResourceType() + " Resource with key [" - + getResourceContext().getResourceKey() - + "] - it can be enabled in the Resource's Inventory > Connection tab."); + log.info("Configuration management is currently disabled for the " + + getResourceContext().getResourceType() + " Resource with key [" + + getResourceContext().getResourceKey() + + "] - it can be enabled in the Resource's Inventory > Connection tab."); + return null; } } commit 07217f26a8368f4b9554b3253aea142fe7193f33 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jul 2 09:59:37 2010 -0400 LT commit diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java index aefb351..e4511fd 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java @@ -1,422 +1,422 @@ -/* -* Jopr Management Platform -* Copyright (C) 2005-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, version 2, as -* published by the Free Software Foundation, and/or the GNU Lesser -* General Public License, version 2.1, also as published by the Free -* Software Foundation. -* -* 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 and the GNU Lesser General Public License -* for more details. -* -* You should have received a copy of the GNU General Public License -* and the GNU Lesser General Public License along with this program; -* if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ -package org.rhq.plugins.jbossas5; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.deployers.spi.management.ManagementView; -import org.jboss.deployers.spi.management.deploy.DeploymentManager; -import org.jboss.deployers.spi.management.deploy.DeploymentProgress; -import org.jboss.deployers.spi.management.deploy.DeploymentStatus; -import org.jboss.managed.api.ComponentType; -import org.jboss.managed.api.ManagedComponent; -import org.jboss.managed.api.ManagedDeployment; -import org.jboss.managed.api.ManagedOperation; -import org.jboss.managed.api.ManagedProperty; -import org.jboss.managed.api.RunState; -import org.jboss.metatype.api.values.ArrayValue; -import org.jboss.metatype.api.values.CollectionValue; -import org.jboss.metatype.api.values.CompositeValue; -import org.jboss.metatype.api.values.EnumValue; -import org.jboss.metatype.api.values.MetaValue; -import org.jboss.metatype.api.values.SimpleValue; -import org.jboss.remoting.CannotConnectException; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; -import org.rhq.core.domain.measurement.AvailabilityType; -import org.rhq.core.domain.measurement.DataType; -import org.rhq.core.domain.measurement.MeasurementDataNumeric; -import org.rhq.core.domain.measurement.MeasurementDataTrait; -import org.rhq.core.domain.measurement.MeasurementReport; -import org.rhq.core.domain.measurement.MeasurementScheduleRequest; -import org.rhq.core.domain.operation.OperationDefinition; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.pluginapi.configuration.ConfigurationFacet; -import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; -import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; -import org.rhq.core.pluginapi.inventory.ResourceContext; -import org.rhq.core.pluginapi.measurement.MeasurementFacet; -import org.rhq.core.pluginapi.operation.OperationFacet; -import org.rhq.core.pluginapi.operation.OperationResult; -import org.rhq.core.util.exception.ThrowableUtil; -import org.rhq.plugins.jbossas5.util.ConversionUtils; -import org.rhq.plugins.jbossas5.util.DeploymentUtils; -import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; -import org.rhq.plugins.jbossas5.util.ResourceTypeUtils; -import org.rhq.plugins.jbossas5.util.ResourceComponentUtils; -import org.rhq.plugins.jbossas5.util.DebugUtils; - -/** - * Service ResourceComponent for all {@link ManagedComponent}s in a Profile. - * - * @author Ian Springer - * @author Jason Dobies - * @author Mark Spritzler - */ -public class ManagedComponentComponent extends AbstractManagedComponent implements ConfigurationFacet, - DeleteResourceFacet, OperationFacet, MeasurementFacet { - public static interface Config { - String COMPONENT_TYPE = "componentType"; - String COMPONENT_SUBTYPE = "componentSubtype"; - String COMPONENT_NAME = "componentName"; - String TEMPLATE_NAME = "templateName"; - String COMPONENT_NAME_PROPERTY = "componentNameProperty"; - } - - protected static final char PREFIX_DELIMITER = '|'; - - private final Log log = LogFactory.getLog(this.getClass()); - - private String componentName; - private ComponentType componentType; - - // ResourceComponent Implementation -------------------------------------------- - - public AvailabilityType getAvailability() { - RunState runState; - try { - runState = getManagedComponent().getRunState(); - } catch (CannotConnectException e) { - return AvailabilityType.DOWN; - } - return (runState == RunState.RUNNING) ? AvailabilityType.UP : AvailabilityType.DOWN; - } - - public void start(ResourceContext<ProfileServiceComponent> resourceContext) throws Exception { - super.start(resourceContext); - this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType()); - Configuration pluginConfig = resourceContext.getPluginConfiguration(); - this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue(); - log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType - + " component '" + this.componentName + "'."); - } - - public void stop() { - return; - } - - // ConfigurationComponent Implementation -------------------------------------------- - - public Configuration loadResourceConfiguration() - { - Configuration resourceConfig; - try - { - Map<String, ManagedProperty> managedProperties = getManagedComponent().getProperties(); - Map<String, PropertySimple> customProps = - ResourceComponentUtils.getCustomProperties(getResourceContext().getPluginConfiguration()); - if (this.log.isDebugEnabled()) this.log.debug("*** AFTER LOAD:\n" - + DebugUtils.convertPropertiesToString(managedProperties)); - resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, - customProps, getResourceContext().getResourceType()); - } - catch (Exception e) - { - RunState runState = getManagedComponent().getRunState(); - if (runState == RunState.RUNNING) { - this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e); - } else { - this.log.debug("Failed to load configuration for " + getResourceDescription() - + ", but managed component is not in the RUNNING state.", e); - } - throw new RuntimeException(ThrowableUtil.getAllMessages(e)); - } - return resourceConfig; - } - - public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) - { - Configuration resourceConfig = configurationUpdateReport.getConfiguration(); - Configuration pluginConfig = getResourceContext().getPluginConfiguration(); - try - { - ManagedComponent managedComponent = getManagedComponent(); - Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); - Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig); - if (this.log.isDebugEnabled()) this.log.debug("*** BEFORE UPDATE:\n" - + DebugUtils.convertPropertiesToString(managedProperties)); - ConversionUtils.convertConfigurationToManagedProperties(managedProperties, resourceConfig, - getResourceContext().getResourceType(), customProps); - if (this.log.isDebugEnabled()) this.log.debug("*** AFTER UPDATE:\n" - + DebugUtils.convertPropertiesToString(managedProperties)); - updateComponent(managedComponent); - configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); - } - catch (Exception e) - { - this.log.error("Failed to update configuration for " + getResourceDescription() + ".", e); - configurationUpdateReport.setStatus(ConfigurationUpdateStatus.FAILURE); - configurationUpdateReport.setErrorMessage(ThrowableUtil.getAllMessages(e)); - } - } - - // DeleteResourceFacet Implementation -------------------------------------------- - - public void deleteResource() throws Exception { - DeploymentManager deploymentManager = getConnection().getDeploymentManager(); - if (!deploymentManager.isRedeploySupported()) - throw new UnsupportedOperationException("Deletion of " + getResourceContext().getResourceType().getName() - + " Resources is not currently supported."); - ManagedComponent managedComponent = getManagedComponent(); - log.debug("Removing " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); - ManagementView managementView = getConnection().getManagementView(); - managementView.removeComponent(managedComponent); - ManagedDeployment parentDeployment = managedComponent.getDeployment(); - log.debug("Redeploying parent deployment '" + parentDeployment.getName() - + "' in order to complete removal of component " + toString(managedComponent) + "..."); - DeploymentProgress progress = deploymentManager.redeploy(parentDeployment.getName()); - DeploymentStatus redeployStatus = DeploymentUtils.run(progress); - if (redeployStatus.isFailed()) { - log.error("Failed to redeploy parent deployment '" + parentDeployment.getName() - + "during removal of component " + toString(managedComponent) - + " - removal may not persist when the app server is restarted.", redeployStatus.getFailure()); - } - managementView.load(); - } - - // OperationFacet Implementation -------------------------------------------- - - public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { - OperationDefinition operationDefinition = getOperationDefinition(name); - ManagedOperation managedOperation = getManagedOperation(operationDefinition); - // Convert parameters into MetaValue array. - MetaValue[] parameterMetaValues = ConversionUtils.convertOperationsParametersToMetaValues(managedOperation, - parameters, operationDefinition); - // invoke() takes a varargs, so we need to pass an empty array, rather than null. - MetaValue resultMetaValue = managedOperation.invoke(parameterMetaValues); - OperationResult result = new OperationResult(); - // Convert result MetaValue to corresponding Property type. - ConversionUtils.convertManagedOperationResults(managedOperation, resultMetaValue, result.getComplexResults(), - operationDefinition); - return result; - } - - // MeasurementFacet Implementation -------------------------------------------- - - public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { - ManagedComponent managedComponent = getManagedComponent(); - RunState runState = managedComponent.getRunState(); - for (MeasurementScheduleRequest request : metrics) { - try { - if (request.getName().equals("runState")) { - report.addData(new MeasurementDataTrait(request, runState.name())); - } else { - Object value = getSimpleValue(managedComponent, request); - addValueToMeasurementReport(report, request, value); - } - } catch (Exception e) { - if (runState == RunState.RUNNING) { - log.error("Failed to collect metric for " + request, e); - } else { - log.debug("Failed to collect metric for " + request - + ", but managed component is not in the RUNNING state.", e); - } - } - } - } - - protected void updateComponent(ManagedComponent managedComponent) throws Exception { - log.trace("Updating " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); - ManagementView managementView = getConnection().getManagementView(); - managementView.updateComponent(managedComponent); - managementView.load(); - } - - // ------------------------------------------------------------------------------ - - /** - * The name of the measurement schedule request (i.e. the metric name) can be in one of two forms: - * <p/> - * [prefix'|']simplePropertyName (e.g. "maxTime" or "ThreadPool|currentThreadCount") - * [prefix'|']compositePropertyName'.'key (e.g. "consumerCount" or "messageStatistics.count") - * - * @param managedComponent a managed component - * @param request a measurement schedule request - * @return the metric value - */ - @Nullable - protected Object getSimpleValue(ManagedComponent managedComponent, MeasurementScheduleRequest request) { - String metricName = request.getName(); - int pipeIndex = metricName.indexOf(PREFIX_DELIMITER); - // Remove the prefix if there is one (e.g. "ThreadPool|currentThreadCount" -> "currentThreadCount"). - String compositePropName = (pipeIndex == -1) ? metricName : metricName.substring(pipeIndex + 1); - int dotIndex = compositePropName.indexOf('.'); - String metricPropName = (dotIndex == -1) ? compositePropName : compositePropName.substring(0, dotIndex); - ManagedProperty metricProp = managedComponent.getProperty(metricPropName); - if (metricProp == null) { - return null; - } - MetaValue metaValue; - if (dotIndex == -1) { - metaValue = metricProp.getValue(); - } else { - CompositeValue compositeValue = (CompositeValue) metricProp.getValue(); - String key = compositePropName.substring(dotIndex + 1); - metaValue = compositeValue.get(key); - } - return getInnerValue(metaValue); - } - - // TODO: Move this to a utility class. - @Nullable - private static Object getInnerValue(MetaValue metaValue) { - if (metaValue == null) { - return null; - } - Object value; - if (metaValue.getMetaType().isSimple()) { - SimpleValue simpleValue = (SimpleValue) metaValue; - value = simpleValue.getValue(); - } else if (metaValue.getMetaType().isEnum()) { - EnumValue enumValue = (EnumValue) metaValue; - value = enumValue.getValue(); - } else if (metaValue.getMetaType().isArray()) { - ArrayValue arrayValue = (ArrayValue) metaValue; - value = arrayValue.getValue(); - } else if (metaValue.getMetaType().isCollection()) { - CollectionValue collectionValue = (CollectionValue) metaValue; - List list = new ArrayList(); - for (MetaValue element : collectionValue.getElements()) { - list.add(getInnerValue(element)); - } - value = list; - } else { - value = metaValue.toString(); - } - return value; - } - - protected void addValueToMeasurementReport(MeasurementReport report, MeasurementScheduleRequest request, - Object value) { - if (value == null) { - return; - } - String stringValue = toString(value); - - DataType dataType = request.getDataType(); - switch (dataType) { - case MEASUREMENT: - try { - MeasurementDataNumeric dataNumeric = new MeasurementDataNumeric(request, Double.valueOf(stringValue)); - report.addData(dataNumeric); - } catch (NumberFormatException e) { - log.error("Profile service did not return a numeric value as expected for metric [" + request.getName() - + "] - value returned was " + value + ".", e); - } - break; - case TRAIT: - MeasurementDataTrait dataTrait = new MeasurementDataTrait(request, stringValue); - report.addData(dataTrait); - break; - default: - throw new IllegalStateException("Unsupported measurement data type: " + dataType); - } - } - - protected ComponentType getComponentType() { - return componentType; - } - - protected String getComponentName() { - return componentName; - } - - protected ManagedComponent getManagedComponent() { - ManagedComponent managedComponent; - try { - ManagementView managementView = getConnection().getManagementView(); - managedComponent = ManagedComponentUtils.getManagedComponent(managementView, this.componentType, - this.componentName); - } catch (Exception e) { - throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent [" - + this.componentName + "].", e); - } - if (managedComponent == null) - throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named [" - + this.componentName + "]."); - log.trace("Retrieved " + toString(managedComponent) + "."); - return managedComponent; - } - - @NotNull - private OperationDefinition getOperationDefinition(String operationName) { - ResourceType resourceType = getResourceContext().getResourceType(); - OperationDefinition operationDefinition = ResourceTypeUtils.getOperationDefinition(resourceType, operationName); - if (operationDefinition == null) - throw new IllegalStateException("Operation named '" + operationName - + "' is not defined for Resource type '" + resourceType.getName() + "' in the '" - + resourceType.getPlugin() + "' plugin's descriptor."); - return operationDefinition; - } - - @NotNull - private ManagedOperation getManagedOperation(OperationDefinition operationDefinition) { - ManagedComponent managedComponent = getManagedComponent(); - Set<ManagedOperation> operations = managedComponent.getOperations(); - for (ManagedOperation operation : operations) { - ConfigurationDefinition paramsConfigDef = operationDefinition.getParametersConfigurationDefinition(); - int paramCount = (paramsConfigDef != null) ? paramsConfigDef.getPropertyDefinitions().size() : 0; - if (operation.getName().equals(operationDefinition.getName()) - && (operation.getParameters().length == paramCount)) - return operation; - } - throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName() - + "' not found on ManagedComponent [" + getManagedComponent() + "]."); - } - - private static String toString(ManagedComponent managedComponent) { - Map<String, ManagedProperty> properties = managedComponent.getProperties(); - return managedComponent.getClass().getSimpleName() + "@" + System.identityHashCode(managedComponent) + "[" - + "type=" + managedComponent.getType() + ", name=" + managedComponent.getName() + ", properties=" - + properties.getClass().getSimpleName() + "@" + System.identityHashCode(properties) + "]"; - } - - private static String toString(@NotNull Object value) { - if (value.getClass().isArray()) { - StringBuilder buffer = new StringBuilder(); - int lastIndex = Array.getLength(value) - 1; - for (int i = 0; i < Array.getLength(value); i++) { - buffer.append(String.valueOf(Array.get(value, i))); - if (i == lastIndex) { - break; - } - buffer.append(", "); - } - return buffer.toString(); - } else { - return value.toString(); - } - } -} +/* +* Jopr Management Platform +* Copyright (C) 2005-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, version 2, as +* published by the Free Software Foundation, and/or the GNU Lesser +* General Public License, version 2.1, also as published by the Free +* Software Foundation. +* +* 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 and the GNU Lesser General Public License +* for more details. +* +* You should have received a copy of the GNU General Public License +* and the GNU Lesser General Public License along with this program; +* if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ +package org.rhq.plugins.jbossas5; + +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.deployers.spi.management.ManagementView; +import org.jboss.deployers.spi.management.deploy.DeploymentManager; +import org.jboss.deployers.spi.management.deploy.DeploymentProgress; +import org.jboss.deployers.spi.management.deploy.DeploymentStatus; +import org.jboss.managed.api.ComponentType; +import org.jboss.managed.api.ManagedComponent; +import org.jboss.managed.api.ManagedDeployment; +import org.jboss.managed.api.ManagedOperation; +import org.jboss.managed.api.ManagedProperty; +import org.jboss.managed.api.RunState; +import org.jboss.metatype.api.values.ArrayValue; +import org.jboss.metatype.api.values.CollectionValue; +import org.jboss.metatype.api.values.CompositeValue; +import org.jboss.metatype.api.values.EnumValue; +import org.jboss.metatype.api.values.MetaValue; +import org.jboss.metatype.api.values.SimpleValue; +import org.jboss.remoting.CannotConnectException; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementDataNumeric; +import org.rhq.core.domain.measurement.MeasurementDataTrait; +import org.rhq.core.domain.measurement.MeasurementReport; +import org.rhq.core.domain.measurement.MeasurementScheduleRequest; +import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.configuration.ConfigurationFacet; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.inventory.DeleteResourceFacet; +import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.pluginapi.measurement.MeasurementFacet; +import org.rhq.core.pluginapi.operation.OperationFacet; +import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.plugins.jbossas5.util.ConversionUtils; +import org.rhq.plugins.jbossas5.util.DeploymentUtils; +import org.rhq.plugins.jbossas5.util.ManagedComponentUtils; +import org.rhq.plugins.jbossas5.util.ResourceTypeUtils; +import org.rhq.plugins.jbossas5.util.ResourceComponentUtils; +import org.rhq.plugins.jbossas5.util.DebugUtils; + +/** + * Service ResourceComponent for all {@link ManagedComponent}s in a Profile. + * + * @author Ian Springer + * @author Jason Dobies + * @author Mark Spritzler + */ +public class ManagedComponentComponent extends AbstractManagedComponent implements ConfigurationFacet, + DeleteResourceFacet, OperationFacet, MeasurementFacet { + public static interface Config { + String COMPONENT_TYPE = "componentType"; + String COMPONENT_SUBTYPE = "componentSubtype"; + String COMPONENT_NAME = "componentName"; + String TEMPLATE_NAME = "templateName"; + String COMPONENT_NAME_PROPERTY = "componentNameProperty"; + } + + protected static final char PREFIX_DELIMITER = '|'; + + private final Log log = LogFactory.getLog(this.getClass()); + + private String componentName; + private ComponentType componentType; + + // ResourceComponent Implementation -------------------------------------------- + + public AvailabilityType getAvailability() { + RunState runState; + try { + runState = getManagedComponent().getRunState(); + } catch (CannotConnectException e) { + return AvailabilityType.DOWN; + } + return (runState == RunState.RUNNING) ? AvailabilityType.UP : AvailabilityType.DOWN; + } + + public void start(ResourceContext<ProfileServiceComponent> resourceContext) throws Exception { + super.start(resourceContext); + this.componentType = ConversionUtils.getComponentType(getResourceContext().getResourceType()); + Configuration pluginConfig = resourceContext.getPluginConfiguration(); + this.componentName = pluginConfig.getSimple(Config.COMPONENT_NAME).getStringValue(); + log.trace("Started ResourceComponent for " + getResourceDescription() + ", managing " + this.componentType + + " component '" + this.componentName + "'."); + } + + public void stop() { + return; + } + + // ConfigurationComponent Implementation -------------------------------------------- + + public Configuration loadResourceConfiguration() + { + Configuration resourceConfig; + try + { + Map<String, ManagedProperty> managedProperties = getManagedComponent().getProperties(); + Map<String, PropertySimple> customProps = + ResourceComponentUtils.getCustomProperties(getResourceContext().getPluginConfiguration()); + if (this.log.isDebugEnabled()) this.log.debug("*** AFTER LOAD:\n" + + DebugUtils.convertPropertiesToString(managedProperties)); + resourceConfig = ConversionUtils.convertManagedObjectToConfiguration(managedProperties, + customProps, getResourceContext().getResourceType()); + } + catch (Exception e) + { + RunState runState = getManagedComponent().getRunState(); + if (runState == RunState.RUNNING) { + this.log.error("Failed to load configuration for " + getResourceDescription() + ".", e); + } else { + this.log.debug("Failed to load configuration for " + getResourceDescription() + + ", but managed component is not in the RUNNING state.", e); + } + throw new RuntimeException(ThrowableUtil.getAllMessages(e)); + } + return resourceConfig; + } + + public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport) + { + Configuration resourceConfig = configurationUpdateReport.getConfiguration(); + Configuration pluginConfig = getResourceContext().getPluginConfiguration(); + try + { + ManagedComponent managedComponent = getManagedComponent(); + Map<String, ManagedProperty> managedProperties = managedComponent.getProperties(); + Map<String, PropertySimple> customProps = ResourceComponentUtils.getCustomProperties(pluginConfig); + if (this.log.isDebugEnabled()) this.log.debug("*** BEFORE UPDATE:\n" + + DebugUtils.convertPropertiesToString(managedProperties)); + ConversionUtils.convertConfigurationToManagedProperties(managedProperties, resourceConfig, + getResourceContext().getResourceType(), customProps); + if (this.log.isDebugEnabled()) this.log.debug("*** AFTER UPDATE:\n" + + DebugUtils.convertPropertiesToString(managedProperties)); + updateComponent(managedComponent); + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.SUCCESS); + } + catch (Exception e) + { + this.log.error("Failed to update configuration for " + getResourceDescription() + ".", e); + configurationUpdateReport.setStatus(ConfigurationUpdateStatus.FAILURE); + configurationUpdateReport.setErrorMessage(ThrowableUtil.getAllMessages(e)); + } + } + + // DeleteResourceFacet Implementation -------------------------------------------- + + public void deleteResource() throws Exception { + DeploymentManager deploymentManager = getConnection().getDeploymentManager(); + if (!deploymentManager.isRedeploySupported()) + throw new UnsupportedOperationException("Deletion of " + getResourceContext().getResourceType().getName() + + " Resources is not currently supported."); + ManagedComponent managedComponent = getManagedComponent(); + log.debug("Removing " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); + ManagementView managementView = getConnection().getManagementView(); + managementView.removeComponent(managedComponent); + ManagedDeployment parentDeployment = managedComponent.getDeployment(); + log.debug("Redeploying parent deployment '" + parentDeployment.getName() + + "' in order to complete removal of component " + toString(managedComponent) + "..."); + DeploymentProgress progress = deploymentManager.redeploy(parentDeployment.getName()); + DeploymentStatus redeployStatus = DeploymentUtils.run(progress); + if (redeployStatus.isFailed()) { + log.error("Failed to redeploy parent deployment '" + parentDeployment.getName() + + "during removal of component " + toString(managedComponent) + + " - removal may not persist when the app server is restarted.", redeployStatus.getFailure()); + } + managementView.load(); + } + + // OperationFacet Implementation -------------------------------------------- + + public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { + OperationDefinition operationDefinition = getOperationDefinition(name); + ManagedOperation managedOperation = getManagedOperation(operationDefinition); + // Convert parameters into MetaValue array. + MetaValue[] parameterMetaValues = ConversionUtils.convertOperationsParametersToMetaValues(managedOperation, + parameters, operationDefinition); + // invoke() takes a varargs, so we need to pass an empty array, rather than null. + MetaValue resultMetaValue = managedOperation.invoke(parameterMetaValues); + OperationResult result = new OperationResult(); + // Convert result MetaValue to corresponding Property type. + ConversionUtils.convertManagedOperationResults(managedOperation, resultMetaValue, result.getComplexResults(), + operationDefinition); + return result; + } + + // MeasurementFacet Implementation -------------------------------------------- + + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { + ManagedComponent managedComponent = getManagedComponent(); + RunState runState = managedComponent.getRunState(); + for (MeasurementScheduleRequest request : metrics) { + try { + if (request.getName().equals("runState")) { + report.addData(new MeasurementDataTrait(request, runState.name())); + } else { + Object value = getSimpleValue(managedComponent, request); + addValueToMeasurementReport(report, request, value); + } + } catch (Exception e) { + if (runState == RunState.RUNNING) { + log.error("Failed to collect metric for " + request, e); + } else { + log.debug("Failed to collect metric for " + request + + ", but managed component is not in the RUNNING state.", e); + } + } + } + } + + protected void updateComponent(ManagedComponent managedComponent) throws Exception { + log.trace("Updating " + getResourceDescription() + " with component " + toString(managedComponent) + "..."); + ManagementView managementView = getConnection().getManagementView(); + managementView.updateComponent(managedComponent); + managementView.load(); + } + + // ------------------------------------------------------------------------------ + + /** + * The name of the measurement schedule request (i.e. the metric name) can be in one of two forms: + * <p/> + * [prefix'|']simplePropertyName (e.g. "maxTime" or "ThreadPool|currentThreadCount") + * [prefix'|']compositePropertyName'.'key (e.g. "consumerCount" or "messageStatistics.count") + * + * @param managedComponent a managed component + * @param request a measurement schedule request + * @return the metric value + */ + @Nullable + protected Object getSimpleValue(ManagedComponent managedComponent, MeasurementScheduleRequest request) { + String metricName = request.getName(); + int pipeIndex = metricName.indexOf(PREFIX_DELIMITER); + // Remove the prefix if there is one (e.g. "ThreadPool|currentThreadCount" -> "currentThreadCount"). + String compositePropName = (pipeIndex == -1) ? metricName : metricName.substring(pipeIndex + 1); + int dotIndex = compositePropName.indexOf('.'); + String metricPropName = (dotIndex == -1) ? compositePropName : compositePropName.substring(0, dotIndex); + ManagedProperty metricProp = managedComponent.getProperty(metricPropName); + if (metricProp == null) { + return null; + } + MetaValue metaValue; + if (dotIndex == -1) { + metaValue = metricProp.getValue(); + } else { + CompositeValue compositeValue = (CompositeValue) metricProp.getValue(); + String key = compositePropName.substring(dotIndex + 1); + metaValue = compositeValue.get(key); + } + return getInnerValue(metaValue); + } + + // TODO: Move this to a utility class. + @Nullable + private static Object getInnerValue(MetaValue metaValue) { + if (metaValue == null) { + return null; + } + Object value; + if (metaValue.getMetaType().isSimple()) { + SimpleValue simpleValue = (SimpleValue) metaValue; + value = simpleValue.getValue(); + } else if (metaValue.getMetaType().isEnum()) { + EnumValue enumValue = (EnumValue) metaValue; + value = enumValue.getValue(); + } else if (metaValue.getMetaType().isArray()) { + ArrayValue arrayValue = (ArrayValue) metaValue; + value = arrayValue.getValue(); + } else if (metaValue.getMetaType().isCollection()) { + CollectionValue collectionValue = (CollectionValue) metaValue; + List list = new ArrayList(); + for (MetaValue element : collectionValue.getElements()) { + list.add(getInnerValue(element)); + } + value = list; + } else { + value = metaValue.toString(); + } + return value; + } + + protected void addValueToMeasurementReport(MeasurementReport report, MeasurementScheduleRequest request, + Object value) { + if (value == null) { + return; + } + String stringValue = toString(value); + + DataType dataType = request.getDataType(); + switch (dataType) { + case MEASUREMENT: + try { + MeasurementDataNumeric dataNumeric = new MeasurementDataNumeric(request, Double.valueOf(stringValue)); + report.addData(dataNumeric); + } catch (NumberFormatException e) { + log.error("Profile service did not return a numeric value as expected for metric [" + request.getName() + + "] - value returned was " + value + ".", e); + } + break; + case TRAIT: + MeasurementDataTrait dataTrait = new MeasurementDataTrait(request, stringValue); + report.addData(dataTrait); + break; + default: + throw new IllegalStateException("Unsupported measurement data type: " + dataType); + } + } + + protected ComponentType getComponentType() { + return componentType; + } + + protected String getComponentName() { + return componentName; + } + + protected ManagedComponent getManagedComponent() { + ManagedComponent managedComponent; + try { + ManagementView managementView = getConnection().getManagementView(); + managedComponent = ManagedComponentUtils.getManagedComponent(managementView, this.componentType, + this.componentName); + } catch (Exception e) { + throw new RuntimeException("Failed to load [" + this.componentType + "] ManagedComponent [" + + this.componentName + "].", e); + } + if (managedComponent == null) + throw new IllegalStateException("Failed to find [" + this.componentType + "] ManagedComponent named [" + + this.componentName + "]."); + log.trace("Retrieved " + toString(managedComponent) + "."); + return managedComponent; + } + + @NotNull + private OperationDefinition getOperationDefinition(String operationName) { + ResourceType resourceType = getResourceContext().getResourceType(); + OperationDefinition operationDefinition = ResourceTypeUtils.getOperationDefinition(resourceType, operationName); + if (operationDefinition == null) + throw new IllegalStateException("Operation named '" + operationName + + "' is not defined for Resource type '" + resourceType.getName() + "' in the '" + + resourceType.getPlugin() + "' plugin's descriptor."); + return operationDefinition; + } + + @NotNull + private ManagedOperation getManagedOperation(OperationDefinition operationDefinition) { + ManagedComponent managedComponent = getManagedComponent(); + Set<ManagedOperation> operations = managedComponent.getOperations(); + for (ManagedOperation operation : operations) { + ConfigurationDefinition paramsConfigDef = operationDefinition.getParametersConfigurationDefinition(); + int paramCount = (paramsConfigDef != null) ? paramsConfigDef.getPropertyDefinitions().size() : 0; + if (operation.getName().equals(operationDefinition.getName()) + && (operation.getParameters().length == paramCount)) + return operation; + } + throw new IllegalStateException("ManagedOperation named '" + operationDefinition.getName() + + "' not found on ManagedComponent [" + getManagedComponent() + "]."); + } + + private static String toString(ManagedComponent managedComponent) { + Map<String, ManagedProperty> properties = managedComponent.getProperties(); + return managedComponent.getClass().getSimpleName() + "@" + System.identityHashCode(managedComponent) + "[" + + "type=" + managedComponent.getType() + ", name=" + managedComponent.getName() + ", properties=" + + properties.getClass().getSimpleName() + "@" + System.identityHashCode(properties) + "]"; + } + + private static String toString(@NotNull Object value) { + if (value.getClass().isArray()) { + StringBuilder buffer = new StringBuilder(); + int lastIndex = Array.getLength(value) - 1; + for (int i = 0; i < Array.getLength(value); i++) { + buffer.append(String.valueOf(Array.get(value, i))); + if (i == lastIndex) { + break; + } + buffer.append(", "); + } + return buffer.toString(); + } else { + return value.toString(); + } + } +}

1 0

[rhq] Branch 'release-3.0.0' - 2 commits - modules/plugins
by Jay Shaughnessy 02 Jul '10

02 Jul '10

modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java | 39 ++++------ 1 file changed, 18 insertions(+), 21 deletions(-) New commits: commit 19fe58e4a5f500eaa95c79eb41fd957c9589e05f Merge: f36efc3... ed06919... Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jul 2 09:12:40 2010 -0400 Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0 commit f36efc3c6df28459c7580fa4a3ed3f377a859c22 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Fri Jul 2 09:11:01 2010 -0400 trivial - Remove some left-behind dev logging diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java index dfd4ec6..3007520 100644 --- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java +++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java @@ -24,8 +24,6 @@ package org.jboss.on.plugins.tomcat; import java.io.File; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -35,7 +33,9 @@ import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.jboss.on.plugins.tomcat.helper.TomcatConfig; + import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; @@ -109,7 +109,6 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man public static final String EWS_TOMCAT_5 = "tomcat5"; public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) { - log.warn("DEBUG DEPLOYMENT...."); log.debug("Discovering Tomcat servers..."); Set<DiscoveredResourceDetails> resources = new HashSet<DiscoveredResourceDetails>(); @@ -139,10 +138,9 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man } public DiscoveredResourceDetails discoverResource(Configuration pluginConfig, - ResourceDiscoveryContext discoveryContext) - throws InvalidPluginConfigurationException { - String catalinaHome = pluginConfig.getSimple( - TomcatServerComponent.PLUGIN_CONFIG_CATALINA_HOME_PATH).getStringValue(); + ResourceDiscoveryContext discoveryContext) throws InvalidPluginConfigurationException { + String catalinaHome = pluginConfig.getSimple(TomcatServerComponent.PLUGIN_CONFIG_CATALINA_HOME_PATH) + .getStringValue(); try { catalinaHome = FileUtils.getCanonicalPath(catalinaHome); } catch (Exception e) { @@ -151,8 +149,8 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man } File catalinaHomeDir = new File(catalinaHome); - String catalinaBase = pluginConfig.getSimple( - TomcatServerComponent.PLUGIN_CONFIG_CATALINA_BASE_PATH).getStringValue(); + String catalinaBase = pluginConfig.getSimple(TomcatServerComponent.PLUGIN_CONFIG_CATALINA_BASE_PATH) + .getStringValue(); try { catalinaBase = FileUtils.getCanonicalPath(catalinaBase); } catch (Exception e) { @@ -190,24 +188,23 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man TomcatConfig tomcatConfig = parseTomcatConfig(catalinaBase); version = determineVersion(catalinaHome, catalinaBase, systemInfo); if (tomcatConfig.getAddress() != null) { - address = tomcatConfig.getAddress(); - }else + address = tomcatConfig.getAddress(); + } else address = hostname; if (tomcatConfig.getPort() != null) { - port = tomcatConfig.getPort(); + port = tomcatConfig.getPort(); } } String productDescription = PRODUCT_DESCRIPTION + ((hostname == null) ? "" : (" (" + hostname + ")")); - String resourceName=null; - - + String resourceName = null; + resourceName = address + (port == null ? "" : ":" + port); String resourceKey = catalinaBase; populatePluginConfiguration(pluginConfig, catalinaHome, catalinaBase, null); - DiscoveredResourceDetails resource = new DiscoveredResourceDetails(discoveryContext.getResourceType(), resourceKey, - resourceName, version, productDescription, pluginConfig, null); + DiscoveredResourceDetails resource = new DiscoveredResourceDetails(discoveryContext.getResourceType(), + resourceKey, resourceName, version, productDescription, pluginConfig, null); log.debug("Verified manually-added Tomcat Resource with plugin config: " + pluginConfig); return resource; @@ -270,7 +267,7 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man String hostname = systemInfo.getHostname(); TomcatConfig tomcatConfig = parseTomcatConfig(catalinaBase); tomcatConfig = applySystemProperties(tomcatConfig, commandLine); - + // Create pieces necessary for the resource creation String resourceVersion = determineVersion(catalinaHome, catalinaBase, systemInfo); String productName = PRODUCT_NAME; @@ -563,13 +560,13 @@ public class TomcatDiscoveryComponent implements ResourceDiscoveryComponent, Man String address = applySystemProperty(config.getAddress(), commandLine); return new TomcatConfig(port, address); } - + private String applySystemProperty(String variable, String[] commandLine) { if (variable != null && variable.startsWith("${") && variable.endsWith("}")) { String variableName = variable.substring(2, variable.length() - 1); //${var} - + String envVarDefine = "-D" + variableName + "="; - for(String commandLineArg : commandLine) { + for (String commandLineArg : commandLine) { if (commandLineArg.startsWith(envVarDefine)) { return commandLineArg.substring(envVarDefine.length()); }

1 0

[rhq] Branch 'release-3.0.0-test-build' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by ips 02 Jul '10

02 Jul '10

modules/common/ant-bundle/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/client-api/pom.xml | 2 +- modules/core/comm-api/pom.xml | 2 +- modules/core/dbutils/pom.xml | 2 +- modules/core/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/comm/pom.xml | 2 +- modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +- modules/enterprise/gui/base-perspective-war/pom.xml | 2 +- modules/enterprise/gui/content_http-war/pom.xml | 2 +- modules/enterprise/gui/coregui/pom.xml | 2 +- modules/enterprise/gui/installer-war/pom.xml | 2 +- modules/enterprise/gui/pom.xml | 2 +- modules/enterprise/gui/portal-war/pom.xml | 2 +- modules/enterprise/gui/webdav-war/pom.xml | 2 +- modules/enterprise/pom.xml | 2 +- modules/enterprise/remoting/cli/pom.xml | 2 +- modules/enterprise/remoting/client-api/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/remoting/webservices/pom.xml | 2 +- modules/enterprise/server/container-lib/pom.xml | 2 +- modules/enterprise/server/container/pom.xml | 2 +- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 2 +- modules/enterprise/server/plugins/alert-email/pom.xml | 2 +- modules/enterprise/server/plugins/alert-irc/pom.xml | 2 +- modules/enterprise/server/plugins/alert-microblog/pom.xml | 2 +- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2 +- modules/enterprise/server/plugins/alert-operations/pom.xml | 2 +- modules/enterprise/server/plugins/alert-roles/pom.xml | 2 +- modules/enterprise/server/plugins/alert-snmp/pom.xml | 2 +- modules/enterprise/server/plugins/alert-subject/pom.xml | 2 +- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 2 +- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +- modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +- modules/enterprise/server/plugins/pom.xml | 2 +- modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +- modules/enterprise/server/plugins/url/pom.xml | 2 +- modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +- modules/enterprise/server/plugins/yum/pom.xml | 2 +- modules/enterprise/server/safe-invoker/pom.xml | 2 +- modules/enterprise/server/sars/agent-sar/pom.xml | 2 +- modules/enterprise/server/sars/pom.xml | 2 +- modules/enterprise/server/xml-schemas/pom.xml | 2 +- modules/helpers/pluginAnnotations/pom.xml | 2 +- modules/helpers/pluginGen/pom.xml | 2 +- modules/helpers/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/plugins/aliases/pom.xml | 2 +- modules/plugins/ant-bundle/pom.xml | 2 +- modules/plugins/apache/pom.xml | 2 +- modules/plugins/augeas/pom.xml | 2 +- modules/plugins/cobbler/pom.xml | 2 +- modules/plugins/cron/pom.xml | 2 +- modules/plugins/database/pom.xml | 2 +- modules/plugins/filetemplate-bundle/pom.xml | 2 +- modules/plugins/grub/pom.xml | 2 +- modules/plugins/hibernate/pom.xml | 2 +- modules/plugins/hosts/pom.xml | 2 +- modules/plugins/hudson/pom.xml | 2 +- modules/plugins/iis/pom.xml | 2 +- modules/plugins/jboss-as-5/pom.xml | 2 +- modules/plugins/jboss-as/pom.xml | 2 +- modules/plugins/jboss-cache-v3/pom.xml | 2 +- modules/plugins/jboss-cache/pom.xml | 2 +- modules/plugins/jmx/pom.xml | 2 +- modules/plugins/mysql/pom.xml | 2 +- modules/plugins/netservices/pom.xml | 2 +- modules/plugins/oracle/pom.xml | 2 +- modules/plugins/perftest/pom.xml | 2 +- modules/plugins/platform/pom.xml | 2 +- modules/plugins/pom.xml | 2 +- modules/plugins/postfix/pom.xml | 2 +- modules/plugins/postgres/pom.xml | 2 +- modules/plugins/rhq-agent/pom.xml | 2 +- modules/plugins/rhq-server/pom.xml | 2 +- modules/plugins/samba/pom.xml | 2 +- modules/plugins/script/pom.xml | 2 +- modules/plugins/snmptrapd/pom.xml | 2 +- modules/plugins/sshd/pom.xml | 2 +- modules/plugins/sudoers/pom.xml | 2 +- modules/plugins/tomcat/pom.xml | 2 +- modules/plugins/twitter/pom.xml | 2 +- modules/plugins/validate-all-plugins/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 103 files changed, 103 insertions(+), 103 deletions(-) New commits: commit 6b912e8b82570c3eab85ec8a1be143431e7aceac Author: hudson auto <wnstb(a)yahoo.com> Date: Thu Jul 1 23:58:53 2010 -0400 [maven-release-plugin] prepare for next development iteration diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 6d440ef..eda9133 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index dbd8dd6..bc7965b 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 1077987..2cf950b 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 751726e..ee81a94 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 78d1f23..d177f9e 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index f6fadb5..a51f92b 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index b036bfa..d536ce6 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 96cbc8e..e0ced84 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 0df3808..0911918 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 558b9a2..d47d4c8 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index ba389df..e1ce7ef 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index a570e19..2e58102 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index c721f21..7739177 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 9e92634..eeb7e81 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 47cb583..7aad64c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index cee7efe..bc41dc5 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index f917e15..d9f1c1c 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index c569283..8942239 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 88ef26e..8b9da9c 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 6a09d32..611eb9d 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 643d41e..798a8ca 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 3068b31..df05645 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 6cd8f92..ca1b68d 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index e908b75..1beadca 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index f01ec85..0c529ba 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index a3e6434..783942c 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml index bdef75c..aa880be 100644 --- a/modules/enterprise/gui/webdav-war/pom.xml +++ b/modules/enterprise/gui/webdav-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index c3fc4fa..3b0dbb8 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 5e0a013..33966bd 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-cli</artifactId> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 57e79e7..605267f 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-client-api</artifactId> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 1feb631..910b617 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-parent</artifactId> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index a4d9ed6..2ea73ee 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>rhq-remoting-webservices</artifactId> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index c2acfe1..2c98817 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index aee0070..3fd11e8 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 6956e3c..bf15866 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 4f2650b..9e7bb24 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index b05532d..dd5bc18 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 988e2e3..c0973f3 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index b9f3d0c..a62fee8 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 8a0c7c9..3193539 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index bf7fe01..e69bfbc 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 466b99a..ca33bb7 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index b743122..af75153 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 97c50f4..09839b8 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,7 +3,7 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 8abb60d..73f405e 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index ce9b430..4c44f10 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 86a21ef..0033d1b 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index b83824c..61965f2 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index b8bba65..7451668 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index a53f3ad..0ac61d3 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index ab30954..5a78451 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 8b6a170..2b16f4a 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 9a96ab0..e4ab9b2 100644 --- a/modules/enterprise/server/plugins/rhnhosted/pom.xml +++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 3a96e6d..a6cba32 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 8bcdcea..9c7cc74 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 2dce331..ebdd3da 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 3fd87f6..06c8981 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 7ecbbad..aa278b8 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index cadb656..0cc2084 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 8df64c1..14738d0 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml index 031c90d..d056f74 100644 --- a/modules/helpers/pluginAnnotations/pom.xml +++ b/modules/helpers/pluginAnnotations/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml index ba37942..28dc9b1 100644 --- a/modules/helpers/pluginGen/pom.xml +++ b/modules/helpers/pluginGen/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 762f318..a0721a9 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index e17c9d8..5d327ee 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 7006ed8..c37598e 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 851c129..cc160c9 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index f2682e9..b4f9208 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index a6f56dc..915106a 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 1e8011a..d920440 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 6ee0662..d5aaad5 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 7d98f84..30889f7 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 05ac956..b79645d 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 1c68b9b..f7cf265 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 35fd599..acb08ef 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index eddd3ed..7dd0fde 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 5d79625..65fa7b8 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,7 +6,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 7e17c2b..853c020 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index ceb58be..a0ade77 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 54536d9..b9ed2b3 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index f276b7d..b3846fa 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index f1aa8f9..443e524 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 6bc1bfa..ac9885a 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index e488d56..d0c9053 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 37d84af..06ae2ae 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 75a1aff..1acdb0f 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index 4e78da5..39c75da 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 87ba78d..97b83b0 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 4873dae..85d6105 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 1e95ca3..283ab6a 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index daf3133..5a4466c 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index b0c26a5..a190dcd 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 98333bb..8f4e675 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index d0d0d63..0d41574 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 7189f74..7719b14 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index fdb421d..2d9d715 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index 9c38247..3579496 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 7932012..41df1b8 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 03e2df8..205d5b0 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index cab4269..e299efa 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 4f886fd..b3d5e87 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 9a28ce8..bc96ae3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 07130df..2235687 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> <name>RHQ Test Utils</name> diff --git a/pom.xml b/pom.xml index efc840d..95b0dc6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.GA_QA</version> + <version>3.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits July 2010