Browse files

SWITCHYARD-1277 upgrade AS7 console to 1.5.1.Final

  • Loading branch information...
1 parent fe5ac3b commit 1e30409c783c80ce9b6a53518893eeff4cf88b3f @rcernich rcernich committed with kcbabo Mar 4, 2013
View
6 installer/scripts/installer.ant.xml
@@ -116,7 +116,7 @@
<condition property="sy.console.not.available">
<and>
<not>
- <available file="res/switchyard-console-application.war"/>
+ <available file="res/switchyard-console-application-resources.jar"/>
</not>
<isset property="installSYConsole"/>
</and>
@@ -248,7 +248,7 @@
</condition>
<condition property="switchyardConsoleAlreadyInstalled">
<or>
- <available file="switchyard-console-application.war" filepath="${INSTALL_PATH}/modules/org/jboss/as/console/main" />
+ <available file="switchyard-console-application-resources.jar" filepath="${INSTALL_PATH}/modules/org/jboss/as/console/main" />
<isset property="SKIP_CONSOLE"/>
</or>
</condition>
@@ -395,7 +395,7 @@
</target>
<target name="install-sy-console" if="installSYConsole" depends="request-sy-console-install, download-sy-console">
- <copy todir="${INSTALL_PATH}/modules/org/jboss/as/console/main" overwrite="true" file="res/switchyard-console-application.war"/>
+ <copy todir="${INSTALL_PATH}/modules/org/jboss/as/console/main" overwrite="true" file="res/switchyard-console-application-resources.jar"/>
<antcall target="transform-console-module" />
</target>
View
2 ...s7/extension/src/main/java/org/switchyard/as7/extension/SwitchYardSubsystemProviders.java
@@ -498,7 +498,7 @@ static ModelNode getSubsystemShowMetrics(Locale locale) {
op.get(REPLY_PROPERTIES, VALUE_TYPE, TOTAL_COUNT, TYPE).set(ModelType.INT);
op.get(REPLY_PROPERTIES, VALUE_TYPE, TOTAL_COUNT, DESCRIPTION).set(
bundle.getString("switchyard.show-metrics.reply.totalCount"));
- op.get(REPLY_PROPERTIES, VALUE_TYPE, AVERAGE_TIME, TYPE).set(ModelType.DOUBLE);
+ op.get(REPLY_PROPERTIES, VALUE_TYPE, AVERAGE_TIME, TYPE).set(ModelType.BIG_DECIMAL);
op.get(REPLY_PROPERTIES, VALUE_TYPE, AVERAGE_TIME, DESCRIPTION).set(
bundle.getString("switchyard.show-metrics.reply.averageTime"));
op.get(REPLY_PROPERTIES, VALUE_TYPE, MIN_TIME, TYPE).set(ModelType.INT);
View
3 ...as7/extension/src/main/java/org/switchyard/as7/extension/admin/ModelNodeCreationUtil.java
@@ -45,6 +45,7 @@
import static org.switchyard.as7.extension.SwitchYardModelConstants.URL;
import static org.switchyard.as7.extension.SwitchYardModelConstants.VALIDATORS;
+import java.math.BigDecimal;
import org.jboss.dmr.ModelNode;
import org.switchyard.admin.Application;
import org.switchyard.admin.Binding;
@@ -461,7 +462,7 @@ public static ModelNode addMetricsToNode(ModelNode node, MessageMetrics metrics)
node.get(SUCCESS_COUNT).set(metrics.getSuccessCount());
node.get(FAULT_COUNT).set(metrics.getFaultCount());
node.get(TOTAL_COUNT).set(metrics.getTotalCount());
- node.get(AVERAGE_TIME).set(metrics.getAverageProcessingTime());
+ node.get(AVERAGE_TIME).set(BigDecimal.valueOf(metrics.getAverageProcessingTime()));
node.get(MIN_TIME).set(metrics.getMinProcessingTime());
node.get(MAX_TIME).set(metrics.getMaxProcessingTime());
node.get(TOTAL_TIME).set(metrics.getTotalProcessingTime());
View
2 jboss-as7/modules/pom.xml
@@ -317,7 +317,7 @@
<dependency>
<groupId>org.switchyard.console</groupId>
<artifactId>switchyard-console-application</artifactId>
- <type>war</type>
+ <classifier>resources</classifier>
</dependency>
<!--
H2Database...
View
4 jboss-as7/modules/src/main/resources/switchyard/console/assembly-component.xml
@@ -23,10 +23,10 @@
<dependencySet>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
- <include>org.switchyard.console:switchyard-console-application</include>
+ <include>org.switchyard.console:switchyard-console-application:jar:resources</include>
</includes>
<outputDirectory>/modules/org/jboss/as/console/main</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}
</outputFileNameMapping>
</dependencySet>
</dependencySets>
View
2 jboss-as7/standalone/bundle/xsl/console_module.xsl
@@ -39,7 +39,7 @@
<xsl:template match="node()[name(.)='resources']">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
- <resource-root path="switchyard-console-application.war"/>
+ <resource-root path="switchyard-console-application-resources.jar"/>
</xsl:copy>
</xsl:template>
View
2 tools/dist/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.switchyard.console</groupId>
<artifactId>switchyard-console-application</artifactId>
- <type>war</type>
+ <classifier>resources</classifier>
</dependency>
<dependency>
<groupId>org.riftsaw.console</groupId>

0 comments on commit 1e30409

Please sign in to comment.