October 2008 - embjopr-commits - Jboss List Archives

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2008-10-31 09:53:01 -0400 (Fri, 31 Oct 2008) New Revision: 30 Modified: trunk/core/pom.xml Log: strip ejb-jar.xml and persistence.xml out of the core domain jar under WEB-INF/lib/ (fix for https://jira.jboss.org/jira/browse/EMBJOPR-21) Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2008-10-30 15:38:13 UTC (rev 29) +++ trunk/core/pom.xml 2008-10-31 13:53:01 UTC (rev 30) @@ -308,6 +308,49 @@ <trimStackTrace>false</trimStackTrace> </configuration> </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>de-ejb-domain-jar</id> + <phase>package</phase> + <goals><goal>run</goal></goals> + <configuration> + <tasks> +  + +  + <property name="deEjb.tmpDir" location="${basedir}/target/deEjb.tmp"/> + <delete dir="${deEjb.tmpDir}"/> + <mkdir dir="${deEjb.tmpDir}"/> + <unwar src="${basedir}/target/${project.build.finalName}.war" + dest="${deEjb.tmpDir}"> + <patternset><include name="WEB-INF/lib/rhq-core-domain-${rhq.version}.jar"/></patternset> + </unwar> + +  + <property name="domainJar.tmpDir" location="${deEjb.tmpDir}/rhq-core-domain"/> + <property name="domainJar" location="${deEjb.tmpDir}/WEB-INF/lib/rhq-core-domain-${rhq.version}.jar"/> + <mkdir dir="${domainJar.tmpDir}"/> + <unzip dest="${domainJar.tmpDir}" src="${domainJar}"/> + <delete> + <fileset dir="${domainJar.tmpDir}" includes="META-INF/ejb-jar.xml,META-INF/persistence.xml"/> + </delete> + <delete file="${domainJar}"/> + <zip destfile="${domainJar}" basedir="${domainJar.tmpDir}"/> + +  + <war destfile="${basedir}/target/${project.build.finalName}.war" + basedir="${deEjb.tmpDir}" + update="true"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build>

16 years, 2 months

1
0
0 / 0

EMBJOPR SVN: r29 - trunk/core/src/main/webapp.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2008-10-30 11:38:13 -0400 (Thu, 30 Oct 2008) New Revision: 29 Modified: trunk/core/src/main/webapp/errorLayout.xhtml trunk/core/src/main/webapp/index.xhtml trunk/core/src/main/webapp/layout.xhtml trunk/core/src/main/webapp/login.xhtml Log: specify page encoding using <f:view contentType="text/html; charset=UTF-8"> since we cannot specify it via the xml prolog (thanks to IE6) (see https://jira.jboss.org/jira/browse/EMBJOPR-19) Modified: trunk/core/src/main/webapp/errorLayout.xhtml =================================================================== --- trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-30 15:16:06 UTC (rev 28) +++ trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-30 15:38:13 UTC (rev 29) @@ -1,24 +1,24 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:h="http://java.sun.com/jsf/html" @@ -26,14 +26,16 @@ xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:remove> -  +  </ui:remove> -<f:view contentType="text/html"> +<f:view contentType="text/html; charset=UTF-8"> <head> <base href="#{navigationAction.baseUrl}" /> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <title> <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> </title> Modified: trunk/core/src/main/webapp/index.xhtml =================================================================== --- trunk/core/src/main/webapp/index.xhtml 2008-10-30 15:16:06 UTC (rev 28) +++ trunk/core/src/main/webapp/index.xhtml 2008-10-30 15:38:13 UTC (rev 29) @@ -1,31 +1,38 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - + <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> -<f:view contentType="text/html"> +<ui:remove> +  +</ui:remove> +<f:view contentType="text/html; charset=UTF-8"> <head> <meta http-equiv="Refresh" content="0; URL=secure/summary.seam"/> Modified: trunk/core/src/main/webapp/layout.xhtml =================================================================== --- trunk/core/src/main/webapp/layout.xhtml 2008-10-30 15:16:06 UTC (rev 28) +++ trunk/core/src/main/webapp/layout.xhtml 2008-10-30 15:38:13 UTC (rev 29) @@ -1,24 +1,24 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:h="http://java.sun.com/jsf/html" @@ -26,19 +26,21 @@ xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:remove> -  +  </ui:remove> -<f:view contentType="text/html;charset=UTF-8"> +<f:view contentType="text/html; charset=UTF-8"> <head> - <base href="#{navigationAction.baseUrl}"/> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> - <title> - <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> - </title> - <link href="css/console-style.css" rel="stylesheet" type="text/css"/> - <link href="css/form-style.css" rel="stylesheet" type="text/css"/> - <script type="text/javascript" src="js/embedded.js"></script> + <base href="#{navigationAction.baseUrl}"/> + <title> + <ui:insert name="title">#{messages['default.windowTitle']}</ui:insert> + </title> + <link href="css/console-style.css" rel="stylesheet" type="text/css"/> + <link href="css/form-style.css" rel="stylesheet" type="text/css"/> + <script type="text/javascript" src="js/embedded.js"></script>  + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> -<f:view contentType="text/html;charset=UTF-8"> +<ui:remove> +  +</ui:remove> +<f:view contentType="text/html; charset=UTF-8"> <head> <base href="#{navigationAction.baseUrl}"/> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <title><ui:insert name="title">#{messages['default.windowTitle']}</ui:insert></title> <link href="css/console-style.css" rel="stylesheet" type="text/css"/> </head>

16 years, 2 months

1
0
0 / 0

EMBJOPR SVN: r28 - trunk.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2008-10-30 11:16:06 -0400 (Thu, 30 Oct 2008) New Revision: 28 Modified: trunk/INSTALL.txt Log: update profile service enabling instructions for latest AS5 build Modified: trunk/INSTALL.txt =================================================================== --- trunk/INSTALL.txt 2008-10-29 22:24:11 UTC (rev 27) +++ trunk/INSTALL.txt 2008-10-30 15:16:06 UTC (rev 28) @@ -26,9 +26,12 @@ *NOTE* These instructions currently work for AS5 CR1, but not for CR2. a) In the ${JBOSS_CONFIG_DIR}/conf directory, delete the bootstrap.xml file and rename the bootstrap-repo.xml to bootstrap.xml. - b) In ${JBOSS_CONFIG_DIR}/deployers directory, rename the - profileservice-beans.xml.bak file to profile-service-beans.xml. - + b) ***CR2 and earlier***: In ${JBOSS_CONFIG_DIR}/deployers directory, rename + profileservice-beans.xml.bak file to profileservice-beans.xml. + or + ***post CR2***: In ${JBOSS_CONFIG_DIR}/deploy directory, rename + profileservice-jboss-beans.xml.bak to profileservice-jboss-beans.xml. + 7) Restart your JBAS instance. 8) Once JBAS fully starts, go to http://localhost:8080/jbas4-console/ (JBAS 4.2.x/4.3.x)

