Author: charles.crouch(a)jboss.com Date: 2010-01-15 16:01:01 -0500 (Fri, 15 Jan 2010) New Revision: 864 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java Log: first cut at EMBJOPR-273 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2010-01-07 02:51:42 UTC (rev 863) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2010-01-15 21:01:01 UTC (rev 864) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse; -import org.rhq.core.clientapi.server.plugin.content.ContentSourcePackageDetailsKey; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.content.PackageDetailsKey; @@ -119,8 +118,8 @@ return FAILURE_OUTCOME; } - PackageDetailsKey key = new ContentSourcePackageDetailsKey(tempFile.getPath(), INITIAL_PACKAGE_VERSION, this.packageType.getName(), - PACKAGE_ARCHITECTURE, this.resourceType.getName(), this.resourceType.getPlugin()); + PackageDetailsKey key = new PackageDetailsKey(tempFile.getPath(), INITIAL_PACKAGE_VERSION, this.packageType.getName(), + PACKAGE_ARCHITECTURE); ResourcePackageDetails detail = new ResourcePackageDetails(key); detail.setDeploymentTimeConfiguration(this.configuration); Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2010-01-07 02:51:42 UTC (rev 863) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2010-01-15 21:01:01 UTC (rev 864) @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.rhq.core.clientapi.agent.PluginContainerException; -import org.rhq.core.clientapi.server.plugin.content.ContentSourcePackageDetailsKey; import org.rhq.core.domain.content.PackageDetailsKey; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; @@ -143,8 +142,8 @@ // TODO: Allow user to specify version? String version = String.valueOf(System.currentTimeMillis()); - PackageDetailsKey key = new ContentSourcePackageDetailsKey(tempFile.getPath(), version, this.packageType.getName(), - PACKAGE_ARCHITECTURE, this.resourceType.getName(), this.resourceType.getPlugin()); + PackageDetailsKey key = new PackageDetailsKey(tempFile.getPath(), version, this.packageType.getName(), + PACKAGE_ARCHITECTURE); ResourcePackageDetails detail = new ResourcePackageDetails(key); //detail.setDeploymentTimeConfiguration(this.packageDetails.getDeploymentTimeConfiguration());