Menu
▾
▴
[Jaffa-svn] SF.net SVN: jaffa:[6159] trunk
|
From: <er...@us...> - 2012-04-12 21:54:43
|
Revision: 6159
http://jaffa.svn.sourceforge.net/jaffa/?rev=6159&view=rev
Author: erikb78
Date: 2012-04-12 21:54:33 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Merge from JAFFA_5_12_RELEASE
Modified Paths:
--------------
trunk/DWR/build/project.ant.properties
trunk/DWR/source/java/org/jaffa/dwr/converters/NotNullBeanConverter.java
trunk/JaffaBuild/build/build-jboss.xml
trunk/JaffaComponents/source/aop/1/domain/AuditTransaction-aop.xml
trunk/JaffaComponentsAdmin/source/html/jaffa/admin/menunavigation/main.jsp
trunk/JaffaComponentsAdmin/source/html/jaffa/admin/roleseditor/main.jsp
trunk/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/components/formdefinitionmaintenance/tx/FormDefinitionMaintenanceTx.java
trunk/JaffaConsole/source/html/jaffa/audit/audittransactionfinder/AuditTransactionCriteriaPanel.js
trunk/JaffaConsole/source/html/jaffa/audit/audittransactionviewer/AuditTransactionViewerDetail.js
trunk/JaffaConsole/source/html/jaffa/audit/audittransactionviewer/main.js
trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/RulesDetailPanel.js
trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/main.js
trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/main.jsp.labels
trunk/JaffaConsole/source/html/jaffa/ws/css/docs.css
trunk/JaffaConsole/source/html/jaffa/ws/css/jawr.pfragment
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/APITree.js
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/DocPanel.js
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/HtmlEditor.js
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/MainPanel.js
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/RulesSourceListPanel.js
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/WSTestUtilPanel.js
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/WsdlComparePanel.js
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/exportToExcel.jsp
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/exportToText.jsp
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/jawr.pfragment
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/main.js
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/serviceMetaData.jsp
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/wsLoggingEnabler.jsp
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/wsMetaData.jsp
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/wsMetaDataRuleFilter.jsp
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/wsTestUtil.jsp
trunk/JaffaConsole/source/java/org/jaffa/sc/ApplicationResources.pfragment
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/AspectUpdateService.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/MappingFilterFlushService.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/QuartzStateManagerService.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/QuartzStateManagerServiceMBean.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/RulesSourceListService.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/WSDLCompareService.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/WSMetricsSchedulerService.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/WSMetricsSchedulerServiceMBean.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/WebServiceDocService.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/WebServiceMetricsJob.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/data/MethodDetails.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/data/RulesSourceListDetails.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/data/RulesSourceListDto.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/data/ServiceDetails.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/data/TreeNode.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/data/WSDLCompareDetails.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/data/WSDLCompareDto.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/helper/AspectUpdateHelper.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/helper/MappedContext.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/helper/SoapHandlerHelper.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/helper/WSResultGraphRulesMetricsHelper.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/helper/WebServiceApiHelper.java
trunk/JaffaConsole/source/java/org/jaffa/wsapi/apis/helper/WebServiceMetricsHelper.java
trunk/JaffaCore/source/java/ApplicationResources.pfragment
trunk/JaffaCore/source/java/org/jaffa/components/finder/FinderTx.java
trunk/JaffaCore/source/java/org/jaffa/presentation/portlet/session/UserSession.java
trunk/JaffaRIA/source/html/js/extjs/jaffa/component/CRUDController.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/component/PanelController.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/finder/CriteriaPanel.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderComboGrid.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderGridWindow.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderHeader.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/finder/FinderViewport.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/finder/exportToExcel.jsp
trunk/JaffaRIA/source/html/js/extjs/jaffa/form/Comment.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/form/DisplayRenderers.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/form/FinderLovComboGrid.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/layout/FullAccordion.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/maintenance/GridDetailContainer.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/maintenance/HeaderPanel.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/maintenance/PendingEventPanel.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/maintenance/PendingEventsWindow.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/maintenance/SaveMenuButton.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/maintenance/Viewport.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/Panel.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/maintenance/plugins/PanelLoadSave.js
trunk/JaffaRIA/source/html/js/extjs/jaffa/metadata/rules.jsp
trunk/JaffaRIA/source/html/js/extjs/ux/Renderers.js
trunk/JaffaRIA/source/html/js/extjs/ux/grid/MultiGroupingPanel.js
trunk/JaffaRIA/source/html/js/extjs/ux/plugins/InsertFromGrid.js
trunk/JaffaRIA/source/java/resources/jawr.properties
trunk/JaffaRules/source/aop/0/2-rulemeta-aop.xml
trunk/JaffaRules/source/java/org/jaffa/rules/jbossaop/interceptors/InListInterceptor.java
trunk/JaffaSOA/source/java/org/jaffa/soa/dataaccess/TransformationHandler.java
Added Paths:
-----------
trunk/JaffaBuild/build/templates/jboss/jboss-app.xml
trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/json2.js
trunk/JaffaCore/source/java/org/jaffa/datatypes/exceptions/InListException.java
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JAFFA_2_1_0_RELEASE:3009-3735
/branches/JAFFA_4_1_0_RELEASE:3009-3734
/branches/JAFFA_5_0_0_RELEASE:3427-3733
/branches/JAFFA_5_10_RELEASE:5429-5965
/branches/JAFFA_5_11_RELEASE:5507-5967
/branches/JAFFA_5_12_RELEASE:5784-5868
/branches/JAFFA_5_1_0_RELEASE:3704-3732
/branches/JAFFA_5_7_RELEASE:4878-5962
/branches/JAFFA_5_8_RELEASE:5013-5963
/branches/JAFFA_5_9_RELEASE:5138-5964
/trunk/JaffaBuild/build/shared.ant.properties:1685-4877
+ /branches/JAFFA_2_1_0_RELEASE:3009-3735
/branches/JAFFA_4_1_0_RELEASE:3009-3734
/branches/JAFFA_5_0_0_RELEASE:3427-3733
/branches/JAFFA_5_10_RELEASE:5429-6105
/branches/JAFFA_5_11_RELEASE:5507-6112
/branches/JAFFA_5_12_RELEASE:5784-6155
/branches/JAFFA_5_1_0_RELEASE:3704-3732
/branches/JAFFA_5_7_RELEASE:4878-6102
/branches/JAFFA_5_8_RELEASE:5013-6103
/branches/JAFFA_5_9_RELEASE:5138-6104
/trunk/JaffaBuild/build/shared.ant.properties:1685-4877
Modified: trunk/DWR/build/project.ant.properties
===================================================================
--- trunk/DWR/build/project.ant.properties 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/DWR/build/project.ant.properties 2012-04-12 21:54:33 UTC (rev 6159)
@@ -11,4 +11,4 @@
module.name=DWR
# Names of the modules this project depends on...
-modules=JaffaCore
+modules=JaffaCore,JaffaSOA
Modified: trunk/DWR/source/java/org/jaffa/dwr/converters/NotNullBeanConverter.java
===================================================================
--- trunk/DWR/source/java/org/jaffa/dwr/converters/NotNullBeanConverter.java 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/DWR/source/java/org/jaffa/dwr/converters/NotNullBeanConverter.java 2012-04-12 21:54:33 UTC (rev 6159)
@@ -58,6 +58,7 @@
import org.directwebremoting.extend.OutboundContext;
import org.directwebremoting.extend.OutboundVariable;
import org.directwebremoting.extend.Property;
+import org.jaffa.soa.graph.GraphDataObject;
/**
* Convert a Javascript associative array into a JavaBean
@@ -87,8 +88,8 @@
Property property = (Property) entry.getValue();
Object value = property.getValue(data);
-
- if(value!=null) { // Added check to exclude null fields
+
+ if(value!=null || (data instanceof GraphDataObject && ((GraphDataObject)data).hasChanged(name))) { // Added check to exclude null fields
OutboundVariable nested = getConverterManager().convertOutbound(value, outctx);
ovs.put(name, nested);
}
Modified: trunk/JaffaBuild/build/build-jboss.xml
===================================================================
--- trunk/JaffaBuild/build/build-jboss.xml 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaBuild/build/build-jboss.xml 2012-04-12 21:54:33 UTC (rev 6159)
@@ -69,6 +69,9 @@
<if><isset property="appname.ws"/><then>
<mkdir dir="${sar.war.ws}/WEB-INF"/>
</then></if>
+ <if><isset property="appname.camel"/><then>
+ <mkdir dir="${sar.war.camel}/WEB-INF"/>
+ </then></if>
<mkdir dir="${sar.aop}"/>
<for list="${modules.cache}" param="module">
@@ -185,6 +188,10 @@
tofile="${sar.ear}/META-INF/application.xml"
/>
<copy overwrite="true" failonerror="false"
+ file="${build.container.templates}/jboss-app.xml"
+ tofile="${sar.ear}/META-INF/jboss-app.xml"
+ />
+ <copy overwrite="true" failonerror="false"
file="${build.container.templates}/login-config.xml"
tofile="${sarFolder}/login-config.xml"
/>
@@ -212,6 +219,21 @@
/>
</then></if>
+ <if><isset property="appname.camel"/><then>
+ <copy overwrite="true" failonerror="false"
+ file="${build.container.templates}/jboss-web.xml"
+ tofile="${sar.war.camel}/WEB-INF/jboss-web.xml"
+ />
+ <copy overwrite="true" failonerror="false"
+ file="${build.container.templates}/web-camel.xml"
+ tofile="${sar.war.camel}/WEB-INF/web.xml"
+ />
+ <copy overwrite="true" failonerror="false"
+ file="${build.container.templates}/applicationContext.xml"
+ tofile="${sar.war.camel}/WEB-INF/applicationContext.xml"
+ />
+ </then></if>
+
<if><and>
<isset property="jboss.use.port.bindings"/>
<equals arg1="${jboss.use.port.bindings}" arg2="true"/>
@@ -239,6 +261,10 @@
tofile="${sar.ear}/META-INF/application.xml"
/>
<copy overwrite="true" failonerror="false"
+ file="${build.container.templates}/jboss-app.xml"
+ tofile="${sar.ear}/META-INF/jboss-app.xml"
+ />
+ <copy overwrite="true" failonerror="false"
file="${build.container.templates}/login-config.xml"
tofile="${sarFolder}/login-config.xml"
/>
@@ -266,6 +292,21 @@
/>
</then></if>
+ <if><isset property="appname.camel"/><then>
+ <copy overwrite="true" failonerror="false"
+ file="${build.container.templates}/jboss-web.xml"
+ tofile="${sar.war.camel}/WEB-INF/jboss-web.xml"
+ />
+ <copy overwrite="true" failonerror="false"
+ file="${build.container.templates}/web-camel.xml"
+ tofile="${sar.war.camel}/WEB-INF/web.xml"
+ />
+ <copy overwrite="true" failonerror="false"
+ file="${build.container.templates}/applicationContext.xml"
+ tofile="${sar.war.camel}/WEB-INF/applicationContext.xml"
+ />
+ </then></if>
+
<if><and>
<isset property="jboss.use.port.bindings"/>
<equals arg1="${jboss.use.port.bindings}" arg2="true"/>
@@ -409,9 +450,9 @@
<!-- applicationContext.xml merge in fragments -->
<if>
- <available file="${sar.war}/WEB-INF/applicationContext.xml" type="file"/>
+ <available file="${sar.war.camel}/WEB-INF/applicationContext.xml" type="file"/>
<then>
- <configfileupdate file="${sar.war}/WEB-INF/applicationContext.xml" dir="${dist.staging}/fragments" taskname="configfileupdate/${appname}"/>
+ <configfileupdate file="${sar.war.camel}/WEB-INF/applicationContext.xml" dir="${dist.staging}/fragments" taskname="configfileupdate/${appname}"/>
</then>
</if>
</target>
@@ -432,7 +473,9 @@
<fileset dir="${sarFolder}">
<include name="${appname}.ear/${appname}-WS.war/WEB-INF/jboss-web.xml"/>
<include name="${appname}.ear/${appname}-WS.war/WEB-INF/web.xml"/>
- <include name="${appname}.ear/${appname}.war/WEB-INF/applicationContext.xml"/>
+ <include name="${appname}.ear/${appname}-Camel.war/WEB-INF/jboss-web.xml"/>
+ <include name="${appname}.ear/${appname}-Camel.war/WEB-INF/web.xml"/>
+ <include name="${appname}.ear/${appname}-Camel.war/WEB-INF/applicationContext.xml"/>
<include name="${appname}.ear/${appname}.war/WEB-INF/jboss-web.xml"/>
<include name="${appname}.ear/${appname}.war/WEB-INF/web.xml"/>
<include name="${appname}.ear/META-INF/application.xml"/>
@@ -491,6 +534,42 @@
</my.xmltask>
</then>
</if>
+
+ <!-- Remove appname.ws from application.xml -->
+ <if>
+ <not>
+ <isset property="appname.ws"/>
+ </not>
+ <then>
+ <echo message="Removing ${appname}-WS from application.xml"/>
+ <my.xmltask
+ source="${sar.ear}/META-INF/application.xml"
+ dest="${sar.ear}/META-INF/application.xml"
+ failWithoutMatch="false"
+ >
+ <xmlcatalog refid="dtds"/>
+ <remove path="//application/module[contains(./web/web-uri,'${appname}-WS')]"/>
+ </my.xmltask>
+ </then>
+ </if>
+
+ <!-- Remove appname.camel from application.xml -->
+ <if>
+ <not>
+ <isset property="appname.camel"/>
+ </not>
+ <then>
+ <echo message="Removing ${appname}-Camel from application.xml"/>
+ <my.xmltask
+ source="${sar.ear}/META-INF/application.xml"
+ dest="${sar.ear}/META-INF/application.xml"
+ failWithoutMatch="false"
+ >
+ <xmlcatalog refid="dtds"/>
+ <remove path="//application/module[contains(./web/web-uri,'${appname}-Camel')]"/>
+ </my.xmltask>
+ </then>
+ </if>
</target>
@@ -730,6 +809,15 @@
<echo>Deploying WebService App as ${sar.war.ws}</echo>
</then></if>
+ <if><equals arg1="${appname.camel}" arg2=""/><then>
+ <var name="appname.camel" unset="true"/>
+ <echo>Unset Camel App Name, as it is blank</echo>
+ </then></if>
+ <if><isset property="appname.camel"/><then>
+ <var name="sar.war.camel" value="${sarFolder}/${appname}.ear/${appname.camel}.war"/>
+ <echo>Deploying Camel App as ${sar.war.camel}</echo>
+ </then></if>
+
<!-- Add rules engine to AOP compiler path -->
<path id="jboss.aop.classpath">
<fileset dir="${lib.dependent}/${module.JaffaRules.name}/${module.JaffaRules.version}" includes="*.jar"/>
Copied: trunk/JaffaBuild/build/templates/jboss/jboss-app.xml (from rev 6155, branches/JAFFA_5_12_RELEASE/JaffaBuild/build/templates/jboss/jboss-app.xml)
===================================================================
--- trunk/JaffaBuild/build/templates/jboss/jboss-app.xml (rev 0)
+++ trunk/JaffaBuild/build/templates/jboss/jboss-app.xml 2012-04-12 21:54:33 UTC (rev 6159)
@@ -0,0 +1,7 @@
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD J2EE Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd">
+
+<jboss-app>
+ <module-order>strict</module-order>
+</jboss-app>
\ No newline at end of file
Modified: trunk/JaffaComponents/source/aop/1/domain/AuditTransaction-aop.xml
===================================================================
--- trunk/JaffaComponents/source/aop/1/domain/AuditTransaction-aop.xml 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaComponents/source/aop/1/domain/AuditTransaction-aop.xml 2012-04-12 21:54:33 UTC (rev 6159)
@@ -32,6 +32,7 @@
<property name="createdBy">
<label>[label.Jaffa.Audit.AuditTransaction.CreatedBy]</label>
<max-length>20</max-length>
+ <case-type>Upper</case-type>
</property>
<property name="createdOn">
Modified: trunk/JaffaComponentsAdmin/source/html/jaffa/admin/menunavigation/main.jsp
===================================================================
--- trunk/JaffaComponentsAdmin/source/html/jaffa/admin/menunavigation/main.jsp 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaComponentsAdmin/source/html/jaffa/admin/menunavigation/main.jsp 2012-04-12 21:54:33 UTC (rev 6159)
@@ -3,21 +3,33 @@
--
-- This library is free software; you can redistribute it and/or modify it under the terms
-- of the GNU Lesser General Public License (version 2.1 any later).
- --
+ --
-- See http://jaffa.sourceforge.net/site/legal.html for more details.
-- ---------------------------------------------------------------------------------------- --%>
<%-- The contents of this JSP will appear in the 'body' of ViewerLayout.jsp --%>
<%@ page import='org.jaffa.presentation.portlet.widgets.taglib.TagHelper' %>
<%@ page import='org.jaffa.applications.jaffa.modules.admin.components.menunavigation.ui.MenuNavigationComponent' %>
+<%@ page import="org.jaffa.session.ContextManagerFactory" %>
+<%@ page import="org.jaffa.presentation.portlet.widgets.taglib.EditBoxTag" %>
<%@ taglib uri='/WEB-INF/jaffa-portlet.tld' prefix='Portlet' %>
+<%
+ // This is a hack to turn off 'hard' wrapping for non-comment TextArea
+ // An alternative could be to provide a 'wrap' attribute for the EditBox tag
+ // NOTE: This hack should be more fine-grained, if any comment fields are added in the JSP
+ Object originalTextareaWrap = ContextManagerFactory.instance().getProperty(EditBoxTag.RULE_TEXTAREA_WRAP);
+ ContextManagerFactory.instance().setProperty(EditBoxTag.RULE_TEXTAREA_WRAP, "off");
+%>
+
<!-- Start of '/jaffa/admin/menunavigation/main.jsp' -->
<BR>
<TABLE>
- <TR>
+ <TR>
<TD><Portlet:EditBox field='fileContents' rows='2' horizontalSizePercentage='60' verticalSizePercentage='65'/></TD>
</TR>
</TABLE>
<!-- End of '/jaffa/admin/menunavigation/main.jsp' -->
+
+<% ContextManagerFactory.instance().setProperty(EditBoxTag.RULE_TEXTAREA_WRAP, originalTextareaWrap); %>
\ No newline at end of file
Modified: trunk/JaffaComponentsAdmin/source/html/jaffa/admin/roleseditor/main.jsp
===================================================================
--- trunk/JaffaComponentsAdmin/source/html/jaffa/admin/roleseditor/main.jsp 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaComponentsAdmin/source/html/jaffa/admin/roleseditor/main.jsp 2012-04-12 21:54:33 UTC (rev 6159)
@@ -3,21 +3,33 @@
--
-- This library is free software; you can redistribute it and/or modify it under the terms
-- of the GNU Lesser General Public License (version 2.1 any later).
- --
+ --
-- See http://jaffa.sourceforge.net/site/legal.html for more details.
-- ---------------------------------------------------------------------------------------- --%>
<%-- The contents of this JSP will appear in the 'body' of ViewerLayout.jsp --%>
<%@ page import='org.jaffa.presentation.portlet.widgets.taglib.TagHelper' %>
<%@ page import='org.jaffa.applications.jaffa.modules.admin.components.log4jconfig.ui.Log4jConfigComponent' %>
+<%@ page import="org.jaffa.session.ContextManagerFactory" %>
+<%@ page import="org.jaffa.presentation.portlet.widgets.taglib.EditBoxTag" %>
<%@ taglib uri='/WEB-INF/jaffa-portlet.tld' prefix='Portlet' %>
+<%
+ // This is a hack to turn off 'hard' wrapping for non-comment TextArea
+ // An alternative could be to provide a 'wrap' attribute for the EditBox tag
+ // NOTE: This hack should be more fine-grained, if any comment fields are added in the JSP
+ Object originalTextareaWrap = ContextManagerFactory.instance().getProperty(EditBoxTag.RULE_TEXTAREA_WRAP);
+ ContextManagerFactory.instance().setProperty(EditBoxTag.RULE_TEXTAREA_WRAP, "off");
+%>
+
<!-- Start of '/jaffa/admin/log4jconfig/main.jsp' -->
<BR>
<TABLE>
- <TR>
+ <TR>
<TD><Portlet:EditBox field='fileContents' rows='2' horizontalSizePercentage='60' verticalSizePercentage='65'/></TD>
</TR>
</TABLE>
<!-- End of '/jaffa/admin/log4jconfig/main.jsp' -->
+
+<% ContextManagerFactory.instance().setProperty(EditBoxTag.RULE_TEXTAREA_WRAP, originalTextareaWrap); %>
\ No newline at end of file
Modified: trunk/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/components/formdefinitionmaintenance/tx/FormDefinitionMaintenanceTx.java
===================================================================
--- trunk/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/components/formdefinitionmaintenance/tx/FormDefinitionMaintenanceTx.java 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaComponentsPrinting/source/java/org/jaffa/modules/printing/components/formdefinitionmaintenance/tx/FormDefinitionMaintenanceTx.java 2012-04-12 21:54:33 UTC (rev 6159)
@@ -24,6 +24,7 @@
import org.jaffa.datatypes.DateTime;
import org.jaffa.datatypes.Formatter;
import org.jaffa.util.BeanHelper;
+import org.jaffa.util.ExceptionHelper;
import org.jaffa.components.maint.MaintTx;
import org.jaffa.components.voucher.IVoucherGenerator;
import org.jaffa.datatypes.exceptions.InvalidForeignKeyException;
Modified: trunk/JaffaConsole/source/html/jaffa/audit/audittransactionfinder/AuditTransactionCriteriaPanel.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/audit/audittransactionfinder/AuditTransactionCriteriaPanel.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/audit/audittransactionfinder/AuditTransactionCriteriaPanel.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -1,11 +1,10 @@
AuditTransactionCriteriaPanel = function(config) {
config = config||{};
- var labelWidth = 160;
+ var labelWidth = 150;
config = Ext.apply(config, {
region: 'west',
title: Labels.get('label.Jaffa.Audit.AuditTransaction') + ' ' + Labels.get('title.Jaffa.Finder.Criteria'),
- width: 490,
minWidth: 450,
autoScroll: true,
split: true,
Modified: trunk/JaffaConsole/source/html/jaffa/audit/audittransactionviewer/AuditTransactionViewerDetail.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/audit/audittransactionviewer/AuditTransactionViewerDetail.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/audit/audittransactionviewer/AuditTransactionViewerDetail.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -24,7 +24,7 @@
mapping: 'changedFrom',
type: 'string'
}, {
- name: 'changedFrom',
+ name: 'changedTo',
mapping: 'changedTo',
type: 'string'
}]);
Modified: trunk/JaffaConsole/source/html/jaffa/audit/audittransactionviewer/main.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/audit/audittransactionviewer/main.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/audit/audittransactionviewer/main.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -9,6 +9,7 @@
})
,reader: new Jaffa.data.DWRQueryResponseReader()
,criteria: {objectLimit: 1, resultGraphRules: ['**']}
+ ,loadMask: true
});
// Create local funtion that will build the viewport
@@ -22,7 +23,8 @@
,generateHeaderTitleSuffix: function () {
return '';
}
- })
+ }),
+ nav: new Jaffa.maintenance.NavPanel({width: '300'})
});
viewport.navPanel.collapse();
@@ -33,6 +35,7 @@
defaultType: 'textfield',
disabled: !params.defaultName,
title:'Last Update',
+ labelWidth: 85,
items:[
{
mapping:'createdBy',
Modified: trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/RulesDetailPanel.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/RulesDetailPanel.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/RulesDetailPanel.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -75,8 +75,29 @@
}
}
];
- if (this.tbarExtend)
- tbar = tbar.concat(this.tbarExtend);
+ if (this.enableSearch)
+ tbar = tbar.concat([
+ '-',
+ {xtype:'textfield', emptyText:Labels.get('label.Jaffa.SC.SystemConfigDesktop.searchValue'),ref:'searchField',
+ listeners : {
+ "specialkey": function(field, ev){
+ if(ev.getKey() == ev.ENTER){
+ ev.preventDefault();
+ this.ownerCt.ownerCt.search(this.getValue());
+ }
+ },
+ keydown: {
+ fn: function(){
+ this.ownerCt.ownerCt.search(this.getValue());
+ },
+ buffer: 350
+ }
+ }
+ },{
+ itemId:'searchCount',
+ text: Labels.get('label.Jaffa.Widgets.Button.Search') + ': 0 of 0'
+ }
+ ]);
Ext.apply(this, {
title: this.path?this.path:Labels.get('label.Jaffa.SC.SystemConfigDesktop.mainTabTitle'),
@@ -180,6 +201,8 @@
}, this);
},
loadFromPath: function(path){
+ this.path = path;
+ this.store.removeAll();
var tableProperties = {};
for (var property in Jaffa.SC.BusinessRules.uniqueRuleSet) {
var prop = property.toLowerCase();
@@ -231,6 +254,8 @@
metaData: propMeta}));
},
search: function(searchString){
+ this.searchString = searchString;
+ this.topToolbar.searchField.setValue(this.searchString);
if (this._dirty){
Ext.MessageBox.show({
title : Labels.get('label.Jaffa.SC.SystemConfigDesktop.SearchWarning'),
@@ -249,20 +274,41 @@
return false;
}
this.store.removeAll();
+
+ var searchCount = 0;
+ var totalCount = 0;
+ this.getTopToolbar().getComponent('searchCount').setText(Labels.get('label.Jaffa.Widgets.Button.Search') + ': ' + searchCount + ' of ' + totalCount);
+
if (searchString!=''){
searchString = searchString.toLowerCase();
var tableProperties = {};
for (var property in Jaffa.SC.BusinessRules.uniqueRuleSet) {
var prop = property.toLowerCase();
var meta = this.getMetaData(property);
+ var searchLimit = 50;
if (prop.indexOf(searchString) >= 0) {
- this.addRuleToStore(property,this.store);
+ totalCount = totalCount + 1;
+ if (totalCount <= searchLimit){
+ searchCount = searchCount + 1;
+ this.addRuleToStore(property,this.store);
+ }
} else if (meta && meta.label && meta.label.toLowerCase().indexOf(searchString) >= 0){
- this.addRuleToStore(property,this.store);
+ totalCount = totalCount + 1;
+ if (totalCount <= searchLimit){
+ searchCount = searchCount + 1;
+ this.addRuleToStore(property,this.store);
+ }
} else if (meta && meta.annotation && meta.annotation.toLowerCase().indexOf(searchString) >= 0){
- this.addRuleToStore(property,this.store);
+ totalCount = totalCount + 1;
+ if (totalCount <= searchLimit){
+ searchCount = searchCount + 1;
+ this.addRuleToStore(property,this.store);
+ }
}
}
+
+ this.getTopToolbar().getComponent('searchCount').setText(Labels.get('label.Jaffa.Widgets.Button.Search') + ': ' + searchCount + ' of ' + totalCount);
+
if (this.store.sortInfo && this.store.sortInfo.field && this.store.sortInfo.direction)
this.store.sort(this.store.sortInfo.field,this.store.sortInfo.direction);
}
@@ -292,9 +338,10 @@
if (meta){
switch (meta.type) {
case 'string':
- if (meta.inList)
+ if (meta.inList){
config.xtype = 'combo';
- else{
+ config.forceSelection = true;
+ }else{
config.xtype = 'textfield';
if (meta.maxLength) config.maxLength=meta.maxLength;
if (meta.minLength) config.minLength=meta.minLength;
@@ -330,7 +377,6 @@
config.xtype = 'lovcombo';
config.displayField = 'field2';
config.valueField = 'field1';
- config.initialized = true;
}else
config.xtype = 'textfield';
break;
@@ -342,6 +388,7 @@
config.store = meta.inList;
config.minChars= 0;
config.triggerAction= 'all';
+ config.initialized= 'all';
config.maxHeight= 150;
config.resizable= true;
}
@@ -359,6 +406,15 @@
this._dirty = false;
this.setTitle(this.baseTitle);
}
+ },
+ refresh: function(){
+ this.setDirty(false);
+ if (this.path)
+ this.loadFromPath(this.path);
+ else if (this.searchString)
+ this.search('');
+ if (this.store.sortInfo && this.store.sortInfo.field && this.store.sortInfo.direction)
+ this.store.sort(this.store.sortInfo.field,this.store.sortInfo.direction);
}
});
Modified: trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/main.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/main.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/main.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -142,6 +142,36 @@
headerTitle: Labels.get('title.Jaffa.SC.SystemConfigDesktop'),
generateHeaderTitleSuffix: function(){
return '';
+ },
+ helpPathName: 'jaffa/sc/systemconfigdesktop',
+ onRefresh: function(btn, evt){
+ if (Jaffa.SC.DesktopController.isDirty()){
+ Ext.MessageBox.show({
+ title : Labels.get('label.Jaffa.SC.SystemConfigDesktop.RefreshWarning'),
+ msg : Labels.get('label.Jaffa.SC.SystemConfigDesktop.RefreshWarningMessage'),
+ width : 400,
+ buttons : Ext.MessageBox.YESNO,
+ icon : Ext.MessageBox.QUESTION,
+ scope: this,
+ fn : function(btn) {
+ if (btn == 'yes') {
+ viewport.tabPanel.items.each(
+ function(tab){
+ tab.refresh();
+ }
+ );
+ Jaffa.SC.DesktopController.setDirty(false);
+ }
+ }
+ });
+ } else {
+ viewport.tabPanel.items.each(
+ function(tab){
+ tab.refresh();
+ }
+ );
+ Jaffa.SC.DesktopController.setDirty(false);
+ }
}
})
});
@@ -171,24 +201,11 @@
controller: Jaffa.SC.DesktopController,
stateId: 'rulesearchgrid',
closable: false,
- tbarExtend: [
- '-',
- {xtype:'textfield', emptyText:Labels.get('label.Jaffa.SC.SystemConfigDesktop.searchValue'),ref:'searchField',
- listeners : {
- "specialkey": function(field, ev){
- if(ev.getKey() == ev.ENTER){
- ev.preventDefault();
- this.ownerCt.ownerCt.search(this.getValue());
- }
- }
- }},
- {iconCls:'search', handler:function(){
- this.ownerCt.ownerCt.search(this.ownerCt.searchField.getValue());
- }}
- ]
+ enableSearch: true
}
));
-
+
+ viewport.header.topToolbar.refreshBtn.enable();
viewport.doLayout();
Ext.get(document.body).unmask();
});
Modified: trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/main.jsp.labels
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/main.jsp.labels 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/sc/systemconfigdesktop/main.jsp.labels 2012-04-12 21:54:33 UTC (rev 6159)
@@ -1,3 +1,5 @@
+label.Jaffa.SC.SystemConfigDesktop.RefreshWarning
+label.Jaffa.SC.SystemConfigDesktop.RefreshWarningMessage
label.Jaffa.SC.SystemConfigDesktop.SaveWarning
label.Jaffa.SC.SystemConfigDesktop.SaveWarningMessage
label.Jaffa.SC.SystemConfigDesktop.SearchWarning
Modified: trunk/JaffaConsole/source/html/jaffa/ws/css/docs.css
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/ws/css/docs.css 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/ws/css/docs.css 2012-04-12 21:54:33 UTC (rev 6159)
@@ -264,15 +264,6 @@
background-image: url('../imgs/disable_log.png');
}
-.x-btn-disabled.log-btn .x-btn-text {
- background-image: url('../imgs/disable_log.png');
-}
-
-.x-btn-pressed.log-btn .x-btn-text {
- background-image: url('../imgs/enable_log.png');
-}
-
-
#legend li {
line-height:16px;
}
@@ -451,4 +442,36 @@
background-color:#6299c5;
border:1px solid #6299c5;
color:#fff;
-}
\ No newline at end of file
+}
+
+table.docEditor ol {
+
+ margin: 40px;
+
+ list-style:decimal;
+
+}
+
+table.docEditor ul {
+
+ margin: 40px;
+
+ list-style:disc;
+
+}
+
+div.docEditor1 ol {
+
+ margin: 40px;
+
+ list-style:decimal;
+
+}
+
+div.docEditor1 ul {
+
+ margin: 40px;
+
+ list-style:disc;
+
+}
Modified: trunk/JaffaConsole/source/html/jaffa/ws/css/jawr.pfragment
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/ws/css/jawr.pfragment 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/ws/css/jawr.pfragment 2012-04-12 21:54:33 UTC (rev 6159)
@@ -8,7 +8,8 @@
/jaffa/ws/css/collapser.css, \
/jaffa/ws/css/docs.css, \
/jaffa/ws/css/style.css, \
- /jaffa/ws/css/welcome.css
+ /jaffa/ws/css/welcome.css, \
+ /jaffa/ws/css/wramonline.css
# Now define a full bundle of jaffaRia+product1+jaffa/ws
jawr.css.bundle.jaffaWsAll.id=/bundles/jaffa/ws.css
Modified: trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/APITree.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/APITree.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/APITree.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -1,3 +1,8 @@
+/**
+ * @param {json} treeNodes
+ *
+ * Load the web service details into ApiTree
+ */
ApiPanel = function(treeNodes) {
ApiPanel.superclass.constructor.call(this, {
id:'api-tree',
@@ -30,6 +35,15 @@
});
};
+/**
+ * @class ApiPanel
+ * @extends Ext.tree.TreePanel
+ * @author Saravanan N
+ *
+ * 1) Loads the web service classes in tree representation.
+ * 2) Filter option to find the specified web service in loaded web service tree.
+ *
+ */
Ext.extend(ApiPanel, Ext.tree.TreePanel, {
initComponent: function(){
this.hiddenPkgs = [];
Modified: trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/DocPanel.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/DocPanel.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/DocPanel.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -1,3 +1,10 @@
+/**
+ * @param {string} description
+ *
+ * @return string.
+ *
+ * This method will replace the " with '"'.
+ */
function replaceQuot(description){
description = description.replace(/"/g, '"');
@@ -4,6 +11,13 @@
return description;
}
+/**
+ * @param {string} ruleName
+ * @param {string} property
+ * @param {string} className
+ *
+ * This method will init the rules source list window.
+ */
function fnRuleSourceList(ruleName,property,className){
ruleSourceListWindow = new Ext.Window(
{
@@ -24,6 +38,12 @@
ruleSourceListWindow.show();
}
+/**
+ * @param {object} target
+ *
+ * This method will init and open the web service test tab for the
+ * selected property of the service.
+ */
function fnWsUtilToolCall(target){
var methodName = target.getAttribute('propName');
var serviceClass = target.getAttribute('serviceClass');
@@ -34,6 +54,12 @@
methodName : methodName
}));
}
+
+/**
+ * @param {string} htmlString
+ *
+ * This method is used to Strip out all the html tags from the input html string.
+ */
function removeHTMLTags(htmlString){
var strInputCode = htmlString;
strInputCode = strInputCode.replace(/&(lt|gt);/g, function (strMatch, p1){
@@ -44,6 +70,11 @@
return strTagStrippedText;
}
+/**
+ * @param {string} str.
+ *
+ * This method is used conver the input string into mixed case.
+ */
function toMixedCase(str) {
var val = str.replace(/\w\S*/g, function(txt){
return txt.charAt(0).toLowerCase() + txt.substr(1);
@@ -54,15 +85,17 @@
}
return val;
}
-
+/**
+ * @param {object} divElement.
+ *
+ * This method is used initialize the html editor for the selected
+ * editable description.
+ */
function fnContentEditable(divElement){
- //alert(divElement.id);
var className = divElement.id.substr(0,divElement.id.indexOf("_"))
- //alert(className);
-
var propName ='';
var paramName = '';
var returnTypeName = '';
@@ -83,10 +116,6 @@
returnTypeName = divElement.getAttribute('returnTypeName');
}
- //alert(propName)
- //alert(paramName)
- //alert(returnTypeName)
-
var htmlEditorId = className.substr(className.lastIndexOf(".")+1)+propName;
var htmlEditor = Ext.getCmp(htmlEditorId);
@@ -96,15 +125,32 @@
htmlEditor.show();
}
-
+/**
+ * @class DocPanel
+ * @extends Ext.Panel
+ * @author Saravanan N
+ *
+ * 1) Loads the web service/graph/critrie details into new tab in DocPanel.
+ * 2) Have the option to edit the class/method/parameter/return type description details.
+ *
+ */
DocPanel = Ext.extend(Ext.Panel, {
closable: true,
autoScroll:true,
+ /**
+ * initialize the event for body onclick.
+ */
initEvents : function(){
DocPanel.superclass.initEvents.call(this);
this.body.on('click', this.onClick, this);
},
+ /**
+ * @parama event
+ * @parama target
+ *
+ * Find the appropriate action for selected target.
+ */
onClick: function(e, target){
if(target = e.getTarget('a:not(.exi)', 3)){
var cls = Ext.fly(target).getAttributeNS('ext', 'cls');
@@ -129,7 +175,14 @@
}
}
},
-
+
+ /**
+ * @parama {string} class
+ *
+ * Load the class details into new tab if it's already not opened in tab.
+ * The tab will be selected as active tab if the select class is already
+ * loaded into a tab.
+ */
loadClass : function(cls){
var clazz = cls.substr(cls.lastIndexOf(".")+1);
var id = 'docs-' + clazz;
@@ -150,6 +203,9 @@
}
},
+ /**
+ * Initialize the DocPanel component.
+ */
initComponent : function(){
var ps = this.cclass.split('.');
var docId = this.id;
@@ -158,6 +214,18 @@
this.title = ps[ps.length-1];
this.bodyStyle = 'background-color:white';
+ /**
+ * Hidden iframe for export data to open in dowload window.
+ */
+ Ext.DomHelper.append(document.body, {
+ tag: 'iframe',
+ id:'downloadIframe',
+ frameBorder: 0,
+ width: 0,
+ height: 0,
+ css: 'display:none;visibility:hidden;height:0px;'
+ });
+
if(cclass.endsWith("Service")){
Ext.Ajax.request({
url: 'jaffa/ws/wsdoc/serviceMetaData.jsp?className='+this.cclass+'&serviceMapping='+serviceMapping,
@@ -311,7 +379,9 @@
}
- // export to File
+ /**
+ * Export to Text file.
+ */
var expTxtBut = new Ext.Button({
iconCls: "icon-text",
tooltip:'Export to Text',
@@ -319,15 +389,6 @@
handler: function(item) {
var jsonStr = JSON.stringify(Ext.getCmp(docId+"_center").getRootNode().getJson(),null,8);
- Ext.DomHelper.append(document.body, {
- tag: 'iframe',
- id:'downloadIframe',
- frameBorder: 0,
- width: 0,
- height: 0,
- css: 'display:none;visibility:hidden;height:0px;'
- });
-
var iFrameBody = document.getElementById("downloadIframe").contentWindow.document.body;
iFrameBody.innerHTML =
"<form action='"+params.appCtx+'/jaffa/ws/wsdoc/exportToText.jsp'+"' method='POST'>" +
@@ -340,7 +401,10 @@
}
});
- //toggle button for logging
+ /**
+ * Toggle button for enabling and disabling the
+ * web service logging for soap message handler.
+ */
var toggleBut = new Ext.Button({
id:docId+'log_taggle',
tooltip: 'Enable/Disable Logging',
@@ -349,9 +413,17 @@
scope: this,
toggleHandler: function(b,pressed){
Ext.getCmp(docId).enableLogging(b,pressed,serviceMapping,docId);
+ if(pressed){
+ this.el.child('button:first').dom.style.backgroundImage = 'url(jaffa/ws/imgs/enable_log.png)';
+ }else{
+ this.el.child('button:first').dom.style.backgroundImage = 'url(jaffa/ws/imgs/disable_log.png)';
+ }
}
});
+ /**
+ * Expand all member function in the web service tab.
+ */
var expandAllMemButton = new Ext.Button({
id:docId+'expand_all_members',
tooltip:'Expand All Members',
@@ -362,7 +434,10 @@
this.body[pressed ? 'addClass' : 'removeClass']('full-details');
}
});
- // export
+
+ /**
+ * Export to Excel file.
+ */
var expBut = new Ext.Button({
iconCls: "excel",
tooltip:'Export to Excel',
@@ -370,15 +445,6 @@
handler: function(item) {
var jsonStr = JSON.stringify(Ext.getCmp(docId+"_center").getRootNode().getJson());
- Ext.DomHelper.append(document.body, {
- tag: 'iframe',
- id:'downloadIframe',
- frameBorder: 0,
- width: 0,
- height: 0,
- css: 'display:none;visibility:hidden;height:0px;'
- });
-
var iFrameBody = document.getElementById("downloadIframe").contentWindow.document.body;
iFrameBody.innerHTML =
"<form action='"+params.appCtx+'/jaffa/ws/wsdoc/exportToExcel.jsp'+"' method='POST'>" +
@@ -405,6 +471,11 @@
expandAllMemButton.setVisible(false);
}
+ /**
+ * Get the json representation of the graph/criteria/dto
+ * tree data for export.
+ *
+ */
Ext.data.Node.prototype.getJson = function () {
// Should deep copy so we don't affect the tree
var json = this.attributes;
@@ -420,9 +491,17 @@
},
+ /**
+ * @param button
+ * @param {boolean} pressed
+ * @param {string} service mapping key for selected web service.
+ * @param {string} tab id
+ *
+ * This method will enable or disable the web service soap message handler logging.
+ *
+ */
enableLogging: function(b,pressed,serviceMapping,docId){
- //alert(pressed);
- //alert(serviceMapping);
+
Ext.getCmp(docId).body.mask("Loading..",'x-mask-loading');
Ext.Ajax.request({
url: 'jaffa/ws/wsdoc/wsLoggingEnabler.jsp?flag='+pressed+'&serviceMapping='+serviceMapping,
@@ -442,6 +521,13 @@
},
+ /**
+ * @param {string} filter. The resultGraphRule.
+ * @param {string} class. The select graph class name.
+ * @param {string} tab id.
+ *
+ * This method is used for filtering the graph as per specified resultGraphRule.
+ */
filteredGraph: function(filter,cclass,docId){
if(cclass.endsWith('Graph')){
filter = filter.replace(/\+/g,'%2B')
@@ -489,19 +575,26 @@
}
})
},
+ /**
+ * @param {Node} node. The tree node.
+ * @param {Event} event. The expand event.
+ *
+ * This method is used for expand event on the tree node to
+ * populate the child nodes for the select node.
+ *
+ */
expandListener : function (node,event){
-
-
var filterText='';
if(Ext.getCmp(node.attributes.docId+'_ruleField')){
filterText = Ext.getCmp(node.attributes.docId+'_ruleField').getValue();
filterText = filterText.replace(/\+/g,'%2B');
}
- //alert(node.attributes.lastFilterText);
- //if filter new value and old value equals do nothing
if(node.attributes.docId && node.attributes.docId.endsWith("Graph")){
+ /**
+ * if filter new value and old value equals do nothing
+ */
if(filterText==node.attributes.lastFilterText){
return;//do nothing
}
@@ -556,7 +649,13 @@
}
},
-
+ /**
+ * @param {Node} node. The tree node.
+ * @param {Event} event. The click event.
+ *
+ * This method is used for tree node onclick event to populate the
+ * detail of the selected node in botton panel of the doc panel.
+ */
clickListener : function (node,event){
var bottomJson = eval(node.attributes.json);
@@ -692,7 +791,17 @@
Ext.getCmp(node.attributes.docId+'_bottom').update(html);
},
-
+ /**
+ * @param {JSON} jsonData
+ * @param {string} className.
+ * @param {string} tab id.
+ * @param {string} filter(resultGraphRule).
+ *
+ * @return JSONArray.
+ *
+ * This method is used for populating the property metadata details
+ * in the json array to load it in the doc panel tree.
+ */
propertyTree: function(jsonData,className,docId,filter){
var json = '['
@@ -731,8 +840,6 @@
}
- //alert(jsonData.fields[field].targetScope);
-
var isLeaf = true;
var iconCls = 'icon-cls';
if(type.endsWith("Graph") || type.endsWith("Criteria") || type.endsWith("Dto") || type.endsWith("FlexBean") ){
@@ -744,8 +851,8 @@
iconCls = 'icon-date';
}else if(type.indexOf("DateTime")>0){
iconCls = 'icon-datetime';
- }else if(type.indexOf("Number")>0 || type.indexOf("Integer") >0
- || type.indexOf("Float")>0 || type.indexOf("Double") > 0 || type.indexOf("Long")>0){
+ }else if(type.indexOf("Number")>0 || type.indexOf("Integer") >0 || type.indexOf("int") >=0
+ || type.indexOf("Float")>0 || type.indexOf("Double") > 0 || type.indexOf("Long")>0 || type.indexOf("Decimal")>0 ){
iconCls = 'icon-number';
}else if(type.indexOf("String")>0 && jsonData.fields[field].caseType && jsonData.fields[field].caseType.endsWith('UpperCase')){
iconCls = 'icon-string-uppercase';
@@ -860,7 +967,17 @@
},
-
+ /**
+ * @param {JSON} jsonData
+ * @param {string} className.
+ * @param {string} tab id.
+ * @param {string} filter(resultGraphRule).
+ *
+ * @return JSONArray.
+ *
+ * This method is used for populating the flexbean metadata details
+ * in the json array to load it in the doc panel tree.
+ */
flexBean: function(jsonData,className,docId,filter){
var json = '['
@@ -925,6 +1042,16 @@
},
+ /**
+ * @param {JSON} jsonData
+ * @param {string} docId. The tab id.
+ * @param {string} serviceMapping.
+ *
+ * @return html string.
+ *
+ * This method is constructing the web service detail dynamically for the specified
+ * service class in html representation to load it on web service tab.
+ */
webServiceHtml: function(docId,jsonData,serviceMapping){
var html = "<div class='body-wrap'>"+
"<table cellspacing='0' width='100%'>"+
@@ -938,19 +1065,19 @@
"</table>";
if(jsonData.classAnnotation){
if(security.hasUpdate)
- html+= "<div id='"+jsonData.serviceClassName+"_classDesc' docId='"+docId+"' class='description doc-comment' ondblclick='fnContentEditable(this)' title='double click to edit'>"+replaceQuot(jsonData.classAnnotation)+"</div>";
+ html+= "<div id='"+jsonData.serviceClassName+"_classDesc' docId='"+docId+"' class='docEditor1 description doc-comment' ondblclick='fnContentEditable(this)' title='double click to edit'>"+replaceQuot(jsonData.classAnnotation)+"</div>";
else
html+= "<div id='"+jsonData.serviceClassName+"_classDesc'>"+replaceQuot(jsonData.classAnnotation)+"</div>";
}else{
if(security.hasUpdate)
- html+= "<div id='"+jsonData.serviceClassName+"_classDesc' class='description doc-comment' docId='"+docId+"' ondblclick='fnContentEditable(this)' title='double click to edit'>No Description</div>";
+ html+= "<div id='"+jsonData.serviceClassName+"_classDesc' class='docEditor1 description doc-comment' docId='"+docId+"' ondblclick='fnContentEditable(this)' title='double click to edit'>No Description</div>";
else
html+= "<div id='"+jsonData.serviceClassName+"_classDesc'>No Description</div>";
}
html+= "<div class='hr'></div>"+
"<h2>Public Method</h2>"+
- "<table cellspacing='0' class='member-table'>"+
+ "<table cellspacing='0' class='member-table docEditor'>"+
"<tbody>"+
"<tr>"+
"<th colspan='2' class='sig-header'>Method</th>"+
@@ -1052,6 +1179,16 @@
return html;
},
+ /**
+ * @param {string} docId. The tab id.
+ * @param {JSON} jsonData
+ * @param {string} className.
+ *
+ * @return html string.
+ *
+ * This method is constructing the editable description section for the given class.
+ *
+ */
topHtml:function(docId,jsonData,className){
var html = "<div class='body-wrap' style='padding: 10 10 0 10;'>"+
"<table cellspacing='0'>"+
@@ -1077,12 +1214,26 @@
return html;
},
+ /**
+ * @param {JSONArray} metricsArray.
+ *
+ * @return html string.
+ *
+ * This method is used to build the short description about graph metrics details.
+ */
metricsShortDetails: function(metricsArray){
var metricsDetails = "Viewing: "+metricsArray[0].filteredFieldsSize+"/"+metricsArray[0].allFieldsSize+
" Time: "+metricsArray[0].filteredFieldsElapsedTime+"/"+metricsArray[0].allFieldsElapsedTime;
return metricsDetails;
},
-
+
+ /**
+ * @param {JSONArray} metricsArray.
+ *
+ * @return html string.
+ *
+ * This method is used to build the detailed description about graph metrics details.
+ */
metricsHtml:function(metricsArray){
var html = "<table cellspacing='5' style='border:1px solid #D9D5BE; border-collapse:collapse; font-size:1.0em;'>"+
"<tr>"+
Modified: trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/HtmlEditor.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/HtmlEditor.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/HtmlEditor.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -1,3 +1,12 @@
+/**
+ * @class Ext.ux.form.HtmlEditor
+ * @extends Ext.util.Observable
+ * @author Saravanan N
+ *
+ * The HTML editor is used for editing the class/method/param/return type
+ * description.
+ *
+ */
Ext.ux.form.HtmlEditor.HR = Ext.extend(Ext.util.Observable, {
init: function(cmp){
this.cmp = cmp;
@@ -50,6 +59,19 @@
}
});
+/**
+ * @param {object} divElement. The editable div element which holds the description.
+ * @param {string} className. The metaData class name to update the description.
+ * @param {string} propertyName. The metaData class property name to update the property description.
+ * @param {string} paramName. The metaData class properties param name to update the params description.
+ * @param {string} returnTypeName.The metaData class properties return type to update the return type description.
+ * @param {string} htmlEditorId. The id of the html editor.
+ * @param {string} nodeId. The tree node id.
+ * @param {string} docId.(tabId)
+ *
+ *
+ * This method initialize the html editor with content from div.
+ */
HtmlEditor = function(divElement,className,propertyName,paramName,returnTypeName,htmlEditorId,nodeId,docId) {
var ctitle = className.substr(className.lastIndexOf(".")+1) +' '+ propertyName+ ' Annotation Editor';
HtmlEditor.superclass.constructor.call(this, {
Modified: trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/MainPanel.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/MainPanel.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/MainPanel.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -1,3 +1,9 @@
+/**
+ *
+ * This method will initialize and open the wsdl comparator panel
+ * in new tab on viewport.
+ *
+ */
function login(){
var remoteURL = document.getElementById("remoteURL").value;
@@ -17,6 +23,17 @@
}));
}
+
+/**
+ * @class MainPanel
+ * @extends Ext.Panel
+ * @author Saravanan N
+ *
+ * The MainPanel is used for API home page. This page has loaded with
+ * web service overview and having section for 'Icon Legent' and
+ * Web service 'WSDL Comparator'.
+ *
+ */
MainPanel = function(){
MainPanel.superclass.constructor.call(this, {
Modified: trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/RulesSourceListPanel.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/RulesSourceListPanel.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/RulesSourceListPanel.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -1,3 +1,12 @@
+/**
+ * @class RulesSourceListPanel
+ * @extends Ext.Panel
+ * @author Saravanan N
+ *
+ * The RulesSourceListPanel is used to show the list of source
+ * aop files for the selected rule for specified class/property.
+ *
+ */
RulesSourceListPanel = Ext.extend(Ext.Panel, {
closable: true,
autoScroll:true,
@@ -2,2 +11,5 @@
+ /**
+ * Initialize the on body click event.
+ */
initEvents : function(){
@@ -15,6 +27,10 @@
}
},
+ /**
+ * Initialize the component and call the RulesSourceListService
+ * and populate the source rules list for the give rule in grid.
+ */
initComponent : function(){
var ruleName = this.rule;
Modified: trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/WSTestUtilPanel.js
===================================================================
--- trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/WSTestUtilPanel.js 2012-04-12 21:35:32 UTC (rev 6158)
+++ trunk/JaffaConsole/source/html/jaffa/ws/wsdoc/WSTestUtilPanel.js 2012-04-12 21:54:33 UTC (rev 6159)
@@ -1,3 +1,16 @@
+/**
+ * @class WSTestUtilPanel
+ * @extends Ext.Panel
+ * @author Saravanan N
+ *
+ * The WSTestUtilPanel is used for testing the web service method.
+ * This tool will take the json input to invoke the web service and
+ * return the output in json representation. This has two container,
+ * The top panel is used for taking the input from user to call the
+ * web service and bottom panel will show the web service response
+ * output.
+ *
+ */
WSTestUtilPanel = Ext.extend(Ext.Panel, {
closable: true,
autoScroll:true,
@@ -56,7 +69,7 @@
handler:function(){
var docId = this.id.substr(0,this.id.lastIndexOf("_"));
- var userName = Ext.getCmp(docId+"_userName").value;
+ var userName = Ext.getCmp(docId+"_userName").getValue();
var password = Ext.getCmp(docId+"_password").getValue();
var jsonInput = Ext.getCmp(docId+"_jsonInput").getValue();
var id = this.id;
@@ -64,16 +77,26 @@
Ext.getCmp(docId+"_jsonInput").getEl().setStyle('background', 'white');
Ext.getCmp(docId+"_jsonOutput").setValue("");
- if(!Ext.getCmp(docId+"_password").getValue()){
+ var passwordEmpty = false;
+
+ if(!userName){
+ Ext.getCmp(docId+"_userName").focus();
+ if (!password){
+ fnErrorMessage("User Name and Password are mandatory","Info")
+ return;
+ }else{
+ fnErrorMessage("User Name is mandatory","Info")
+ return;
+ }
+ } else{
+ if (!password){
Ext.getCmp(docId+"_password").focus();
fnErrorMessage("Password is mandatory","Info")
return;
- }
+ }
- if(!Ext.getCmp(docId+"_userName").getValue()){
- Ext.getCmp(docId+"_userName").focus();
- return;
}
+
Ext.getCmp(docId).body.mask("Loading..",'x-mask-loading');
Ext.Ajax.request({
...
[truncated message content] |