[rhq] Changes to 'feature/rest'
by Heiko W. Rupp
New branch 'feature/rest' available with the following commits:
commit c6be98cee4043752d110f191a039a11bfe869465
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Nov 2 08:51:54 2011 +0100
Introduce a ParamMissing exception for missing query params
commit 47a3371266a2607681cd7ee05f9028ef03bb86ed
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Nov 2 08:48:34 2011 +0100
Add hyperlinks from resource/schedules to their metrics
commit 691dc9c0cce937f4c1b979145bfa6458382c29c0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Oct 28 11:01:52 2011 +0200
Add support for hyperlinking between schedule and metrics and to the edit schedule method.
commit 9e080614d6b101bd3a86905583d4e4de002a89c7
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Oct 27 22:53:51 2011 +0200
API cleanup for getting metrics and schedules. Also fix updating of schedules.
commit 8e40cd43b2ca814b43fcd17140d144ae6523cafb
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Oct 26 15:01:54 2011 +0200
Add cache control and merge all media types into one method
commit abd6af308975aab38766afa51c733923d3df23cf
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Oct 26 14:59:08 2011 +0200
Update to RESTeasy 2.2 and move artifacs into rhq.ear, so future updates do noot need a container build.
12 years, 6 months
[rhq] release.sh
by snegrea
release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ca0281ff8289d4fd04746b1e99fd21075b19f825
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Nov 1 16:30:10 2011 -0500
When branching the name of the branch should be similar to the release version and not tag version.
diff --git a/release.sh b/release.sh
index 09ceb77..7f9e94f 100755
--- a/release.sh
+++ b/release.sh
@@ -527,7 +527,7 @@ checkout_build_branch_for_release()
then
BUILD_BRANCH="${RELEASE_BRANCH}"
else
- BUILD_BRANCH="release-$TAG_VERSION"
+ BUILD_BRANCH="release-$RELEASE_VERSION"
# 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" ];
12 years, 6 months
[rhq] publish_release.sh release.sh
by snegrea
publish_release.sh | 16 ++++++++++++++++
release.sh | 16 ++--------------
2 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit c9680ccf5e78ff9d06653bf6e2354dc2920107a0
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Nov 1 16:05:53 2011 -0500
Move publishing code out of the release script. The code is commented out in the publish release script to include it at a later time.
diff --git a/publish_release.sh b/publish_release.sh
index 3720a6b..949f940 100755
--- a/publish_release.sh
+++ b/publish_release.sh
@@ -173,3 +173,19 @@ mvn $MAVEN_RELEASE_PERFORM_GOAL $MAVEN_ARGS -Ddbreset
[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
echo
echo "Release build succeeded!"
+
+
+
+# 5) Publish release artifacts - **FUTURE IMPROVEMENT**
+#echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
+#mvn deploy $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true
+#[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
+
+
+
+ #if [ "$MODE" = "production" ]; then
+ # if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
+ # usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
+ # fi
+ #fi
+
diff --git a/release.sh b/release.sh
index e8095d2..09ceb77 100755
--- a/release.sh
+++ b/release.sh
@@ -95,7 +95,7 @@ parse_and_validate_options()
OVERRIDE_TAG=false
short_options="h"
- long_options="help,release-version:,development-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,scm-strategy:,extra-profile:,debug::,override-tag::,workspace:"
+ long_options="help,release-version:,development-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,scm-strategy:,extra-profile:,debug::,workspace:,override-tag::"
PROGNAME=${0##*/}
ARGS=$(getopt -s bash --options $short_options --longoptions $long_options --name $PROGNAME -- "$@" )
@@ -204,7 +204,6 @@ parse_and_validate_options()
;;
esac
;;
-
--)
shift
break
@@ -242,12 +241,6 @@ parse_and_validate_options()
usage "Invalid scm strategy: $SCM_STRATEGY (valid scm strategies are 'tag' or 'branch')"
fi
- #if [ "$MODE" = "production" ]; then
- # if [ -z "$JBOSS_ORG_USERNAME" ] || [ -z "$JBOSS_ORG_PASSWORD" ]; then
- # usage "In production mode, jboss.org credentials must be specified via the JBOSS_ORG_USERNAME and JBOSS_ORG_PASSWORD environment variables."
- # fi
- #fi
-
print_centered "Script Options"
script_options=( "RELEASE_VERSION" "DEVELOPMENT_VERSION" "RELEASE_BRANCH" "RELEASE_TYPE" \
"MODE" "SCM_STRATEGY" )
@@ -348,11 +341,6 @@ run_release_version_and_tag_process()
mvn clean install $MAVEN_ARGS -DskipTests=true -Ddbsetup-do-not-check-schema=true
[ "$?" -ne 0 ] && abort "Maven build for new version failed. Please see output for details, fix any issues, then try again."
- # 5) Publish release artifacts - **FUTURE IMPROVEMENT**
- #echo "Building release from tag and publishing Maven artifacts (this will take about 10-15 minutes)..."
- #mvn deploy $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true
- #[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
-
echo "6) Cleanup again after this test build before commiting changes."
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."
@@ -411,7 +399,7 @@ verify_tags()
EXISTING_REMOTE_TAG=`git ls-remote --tags origin "$RELEASE_TAG"`
if [ -n "$EXISTING_REMOTE_TAG" ];
then
- if[ "$OVERRIDE_TAG" ];
+ if [ "$OVERRIDE_TAG" ];
then
echo "A remote tag named $RELEASE_TAG already exists, but will be overriden."
else
12 years, 6 months
[rhq] release.sh
by snegrea
release.sh | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 71693b21d6bf1dc0b763da98303e2afb0e936524
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Nov 1 15:18:10 2011 -0500
Add workspace override option to better facilitate local script runs.
diff --git a/release.sh b/release.sh
index 708ba6e..e8095d2 100755
--- a/release.sh
+++ b/release.sh
@@ -62,7 +62,10 @@ USAGE: release.sh OPTIONS
--debug=[true|false] [OPTIONAL]
Set maven in debug mode. Default is false; true if option specified without argument.
- --override-tag=[true|false]
+ --workspace=workspace_to_use [OPTIONAL]
+ Override the workspace used by default by the script.
+
+ --override-tag=[true|false] [OPTIONAL]
Override the tag if it already exists remotely. Default is false; true if option specified without argument.
EOF
@@ -92,7 +95,7 @@ parse_and_validate_options()
OVERRIDE_TAG=false
short_options="h"
- long_options="help,release-version:,development-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,scm-strategy:,extra-profile:,debug::,override-tag::"
+ long_options="help,release-version:,development-version:,release-branch:,release-type:,test-mode,production-mode,mode:,branch,tag,scm-strategy:,extra-profile:,debug::,override-tag::,workspace:"
PROGNAME=${0##*/}
ARGS=$(getopt -s bash --options $short_options --longoptions $long_options --name $PROGNAME -- "$@" )
@@ -175,6 +178,11 @@ parse_and_validate_options()
;;
esac
;;
+ --workspace)
+ shift
+ WORKSPACE=$1
+ shift
+ ;;
--override-tag)
shift
case "$1" in
12 years, 6 months
[rhq] release.sh
by snegrea
release.sh | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
New commits:
commit 7b599f0d50a80565ad33545246687e985c046774
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Nov 1 15:14:04 2011 -0500
Echo out the steps being executed by the complicated release specific functions to facilitate debug.
diff --git a/release.sh b/release.sh
index 533102e..708ba6e 100755
--- a/release.sh
+++ b/release.sh
@@ -324,20 +324,19 @@ run_release_version_and_tag_process()
{
print_function_information $FUNCNAME
- # 1) Perform a test build before changing version
+ echo "1) Perform a test build before changing version."
mvn clean install $MAVEN_ARGS -Ddbreset
[ "$?" -ne 0 ] && abort "Test build failed. Please see output for details, fix any issues, then try again."
- # 2) Run another cleanup
- echo "Cleaning up module target dirs..."
+ echo "2) Run a maven cleanup to remove all the artifacts from previous build, this cleans 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."
- # 3) Increment version on all poms
+ echo "3) Increment version on all poms."
mvn versions:set versions:use-releases -DnewVersion=$RELEASE_VERSION -DallowSnapshots=false -DgenerateBackupPoms=false
[ "$?" -ne 0 ] && abort "Version set failed. Please see output for details, fix any issues, then try again."
- # 4) Perform a test build with the new version
+ echo "4) Perform a test build with the new version."
mvn clean install $MAVEN_ARGS -DskipTests=true -Ddbsetup-do-not-check-schema=true
[ "$?" -ne 0 ] && abort "Maven build for new version failed. Please see output for details, fix any issues, then try again."
@@ -346,16 +345,15 @@ run_release_version_and_tag_process()
#mvn deploy $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true
#[ "$?" -ne 0 ] && abort "Release build failed. Please see above Maven output for details, fix any issues, then try again."
- # 6) Cleanup after this test build before commiting changes
- echo "Cleaning up module target dirs..."
+ echo "6) Cleanup again after this test build before commiting changes."
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."
- # 7) Commit the change in version (if everything went well so far then this is a good tag)
+ echo "7) Commit the change in version; if everything went well so far then this is a good tag."
git add -u
git commit -m "tag $RELEASE_TAG"
- # 8) Tag the current source
+ echo "8) Tag the current source."
if [ "$OVERRIDE_TAG" ];
then
git tag --force "$RELEASE_TAG"
@@ -363,7 +361,7 @@ run_release_version_and_tag_process()
git tag "$RELEASE_TAG"
fi
- # 9) If everything went well so far than means all the changes can be pushed!!!
+ echo "9) If everything went well so far than means all the changes can be pushed!!!"
git push origin "$BUILD_BRANCH"
git push origin "$RELEASE_TAG"
}
@@ -376,15 +374,15 @@ update_development_version()
{
print_function_information $FUNCNAME
- # 1) Set version to the current development version
+ echo "1) Set version to the current development version"
mvn versions:set versions:use-releases -DnewVersion=$DEVELOPMENT_VERSION -DallowSnapshots=false -DgenerateBackupPoms=false
[ "$?" -ne 0 ] && abort "Version set failed. Please see output for details, fix any issues, then try again."
- # 2) Commit the change in version
+ echo "2) Commit the change in version."
git add -u
git commit -m "development RHQ_$DEVELOPMENT_VERSION"
- # 3) If everything went well so far than means all the changes can be pushed!!!
+ echo "3) If everything went well so far than means all the changes can be pushed!!!"
git push origin "$BUILD_BRANCH"
}
12 years, 6 months
[rhq] release.sh
by snegrea
release.sh | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
New commits:
commit 5ad19923c2562201577bd8dc07f9e3de3b5fdb8e
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Nov 1 15:06:30 2011 -0500
Improve release script output/debug by echoing the function being executed.
diff --git a/release.sh b/release.sh
index 8b48df2..533102e 100755
--- a/release.sh
+++ b/release.sh
@@ -79,6 +79,8 @@ EOF
#========================================================================================
parse_and_validate_options()
{
+ print_function_information $FUNCNAME
+
RELEASE_VERSION=
DEVELOPMENT_VERSION=
RELEASE_BRANCH=
@@ -250,6 +252,8 @@ parse_and_validate_options()
#========================================================================================
set_local_and_environment_variables()
{
+ print_function_information $FUNCNAME
+
# Set environment variables
MAVEN_OPTS="-Xms512M -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M"
export MAVEN_OPTS
@@ -318,6 +322,8 @@ set_local_and_environment_variables()
#========================================================================================
run_release_version_and_tag_process()
{
+ print_function_information $FUNCNAME
+
# 1) Perform a test build before changing version
mvn clean install $MAVEN_ARGS -Ddbreset
[ "$?" -ne 0 ] && abort "Test build failed. Please see output for details, fix any issues, then try again."
@@ -368,6 +374,8 @@ run_release_version_and_tag_process()
#========================================================================================
update_development_version()
{
+ print_function_information $FUNCNAME
+
# 1) Set version to the current development version
mvn versions:set versions:use-releases -DnewVersion=$DEVELOPMENT_VERSION -DallowSnapshots=false -DgenerateBackupPoms=false
[ "$?" -ne 0 ] && abort "Version set failed. Please see output for details, fix any issues, then try again."
@@ -390,6 +398,8 @@ update_development_version()
#========================================================================================
verify_tags()
{
+ print_function_information $FUNCNAME
+
# 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"`
@@ -421,6 +431,8 @@ verify_tags()
#========================================================================================
validate_system_utilities()
{
+ print_function_information $FUNCNAME
+
# TODO: Check that JDK version is < 1.7.
validate_java_6
@@ -442,6 +454,8 @@ validate_system_utilities()
#========================================================================================
print_release_information()
{
+ print_function_information $FUNCNAME
+
echo
print_centered "Release Info"
echo "Version: $RELEASE_VERSION"
@@ -456,6 +470,8 @@ print_release_information()
#========================================================================================
checkout_release_branch()
{
+ print_function_information $FUNCNAME
+
# Checkout the source from git, assume that the git repo is already cloned
git status >/dev/null 2>&1
GIT_STATUS_EXIT_CODE=$?
@@ -492,6 +508,8 @@ checkout_release_branch()
#========================================================================================
checkout_build_branch_for_release()
{
+ print_function_information $FUNCNAME
+
# 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.
@@ -535,6 +553,8 @@ checkout_build_branch_for_release()
#========================================================================================
checkout_build_branch_for_development()
{
+ print_function_information $FUNCNAME
+
if [ "$MODE" = "production" ];
then
if [ "$SCM_STRATEGY" = "branch" ];
12 years, 6 months
[rhq] Branch 'release_jon3.x' - modules/enterprise
by mazz
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit fc4ac3fb4e0e754fb634e105fc396d5e9b80d934
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Nov 1 15:40:27 2011 -0400
[BZ 750224] NPE check
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index f2a1fa6..5b88fe5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -136,7 +136,7 @@ import org.rhq.enterprise.server.util.QuartzUtil;
* @author John Mazzitelli
* @author Ian Springer
*/
-@SuppressWarnings({"UnnecessaryLocalVariable", "UnnecessaryReturnStatement"})
+@SuppressWarnings({ "UnnecessaryLocalVariable", "UnnecessaryReturnStatement" })
@Stateless
@XmlType(namespace = ServerVersion.namespace)
public class ConfigurationManagerBean implements ConfigurationManagerLocal, ConfigurationManagerRemote {
@@ -1245,6 +1245,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
private boolean isRawSupported(int resourceId) {
Resource resource = entityManager.find(Resource.class, resourceId);
ConfigurationDefinition configDef = resource.getResourceType().getResourceConfigurationDefinition();
+ if (configDef == null) {
+ return false;
+ }
return (ConfigurationFormat.STRUCTURED_AND_RAW == configDef.getConfigurationFormat() || (ConfigurationFormat.RAW == configDef
.getConfigurationFormat()));
@@ -1253,7 +1256,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
private boolean isStructuredAndRawSupported(int resourceId) {
Resource resource = entityManager.find(Resource.class, resourceId);
ConfigurationDefinition configDef = resource.getResourceType().getResourceConfigurationDefinition();
-
+ if (configDef == null) {
+ return false;
+ }
return ConfigurationFormat.STRUCTURED_AND_RAW == configDef.getConfigurationFormat();
}
12 years, 6 months
[rhq] modules/enterprise
by mazz
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit d3c98cad366e38d11e78a692a31c3dc434fc87b3
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Nov 1 15:40:27 2011 -0400
[BZ 750224] NPE check
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index f2a1fa6..5b88fe5 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -136,7 +136,7 @@ import org.rhq.enterprise.server.util.QuartzUtil;
* @author John Mazzitelli
* @author Ian Springer
*/
-@SuppressWarnings({"UnnecessaryLocalVariable", "UnnecessaryReturnStatement"})
+@SuppressWarnings({ "UnnecessaryLocalVariable", "UnnecessaryReturnStatement" })
@Stateless
@XmlType(namespace = ServerVersion.namespace)
public class ConfigurationManagerBean implements ConfigurationManagerLocal, ConfigurationManagerRemote {
@@ -1245,6 +1245,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
private boolean isRawSupported(int resourceId) {
Resource resource = entityManager.find(Resource.class, resourceId);
ConfigurationDefinition configDef = resource.getResourceType().getResourceConfigurationDefinition();
+ if (configDef == null) {
+ return false;
+ }
return (ConfigurationFormat.STRUCTURED_AND_RAW == configDef.getConfigurationFormat() || (ConfigurationFormat.RAW == configDef
.getConfigurationFormat()));
@@ -1253,7 +1256,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
private boolean isStructuredAndRawSupported(int resourceId) {
Resource resource = entityManager.find(Resource.class, resourceId);
ConfigurationDefinition configDef = resource.getResourceType().getResourceConfigurationDefinition();
-
+ if (configDef == null) {
+ return false;
+ }
return ConfigurationFormat.STRUCTURED_AND_RAW == configDef.getConfigurationFormat();
}
12 years, 6 months
[rhq] Branch 'release_jon3.x' - modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestPluginServiceMBean.java | 25 ----------
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java | 25 ++++++++++
3 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit c89337323506e8c6f8496fc1c0d3410a3e4e98ed
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Nov 1 15:41:18 2011 -0400
fixing mbean interface name that was causing test failures
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestPluginServiceMBean.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestPluginServiceMBean.java
deleted file mode 100644
index c669b63..0000000
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestPluginServiceMBean.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2011 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.test;
-
-import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement;
-
-public interface TestPluginServiceMBean extends ServerPluginServiceManagement {
-}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
index 87a7655..c28256b 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
@@ -39,7 +39,7 @@ import org.rhq.enterprise.server.plugin.pc.drift.DriftServerPluginContainer;
import org.rhq.enterprise.server.plugin.pc.drift.DriftServerPluginManager;
import org.rhq.enterprise.server.xmlschema.generated.serverplugin.ServerPluginDescriptorType;
-public class TestServerPluginService extends ServerPluginService implements TestPluginServiceMBean {
+public class TestServerPluginService extends ServerPluginService implements TestServerPluginServiceMBean {
public TestMasterServerPluginContainer master;
public MasterServerPluginContainerConfiguration masterConfig;
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java
new file mode 100644
index 0000000..7ab1b77
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java
@@ -0,0 +1,25 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2011 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.test;
+
+import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement;
+
+public interface TestServerPluginServiceMBean extends ServerPluginServiceManagement {
+}
12 years, 6 months
[rhq] modules/enterprise
by John Sanda
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestPluginServiceMBean.java | 25 ----------
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java | 25 ++++++++++
3 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit c66dcc0a3cd599ba56d0e200ed0af4426c734400
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Nov 1 15:41:18 2011 -0400
fixing mbean interface name that was causing test failures
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestPluginServiceMBean.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestPluginServiceMBean.java
deleted file mode 100644
index c669b63..0000000
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestPluginServiceMBean.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2011 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.test;
-
-import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement;
-
-public interface TestPluginServiceMBean extends ServerPluginServiceManagement {
-}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
index 87a7655..c28256b 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java
@@ -39,7 +39,7 @@ import org.rhq.enterprise.server.plugin.pc.drift.DriftServerPluginContainer;
import org.rhq.enterprise.server.plugin.pc.drift.DriftServerPluginManager;
import org.rhq.enterprise.server.xmlschema.generated.serverplugin.ServerPluginDescriptorType;
-public class TestServerPluginService extends ServerPluginService implements TestPluginServiceMBean {
+public class TestServerPluginService extends ServerPluginService implements TestServerPluginServiceMBean {
public TestMasterServerPluginContainer master;
public MasterServerPluginContainerConfiguration masterConfig;
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java
new file mode 100644
index 0000000..7ab1b77
--- /dev/null
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java
@@ -0,0 +1,25 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2011 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.test;
+
+import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement;
+
+public interface TestServerPluginServiceMBean extends ServerPluginServiceManagement {
+}
12 years, 6 months