16 years, 2 months

1
0
0 / 0

EMBJOPR SVN: r27 - trunk/core/src/main/webapp.

by embjopr-commits＠lists.jboss.org

Author: charles.crouch(a)jboss.com Date: 2008-10-29 18:24:11 -0400 (Wed, 29 Oct 2008) New Revision: 27 Modified: trunk/core/src/main/webapp/errorLayout.xhtml trunk/core/src/main/webapp/index.xhtml trunk/core/src/main/webapp/layout.xhtml trunk/core/src/main/webapp/login.xhtml Log: EMBJOPR-18 get rid of the xml prolog to make sure even IE6 renders in Standards mode. Can also have the license header included in final content with this setup. Modified: trunk/core/src/main/webapp/errorLayout.xhtml =================================================================== --- trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-28 21:49:58 UTC (rev 26) +++ trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-29 22:24:11 UTC (rev 27) @@ -1,5 +1,24 @@ -<?xml version="1.0"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:h="http://java.sun.com/jsf/html" @@ -7,27 +26,6 @@ xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:remove> - -</ui:remove> -<ui:remove>  </ui:remove> Modified: trunk/core/src/main/webapp/index.xhtml =================================================================== --- trunk/core/src/main/webapp/index.xhtml 2008-10-28 21:49:58 UTC (rev 26) +++ trunk/core/src/main/webapp/index.xhtml 2008-10-29 22:24:11 UTC (rev 27) @@ -1,33 +1,30 @@ -<?xml version="1.0"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> -<ui:remove> - -</ui:remove> <f:view contentType="text/html"> <head> Modified: trunk/core/src/main/webapp/layout.xhtml =================================================================== --- trunk/core/src/main/webapp/layout.xhtml 2008-10-28 21:49:58 UTC (rev 26) +++ trunk/core/src/main/webapp/layout.xhtml 2008-10-29 22:24:11 UTC (rev 27) @@ -1,6 +1,24 @@ -<?xml version="1.0"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:h="http://java.sun.com/jsf/html" @@ -8,27 +26,6 @@ xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:remove> - -</ui:remove> -<ui:remove>  </ui:remove> Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2008-10-28 21:49:58 UTC (rev 26) +++ trunk/core/src/main/webapp/login.xhtml 2008-10-29 22:24:11 UTC (rev 27) @@ -1,33 +1,30 @@ -<?xml version="1.0"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib" xmlns:ui="http://java.sun.com/jsf/facelets"> -<ui:remove> - -</ui:remove> <f:view contentType="text/html;charset=UTF-8"> <head> <base href="#{navigationAction.baseUrl}"/>

