modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java | 16 ++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 37 +++++++++- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 2 3 files changed, 52 insertions(+), 3 deletions(-)
New commits: commit fddbaae073111f1f42877df4fa69378ff940dd6f Merge: c24e798... 1149b0f... Author: John Mazzitelli mazz@redhat.com Date: Thu May 27 08:29:51 2010 -0400
Merge branch 'master' into bundle
Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java
diff --cc modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java index 6440fc5,d8651c9..17fb6d9 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java @@@ -608,4 -595,4 +595,4 @@@ public class ResourceFactoryManagerBea } }
--} ++}
commit c24e798945928295db181e53d69d2441fc075379 Merge: 4d2c161... 6ae857a... Author: Jay Shaughnessy jshaughn@redhat.com Date: Wed May 26 16:56:51 2010 -0400
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
commit 4d2c16104642e4ba423a2dca91e2a5195312cea5 Author: Simeon Pinder spinder@redhat.com Date: Wed May 26 15:30:40 2010 -0400
take two on regression fix.
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 11f709f..4439771 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 @@ -1278,7 +1278,23 @@ 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); + // 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); + }
newPackageVersion.setPackageBits(bits); newPackageVersion.setFileSize((long) bits.getBits().length); @@ -1596,7 +1612,24 @@ public class ContentManagerBean implements ContentManagerLocal, ContentManagerRe }
//get the data and persist/merge packageVersion - PackageBits bits = loadPackageBits(packageBitStream); + // 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); + } + packageVersion.setPackageBits(bits);
//populate extra details, persist diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java index 3ecd40f..6440fc5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java @@ -530,18 +530,18 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, packageVersionNumber, architectureId, packageBitStream, packageUploadDetails, newResourceTypeId); }
- //check that Configuration is persisted correctly. - if (deploymentTimeConfiguration.getId() > 0) { - entityManager.merge(deploymentTimeConfiguration); - } else { - entityManager.persist(deploymentTimeConfiguration); - } - //check that Configuration is persisted correctly. - if (pluginConfiguration.getId() > 0) { - entityManager.merge(pluginConfiguration); - } else { - entityManager.persist(pluginConfiguration); - } + // //check that Configuration is persisted correctly. + // if (deploymentTimeConfiguration.getId() > 0) { + // entityManager.merge(deploymentTimeConfiguration); + // } else { + // entityManager.persist(deploymentTimeConfiguration); + // } + // //check that Configuration is persisted correctly. + // if (pluginConfiguration.getId() > 0) { + // entityManager.merge(pluginConfiguration); + // } else { + // entityManager.persist(pluginConfiguration); + // }
// Persist in separate transaction so it is committed immediately, before the request is sent to the agent CreateResourceHistory persistedHistory = resourceFactoryManager.persistCreateHistory(user, parentResourceId,
commit 6ae857a91564f02b8521c060859523c5ca8fdad4 Author: John Mazzitelli mazz@redhat.com Date: Wed May 26 15:49:05 2010 -0400
add some public APIs to determine where the deployment dir is and if its already managed
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java index f7185d7..c8111fc 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java @@ -111,6 +111,22 @@ public class Deployer { }
/** + * @return information about the particular deployment that this deployer will install. + */ + public DeploymentData getDeploymentData() { + return deploymentData; + } + + /** + * @return <code>true</code> if the deployer is to install the deployment data in a directory + * that already has a managed deployment in it. <code>false</code> if there is currently + * no managed deployments in the destination directory. + */ + public boolean isDestinationDirectoryManaged() { + return deploymentsMetadata.isManaged(); + } + + /** * Convienence method that is equivalent to {@link #deploy(DeployDifferences, boolean) deploy(diff, false)}. * @see #deploy(DeployDifferences, boolean) */
commit 11c9450a37476de98bd9dcee79d5bc5f4d9a2659 Author: Jay Shaughnessy jshaughn@redhat.com Date: Wed May 26 15:29:40 2010 -0400
return 2.86 to the front lines
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 4b4ce55..a00c8a5 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -2964,16 +2964,27 @@ </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"> - CREATE UNIQUE INDEX RHQ_RES_TYPE_IDX_PLG_NAME ON RHQ_RESOURCE_TYPE (name, plugin) - </statement> - </schema-directSQL> - </schemaSpec> + <schemaSpec version="2.86"> + <schema-directSQL> + <statement desc="Adding MANAGE_BUNDLE permission to overlord"> + INSERT INTO RHQ_PERMISSION VALUES(1, 12) + </statement> + <statement desc="Adding MANAGE_BUNDLE permission to superuser"> + INSERT INTO RHQ_PERMISSION VALUES(2, 12) + </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"> + CREATE UNIQUE INDEX RHQ_RES_TYPE_IDX_PLG_NAME ON RHQ_RESOURCE_TYPE (name, plugin) + </statement> + </schema-directSQL> + </schemaSpec>
</dbupgrade> </target>
rhq-commits@lists.fedorahosted.org