[embjopr-commits] EMBJOPR SVN: r937 - in branches/EmbJopr_1_3: core and 9 other directories.

Author: ips Date: 2010-05-13 18:17:04 -0400 (Thu, 13 May 2010) New Revision: 937 Modified: branches/EmbJopr_1_3/core/pom.xml branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/web.xml branches/EmbJopr_1_3/jbas4/pom.xml branches/EmbJopr_1_3/jbas5/pom.xml branches/EmbJopr_1_3/jsfunit/pom.xml branches/EmbJopr_1_3/pom.xml Log: upgrade RHQ dep to 3.0.0.B05 Modified: branches/EmbJopr_1_3/core/pom.xml =================================================================== --- branches/EmbJopr_1_3/core/pom.xml 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/pom.xml 2010-05-13 22:17:04 UTC (rev 937) @@ -23,7 +23,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2.GA_CP01-SNAPSHOT</version> + <version>1.3.4-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java 2010-05-13 22:17:04 UTC (rev 937) @@ -21,7 +21,7 @@ import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; -import org.rhq.core.domain.measurement.util.MeasurementConverter; +import org.rhq.core.server.MeasurementConverter; /** * A subclass of {@link MeasurementNumericValueAndUnits) that overrides toString() to display the value as an integer Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2010-05-13 22:17:04 UTC (rev 937) @@ -37,7 +37,7 @@ import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; import org.rhq.core.domain.measurement.composite.MeasurementStringValueAndUnits; import org.rhq.core.domain.measurement.util.MeasurementConversionException; -import org.rhq.core.domain.measurement.util.MeasurementConverter; +import org.rhq.core.server.MeasurementConverter; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pc.PluginContainer; Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java 2010-05-13 22:17:04 UTC (rev 937) @@ -22,7 +22,7 @@ import java.util.Collection; -import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; +import org.rhq.core.clientapi.server.content.ContentDiscoveryReport; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java 2010-05-13 22:17:04 UTC (rev 937) @@ -34,7 +34,7 @@ import org.rhq.core.clientapi.server.content.ContentServiceResponse; import org.rhq.core.domain.content.PackageDetailsKey; import org.rhq.core.domain.content.composite.PackageVersionMetadataComposite; -import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; +import org.rhq.core.clientapi.server.content.ContentDiscoveryReport; import org.rhq.core.domain.content.transfer.DeployPackagesResponse; import org.rhq.core.domain.content.transfer.RemovePackagesResponse; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java 2010-05-13 22:17:04 UTC (rev 937) @@ -19,7 +19,7 @@ */ package org.jboss.on.embedded.manager.history.content; -import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; +import org.rhq.core.clientapi.server.content.ContentDiscoveryReport; import org.jboss.on.embedded.manager.history.HistoryManager; Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2010-05-13 22:17:04 UTC (rev 937) @@ -25,7 +25,7 @@ import java.util.List; import java.util.Set; -import org.rhq.core.domain.content.transfer.ContentDiscoveryReport; +import org.rhq.core.clientapi.server.content.ContentDiscoveryReport; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; import org.rhq.core.domain.resource.Resource; Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2010-05-13 22:17:04 UTC (rev 937) @@ -136,7 +136,7 @@ catch (RuntimeException e) { newOperationHistory.setStatus(OperationRequestStatus.FAILURE); - newOperationHistory.setErrorMessageFromThrowable(e); + newOperationHistory.setErrorMessage(e.toString()); this.facesMessages.add(FacesMessage.SEVERITY_FATAL, "Failed to invoke operation: #0", e); } initHistories(); Modified: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2010-05-13 22:17:04 UTC (rev 937) @@ -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: branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java =================================================================== --- branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2010-05-13 22:17:04 UTC (rev 937) @@ -30,12 +30,11 @@ 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; +import org.rhq.core.clientapi.server.content.ContentDiscoveryReport; import org.rhq.core.domain.content.transfer.DeployIndividualPackageResponse; -import org.rhq.core.domain.content.transfer.DeployPackagesRequest; +import org.rhq.core.clientapi.server.content.DeployPackagesRequest; import org.rhq.core.domain.content.transfer.DeployPackagesResponse; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; import org.rhq.core.domain.resource.Resource; @@ -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()); @@ -203,4 +202,4 @@ log.debug("Backing package for " + this.resource + " is " + packageDetails + "."); return packageDetails; } -} \ No newline at end of file +} Modified: branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/web.xml 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/core/src/main/webapp/WEB-INF/web.xml 2010-05-13 22:17:04 UTC (rev 937) @@ -92,16 +92,6 @@ <param-value>.xhtml</param-value> </context-param> - <!-- MyFaces --> - <context-param> - <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> - <param-value>true</param-value> - </context-param> - - <listener> - <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> - </listener> - <!-- Facelets --> <!-- load our Facelets taglibs (value must be semicolon-delimited) --> Modified: branches/EmbJopr_1_3/jbas4/pom.xml =================================================================== --- branches/EmbJopr_1_3/jbas4/pom.xml 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/jbas4/pom.xml 2010-05-13 22:17:04 UTC (rev 937) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2.GA_CP01-SNAPSHOT</version> + <version>1.3.4-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: branches/EmbJopr_1_3/jbas5/pom.xml =================================================================== --- branches/EmbJopr_1_3/jbas5/pom.xml 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/jbas5/pom.xml 2010-05-13 22:17:04 UTC (rev 937) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2.GA_CP01-SNAPSHOT</version> + <version>1.3.4-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: branches/EmbJopr_1_3/jsfunit/pom.xml =================================================================== --- branches/EmbJopr_1_3/jsfunit/pom.xml 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/jsfunit/pom.xml 2010-05-13 22:17:04 UTC (rev 937) @@ -10,7 +10,6 @@ <jvm.args.common>-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${project.build.directory}/heapdump-sun -Xmx1536m -XX:PermSize=256m -XX:MaxPermSize=512m</jvm.args.common> <jvm.args.vendor-specific></jvm.args.vendor-specific> - <cargo.jboss.configuration>default</cargo.jboss.configuration><!-- JBoss AS configuration. --> <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address><!-- Address for JBoss AS to bind to. --> <htmlunit.browser>ff3</htmlunit.browser><!-- ff2 | ff3 | ie6 | ie7 --> @@ -20,7 +19,7 @@ <parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2.GA_CP01-SNAPSHOT</version> + <version>1.3.4-SNAPSHOT</version> </parent> <groupId>org.jboss.jopr</groupId> Modified: branches/EmbJopr_1_3/pom.xml =================================================================== --- branches/EmbJopr_1_3/pom.xml 2010-05-13 19:14:23 UTC (rev 936) +++ branches/EmbJopr_1_3/pom.xml 2010-05-13 22:17:04 UTC (rev 937) @@ -17,7 +17,10 @@ ~ License along with this program; if not, write to the Free Software ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. --> -<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"> +<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> <!-- NOTE: We extend the RHQ parent pom, because we essentially want all the same @@ -25,12 +28,12 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>1.3.0.EmbJopr.1.3.0-4</version> + <version>3.0.0.B05</version> </parent> <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-parent</artifactId> - <version>1.3.2.GA_CP01-SNAPSHOT</version> + <version>1.3.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Embedded Jopr</name> <description>a web application that provides administration and monitoring of the app server instance to which it is deployed</description> @@ -42,8 +45,8 @@ </organization> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/Emb... - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branch... + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/Emb... + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branch... </scm> <issueManagement> @@ -66,7 +69,7 @@ <jaxb-impl.version>2.1.6</jaxb-impl.version> <jopr.version>2.3.0.EmbJopr.1.3.0-4</jopr.version> <richfaces.version>3.3.0.GA</richfaces.version> - <rhq.version>1.3.0.EmbJopr.1.3.0-4</rhq.version> + <rhq.version>3.0.0.B05</rhq.version> <seam.version>2.1.0.SP1</seam.version> <seam.embedded.version>beta3.SP3</seam.embedded.version> <!-- This is a special patched version of not-yet-released Facelets 1.1.15, @@ -117,6 +120,41 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-build-number-properties</id> + <phase>generate-resources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>git</executable> + <skip>true</skip> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <executions> + <execution> + <id>read-build-properties</id> + <phase>process-resources</phase> + <goals> + <goal>read-project-properties</goal> + </goals> + <configuration> + <files /> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build>