16 years, 2 months

1
0
0 / 0

EMBJOPR SVN: r26 - trunk/core/src/main/webapp.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2008-10-28 17:49:58 -0400 (Tue, 28 Oct 2008) New Revision: 26 Modified: trunk/core/src/main/webapp/errorLayout.xhtml trunk/core/src/main/webapp/index.xhtml trunk/core/src/main/webapp/layout.xhtml trunk/core/src/main/webapp/login.xhtml Log: move XML comment containing copyright header after html tag and surround it w/ a ui:remove tag (fix for https://jira.jboss.org/jira/browse/EMBJOPR-18) Modified: trunk/core/src/main/webapp/errorLayout.xhtml =================================================================== --- trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-27 21:19:38 UTC (rev 25) +++ trunk/core/src/main/webapp/errorLayout.xhtml 2008-10-28 21:49:58 UTC (rev 26) @@ -1,4 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<ui:remove>  -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - > - +</ui:remove> <ui:remove>  Modified: trunk/core/src/main/webapp/index.xhtml =================================================================== --- trunk/core/src/main/webapp/index.xhtml 2008-10-27 21:19:38 UTC (rev 25) +++ trunk/core/src/main/webapp/index.xhtml 2008-10-28 21:49:58 UTC (rev 26) @@ -1,4 +1,13 @@ <?xml version="1.0"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<ui:remove>  -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - > -<f:view> +</ui:remove> +<f:view contentType="text/html"> <head> <meta http-equiv="Refresh" content="0; URL=secure/summary.seam"/> </head> + <body/> + </f:view> </html> \ No newline at end of file Modified: trunk/core/src/main/webapp/layout.xhtml =================================================================== --- trunk/core/src/main/webapp/layout.xhtml 2008-10-27 21:19:38 UTC (rev 25) +++ trunk/core/src/main/webapp/layout.xhtml 2008-10-28 21:49:58 UTC (rev 26) @@ -1,4 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<ui:remove>  -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - > +</ui:remove> <ui:remove>  </ui:remove> -<f:view contentType="text/html"> +<f:view contentType="text/html;charset=UTF-8"> <head> <base href="#{navigationAction.baseUrl}"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2008-10-27 21:19:38 UTC (rev 25) +++ trunk/core/src/main/webapp/login.xhtml 2008-10-28 21:49:58 UTC (rev 26) @@ -1,4 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets"> +<ui:remove>  -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - > -<f:view contentType="text/html"> +</ui:remove> +<f:view contentType="text/html;charset=UTF-8"> <head> <base href="#{navigationAction.baseUrl}"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>

16 years, 2 months

1
0
0 / 0

EMBJOPR SVN: r25 - trunk/core/src/main/webapp/include.

by embjopr-commits＠lists.jboss.org

Author: james.cobb(a)jboss.com Date: 2008-10-27 17:19:38 -0400 (Mon, 27 Oct 2008) New Revision: 25 Modified: trunk/core/src/main/webapp/include/header.xhtml Log: fix error in header reported in JIRA JBMANCON-454 Modified: trunk/core/src/main/webapp/include/header.xhtml =================================================================== --- trunk/core/src/main/webapp/include/header.xhtml 2008-10-27 21:12:29 UTC (rev 24) +++ trunk/core/src/main/webapp/include/header.xhtml 2008-10-27 21:19:38 UTC (rev 25) @@ -32,7 +32,7 @@ </head> <body> <ui:composition> - + <div id="pageheader"> <div class="floatleft"> <h:graphicImage value="images/hdr_hdrtitle.gif"/> </div> @@ -57,7 +57,7 @@ [<s:link action="#{debugAction.testErrorPage()}">Test Error Page</s:link>] </h:outputText> </div> - + </div> </ui:composition> </body> </html> \ No newline at end of file

16 years, 2 months

1
0
0 / 0

EMBJOPR SVN: r23 - in trunk/core/src/main: webapp/WEB-INF and 2 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2008-10-24 11:15:13 -0400 (Fri, 24 Oct 2008) New Revision: 23 Added: trunk/core/src/main/webapp/secure/resourceInstanceConfig.xhtml Removed: trunk/core/src/main/webapp/secure/resourceView.xhtml Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/ConfigTemplateSelectUtil.java trunk/core/src/main/webapp/WEB-INF/classes/messages.properties trunk/core/src/main/webapp/WEB-INF/navigation.xml trunk/core/src/main/webapp/WEB-INF/pages.xml Log: fix global error message displayed when validation errors occurred; rename resourceView.xhtml to resourceInstanceConfig.xhtml; add missing space in template selection pulldown labels Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/ConfigTemplateSelectUtil.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/bean/ConfigTemplateSelectUtil.java 2008-10-24 03:02:30 UTC (rev 22) +++ trunk/core/src/main/java/org/jboss/on/embedded/bean/ConfigTemplateSelectUtil.java 2008-10-24 15:15:13 UTC (rev 23) @@ -23,8 +23,7 @@ import java.util.Set; /** - * Utility class used to help with constructing/processing the drop down list of - * avaiable configuration templates + * Utility class used to help with constructing/processing the drop down list of available configuration templates. */ public class ConfigTemplateSelectUtil { @@ -34,7 +33,7 @@ { for (String templateName : templateNames) { - String label = templateName + "(" + resourceTypeName + ")"; + String label = templateName + " (" + resourceTypeName + ")"; String value = templateName + SEPARATOR + resourceTypeName; selectItems.put(label, value); } @@ -81,5 +80,4 @@ return section; } - } Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages.properties =================================================================== --- trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-10-24 03:02:30 UTC (rev 22) +++ trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-10-24 15:15:13 UTC (rev 23) @@ -50,6 +50,7 @@ resource.status.create.failure=Failed to add Resource (see app server log for additional details): resource.status.create.success=Successfully added new {0}. +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. Modified: trunk/core/src/main/webapp/WEB-INF/navigation.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/navigation.xml 2008-10-24 03:02:30 UTC (rev 22) +++ trunk/core/src/main/webapp/WEB-INF/navigation.xml 2008-10-24 15:15:13 UTC (rev 23) @@ -106,14 +106,14 @@    -  +        -  +     Modified: trunk/core/src/main/webapp/WEB-INF/pages.xml =================================================================== --- trunk/core/src/main/webapp/WEB-INF/pages.xml 2008-10-24 03:02:30 UTC (rev 22) +++ trunk/core/src/main/webapp/WEB-INF/pages.xml 2008-10-24 15:15:13 UTC (rev 23) @@ -88,7 +88,7 @@ </navigation> </page> - <page view-id="/secure/resourceView.xhtml"> + <page view-id="/secure/resourceInstanceConfig.xhtml">  +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:onc="http://jboss.org/on/component"> +<f:view> + <ui:composition template="/layout.xhtml"> + + <ui:define name="pagetitle">#{resource.resource.name}</ui:define> + +  + <ui:define name="tabmenu"> + <h:panelGroup rendered="#{resourceConfigurationUIBean.actionType eq 'UPDATE'}"> + <ui:include src="/include/tabMenu.xhtml"> + <ui:param name="activeTab" value="configuration"/> + </ui:include> + </h:panelGroup> + </ui:define> + + <ui:define name="body"> + <div class="tabmenubox"> + <h:panelGroup styleClass="messagingBox" + rendered="#{resourceAction.hasGlobalMessages || resourceAction.hasOnlyNonInfoNonGlobalMessages}"> + <h:outputText styleClass="messagingFail" value="#{messages['resource.status.update.validationErrors']}" + rendered="#{resourceAction.hasOnlyNonInfoNonGlobalMessages}"/> + <h:messages globalOnly="true" + errorClass="messagingFail" + infoClass="messagingSuccess" + warnClass="messagingFail" + fatalClass="messagingFail"/> + </h:panelGroup> + <h:panelGroup rendered="#{resourceConfigurationUIBean.actionType eq 'UPDATE'}"> + <h1>#{messages['resource.edit.title']}</h1> + </h:panelGroup> + <h:panelGroup rendered="#{resourceConfigurationUIBean.actionType eq 'CREATE'}"> + <h1>#{messages['resource.add.pageTitle']}</h1> + </h:panelGroup> + + <h:panelGroup rendered="#{resourceConfigurationUIBean.configuration eq null}"> + #{messages['resource.configuration.null']} + </h:panelGroup> + <h:form id="resourceConfigurationForm" onsubmit="prepareInputsForSubmission(this)" + rendered="#{resourceConfigurationUIBean.configuration ne null}"> + + <onc:config configurationDefinition="#{resourceConfigurationUIBean.configurationDefinition}" + configuration="#{resourceConfigurationUIBean.configuration}" + nullConfigurationDefinitionMessage="#{resourceConfigurationUIBean.nullConfigurationDefinitionMessage}" + nullConfigurationMessage="#{resourceConfigurationUIBean.nullConfigurationMessage}" + nullConfigurationStyle="infoBlock"/> + + <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell"> + <h:commandButton type="submit" + action="#{resourceConfigurationUIBean.saveConfiguration()}" + value="Save" + alt="Click to Save Changes" + styleClass="buttonmed"/> + <s:button value="#{messages['resource.add.button.cancel']}" + view="/secure/summary.xhtml" + styleClass="buttonmed" + propagation="end"/> + </h:panelGrid> + + </h:form> + + </div> + </ui:define> + </ui:composition> +</f:view> +</html> \ No newline at end of file Deleted: trunk/core/src/main/webapp/secure/resourceView.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceView.xhtml 2008-10-24 03:02:30 UTC (rev 22) +++ trunk/core/src/main/webapp/secure/resourceView.xhtml 2008-10-24 15:15:13 UTC (rev 23) @@ -1,90 +0,0 @@ -<?xml version="1.0"?> - -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:onc="http://jboss.org/on/component"> -<f:view> - <ui:composition template="/layout.xhtml"> - - <ui:define name="pagetitle">#{resource.resource.name}</ui:define> - -  - <ui:define name="tabmenu"> - <h:panelGroup rendered="#{resourceConfigurationUIBean.actionType eq 'UPDATE'}"> - <ui:include src="/include/tabMenu.xhtml"> - <ui:param name="activeTab" value="configuration"/> - </ui:include> - </h:panelGroup> - </ui:define> - - <ui:define name="body"> - <div class="tabmenubox"> - <h:panelGroup styleClass="messagingBox" - rendered="#{resourceAction.hasGlobalMessages || resourceAction.hasOnlyNonInfoNonGlobalMessages}"> - <h:outputText styleClass="messagingFail" value="#{messages['resource.status.update.failure']}" - rendered="#{resourceAction.hasOnlyNonInfoNonGlobalMessages}"/> - <h:messages globalOnly="true" - errorClass="messagingFail" - infoClass="messagingSuccess" - warnClass="messagingFail" - fatalClass="messagingFail"/> - </h:panelGroup> - <h:panelGroup rendered="#{resourceConfigurationUIBean.actionType eq 'UPDATE'}"> - <h1>#{messages['resource.edit.title']}</h1> - </h:panelGroup> - <h:panelGroup rendered="#{resourceConfigurationUIBean.actionType eq 'CREATE'}"> - <h1>#{messages['resource.add.pageTitle']}</h1> - </h:panelGroup> - - <h:panelGroup rendered="#{resourceConfigurationUIBean.configuration eq null}"> - #{messages['resource.configuration.null']} - </h:panelGroup> - <h:form id="resourceConfigurationForm" onsubmit="prepareInputsForSubmission(this)" - rendered="#{resourceConfigurationUIBean.configuration ne null}"> - - <onc:config configurationDefinition="#{resourceConfigurationUIBean.configurationDefinition}" - configuration="#{resourceConfigurationUIBean.configuration}" - nullConfigurationDefinitionMessage="#{resourceConfigurationUIBean.nullConfigurationDefinitionMessage}" - nullConfigurationMessage="#{resourceConfigurationUIBean.nullConfigurationMessage}" - nullConfigurationStyle="infoBlock"/> - - <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell"> - <h:commandButton type="submit" - action="#{resourceConfigurationUIBean.saveConfiguration()}" - value="Save" - alt="Click to Save Changes" - styleClass="buttonmed"/> - <s:button value="#{messages['resource.add.button.cancel']}" - view="/secure/summary.xhtml" - styleClass="buttonmed" - propagation="end"/> - </h:panelGrid> - - </h:form> - - </div> - </ui:define> - </ui:composition> -</f:view> -</html> \ No newline at end of file

16 years, 2 months

1
0
0 / 0

EMBJOPR SVN: r22 - 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-10-23 23:02:30 -0400 (Thu, 23 Oct 2008) New Revision: 22 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java Log: fix a couple NPEs Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-10-24 01:57:38 UTC (rev 21) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-10-24 03:02:30 UTC (rev 22) @@ -318,7 +318,7 @@ enabledTabs.add(Constants.TAB_CONTENT); } } - + return enabledTabs; } @@ -345,10 +345,7 @@ ConfigurationDefinition resourceConfigurationDef = resource.getResourceType().getResourceConfigurationDefinition(); if (resourceConfigurationDef != null) - { hasConfiguration = resourceConfigurationDef.getPropertyDefinitions().size() > 0; - } - return hasConfiguration; } @@ -462,9 +459,13 @@ // TODO need to determine if this can ever return null JONTreeNode node = findNode(getResourcePath(deletedResource)); // TODO need to determine if this can ever return null + if (node == null) + { + log.warn("Unable to find node for deleted Resource + '" + deletedResource.getName() + "'."); + return; + } JONTreeNode parent = node.getParent(); parent.reInitializeChildrenMap(); - log.info("About to call triggerAutodiscovery"); } // TODO consider have this return TreeNodeWithResourceType @@ -503,7 +504,6 @@ UIComponent comp = event.getComponent(); UITree tree = (UITree) comp; JONTreeNode data = (JONTreeNode) (tree.getTreeNode().getData()); - data.reInitializeChildrenMap(); } 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-10-24 01:57:38 UTC (rev 21) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-10-24 03:02:30 UTC (rev 22) @@ -184,7 +184,8 @@ String result = Constants.OUTCOME_FAILURE; Configuration configuration = getConfiguration(); - ConfigurationUpdateResponse updateResponse = configurationManager.updateResource(listItem.getResource(), configuration); + ConfigurationUpdateResponse updateResponse = configurationManager.updateResource(this.listItem.getResource(), + configuration); if (updateResponse.getStatus() == ConfigurationUpdateStatus.FAILURE) { @@ -195,7 +196,7 @@ else { facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.update.success", - this.serviceType.getName(), this.listItem.getResource().getName()); + this.listItem.getResource().getResourceType().getName(), this.listItem.getResource().getName()); result = Constants.OUTCOME_SUCCESS; }

