[jboss-cvs] JBoss Profiler SVN: r538 - in tags: JBOSS_PROFILER_2_0_0_BETA4 and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2009-05-31 11:45:55 -0400 (Sun, 31 May 2009)
New Revision: 538

Added:
   tags/JBOSS_PROFILER_2_0_0_BETA4/
Modified:
   tags/JBOSS_PROFILER_2_0_0_BETA4/build.xml
   tags/JBOSS_PROFILER_2_0_0_BETA4/src/etc/faces-config.xml
   tags/JBOSS_PROFILER_2_0_0_BETA4/src/main/www/setup.xhtml
Log:
JBoss Profiler 2.0.0.Beta4

Copied: tags/JBOSS_PROFILER_2_0_0_BETA4 (from rev 537, branches/JBossProfiler2)

Modified: tags/JBOSS_PROFILER_2_0_0_BETA4/build.xml
===================================================================
--- branches/JBossProfiler2/build.xml	2009-05-31 11:29:58 UTC (rev 537)
+++ tags/JBOSS_PROFILER_2_0_0_BETA4/build.xml	2009-05-31 15:45:55 UTC (rev 538)
@@ -423,6 +423,8 @@
           </fileset>
         </move>
 
+        <delete dir="${build.dir}/en"/>
+
         <move todir="${build.dir}/${name}-${major}.${minor}.${type}"
               includeEmptyDirs="false">
             <fileset dir="${dist.dir}"

Modified: tags/JBOSS_PROFILER_2_0_0_BETA4/src/etc/faces-config.xml
===================================================================
--- branches/JBossProfiler2/src/etc/faces-config.xml	2009-05-31 11:29:58 UTC (rev 537)
+++ tags/JBOSS_PROFILER_2_0_0_BETA4/src/etc/faces-config.xml	2009-05-31 15:45:55 UTC (rev 538)
@@ -15,6 +15,12 @@
   </application>
 
   <managed-bean>
+    <managed-bean-name>agentSetup</managed-bean-name>
+    <managed-bean-class>org.jboss.profiler.client.web.agent.AgentSetup</managed-bean-class>
+    <managed-bean-scope>session</managed-bean-scope>
+  </managed-bean>
+
+  <managed-bean>
     <managed-bean-name>overviewBean</managed-bean-name>
     <managed-bean-class>org.jboss.profiler.client.web.OverviewBean</managed-bean-class>
     <managed-bean-scope>session</managed-bean-scope>
@@ -91,17 +97,7 @@
   </managed-bean>
 
   <navigation-rule>
-    <display-name>profilerstatus.xhtml</display-name>
-    <from-view-id>/profilerstatus.xhtml</from-view-id>
     <navigation-case>
-      <from-action>#{basicOptBean.connect}</from-action>
-      <from-outcome>org.jboss.remoting.CannotConnectException</from-outcome>
-      <to-view-id>/connecterr.xhtml</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-
-  <navigation-rule>
-    <navigation-case>
       <from-outcome>go_home</from-outcome>
       <to-view-id>/index.xhtml</to-view-id>
     </navigation-case>

Modified: tags/JBOSS_PROFILER_2_0_0_BETA4/src/main/www/setup.xhtml
===================================================================
--- branches/JBossProfiler2/src/main/www/setup.xhtml	2009-05-31 11:29:58 UTC (rev 537)
+++ tags/JBOSS_PROFILER_2_0_0_BETA4/src/main/www/setup.xhtml	2009-05-31 15:45:55 UTC (rev 538)
@@ -23,35 +23,38 @@
                   <rich:componentControl for="connectPanel" attachTo="hidelink" operation="hide" event="onclick"/>
                 </h:panelGroup>
               </f:facet>
-              <h:panelGroup>
+              <h:panelGroup id="settings">
                 <rich:panel>
                   <f:facet name="header">
                     <h:outputText value="Remote agent"/>
                   </f:facet>
 
                   <h:panelGrid columns="2" width="100%">
-                    <h:outputText value="Host"/>
-                    <h:inputText id="inputhost" value="#{basicOptBean.host}" size="20">
+                    <h:outputText value="Host" style="font-weight: bold" />
+                    <h:outputText value="#{agentSetup.host}" rendered="#{agentSetup.connected}" />
+                    <h:inputText id="inputhost" value="#{agentSetup.host}" size="20" rendered="#{!agentSetup.connected}">
                       <a4j:support event="onkeyup" rendered="inputhost"/>
                     </h:inputText>
         	  
-                    <h:outputText value="Protocol"/>
-                    <a4j:outputPanel id="protocolSelect" ajaxRendered="true">
-                      <h:selectOneMenu value="#{basicOptBean.protocol}" style="width: 200px" valueChangeListener="#{basicOptBean.protocolChanged}"
-                                       label="#{basicOptBean.protocol}">
-                        <a4j:support event="change" reRender="protocolSelect" />   
-                        <f:selectItems value="#{basicOptBean.protocols}" /> 			
-                      </h:selectOneMenu>
-                    </a4j:outputPanel>
+                    <h:outputText value="Protocol" style="font-weight: bold" />
+                    <h:outputText value="#{agentSetup.protocol}" rendered="#{agentSetup.connected}" />
+                    <h:selectOneMenu value="#{agentSetup.protocol}" 
+                                     style="width: 200px" 
+                                     valueChangeListener="#{agentSetup.protocolChanged}"
+                                     label="#{agentSetup.protocol}"
+                                     rendered="#{!agentSetup.connected}">
+                      <a4j:support event="change" reRender="settings" />   
+                      <f:selectItems value="#{agentSetup.protocols}" /> 			
+                    </h:selectOneMenu>
                         
-                    <h:outputText value="Port"/>
-                    <h:inputText id="portvalue" value="#{basicOptBean.port}" size="20">
+                    <h:outputText value="Port" style="font-weight: bold" />
+                    <h:outputText value="#{agentSetup.port}" rendered="#{agentSetup.connected}" />
+                    <h:inputText id="portvalue" value="#{agentSetup.port}" size="20" rendered="#{!agentSetup.connected}">
                       <f:validateLongRange minimum="1" maximum="65535"></f:validateLongRange>
                     </h:inputText>
 
-                    <a4j:commandButton id="connectbutton" value="Verify setup" action="#{basicOptBean.connect}" onclick="this.disable=true">
-                      <rich:componentControl for="connectPanel" attachTo="connectbutton" operation="hide" event="onclick"/>
-                    </a4j:commandButton>
+                    <a4j:commandButton value="Connect" action="#{agentSetup.connect}" rendered="#{!agentSetup.connected}" reRender="settings" />
+                    <a4j:commandButton value="Disconnect" action="#{agentSetup.disconnect}" rendered="#{agentSetup.connected}" reRender="settings" />
                     <br/>
 
 		  </h:panelGrid>