May 2010 - embjopr-commits - Jboss List Archives

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-05-15 11:28:08 -0400 (Sat, 15 May 2010) New Revision: 939 Modified: trunk/pom.xml Log: add nexus jboss repo for RHQ 3.0 B05 jars Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-14 12:36:26 UTC (rev 938) +++ trunk/pom.xml 2010-05-15 15:28:08 UTC (rev 939) @@ -177,16 +177,26 @@ <repositories> +  <repository> - <id>jboss-deprecated-repository</id> - <name>JBoss Deprecated</name> + <id>jboss-old</id> + <name>JBoss Old</name> <url>https://repository.jboss.org/maven2/</url> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> </repository> +  + <repository> + <id>jboss-releases</id> + <name>JBoss Releases</name> + <url>https://repository.jboss.org/nexus/content/repositories/releases/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories>

14 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r938 - in trunk: core/src/main/java/org/jboss/on/embedded/bean and 4 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-05-14 08:36:26 -0400 (Fri, 14 May 2010) New Revision: 938 Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java trunk/pom.xml Log: upgrade RHQ dep from 3.0.0.B04 to 3.0.0.B05 Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java 2010-05-13 22:17:04 UTC (rev 937) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementIntegerValueAndUnits.java 2010-05-14 12:36:26 UTC (rev 938) @@ -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: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2010-05-13 22:17:04 UTC (rev 937) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2010-05-14 12:36:26 UTC (rev 938) @@ -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: trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java 2010-05-13 22:17:04 UTC (rev 937) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentHistoryManagerBean.java 2010-05-14 12:36:26 UTC (rev 938) @@ -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: trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java 2010-05-13 22:17:04 UTC (rev 937) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/history/content/ContentServerServiceImpl.java 2010-05-14 12:36:26 UTC (rev 938) @@ -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: trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java 2010-05-13 22:17:04 UTC (rev 937) +++ trunk/core/src/main/java/org/jboss/on/embedded/manager/history/content/ContentHistoryManager.java 2010-05-14 12:36:26 UTC (rev 938) @@ -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: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2010-05-13 22:17:04 UTC (rev 937) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceContentAction.java 2010-05-14 12:36:26 UTC (rev 938) @@ -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: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2010-05-13 22:17:04 UTC (rev 937) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceOperationAction.java 2010-05-14 12:36:26 UTC (rev 938) @@ -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: 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-05-13 22:17:04 UTC (rev 937) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/UpdateBackingContentAction.java 2010-05-14 12:36:26 UTC (rev 938) @@ -32,9 +32,9 @@ import org.rhq.core.clientapi.agent.PluginContainerException; 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; @@ -202,4 +202,4 @@ log.debug("Backing package for " + this.resource + " is " + packageDetails + "."); return packageDetails; } -} \ No newline at end of file +} Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-13 22:17:04 UTC (rev 937) +++ trunk/pom.xml 2010-05-14 12:36:26 UTC (rev 938) @@ -28,7 +28,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>3.0.0.B04</version> + <version>3.0.0.B05</version> </parent> <groupId>org.jboss.jopr</groupId> @@ -72,7 +72,7 @@ <jaxb.version>2.1.9</jaxb.version> <jboss.web.version>3.0.0-beta-2</jboss.web.version> <richfaces.version>3.3.3.Final</richfaces.version> - <rhq.version>3.0.0.B04</rhq.version> + <rhq.version>3.0.0.B05</rhq.version> <jopr.version>${rhq.version}</jopr.version> <seam.version>2.1.0.SP1</seam.version> <seam.embedded.version>beta3.SP3</seam.embedded.version>

14 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r937 - in branches/EmbJopr_1_3: core and 9 other directories.

by embjopr-commits＠lists.jboss.org

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> -  - <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> -   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> <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address> <htmlunit.browser>ff3</htmlunit.browser> @@ -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/EmbJopr_1_3_2_GA_CP/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3_2_GA_CP/</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/branches/EmbJopr_1_3/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/branches/EmbJopr_1_3/</developerConnection> </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>

14 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r936 - branches.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-05-13 15:14:23 -0400 (Thu, 13 May 2010) New Revision: 936 Added: branches/EmbJopr_1_3/ Removed: branches/EmbJopr_1_3_2_GA_CP/ Log: rename 1.3.x (AS/EAP 5.x) branch Copied: branches/EmbJopr_1_3 (from rev 935, branches/EmbJopr_1_3_2_GA_CP)

14 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r935 - trunk/jbas5.

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2010-05-13 13:47:57 -0400 (Thu, 13 May 2010) New Revision: 935 Modified: trunk/jbas5/pom.xml Log: adjust name to be only for JBossAS 5.x Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2010-05-13 17:44:39 UTC (rev 934) +++ trunk/jbas5/pom.xml 2010-05-13 17:47:57 UTC (rev 935) @@ -11,7 +11,7 @@ <groupId>org.jboss.jopr</groupId> <artifactId>jopr-embedded-jbas5</artifactId> <packaging>war</packaging> - <name>JBossAS 5.x/6.x Administration Console</name> + <name>JBossAS 5.x Administration Console</name> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/jbas5/</connection>

