EMBJOPR SVN: r60 - in trunk: jbas5 and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-25 18:28:30 -0500 (Tue, 25 Nov 2008)
New Revision: 60
Modified:
trunk/jbas4/pom.xml
trunk/jbas5/pom.xml
Log:
fix bug in dev profile's 'clean' phase execution
Modified: trunk/jbas4/pom.xml
===================================================================
--- trunk/jbas4/pom.xml 2008-11-24 23:36:40 UTC (rev 59)
+++ trunk/jbas4/pom.xml 2008-11-25 23:28:30 UTC (rev 60)
@@ -188,7 +188,7 @@
<phase>clean</phase>
<configuration>
<tasks>
- <property name="deployment.dir" location="${warDir}" />
+ <property name="deployment.dir" location="${warDeployDir}" />
<echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
<delete dir="${deployment.dir}" />
</tasks>
Modified: trunk/jbas5/pom.xml
===================================================================
--- trunk/jbas5/pom.xml 2008-11-24 23:36:40 UTC (rev 59)
+++ trunk/jbas5/pom.xml 2008-11-25 23:28:30 UTC (rev 60)
@@ -171,7 +171,7 @@
<phase>clean</phase>
<configuration>
<tasks>
- <property name="deployment.dir" location="${warDir}" />
+ <property name="deployment.dir" location="${warDeployDir}" />
<echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
<delete dir="${deployment.dir}" />
</tasks>
15 years, 5 months
- 1
- 0
EMBJOPR SVN: r59 - trunk/core/src/main/java/org/jboss/on/embedded/ui/nav.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-24 18:36:40 -0500 (Mon, 24 Nov 2008)
New Revision: 59
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/NonSingletonResourceTypeTreeNode.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SingletonResourceTypeTreeNode.java
Log:
pluralize names of ResourceTypeTreeNodes
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/NonSingletonResourceTypeTreeNode.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/NonSingletonResourceTypeTreeNode.java 2008-11-24 01:43:08 UTC (rev 58)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/NonSingletonResourceTypeTreeNode.java 2008-11-24 23:36:40 UTC (rev 59)
@@ -67,10 +67,19 @@
public String getName()
{
- return getResourceType().getName();
+ return pluralize(getResourceType().getName());
}
-
- public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) {
+
+ public SummaryActionOutcome getSummaryActionOutcome(SummaryAction action) {
return action.new NonSingletonResourceTypeOutcome(getResourceType(), getParentResource());
}
+
+ private static String pluralize(String noun) {
+ if (noun.endsWith("y"))
+ return noun.substring(0, noun.length() - 1) + "ies";
+ else if (noun.endsWith("s"))
+ return noun;
+ else
+ return noun + "s";
+ }
}
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SingletonResourceTypeTreeNode.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SingletonResourceTypeTreeNode.java 2008-11-24 01:43:08 UTC (rev 58)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/nav/SingletonResourceTypeTreeNode.java 2008-11-24 23:36:40 UTC (rev 59)
@@ -21,14 +21,10 @@
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
-import org.jboss.on.embedded.manager.ResourceManager;
-import org.jboss.on.embedded.manager.ResourceManagerFactory;
+
import org.jboss.on.embedded.ui.SummaryAction;
-import org.jboss.on.embedded.ui.SummaryAction.ResourceOutcome;
import org.jboss.on.embedded.ui.SummaryAction.SummaryActionOutcome;
-import java.util.Set;
-
/**
* Class representing a node in the nav tree which holds a resource type
* which is a singleton.
@@ -44,7 +40,8 @@
{
private Resource singletonInstance;
- public SingletonResourceTypeTreeNode(String key, ResourceType type, Resource singletonInstance, Resource parentResource)
+ public SingletonResourceTypeTreeNode(String key, ResourceType type, Resource singletonInstance,
+ Resource parentResource)
{
super(key, type, parentResource);
this.singletonInstance = singletonInstance;
15 years, 5 months
- 1
- 0
EMBJOPR SVN: r58 - in trunk: core and 19 other directories.
by embjopr-commits＠lists.jboss.org
Author: stan.silvert(a)jboss.com
Date: 2008-11-23 20:43:08 -0500 (Sun, 23 Nov 2008)
New Revision: 58
Added:
trunk/jsfunit/
trunk/jsfunit/pom.xml
trunk/jsfunit/src/
trunk/jsfunit/src/main/
trunk/jsfunit/src/main/webapp/
trunk/jsfunit/src/main/webapp/META-INF/
trunk/jsfunit/src/main/webapp/META-INF/jboss-structure.xml
trunk/jsfunit/src/main/webapp/WEB-INF/
trunk/jsfunit/src/main/webapp/WEB-INF/web.xml
trunk/jsfunit/src/test/
trunk/jsfunit/src/test/java/
trunk/jsfunit/src/test/java/org/
trunk/jsfunit/src/test/java/org/jboss/
trunk/jsfunit/src/test/java/org/jboss/jopr/
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/JoprLoginStrategy.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/SimpleConfirmHandler.java
trunk/jsfunit/testdata/
trunk/jsfunit/testdata/war/
trunk/jsfunit/testdata/war/hellothere.war
Modified:
trunk/core/
trunk/core/src/main/webapp/include/resourceNavigation.xhtml
trunk/core/src/main/webapp/login.xhtml
trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml
trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml
trunk/jbas4/
trunk/jbas5/
trunk/pom.xml
Log:
JBAS-6200 Integration test framework for admin-console with AS4 and AS5
Property changes on: trunk/core
___________________________________________________________________
Name: svn:ignore
+ target
Modified: trunk/core/src/main/webapp/include/resourceNavigation.xhtml
===================================================================
--- trunk/core/src/main/webapp/include/resourceNavigation.xhtml 2008-11-21 17:51:29 UTC (rev 57)
+++ trunk/core/src/main/webapp/include/resourceNavigation.xhtml 2008-11-24 01:43:08 UTC (rev 58)
@@ -34,9 +34,10 @@
<body>
<ui:composition>
<div id="sidebar-left">
- <h:form rendered="#{s:hasRole('JBossAdmin')}">
+ <h:form id="navTreeForm" rendered="#{s:hasRole('JBossAdmin')}">
<rich:tree switchType="ajax"
+ id="navTree"
value="#{rootNode}"
var="item"
nodeFace="#{item.class.name}"
@@ -50,10 +51,12 @@
style="width: 300px;">
<!-- NODE: resourceInstance summary home node -->
<rich:treeNode type="org.jboss.on.embedded.ui.nav.PlatformResourceTreeNode"
+ id="homeNode"
icon="/images/iconHome#{navigationAction.getAvailableStatus(item.resource).equals('UNKNOWN') ? 'Unkn' : navigationAction.getAvailableStatus(item.resource).equals('DOWN') ? 'Disa' : 'Norm'}.gif"
iconLeaf="/images/iconLeaf#{navigationAction.getAvailableStatus(item.resource).equals('UNKNOWN') ? 'Unkn' : navigationAction.getAvailableStatus(item.resource).equals('DOWN') ? 'Disa' : 'Norm'}.gif">
<!--a-->
<s:link view="/secure/summary.xhtml" propagation="end"
+ id="homeLink"
styleClass="#{navigationAction.getAvailableStatus(item.resource).equals('DOWN') ? 'rich-tree-node-unavailable' : ''} #{navigationAction.equalsSelectedNode(item) ? 'rich-tree-node-selected' : '' }">
#{item.name}
<!--
@@ -65,10 +68,12 @@
</rich:treeNode>
<!-- NODE: resourceInstanceSummary node or leaf-->
<rich:treeNode type="org.jboss.on.embedded.ui.nav.ResourceTreeNode"
+ id="instanceNodeOrLeaf"
iconLeaf="/images/iconLeaf#{navigationAction.getAvailableStatus(item.resource).equals('UNKNOWN') ? 'Unkn' : navigationAction.getAvailableStatus(item.resource).equals('DOWN') ? 'Disa' : 'Norm'}.gif"
icon="/images/iconLeaf#{navigationAction.getAvailableStatus(item.resource).equals('UNKNOWN') ? 'Unkn' : navigationAction.getAvailableStatus(item.resource).equals('DOWN') ? 'Disa' : 'Norm'}.gif">
<!--b-->
<s:link view="/secure/summary.xhtml" propagation="end"
+ id="instanceNodeOrLeafLink"
styleClass="#{navigationAction.getAvailableStatus(item.resource).equals('DOWN') ? 'rich-tree-node-unavailable' : ''} #{navigationAction.equalsSelectedNode(item) ? 'rich-tree-node-selected' : '' }">
#{item.name}
<f:param name="path" value="#{item.path}"/>
@@ -76,10 +81,12 @@
</rich:treeNode>
<!-- NODE: resourceInstanceSummary leaf -->
<rich:treeNode type="org.jboss.on.embedded.ui.nav.SingletonResourceTypeTreeNode"
+ id="instanceLeaf"
iconLeaf="/images/iconLeaf#{navigationAction.getAvailableStatus(item.resource).equals('UNKNOWN') ? 'Unkn' : navigationAction.getAvailableStatus(item.resource).equals('DOWN') ? 'Disa' : 'Norm'}.gif"
icon="/images/iconLeaf#{navigationAction.getAvailableStatus(item.resource).equals('UNKNOWN') ? 'Unkn' : navigationAction.getAvailableStatus(item.resource).equals('DOWN') ? 'Disa' : 'Norm'}.gif">
<!--c-->
<s:link view="/secure/summary.xhtml" propagation="end"
+ id="instanceLeafLink"
styleClass="#{navigationAction.getAvailableStatus(item.resource).equals('DOWN') ? 'rich-tree-node-unavailable' : ''} #{navigationAction.equalsSelectedNode(item) ? 'rich-tree-node-selected' : '' }">
#{item.name}
<f:param name="path" value="#{item.path}"/>
@@ -87,10 +94,12 @@
</rich:treeNode>
<!-- NODE: resourceTypeSummary -->
<rich:treeNode type="org.jboss.on.embedded.ui.nav.NonSingletonResourceTypeTreeNode"
+ id="typeSummary"
iconLeaf="/images/iconFolderNorm.gif"
icon="/images/iconFolderNorm.gif">
<!--d-->
<s:link view="/secure/summary.xhtml" propagation="end"
+ id="typeSummaryLink"
styleClass="#{navigationAction.equalsSelectedNode(item) ? 'rich-tree-node-selected' : 'false_D'}">
#{item.name}
<f:param name="path" value="#{item.path}"/>
@@ -98,10 +107,12 @@
</rich:treeNode>
<!-- NODE: categorySummary or repeatNav -->
<rich:treeNode type="org.jboss.on.embedded.ui.nav.SubCategoryTreeNode"
+ id="categorySummary"
iconLeaf="/images/iconFolderNorm.gif"
icon="/images/iconFolderNorm.gif">
<!--e-->
<s:link view="/secure/summary.xhtml" propagation="end"
+ id="categorySummaryLink"
styleClass="#{navigationAction.equalsSelectedNode(item) ? 'rich-tree-node-selected' : 'false_E'}">
#{item.name}
<f:param name="path" value="#{item.path}"/>
Modified: trunk/core/src/main/webapp/login.xhtml
===================================================================
--- trunk/core/src/main/webapp/login.xhtml 2008-11-21 17:51:29 UTC (rev 57)
+++ trunk/core/src/main/webapp/login.xhtml 2008-11-24 01:43:08 UTC (rev 58)
@@ -54,7 +54,7 @@
<h:inputText id="name" value="#{identity.username}"/></div>
<div style="padding-top: 10px;"><h:outputLabel for="password" value="#{messages['security.password']}"/><br/>
<h:inputSecret id="password" value="#{identity.password}"/></div>
- <div style="padding-top: 10px;"><h:commandButton value="#{messages['security.login']}"
+ <div style="padding-top: 10px;"><h:commandButton value="#{messages['security.login']}" id="submit"
action="#{identity.login()}" styleClass="buttonmed"/>
</div>
</h:form>
Modified: trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml 2008-11-21 17:51:29 UTC (rev 57)
+++ trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml 2008-11-24 01:43:08 UTC (rev 58)
@@ -39,7 +39,7 @@
#{messages['content.resourceInstance.create']}
</div>
<hr/>
- <h:form enctype="multipart/form-data">
+ <h:form id="createContentForm" enctype="multipart/form-data">
<h:panelGrid styleClass="formstyle">
<s:fileUpload id="file"
data="#{createContentBackedResourceAction.file}"
@@ -54,9 +54,11 @@
rendered="#{configurationDefinition ne null}"/>
<h:panelGrid columns="2" cellspacing="9">
<h:commandButton value="#{messages['resource.add.button.continue']}"
+ id="addButton"
action="#{createContentBackedResourceAction.createContentBackedResource()}"
styleClass="buttonmed"/>
<s:button value="#{messages['resource.add.button.cancel']}"
+ id="cancelButton"
view="/secure/summary.xhtml"
propagation="end"
styleClass="buttonmed"/>
Modified: trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml 2008-11-21 17:51:29 UTC (rev 57)
+++ trunk/core/src/main/webapp/secure/resourceTypeSummary.xhtml 2008-11-24 01:43:08 UTC (rev 58)
@@ -51,21 +51,23 @@
#{resourceType.description}
</div>
<div class="actionHeader">
- <h:form rendered="#{resourceType.creatable}" style="text-align: right;">
+ <h:form id="actionHeaderForm" rendered="#{resourceType.creatable}" style="text-align: right;">
<s:button rendered="#{resourceType.creationDataType ne 'CONTENT'}"
+ id="addNewNotContent"
action="#{templateDropDownPopulator.getTemplateDropDownEntriesByResourceType()}"
value="#{messages['summary.resourceType.addNew']}" styleClass="buttonmed">
<f:param name="selectedResourceTypeName" value="#{resourceType.name}"/>
</s:button>
<s:button rendered="#{resourceType.creationDataType eq 'CONTENT'}"
+ id="addNewContent"
action="#{createContentBackedResourceAction.init()}"
value="#{messages['summary.resourceType.addNew']}" styleClass="buttonmed"/>
</h:form>
<h:outputLabel rendered="#{!resourceType.creatable}"
value="#{messages['resourcetype.no.action']}"/>
</div>
- <h:form>
+ <h:form id="resourceSummaryForm">
<!-- TODO: need to add checkboxes and addNew / Delete actions -->
<rich:dataTable
id="dataTable"
@@ -90,7 +92,7 @@
</f:facet>
<rich:column>
<!-- TODO: style should be either link-avilable or link-unavailable -->
- <s:link
+ <s:link id="resourceName"
value="#{resourceItem.name}"
view="/secure/summary.xhtml"
styleClass="link-available">
@@ -100,11 +102,12 @@
</rich:column>
<!-- TODO: need to figure out what other columns to add that are specific to this resourceType -->
<rich:column>
- <h:outputText value="#{resourceItem.availability}"/>
+ <h:outputText id="availability" value="#{resourceItem.availability}"/>
</rich:column>
<rich:column>
<ui:param name="confirmDeleteMessage" value="#{messages['summary.resourceType.confirmDelete']}"/>
- <s:button action="#{resourceCRUDAction.removeResourceAction()}" value="Delete"
+ <s:button id="removeButton"
+ action="#{resourceCRUDAction.removeResourceAction()}" value="Delete"
onclick="if (!confirm('#{confirmDeleteMessage}')) return false"
rendered="#{resourceItem.resource.resourceType.deletable}"
styleClass="buttonsmall">
Property changes on: trunk/jbas4
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: trunk/jbas5
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: trunk/jsfunit
___________________________________________________________________
Name: svn:ignore
+ target
Added: trunk/jsfunit/pom.xml
===================================================================
--- trunk/jsfunit/pom.xml (rev 0)
+++ trunk/jsfunit/pom.xml 2008-11-24 01:43:08 UTC (rev 58)
@@ -0,0 +1,266 @@
+<?xml version="1.0"?>
+<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>
+ <parent>
+ <groupId>org.jboss.jopr</groupId>
+ <artifactId>jopr-embedded-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.jopr</groupId>
+ <artifactId>jopr-embedded-jsfunit</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>JSFUnit Tests for Embedded Admin Console</name>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>codehaus snapshot repository</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jsfunit</groupId>
+ <artifactId>jboss-jsfunit-core</artifactId>
+ <version>1.0.0.GA-SNAPSHOT</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jsfunit</groupId>
+ <artifactId>jboss-jsfunit-richfaces</artifactId>
+ <version>1.0.0.GA-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ <version>5.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>provided</scope>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>provided</scope>
+ <version>2.8.1</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>jboss4.2</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jopr</groupId>
+ <artifactId>jopr-embedded-jbas4</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <wait>false</wait>
+ <container>
+ <containerId>jboss42x</containerId>
+ <home>${JBOSS_HOME}</home>
+ <log>${basedir}/target/jboss4.2.logs/cargo.log</log>
+ <timeout>300000</timeout> <!-- 5 minutes -->
+ <systemProperties>
+ <!-- snoops request and response from client side
+ result is in server.log
+ <jsfunit.htmlunitsnooper>enabled</jsfunit.htmlunitsnooper> -->
+ <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata>
+ </systemProperties>
+ </container>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <systemProperties>
+ <property>
+ <name>cactus.contextURL</name>
+ <value>http://localhost:8080/${project.build.finalName}</value>
+ </property>
+ <property>
+ <name>cactus.servletRedirectorName</name>
+ <value>ServletRedirector.jsfunit</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jboss5x</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jopr</groupId>
+ <artifactId>jopr-embedded-jbas5</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <configuration>
+ <wait>false</wait>
+ <container>
+ <containerId>jboss5x</containerId>
+ <home>${JBOSS_HOME}</home>
+ <log>${basedir}/target/jboss5.x.logs/cargo.log</log>
+ <timeout>300000</timeout> <!-- 5 minutes -->
+ <systemProperties>
+ <jboss.server.log.threshold>INFO</jboss.server.log.threshold>
+ <!-- Snoops request and response from client side. Result is in server.log
+ <jsfunit.htmlunitsnooper>enabled</jsfunit.htmlunitsnooper> -->
+ <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata>
+ </systemProperties>
+ </container>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <systemProperties>
+ <property>
+ <name>cactus.contextURL</name>
+ <value>http://localhost:8080/${project.build.finalName}</value>
+ </property>
+ <property>
+ <name>cactus.servletRedirectorName</name>
+ <value>ServletRedirector.jsfunit</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <build>
+ <sourceDirectory>src/test/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <finalName>admin-console-jsfunit</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <useCache>false</useCache>
+ <archive>
+ <manifest>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ <dependentWarIncludes>**,**/jboss-structure.xml</dependentWarIncludes>
+ </configuration>
+ </plugin>
+ <!-- Only run the tests if you set one of the profiles above -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: trunk/jsfunit/src/main/webapp/META-INF/jboss-structure.xml
===================================================================
--- trunk/jsfunit/src/main/webapp/META-INF/jboss-structure.xml (rev 0)
+++ trunk/jsfunit/src/main/webapp/META-INF/jboss-structure.xml 2008-11-24 01:43:08 UTC (rev 58)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Fix for EMBJOPR-21: ignore the EJB3 related metadata -->
+<structure>
+ <context>
+ <path name=""/>
+ <metaDataPath>
+ <path name="WEB-INF"/>
+ </metaDataPath>
+ <classpath>
+ <path name="WEB-INF/classes"/>
+ <path name="WEB-INF/lib" suffixes=".jar"/>
+ </classpath>
+ </context>
+</structure>
Added: trunk/jsfunit/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/jsfunit/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/jsfunit/src/main/webapp/WEB-INF/web.xml 2008-11-24 01:43:08 UTC (rev 58)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Embedded Jopr Project
+ ~ Copyright (C) 2006-2008 Red Hat, Inc.
+ ~ All rights reserved.
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this program; if not, write to the Free Software
+ ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ -->
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <!-- RichFaces -->
+
+ <!-- From Seam docs: If RichFaces is used in your project, Seam will install
+ the RichFaces Ajax filter for you, making sure to install it before all
+ other built-in filters. You don't need to install the RichFaces Ajax
+ filter in web.xml yourself. -->
+
+ <context-param>
+ <param-name>org.richfaces.SKIN</param-name>
+ <param-value>jboss-console</param-value>
+ </context-param>
+
+ <!-- JSFUnit -->
+ <filter>
+ <filter-name>JSFUnitFilter</filter-name>
+ <filter-class>org.jboss.jsfunit.framework.JSFUnitFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>JSFUnitFilter</filter-name>
+ <servlet-name>ServletTestRunner</servlet-name>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>JSFUnitFilter</filter-name>
+ <servlet-name>ServletRedirector</servlet-name>
+ </filter-mapping>
+
+ <servlet>
+ <servlet-name>ServletRedirector</servlet-name>
+ <servlet-class>org.jboss.jsfunit.framework.JSFUnitServletRedirector</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>ServletTestRunner</servlet-name>
+ <servlet-class>org.apache.cactus.server.runner.ServletTestRunner</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ServletRedirector</servlet-name>
+ <url-pattern>/ServletRedirector.jsfunit</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ServletTestRunner</servlet-name>
+ <url-pattern>/ServletTestRunner</url-pattern>
+ </servlet-mapping>
+
+
+ <!-- Seam -->
+
+ <listener>
+ <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ </listener>
+
+
+
+
+ <!-- From Seam docs: The Seam master filter must be the first filter specified
+ in web.xml. This ensures it is run first. -->
+ <filter>
+ <filter-name>Seam Filter</filter-name>
+ <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>Seam Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <!-- JSF -->
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.seam</url-pattern>
+ </servlet-mapping>
+
+ <context-param>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>/WEB-INF/navigation.xml</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>client</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <!-- JSF RI -->
+
+ <listener>
+ <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ </listener>
+
+ <!-- Facelets -->
+
+ <!-- load our Facelets taglibs (value must be semicolon-delimited) -->
+ <context-param>
+ <param-name>facelets.LIBRARIES</param-name>
+ <param-value>/WEB-INF/on.component.taglib.xml</param-value>
+ </context-param>
+
+ <!-- enable special debug output for development -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <!--<security-constraint>-->
+ <!--<web-resource-collection>-->
+ <!--<web-resource-name>HtmlAdaptor</web-resource-name>-->
+ <!--<description> An example security config that only allows users with-->
+ <!--the role JBossAdmin to access the embedded console web-->
+ <!--application </description>-->
+ <!--<url-pattern>/*</url-pattern>-->
+ <!--<http-method>GET</http-method>-->
+ <!--<http-method>POST</http-method>-->
+ <!--</web-resource-collection>-->
+ <!--<auth-constraint>-->
+ <!--<role-name>JBossAdmin</role-name>-->
+ <!--</auth-constraint>-->
+ <!--</security-constraint>-->
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBoss embedded Console</realm-name>
+ </login-config>
+ <security-role>
+ <role-name>JBossAdmin</role-name>
+ </security-role>
+
+
+</web-app>
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java 2008-11-24 01:43:08 UTC (rev 58)
@@ -0,0 +1,233 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jopr.jsfunit;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
+import com.gargoylesoftware.htmlunit.html.HtmlButtonInput;
+import com.gargoylesoftware.htmlunit.html.HtmlFileInput;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.servlet.http.HttpServletRequest;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.cactus.ServletTestCase;
+import org.jboss.jsfunit.framework.WebClientSpec;
+import org.jboss.jsfunit.jsfsession.JSFClientSession;
+import org.jboss.jsfunit.jsfsession.JSFServerSession;
+import org.jboss.jsfunit.jsfsession.JSFSession;
+import org.jboss.mx.util.MBeanServerLocator;
+
+/**
+ * Sample for testing Embedded Jopr. Here I present a fairly complex test
+ * case to show some of the things that JSFUnit can do.
+ *
+ * @author Stan Silvert
+ */
+public class HelloJoprTest extends ServletTestCase
+{
+ private boolean isJBoss4;
+
+ private JSFClientSession client;
+ private JSFServerSession server;
+
+ /**
+ * Start a JSFUnit session by logging in to the main page. Note that
+ * because setUp() is called before each test, a new HttpSession will be
+ * created each time a test is run.
+ */
+ public void setUp() throws IOException
+ {
+ isJBoss4 = Package.getPackage("org.jboss.system.server")
+ .getImplementationVersion()
+ .startsWith("4");
+
+ // Initial JSF request
+ WebClientSpec wcSpec = new WebClientSpec("/");
+
+ // This is temporary because embedded Jopr can't find /js/rhq.js
+ wcSpec.getWebClient().setThrowExceptionOnFailingStatusCode(false);
+
+ // Always press OK for confirm dialogs
+ wcSpec.getWebClient().setConfirmHandler(new SimpleConfirmHandler(true));
+
+ wcSpec.setInitialRequestStrategy(new JoprLoginStrategy()); // logs in
+
+ JSFSession jsfSession = new JSFSession(wcSpec);
+ this.client = jsfSession.getJSFClientSession();
+ this.server = jsfSession.getJSFServerSession();
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( HelloJoprTest.class );
+ }
+
+ public void testDeployWAR() throws IOException
+ {
+ // click the nave tree
+ HtmlAnchor warLink = getNavTreeLink("Web Application (WAR)");
+ warLink.click();
+
+ // click on the "Add new resource" button
+ client.click("actionHeaderForm:addNewContent"); // 404 if setThrowExceptionOnFailingStatusCode(true) above
+
+ // upload hellothere.war
+ HtmlFileInput fileInput = (HtmlFileInput)client.getElement("createContentForm:file");
+ fileInput.setContentType("application/war");
+ fileInput.setValueAttribute(System.getProperty("jsfunit.testdata") + "/war/hellothere.war");
+ client.click("createContentForm:addButton");
+
+ // assert that the success message appeared on the client side
+ assertTrue(client.getPageAsText().contains("hellothere.war created successfully"));
+
+ // assert text and sevrity level for FacesMessage on server side
+ assertTrue(server.getFacesMessages().hasNext());
+ FacesMessage successMessage = server.getFacesMessages().next();
+ assertTrue(FacesMessage.SEVERITY_INFO.equals(successMessage.getSeverity()));
+ assertTrue(successMessage.getDetail().contains("hellothere.war created successfully"));
+
+ // Use JMX to assert that the WAR really did deploy successfully
+ assertTrue(isWarDeployed("hellothere.war"));
+
+ // use HtmlUnit to test the newly deployed war in a new WebClient session
+ // note that I have full access to the FacesContext and the previous request
+ HttpServletRequest request = (HttpServletRequest)FacesContext.getCurrentInstance().getExternalContext().getRequest();
+ int port = request.getLocalPort();
+ WebClient webClient = new WebClient();
+ HtmlPage page = (HtmlPage)webClient.getPage("http://localhost:" + port + "/hellothere/hello.jsp");
+ assertTrue(page.asText().contains("HELLO WORLD"));
+
+ // Undeploy the WAR
+ HtmlButtonInput deleteButton = getDeleteButton("hellothere.war");
+ deleteButton.click();
+
+ // This assert doesn't work. jopr does remove the WAR, but for some
+ // reason, JBoss doesn't undeploy the MBeans
+ //assertFalse(isWarDeployed("hellothere.war"));
+ }
+
+ private boolean isWarDeployed(String warName)
+ {
+ if (isJBoss4)
+ {
+ return checkWarDeployment_4_2(warName);
+ }
+ else
+ {
+ return checkWarDeployment_5_0(warName);
+ }
+ }
+
+ // Query the MBean server to find if WAR is deployed
+ private boolean checkWarDeployment_4_2(String warName)
+ {
+ try {
+ MBeanServer jmxServer = MBeanServerLocator.locateJBoss();
+ ObjectName objName = new ObjectName("jboss.web.deployment:war=" + warName + ",*");
+ Set mBeans = jmxServer.queryNames(objName, null);
+ if (mBeans.size() != 1) return false;
+ ObjectName deploymentMBean = (ObjectName)mBeans.iterator().next();
+ String state = (String)jmxServer.getAttribute(deploymentMBean, "StateString");
+ return "Started".equals(state);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ // Query the MBean server to find if WAR is deployed
+ private boolean checkWarDeployment_5_0(String warName)
+ {
+ if (warName.endsWith(".war"))
+ {
+ warName = warName.substring(0, warName.lastIndexOf(".war"));
+ }
+ else
+ {
+ warName = warName.substring(0, warName.lastIndexOf(".WAR"));
+ }
+
+ try {
+ MBeanServer jmxServer = MBeanServerLocator.locateJBoss();
+ ObjectName objName = new ObjectName("jboss.deployment:id=\"jboss.web.deployment:war=/" + warName + "\",*");
+ Set mBeans = jmxServer.queryNames(objName, null);
+ if (mBeans.size() != 1) return false;
+ ObjectName deploymentMBean = (ObjectName)mBeans.iterator().next();
+
+ // returns org.jboss.deployers.spi.DeploymentState
+ Object state = jmxServer.getAttribute(deploymentMBean, "State");
+ return "DEPLOYED".equals(state.toString());
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ // need a standard JSFUnit API to replace this code
+ private HtmlAnchor getNavTreeLink(String linkLabel)
+ {
+ return getLinkInsideForm("navTreeForm", linkLabel);
+ }
+
+ private HtmlButtonInput getDeleteButton(String resourceName)
+ {
+ HtmlAnchor link = getLinkInsideForm("resourceSummaryForm", resourceName);
+ // The id will look like "resourceSummaryForm:dataTable:2:resourceName"
+ // I need the row number. (2 in the above example)
+ String id = link.getIdAttribute();
+ String[] idElements = id.split(":");
+ String row = idElements[idElements.length - 2];
+ return (HtmlButtonInput)client.getElement(row + ":removeButton");
+ }
+
+ // finds a <a> tag inside a form that has a particular label
+ private HtmlAnchor getLinkInsideForm(String formId, String linkLabel)
+ {
+ HtmlForm form = (HtmlForm)client.getElement(formId);
+ List links = form.getByXPath(".//a"); // get all <a> tags inside form
+
+ for (Iterator i = links.iterator(); i.hasNext();)
+ {
+ HtmlAnchor link = (HtmlAnchor)i.next();
+ String linkText = link.getTextContent();
+ if (linkText.contains(linkLabel)) return link;
+ }
+
+ throw new IllegalStateException("Nav Tree link for '" + linkLabel + "' not found.");
+ }
+
+}
\ No newline at end of file
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/JoprLoginStrategy.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/JoprLoginStrategy.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/JoprLoginStrategy.java 2008-11-24 01:43:08 UTC (rev 58)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jopr.jsfunit;
+
+import org.jboss.jsfunit.framework.FormAuthenticationStrategy;
+
+/**
+ * This automatically logs in to the app when the challenge form is presented.
+ *
+ * @author Stan Silvert
+ */
+public class JoprLoginStrategy extends FormAuthenticationStrategy
+{
+
+ /**
+ * Create a new JoprLoginStrategy with default username/password.
+ */
+ public JoprLoginStrategy()
+ {
+ this("admin", "admin");
+ }
+
+ /**
+ * Create a new JoprLoginStrategy.
+ *
+ * @param userName The user name.
+ * @param password The password.
+ */
+ public JoprLoginStrategy(String userName, String password)
+ {
+ super(userName, password, "login_form:submit", "login_form:name", "login_form:password");
+ }
+
+}
Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/SimpleConfirmHandler.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/SimpleConfirmHandler.java (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/SimpleConfirmHandler.java 2008-11-24 01:43:08 UTC (rev 58)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jopr.jsfunit;
+
+import com.gargoylesoftware.htmlunit.ConfirmHandler;
+import com.gargoylesoftware.htmlunit.Page;
+
+/**
+ * Simple ConfirmHandler to always reply with OK or Cancel for window.confirm()
+ * dialogs.
+ *
+ * @author Stan Silvert
+ */
+public class SimpleConfirmHandler implements ConfirmHandler
+{
+
+ private boolean cannedResponse;
+
+ /**
+ * Create a new SimpleConfirmHandler.
+ *
+ * @param cannedResponse <code>true</code> to always click OK, <code>false</code>
+ * to always click Cancel.
+ */
+ public SimpleConfirmHandler(boolean cannedResponse)
+ {
+ this.cannedResponse = cannedResponse;
+ }
+
+ public boolean handleConfirm(Page page, String message) {
+ return cannedResponse;
+ }
+
+}
\ No newline at end of file
Added: trunk/jsfunit/testdata/war/hellothere.war
===================================================================
(Binary files differ)
Property changes on: trunk/jsfunit/testdata/war/hellothere.war
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-11-21 17:51:29 UTC (rev 57)
+++ trunk/pom.xml 2008-11-24 01:43:08 UTC (rev 58)
@@ -103,6 +103,7 @@
<module>core</module>
<module>jbas4</module>
<module>jbas5</module>
+ <module>jsfunit</module>
</modules>
<repositories>
15 years, 5 months
- 1
- 0
EMBJOPR SVN: r56 - trunk/core/src/main/webapp/secure.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-21 12:20:07 -0500 (Fri, 21 Nov 2008)
New Revision: 56
Modified:
trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml
Log:
fix page heading
Modified: trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml 2008-11-20 20:26:39 UTC (rev 55)
+++ trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml 2008-11-21 17:20:07 UTC (rev 56)
@@ -54,7 +54,7 @@
<h1>#{messages['resource.edit.title']}</h1>
</h:panelGroup>
<h:panelGroup rendered="#{resourceConfigurationUIBean.actionType eq 'CREATE'}">
- <h1>#{messages['resource.add.pageTitle']}</h1>
+ <h1>#{messages['resource.add.pageTitlePrefix']} #{resource.resource.resourceType.name}</h1>
</h:panelGroup>
<h:panelGroup rendered="#{resourceConfigurationUIBean.configuration eq null}">
15 years, 5 months
- 1
- 0
EMBJOPR SVN: r55 - trunk/jbas5/etc.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-20 15:26:39 -0500 (Thu, 20 Nov 2008)
New Revision: 55
Added:
trunk/jbas5/etc/destinations-service.xml
Modified:
trunk/jbas5/etc/run.bat
Log:
a bunch of example topics and queues for testing purposes
Added: trunk/jbas5/etc/destinations-service.xml
===================================================================
--- trunk/jbas5/etc/destinations-service.xml (rev 0)
+++ trunk/jbas5/etc/destinations-service.xml 2008-11-20 20:26:39 UTC (rev 55)
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Messaging Destinations deployment descriptor.
+
+ $Id$
+ -->
+
+<server>
+
+ <!--
+ The Default Dead Letter Queue. This destination is a dependency of an EJB MDB container.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=DLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ The Default Expiry Queue.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!--
+ Example destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=securedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="publisher" read="true" write="true" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDurableTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="durpublisher" read="true" write="true" create="true"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="SecurityConfig">
+ <security>
+ <role name="guest" read="true" write="true"/>
+ <role name="publisher" read="true" write="true" create="false"/>
+ <role name="noacc" read="false" write="false" create="false"/>
+ </security>
+ </attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=A"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=B"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=C"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=D"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=ex"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <!-- It's possible for indiviual queues and topics to use a specific queue for
+ an expiry or DLQ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateDLQ"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnDLQAndExpiryQueue"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="DLQ">jboss.messaging.destination:service=Queue,name=PrivateDLQ</attribute>
+ <attribute name="ExpiryQueue">jboss.messaging.destination:service=Queue,name=PrivateExpiryQueue</attribute>
+ </mbean>
+
+ <!-- Queues and Topics can also specify their own redelivery delay -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=QueueWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=TopicWithOwnRedeliveryDelay"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="RedeliveryDelay">5000</attribute>
+ </mbean>
+
+ <!--
+ Example clustered destinations.
+ -->
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=testDistributedQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=testDistributedTopic"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ <attribute name="Clustered">true</attribute>
+ </mbean>
+
+</server>
\ No newline at end of file
Property changes on: trunk/jbas5/etc/destinations-service.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Modified: trunk/jbas5/etc/run.bat
===================================================================
--- trunk/jbas5/etc/run.bat 2008-11-14 23:46:30 UTC (rev 54)
+++ trunk/jbas5/etc/run.bat 2008-11-20 20:26:39 UTC (rev 55)
@@ -110,7 +110,7 @@
set JAVA_OPTS=%JAVA_OPTS% -Djboss.platform.mbeanserver -Djbmancon.debug=true
rem JVM memory allocation pool parameters. Modify as appropriate.
-set JAVA_OPTS=%JAVA_OPTS% -Xms100M -Xmx200M -XX:PermSize=100M -XX:MaxPermSize=200M
+set JAVA_OPTS=%JAVA_OPTS% -Xms125M -Xmx250M -XX:PermSize=75M -XX:MaxPermSize=150M
rem Warn when resolving remote XML dtd/schemas
set JAVA_OPTS=%JAVA_OPTS% -Dorg.jboss.resolver.warning=true
15 years, 5 months
- 1
- 0
EMBJOPR SVN: r54 - in trunk: core/src/main/java/org/jboss/on/embedded/ui/configuration/resource and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-14 18:46:30 -0500 (Fri, 14 Nov 2008)
New Revision: 54
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java
trunk/pom.xml
Log:
upgrade to Seam 2.1.0.SP1 and Seam Embedded beta3.SP3 (see https://jira.jboss.org/jira/browse/EMBJOPR-31)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-11-14 23:44:50 UTC (rev 53)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-11-14 23:46:30 UTC (rev 54)
@@ -292,7 +292,7 @@
if (error != null && !error.equals(""))
{
// TODO When this is internationalized, the method call "addToControl" will change to addToControlFromResourceBundle
- this.facesMessages.addToControl(PropertyIdGeneratorUtility.getIdentifier(property, null), new FacesMessage(FacesMessage.SEVERITY_ERROR, error, null));
+ this.facesMessages.addToControl(PropertyIdGeneratorUtility.getIdentifier(property, null), FacesMessage.SEVERITY_ERROR, error);
}
}
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-11-14 23:44:50 UTC (rev 53)
+++ trunk/pom.xml 2008-11-14 23:46:30 UTC (rev 54)
@@ -67,8 +67,8 @@
<jon.version>2.2.0-SNAPSHOT</jon.version>
<richfaces.version>3.2.2.GA</richfaces.version>
<rhq.version>1.2.0-SNAPSHOT</rhq.version>
- <seam.version>2.0.2.SP1</seam.version>
- <seam.embedded.version>beta3.SP2</seam.embedded.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,
which is required in order for Facelets to work in AS5.
(see https://jira.jboss.org/jira/browse/JBSEAM-3066) -->
15 years, 5 months
- 1
- 0
EMBJOPR SVN: r53 - trunk/jbas5.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-14 18:44:50 -0500 (Fri, 14 Nov 2008)
New Revision: 53
Modified:
trunk/jbas5/pom.xml
Log:
remove jboss-seam-jbas5 and cglib-nodep deps, which are no longer needed with AS5 builds from trunk (see https://jira.jboss.org/jira/browse/EMBJOPR-31)
Modified: trunk/jbas5/pom.xml
===================================================================
--- trunk/jbas5/pom.xml 2008-11-14 23:42:49 UTC (rev 52)
+++ trunk/jbas5/pom.xml 2008-11-14 23:44:50 UTC (rev 53)
@@ -39,40 +39,7 @@
<version>${jopr-embedded-core.version}</version>
<type>war</type>
</dependency>
-
- <dependency>
- <!-- TODO: double-check that this jar is still required -->
- <groupId>${seam.groupId}</groupId>
- <artifactId>jboss-seam-jbas5</artifactId>
- <version>${seam.version}</version>
- <exclusions>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <!-- the vfs brings with it a whole bunch of dependencies that are already in the app server -->
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- needed for JBAS5.Beta1 deployment -->
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
- </dependency>
-
- <!--need this to deploy in 5.0??
- TODO check if this is necessary -->
- <!--<dependency>-->
- <!--<groupId>commons-digester</groupId>-->
- <!--<artifactId>commons-digester</artifactId>-->
- <!--<version>1.8</version>-->
- <!--</dependency>-->
-
+
</dependencies>
<build>
15 years, 5 months
- 1
- 0
EMBJOPR SVN: r52 - in trunk/core/src/main: webapp/WEB-INF/classes and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-14 18:42:49 -0500 (Fri, 14 Nov 2008)
New Revision: 52
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java
trunk/core/src/main/webapp/WEB-INF/classes/messages.properties
Log:
display an error message when a delete-resource request fails
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2008-11-14 21:49:42 UTC (rev 51)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2008-11-14 23:42:49 UTC (rev 52)
@@ -39,6 +39,8 @@
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.clientapi.agent.inventory.DeleteResourceResponse;
+
import org.jboss.on.embedded.Constants;
import org.jboss.on.embedded.manager.ResourceManager;
import org.jboss.on.embedded.manager.ResourceManagerFactory;
@@ -55,7 +57,7 @@
{
private static final Log log = LogFactory.getLog(SingleResourceAction.class);
- private ResourceManager manager;
+ private ResourceManager resourceManager;
@In
private NavigationAction navigationAction;
@@ -90,7 +92,7 @@
@Create
public void create()
{
- manager = ResourceManagerFactory.resourceManager();
+ resourceManager = ResourceManagerFactory.resourceManager();
}
@Destroy
@@ -104,17 +106,13 @@
public String removeResourceAction()
{
- Resource resourceToBeDeleted = manager.getResource(resourceId);
-
+ Resource resourceToBeDeleted = resourceManager.getResource(resourceId);
if (resourceToBeDeleted == null)
{
facesMessages.add(FacesMessage.SEVERITY_ERROR, "Resource with id [" + resourceId + "] not found.");
return Constants.OUTCOME_FAILURE;
}
-
- removeResourceAction(resourceToBeDeleted);
-
- return Constants.OUTCOME_SUCCESS;
+ return removeResourceAction(resourceToBeDeleted);
}
/**
@@ -125,14 +123,21 @@
*/
public String removeResourceAction(@NotNull Resource resource)
{
- log.info("resource to be removed: " + resource);
-
- manager.removeResource(resource);
- facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.remove.success", resource.getResourceType().getName(), resource.getName());
- Events.instance().raiseEvent("resourceDeleted", resource);
-
- // TODO remove this, not used
- return Constants.OUTCOME_SUCCESS;
+ log.debug("Removing Resource " + resource + "...");
+ DeleteResourceResponse deleteResourceResponse = resourceManager.removeResource(resource);
+ switch (deleteResourceResponse.getStatus()) {
+ case SUCCESS:
+ facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.remove.success",
+ resource.getResourceType().getName(), resource.getName());
+ Events.instance().raiseEvent("resourceDeleted", resource);
+ return Constants.OUTCOME_SUCCESS;
+ default:
+ String details = (deleteResourceResponse.getErrorMessage() != null) ?
+ deleteResourceResponse.getErrorMessage() : "Check server log for more details.";
+ facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_ERROR, "resource.status.remove.failure",
+ resource.getResourceType().getName(), resource.getName(), details);
+ return Constants.OUTCOME_FAILURE;
+ }
}
// TODO just a test
Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages.properties
===================================================================
--- trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-11-14 21:49:42 UTC (rev 51)
+++ trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-11-14 23:42:49 UTC (rev 52)
@@ -53,7 +53,7 @@
resource.status.update.validationErrors=An invalid value was specified for one or more properties. See below for details.
resource.status.update.failure=Failed to update Resource (see app server log for additional details):
resource.status.update.success=Successfully updated {0} '{1}'.
-resource.status.remove.failure=Failed to delete Resource, please see app server log for more information.
+resource.status.remove.failure=Failed to delete {0} '{1}' - {2}
resource.status.remove.success=Successfully deleted {0} '{1}'.
resource.status.invalidProps=One or more property values was invalid - see below for details.
15 years, 5 months
- 1
- 0
EMBJOPR SVN: r51 - trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource.
by embjopr-commits＠lists.jboss.org
Author: charles.crouch(a)jboss.com
Date: 2008-11-14 16:49:42 -0500 (Fri, 14 Nov 2008)
New Revision: 51
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java
Log:
add TODO
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-11-14 19:07:14 UTC (rev 50)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-11-14 21:49:42 UTC (rev 51)
@@ -224,6 +224,10 @@
{
facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.create.success", serviceType.getName());
result = Constants.OUTCOME_SUCCESS;
+ // TODO this event should really be passed ancestorResource
+ // that way its much easier to tell associated resources to regenerate
+ // based on the parent, rather than just the serviceType
+ // on 2nd thoughts maybe it should pass both
Events.instance().raiseEvent("resourceCreated", serviceType);
break;
}
15 years, 5 months
- 1
- 0
EMBJOPR SVN: r50 - trunk/core/src/main/java/org/jboss/on/embedded/manager/pc.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-14 14:07:14 -0500 (Fri, 14 Nov 2008)
New Revision: 50
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java
Log:
add comment describing why we do a runtime scan after updating a resource's config
Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2008-11-14 19:06:48 UTC (rev 49)
+++ trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2008-11-14 19:07:14 UTC (rev 50)
@@ -139,7 +139,6 @@
resourceType = type;
}
}
-
return resourceType;
}
@@ -219,7 +218,6 @@
}
}
}
-
return result;
}
@@ -229,7 +227,6 @@
{
throw new IllegalArgumentException(CANNOT_BE_NULL);
}
-
Configuration configuration;
try
{
@@ -240,10 +237,8 @@
LOG.error(GET_RESOURCE_ERROR + resource, e);
throw new RuntimeException(e);
}
-
ConfigurationUtility.normalizeConfiguration(configuration,
resource.getResourceType().getResourceConfigurationDefinition());
-
return configuration;
}
@@ -264,7 +259,6 @@
LOG.error(REMOVE_RESOURCE_ERROR + resource, e);
throw new RuntimeException(e);
}
-
return response;
}
@@ -273,7 +267,6 @@
CreateResourceResponse response;
CreateResourceRequest request = new CreateResourceRequest(1, ancestorResource.getId(), resourceName, resourceType.getName(), resourceType.getPlugin(), pluginConfiguration, resourceConfiguration);
response = createResource(resourceType, request);
-
return response;
}
@@ -281,8 +274,7 @@
{
CreateResourceResponse response;
CreateResourceRequest request = new CreateResourceRequest(1, parentResource.getId(), resourceName, resourceType.getName(), resourceType.getPlugin(), pluginConfiguration, packageDetails);
- response = createResource(resourceType, request);
-
+ response = createResource(resourceType, request);
return response;
}
@@ -309,7 +301,6 @@
LOG.error(CANNOT_CREATE_REQUEST + e);
throw new RuntimeException(CANNOT_CREATE_REQUEST, e);
}
-
return response;
}
@@ -322,6 +313,7 @@
response = getConfigService().executeUpdateResourceConfigurationImmediately(request);
if (response.getStatus() == ConfigurationUpdateStatus.SUCCESS)
{
+ // As ccrouch recalls, we do a service scan to pickup any change to the updated Resource's name.
discoverServicesSync();
}
}
@@ -330,7 +322,6 @@
LOG.error(UPDATE_RESOURCE_ERROR);
throw new RuntimeException(UPDATE_RESOURCE_ERROR, e);
}
-
return response;
}
@@ -351,7 +342,6 @@
{
operationDefinitions = Collections.emptyList();
}
-
return operationDefinitions;
}
15 years, 5 months
- 1
- 0