Branch: refs/heads/master-dup Home: https://github.com/rhq-project/rhq Commit: 97772bcac2d68ce0e85a9f5d7233ff8fb50e31b7 https://github.com/rhq-project/rhq/commit/97772bcac2d68ce0e85a9f5d7233ff8fb5... Author: John Mazzitelli mazz@redhat.com Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths: M .classpath M modules/common/filetemplate-bundle/pom.xml M modules/core/domain/pom.xml M modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java M modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceFacets.java M modules/core/plugin-container/pom.xml M modules/enterprise/agent/ant-run.xml M modules/enterprise/agent/pom.xml M modules/enterprise/agentupdate/pom.xml M modules/enterprise/binding/pom.xml M modules/enterprise/comm/pom.xml M modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/ServiceContainerMetricsMBean.java M modules/enterprise/remoting/ant-run.xml M modules/enterprise/remoting/cli/pom.xml M modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml M modules/enterprise/remoting/client-api/pom.xml M modules/enterprise/server/appserver/pom.xml M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/embeddedagent/pom.xml M modules/enterprise/server/installer/pom.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java M modules/enterprise/server/itests-2/pom.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java M modules/enterprise/server/jar/pom.xml M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentServiceMBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandlerMetricsMBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerServiceMBean.java M modules/enterprise/server/plugins/alert-roles/pom.xml M modules/enterprise/server/plugins/alert-snmp/pom.xml M modules/enterprise/server/plugins/cobbler/pom.xml M modules/enterprise/server/plugins/filetemplate-bundle/pom.xml M modules/enterprise/server/plugins/yum/pom.xml M modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java M modules/enterprise/server/startup-subsystem/pom.xml A modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupCrippledDeploymentProcessor.java M modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemAdd.java M modules/helpers/inventory-serializer/pom.xml M modules/helpers/perftest-support/pom.xml M modules/helpers/rtfilter-subsystem/pom.xml M modules/plugins/filetemplate-bundle/pom.xml M modules/plugins/jboss-as-5/pom.xml M modules/plugins/jboss-as/pom.xml M modules/plugins/netservices/pom.xml M pom.xml
Log Message: ----------- Squashed commit of the following:
commit 93d5e60a621e06e85c86caee2e0b2615b69325c5 Merge: 8a975ea 147d506 Author: John Mazzitelli mazz@redhat.com Date: Thu Jun 26 09:55:50 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 8a975ea58d708fc1f3ba65549d8a7f0d30f93c0e Author: John Mazzitelli mazz@redhat.com Date: Wed Jun 25 15:20:48 2014 -0400
BZ 1069606 - add missing dep the server-side yum plugin needs for its tests
commit e211753afa6bbf69b56ec12b1eb98b5039cff376 Author: John Mazzitelli mazz@redhat.com Date: Wed Jun 25 11:55:04 2014 -0400
BZ 1069606 - make sure we use arquillian dependencies that we work with and are available on public mvn repos.
commit 91708a20af1d7f8f194ae87e37fbb5981c8f3fa7 Merge: 7164c26 c0563e4 Author: John Mazzitelli mazz@redhat.com Date: Tue Jun 24 10:42:10 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 7164c268be7111fb4b393a545a1e058bcc79cd46 Author: John Mazzitelli mazz@redhat.com Date: Mon Jun 23 11:46:18 2014 -0400
switch to building with 6.3 Alpha and point to the public maven repo
commit 1019de010cbb954bc402b49c49e129ab2216dc05 Author: John Mazzitelli mazz@redhat.com Date: Thu Jun 19 17:07:06 2014 -0400
BZ 1069606 - this allows the build to complete if the jboss.version is set to the EAP 6.3.Alpha version string ("7.4.0.Final-redhat-4").
However, this requires that the root pom define a mvn repository that has that version of the org/jboss/as/jboss-as-dist artifact (which today does not exist on any public repo).
commit abac7aec4676ec0394bcbce318de974f8a277157 Merge: 179c306 57e5b74 Author: John Mazzitelli mazz@redhat.com Date: Tue Jun 17 20:36:25 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 179c3065c4b678d295cfb07ea465e293318d2f5c Author: John Mazzitelli mazz@redhat.com Date: Tue Jun 17 15:39:49 2014 -0400
BZ 1069606 - hibernate is generating IDs a bit differently, fix bundle tests so they sort their query results in expected ways
commit 6bb2e6411484528b3d036ec3b626fa4c14aca52c Author: John Mazzitelli mazz@redhat.com Date: Tue Jun 17 13:25:11 2014 -0400
BZ 1069606 - fix assertTrue msg
commit 47be8c1e08fe3a24793f9a3c91935ae618b0f8e3 Author: John Mazzitelli mazz@redhat.com Date: Tue Jun 17 13:10:12 2014 -0400
BZ 1069606 - toString should not try to print bundle name since it might not be fetched and we only have a hibernate proxy that will throw a lazy init exception (I saw sometimes when running BundleManagerBeanTest in itest-2)
commit 533506cfcbf513efa0f6a76d2d1d54c407a76cba Author: John Mazzitelli mazz@redhat.com Date: Mon Jun 16 16:17:47 2014 -0400
BZ 1069606 - fix eclipse classpath now that server is on EAP 6.3
commit 13834e0f171aace47eaa6553b0ee100850f9eebb Merge: 10dec9a 3049c67 Author: John Mazzitelli mazz@redhat.com Date: Mon Jun 16 14:10:33 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 10dec9a32eb30efb1690cf24d19652f7ea28d91e Author: John Mazzitelli mazz@redhat.com Date: Mon Jun 16 12:39:36 2014 -0400
BZ 1069606 - EAP 6.3 bumped up versions of some subsystems since 6.1, so our itests-2 needs to take this into account when modifying the app server config. Also we need to create two security domains to avoid the bug where one security domain cannot be shared across multiple datasources of different types
commit 4d3d64c9159083c282bd7bec7db3c336de2626d0 Merge: dadc434 2fa7c54 Author: John Mazzitelli mazz@redhat.com Date: Fri Jun 13 23:38:25 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit dadc434100ce82db6cae63f61144fda00aff1816 Author: John Mazzitelli mazz@redhat.com Date: Fri Jun 13 23:36:49 2014 -0400
BZ 1069606 - itests2 needs to start the server with the jboss.modules.policy-permissions=true sysprop to work around security manager issue
commit dabd4859c06caf23d2e705f4d29bab2ea93ef766 Author: John Mazzitelli mazz@redhat.com Date: Fri Jun 13 19:13:59 2014 -0400
BZ 1069606 - we no longer have to patch jgroups - we are using a later app server that already uses a fixed jgroups library
commit 2f5f75316402f7ceea8b5b48fc56b4c8e4d6047b Author: John Mazzitelli mazz@redhat.com Date: Fri Jun 13 19:02:35 2014 -0400
BZ 1069606 - initial changes to pom.xml files, dependencies and some other things related so we can build on EAP 6.3. - arquillian tests throw exception because the jta attribute is here (even though AS allows for it and we are setting it to the default value, not sure why this isn't allowed in tests) - define xnio deps explicitly so they point to 3.0.10.GA which is what arquillian needs to test that the server is up - fix security exception "class org.hamcrest.TypeSafeMatcher signer information is different from other classes in same package" when running PC tests - jboss-as-subsystem-test changed its artifact name - it now has "-framework" at the end of its name
commit dac845e70112dad61a9e5b83719fb3b474d201f9 Merge: 12ca40d e8f72b7 Author: John Mazzitelli mazz@redhat.com Date: Tue Jun 10 09:33:02 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 12ca40d064b504287a4d0580b9b425061015e919 Author: John Mazzitelli mazz@redhat.com Date: Tue Jun 10 09:32:33 2014 -0400
BZ 1069606 - disable the ability to deploy custom apps in the underlying app server
commit 811544eb5a7bfce6243e9c7e7ee0ce874da4146e Author: John Mazzitelli mazz@redhat.com Date: Mon Jun 2 16:50:21 2014 -0400
BZ 1069606 - EAP 6.3 uses a newer hibernate that uses a newer javassist which names its proxies differently. This fixes things like the left-hand tree and operation history among many other various things I'm sure.
commit 9f798615b67258e854d16fae31bf3b69aded22b7 Merge: 4e8484e ed8a2c4 Author: John Mazzitelli mazz@redhat.com Date: Mon Jun 2 09:44:43 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 4e8484ef626564b9d3a72203689d8acfb378f7c1 Author: John Mazzitelli mazz@redhat.com Date: Fri May 30 16:49:35 2014 -0400
BZ 1069606 1102332 - create separate security domains per data source to avoid bug in app server
commit 8729d53e681f4a9f550345ab8fbf6a3af2375a18 Author: John Mazzitelli mazz@redhat.com Date: Fri May 30 16:03:51 2014 -0400
BZ 1069606 1100361 - turn off security manager. if we want to turn this back on, we'll need EAP to fix standalone.sh to not set -Djboss.modules.policy-permissions without a value - they need to set it "=true". The BZ will have EAP folks move that setting to standalone.conf and set it =true. For now, we'll turn off security manager though.
commit b88731f09ebf9f449927d0e3749bcc05c6ba59f6 Merge: ce5c8cb bd90bfa Author: John Mazzitelli mazz@redhat.com Date: Fri May 30 11:08:19 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit ce5c8cb634a80a8bf4c544b2522c0acff08c57f6 Merge: 1dfa775 0d6acf9 Author: John Mazzitelli mazz@redhat.com Date: Thu May 22 19:02:04 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 1dfa775d38026d919eaf3d56fafc072dd54b362f Merge: 4d2b802 aa0032b Author: John Mazzitelli mazz@redhat.com Date: Thu May 22 17:25:55 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 4d2b8024c7c4b8a61226b99030a3438cebe2c88b Merge: ae80968 5cbf420 Author: John Mazzitelli mazz@redhat.com Date: Thu May 22 16:24:20 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit ae8096854128095b09daf871ff13c480f76b5342 Merge: 804e84f 2f52d8d Author: John Mazzitelli mazz@redhat.com Date: Thu May 22 15:00:10 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 804e84f44aaca2a86c86a08da61f3937a16be003 Merge: 0abbabd 4bec04a Author: John Mazzitelli mazz@redhat.com Date: Tue May 13 09:55:09 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 0abbabd0a16d4efe31e48eaede387c0ec24464a4 Merge: 4688250 5c08e3f Author: John Mazzitelli mazz@redhat.com Date: Thu May 8 13:40:05 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit 468825097a99038202b0a791a49f0dede0aed243 Merge: f24e990 d78179e Author: John Mazzitelli mazz@redhat.com Date: Tue Apr 15 10:38:44 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit f24e990ede910c310f6554e8b1234123f5586d40 Merge: c838682 38b1711 Author: John Mazzitelli mazz@redhat.com Date: Mon Apr 14 16:46:41 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
Conflicts: modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
commit c8386827c162bcb723be533b32e5c07310e5cd4d Merge: f2b7ea3 e2eac63 Author: John Mazzitelli mazz@redhat.com Date: Fri Mar 28 09:34:14 2014 -0400
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
commit f2b7ea32d76ee5a9d918b8727b9b133488532689 Author: John Mazzitelli mazz@redhat.com Date: Thu Mar 27 17:25:54 2014 -0400
BZ 1069606 - adding -Djboss.modules.policy-permissions=true to the AS startup will avoid some odd classloader errors we were getting at startup.
commit 9f8f1879e31449c47d2ecc3ae5aeca5af9915a0a Author: John Mazzitelli mazz@redhat.com Date: Thu Mar 27 17:24:58 2014 -0400
BZ 1069606 - hibernate got a class not found error with initEnum being called from the constructor. If we move it to the getFacets method, the class-not-found error goes away.
commit ab4d586aec2cf907dc6fbcb27fde513ad65a9e01 Author: John Mazzitelli mazz@redhat.com Date: Mon Mar 24 14:04:01 2014 -0400
BZ 1069606 - EAP 6.3 won't deploy properly if using the old gnu getopt jar due to a bad manifest in that jar. change to a redhat specific gnu getopt build.