16 years, 2 months

1
0
0 / 0

EMBJOPR SVN: r21 - trunk.

by embjopr-commits＠lists.jboss.org

Author: charles.crouch(a)jboss.com Date: 2008-10-23 21:57:38 -0400 (Thu, 23 Oct 2008) New Revision: 21 Modified: trunk/INSTALL.txt Log: added comment about deployment config needing to support Seam Modified: trunk/INSTALL.txt =================================================================== --- trunk/INSTALL.txt 2008-10-23 21:07:01 UTC (rev 20) +++ trunk/INSTALL.txt 2008-10-24 01:57:38 UTC (rev 21) @@ -34,3 +34,13 @@ 8) Once JBAS fully starts, go to http://localhost:8080/jbas4-console/ (JBAS 4.2.x/4.3.x) *or* http://localhost:8080/jbas5-console/ (JBAS 5.x). Login with the same credentials you would use for the JMX console (e.g. admin:admin). + + +Troubleshooting +*************** +Take a look at the following tips and if they don't help jump over to the forum: http://www.jboss.com/index.html?module=bb&op=viewforum&f=294 + +1) Console not deploying +The console has been designed to run in any configuration of JBAS4.2 which supports dpeloying Seam applications, if you can deploy one of the simple Seam apps described here: +http://www.seamframework.org/Documentation/RunningSeamExamplesWithJBossApplicationServer42X +you should be able to deploy the console. \ No newline at end of file