14 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r934 - trunk/jbas6/src/main/webapp/WEB-INF.

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2010-05-13 13:44:39 -0400 (Thu, 13 May 2010) New Revision: 934 Added: trunk/jbas6/src/main/webapp/WEB-INF/jboss-scanning.xml Log: EMBJOPR-291- add jboss-scanning.xml Added: trunk/jbas6/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/jbas6/src/main/webapp/WEB-INF/jboss-scanning.xml (rev 0) +++ trunk/jbas6/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-05-13 17:44:39 UTC (rev 934) @@ -0,0 +1,3 @@ +<scanning xmlns="urn:jboss:scanning:1.0"> + +</scanning>

14 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r933 - in trunk: jbas6 and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: smcgowan(a)redhat.com Date: 2010-05-13 13:41:45 -0400 (Thu, 13 May 2010) New Revision: 933 Added: trunk/jbas6/ Modified: trunk/BUILD.txt trunk/jbas6/pom.xml trunk/pom.xml Log: clone jbas5 target to create a jbas6 module for AS 6 Modified: trunk/BUILD.txt =================================================================== --- trunk/BUILD.txt 2010-05-12 18:25:59 UTC (rev 932) +++ trunk/BUILD.txt 2010-05-13 17:41:45 UTC (rev 933) @@ -18,12 +18,14 @@ cd embjopr mvn install -Dmaven.test.skip=true - This will produce two admin console WARs: + This will produce three admin console WARs: * jbas4/target/jbas4-console.war - for deployment to JBoss AS 4.2.x or JBoss EAP 4.3.x * jbas5/target/jbas5-console.war - for deployment to JBoss AS 5.1.x or JBoss EAP 5.x + * jbas6/target/jbas6-console.war + - for deployment to JBoss AS 6.x Installation ============ Copied: trunk/jbas6 (from rev 932, trunk/jbas5) Modified: trunk/jbas6/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2010-05-12 18:25:59 UTC (rev 932) +++ trunk/jbas6/pom.xml 2010-05-13 17:41:45 UTC (rev 933) @@ -9,21 +9,21 @@ </parent> <groupId>org.jboss.jopr</groupId> - <artifactId>jopr-embedded-jbas5</artifactId> + <artifactId>jopr-embedded-jbas6</artifactId> <packaging>war</packaging> - <name>JBossAS 5.x/6.x Administration Console</name> + <name>JBossAS 6.x Administration Console</name> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/jbas5/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas5/</developerConnection> - <url>http://git.fedorahosted.org/git/?p=rhq/rhq.git;a=tree/jopr-embedded-paren...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/embjopr/trunk/jbas6/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/embjopr/trunk/jbas6/</developerConnection> + <url>http://git.fedorahosted.org/git/?p=rhq/rhq.git;a=tree/jopr-embedded-paren...</url> </scm> <properties> <warDir>${basedir}/target/${project.build.finalName}</warDir> <warFile>${warDir}.war</warFile> <contextRoot>admin-console</contextRoot> - <product.name>JBoss AS Admin Console</product.name> + <product.name>JBoss AS 6 Admin Console</product.name> </properties> <dependencies> @@ -38,7 +38,7 @@ </dependencies> <build> - <finalName>${jbas5.finalName}</finalName> + <finalName>${jbas6.finalName}</finalName> <plugins> <plugin> <artifactId>maven-dependency-plugin</artifactId> @@ -159,7 +159,7 @@ <id>dev</id> <properties> - <warDeployDir>${jbas5.configDir}/deploy/${project.build.finalName}.war</warDeployDir> + <warDeployDir>${jbas6.configDir}/deploy/${project.build.finalName}.war</warDeployDir> </properties> <build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-12 18:25:59 UTC (rev 932) +++ trunk/pom.xml 2010-05-13 17:41:45 UTC (rev 933) @@ -60,6 +60,7 @@ <properties> <jbas4.finalName>jbas4-admin-console</jbas4.finalName> <jbas5.finalName>jbas5-admin-console</jbas5.finalName> + <jbas6.finalName>jbas6-admin-console</jbas6.finalName>  <rhq.groupId>org.rhq</rhq.groupId> @@ -168,6 +169,7 @@ <module>core</module> <module>jbas4</module> <module>jbas5</module> + <module>jbas6</module>   </modules>

14 years, 7 months

1
0
0 / 0

EMBJOPR SVN: r932 - trunk/core.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2010-05-12 14:25:59 -0400 (Wed, 12 May 2010) New Revision: 932 Modified: trunk/core/pom.xml Log: explicitly add dep on richfaces-api:3.3.3.Final to avoid pulling in richfaces-api:3.3.2.GA via erroneous transitive dep from richfaces-ui:3.3.3.Final pom Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2010-04-27 14:19:03 UTC (rev 931) +++ trunk/core/pom.xml 2010-05-12 18:25:59 UTC (rev 932) @@ -65,6 +65,10 @@ <exclusions> <exclusion> <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> </exclusion> </exclusions> @@ -224,6 +228,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <version>${richfaces.version}</version> + </dependency> + + <dependency> + <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl-jsf2</artifactId> <version>${richfaces.version}</version> </dependency>

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits May 2010