16 years, 2 months

1
0
0 / 0

EMBJOPR SVN: r20 - in trunk/core/src/main: java/org/jboss/on/embedded/ui and 2 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2008-10-23 17:07:01 -0400 (Thu, 23 Oct 2008) New Revision: 20 Modified: trunk/core/src/main/java/org/jboss/on/embedded/Constants.java trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java trunk/core/src/main/webapp/WEB-INF/classes/messages.properties Log: make some of the success/failure messages a little more informative Modified: trunk/core/src/main/java/org/jboss/on/embedded/Constants.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/Constants.java 2008-10-23 00:54:28 UTC (rev 19) +++ trunk/core/src/main/java/org/jboss/on/embedded/Constants.java 2008-10-23 21:07:01 UTC (rev 20) @@ -42,9 +42,8 @@ * action outcome indicating there was an error */ public static final String OUTCOME_ERROR = "error"; - /** - * action outcome indidating that the ROOT summary page should be displayed + * action outcome indicating that the ROOT summary page should be displayed */ public static final String OUTCOME_ROOT = "root"; /** @@ -52,7 +51,7 @@ */ public static final String OUTCOME_CATEGORY_TABLE = "table"; /** - * action outcome indicating that thenavigation should simply be repeated + * action outcome indicating that the navigation should simply be repeated */ public static final String OUTCOME_REPEAT_NAV = "repeatNav"; /** @@ -60,10 +59,9 @@ */ public static final String OUTCOME_RESOURCE_TYPE_SUMMARY = "resourceSummary"; /** - * action outcome indicating that a summary of this single reosource instance should be displayed + * action outcome indicating that a summary of this single resource instance should be displayed */ public static final String OUTCOME_RESOURCE_INSTANCE = "resourceInstance"; - /** * navigation key used to store all the datasources in the nav */ @@ -72,7 +70,6 @@ * navigation key used to store all the JMS items in the nav */ public static final String RESOURCE_CATEGORY_JMS = "jms"; - /** * used to retrieve all the no-tx datasource ResourceTypes from the ResourceManager */ @@ -105,5 +102,4 @@ public static final String TAB_METRIC = "metric"; public static final String TAB_OPERATION = "operation"; public static final String TAB_CONTENT = "content"; - } 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-10-23 00:54:28 UTC (rev 19) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2008-10-23 21:07:01 UTC (rev 20) @@ -128,7 +128,7 @@ log.info("resource to be removed: " + resource); manager.removeResource(resource); - facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.remove.success"); + facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.remove.success", resource.getResourceType().getName(), resource.getName()); Events.instance().raiseEvent("resourceDeleted", resource); // TODO remove this, not used 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-10-23 00:54:28 UTC (rev 19) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-10-23 21:07:01 UTC (rev 20) @@ -194,7 +194,8 @@ } else { - facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.update.success"); + facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.update.success", + this.serviceType.getName(), this.listItem.getResource().getName()); result = Constants.OUTCOME_SUCCESS; } @@ -220,7 +221,7 @@ { case SUCCESS: { - facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.create.success"); + facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.create.success", serviceType.getName()); result = Constants.OUTCOME_SUCCESS; Events.instance().raiseEvent("resourceCreated", serviceType); break; Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages.properties =================================================================== --- trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-10-23 00:54:28 UTC (rev 19) +++ trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2008-10-23 21:07:01 UTC (rev 20) @@ -49,11 +49,11 @@ resource.configuration.null=There was an error retrieving the configuration for this resource. resource.status.create.failure=Failed to add Resource (see app server log for additional details): -resource.status.create.success=Successfully added resource. +resource.status.create.success=Successfully added new {0}. resource.status.update.failure=Failed to update Resource (see app server log for additional details): -resource.status.update.success=Successfully updated resource. -resource.status.remove.failure=Failed to remove Resource, please see app server log for more information. -resource.status.remove.success=Successfully removed resource. +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.success=Successfully deleted {0} '{1}'. resource.status.invalidProps=One or more property values was invalid - see below for details. resource.edit.title=Edit Resource

16 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits October 2008