[prev in list] [next in list] [prev in thread] [next in thread]
List: esb-java-dev
Subject: [esb-java-dev] svn commit r13179 - in trunk/esb/java: .
From: svn () wso2 ! org
Date: 2008-01-30 15:47:25
Message-ID: E1JKF9p-0005PK-2H () wso2 ! org
[Download RAW message or body]
Author: asankha
Date: Wed Jan 30 07:41:20 2008
New Revision: 13179
Log:
merge changes from 1.6 branch back to trunk
Added:
trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/modules/distribution/src/main/bin/wso2-esb.bat \
trunk/esb/java/modules/distribution/src/main/conf/sample-server-wrapper.conf
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/modules/distribution/src/main/conf/sample-server-wrapper.conf
trunk/esb/java/modules/distribution/src/main/release/BUILDING.txt
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/modules/distribution/src/main/release/BUILDING.txt \
trunk/esb/java/patches/
- copied from r13177, branches/esb/java/1.6/esb/java/patches/
trunk/esb/java/patches/axis2-1.3-kernel-001.jar
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/patches/axis2-1.3-kernel-001.jar \
trunk/esb/java/patches/patches.txt
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/patches/patches.txt \
trunk/esb/java/patches/synapse-1.1.1-trp-jms-001.jar
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/patches/synapse-1.1.1-trp-jms-001.jar \
trunk/esb/java/repository/conf/sample/synapse_sample_256.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/repository/conf/sample/synapse_sample_256.xml \
trunk/esb/java/src/
- copied from r13177, branches/esb/java/1.6/esb/java/src/
trunk/esb/java/src/site/
- copied from r13177, branches/esb/java/1.6/esb/java/src/site/
trunk/esb/java/src/site/resources/
- copied from r13177, branches/esb/java/1.6/esb/java/src/site/resources/
trunk/esb/java/src/site/resources/css/
- copied from r13177, branches/esb/java/1.6/esb/java/src/site/resources/css/
trunk/esb/java/src/site/resources/css/site.css
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/css/site.css \
trunk/esb/java/src/site/resources/images/
- copied from r13177, branches/esb/java/1.6/esb/java/src/site/resources/images/
trunk/esb/java/src/site/resources/images/add_22.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/add_22.gif \
trunk/esb/java/src/site/resources/images/add_m.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/add_m.gif \
trunk/esb/java/src/site/resources/images/add_mediator_22.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/add_mediator_22.gif \
trunk/esb/java/src/site/resources/images/addendpoint.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/addendpoint.jpg \
trunk/esb/java/src/site/resources/images/addregistryentry.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/addregistryentry.jpg \
trunk/esb/java/src/site/resources/images/address_endpoint_editor.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/address_endpoint_editor.jpg \
trunk/esb/java/src/site/resources/images/address_endpoint_editor.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/address_endpoint_editor.png \
trunk/esb/java/src/site/resources/images/basic-con.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/basic-con.jpg \
trunk/esb/java/src/site/resources/images/delete_22.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/delete_22.gif \
trunk/esb/java/src/site/resources/images/delete_m.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/delete_m.gif \
trunk/esb/java/src/site/resources/images/dropdown_m.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/dropdown_m.gif \
trunk/esb/java/src/site/resources/images/edit_22.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/edit_22.gif \
trunk/esb/java/src/site/resources/images/edit_m.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/edit_m.gif \
trunk/esb/java/src/site/resources/images/endpoints.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/endpoints.jpg \
trunk/esb/java/src/site/resources/images/help.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/help.gif \
trunk/esb/java/src/site/resources/images/integrated-reg.Jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/integrated-reg.Jpg \
trunk/esb/java/src/site/resources/images/localrepo.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/localrepo.jpg \
trunk/esb/java/src/site/resources/images/log-settings.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/log-settings.jpg \
trunk/esb/java/src/site/resources/images/login.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/login.png \
trunk/esb/java/src/site/resources/images/logs.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/logs.png \
trunk/esb/java/src/site/resources/images/main_seq.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/main_seq.png \
trunk/esb/java/src/site/resources/images/manage_ps.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/manage_ps.png \
trunk/esb/java/src/site/resources/images/manage_seq.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/manage_seq.png \
trunk/esb/java/src/site/resources/images/mediators.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/mediators.jpg \
trunk/esb/java/src/site/resources/images/ns-add.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/ns-add.jpg \
trunk/esb/java/src/site/resources/images/ns_picker_22.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/ns_picker_22.gif \
trunk/esb/java/src/site/resources/images/out_sequence_editor.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/out_sequence_editor.png \
trunk/esb/java/src/site/resources/images/proxy.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/proxy.jpg \
trunk/esb/java/src/site/resources/images/proxy_basic.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/proxy_basic.png \
trunk/esb/java/src/site/resources/images/ps_stats.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/ps_stats.png \
trunk/esb/java/src/site/resources/images/ps_stats2.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/ps_stats2.png \
trunk/esb/java/src/site/resources/images/registry_picker_22.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/registry_picker_22.gif \
trunk/esb/java/src/site/resources/images/registrybrowser.Jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/registrybrowser.Jpg \
trunk/esb/java/src/site/resources/images/seq-editor.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/seq-editor.jpg \
trunk/esb/java/src/site/resources/images/seq-tab.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/seq-tab.jpg \
trunk/esb/java/src/site/resources/images/server_statistics.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/server_statistics.png \
trunk/esb/java/src/site/resources/images/set-java-home.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/set-java-home.jpg \
trunk/esb/java/src/site/resources/images/stat_s.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/stat_s.gif \
trunk/esb/java/src/site/resources/images/stat_s_disabled.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/stat_s_disabled.gif \
trunk/esb/java/src/site/resources/images/statistics.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/statistics.png \
trunk/esb/java/src/site/resources/images/synapse-flow.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/synapse-flow.png \
trunk/esb/java/src/site/resources/images/synapse-logo-web2.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/synapse-logo-web2.png \
trunk/esb/java/src/site/resources/images/task-con.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/task-con.jpg \
trunk/esb/java/src/site/resources/images/tasks.jpg
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/tasks.jpg \
trunk/esb/java/src/site/resources/images/trace.png
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/trace.png \
trunk/esb/java/src/site/resources/images/tracer_s.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/tracer_s.gif \
trunk/esb/java/src/site/resources/images/tracer_s_disabled.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/tracer_s_disabled.gif \
trunk/esb/java/src/site/resources/images/update_22.gif
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/resources/images/update_22.gif \
trunk/esb/java/src/site/site.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/site.xml trunk/esb/java/src/site/xdoc/
- copied from r13177, branches/esb/java/1.6/esb/java/src/site/xdoc/
trunk/esb/java/src/site/xdoc/ESB_Configuration_Language.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/ESB_Configuration_Language.xml \
trunk/esb/java/src/site/xdoc/ESB_Extending.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/ESB_Extending.xml \
trunk/esb/java/src/site/xdoc/ESB_QuickStart.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/ESB_QuickStart.xml \
trunk/esb/java/src/site/xdoc/ESB_Samples.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/ESB_Samples.xml \
trunk/esb/java/src/site/xdoc/ESB_Samples_Setup.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/ESB_Samples_Setup.xml \
trunk/esb/java/src/site/xdoc/administratorguide.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/administratorguide.xml \
trunk/esb/java/src/site/xdoc/docs_index.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/docs_index.xml \
trunk/esb/java/src/site/xdoc/index.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/index.xml \
trunk/esb/java/src/site/xdoc/installationguide.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/installationguide.xml \
trunk/esb/java/src/site/xdoc/release_notes.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/release_notes.xml \
trunk/esb/java/src/site/xdoc/setting-java-home.xml
- copied unchanged from r13177, \
branches/esb/java/1.6/esb/java/src/site/xdoc/setting-java-home.xml Removed:
trunk/esb/java/modules/distribution/src/main/bin/run-wso2-esb-service.bat
trunk/esb/java/modules/distribution/src/main/docs/
Modified:
trunk/esb/java/modules/core/pom.xml
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/jmx/mbean/ServerStatusView.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/tos/ServerStatus.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java
trunk/esb/java/modules/distribution/pom.xml
trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
trunk/esb/java/modules/distribution/src/main/assembly/src.xml
trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.sh
trunk/esb/java/modules/distribution/src/main/conf/axis2.xml
trunk/esb/java/modules/distribution/src/main/conf/server.xml
trunk/esb/java/modules/distribution/src/main/conf/wrapper.conf
trunk/esb/java/modules/distribution/src/main/release/NOTICE
trunk/esb/java/modules/distribution/src/main/release/README.txt
trunk/esb/java/modules/distribution/src/main/release/release_notes.txt
trunk/esb/java/modules/distribution/src/main/release/samples/README.txt
trunk/esb/java/modules/distribution/src/main/www/about.html
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/esbregistry.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/aggregate_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/callout_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/header_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/makefault_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/pojoCommand_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/send_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/throttle_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/xquery_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/proxyservices.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/menu.html
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/callout_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/class_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/commons.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/filter_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/header_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/pojoCommand_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/pojoCommand_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/property_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/property_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/send_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/spring_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/switch_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/switch_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/throttle_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/throttle_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/validate_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/validate_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_misc_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_misc_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_transport_view.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/system_status.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewtracelogs.xsl
trunk/esb/java/modules/distribution/src/main/www/faq.html
trunk/esb/java/modules/samples/pom.xml
trunk/esb/java/modules/samples/src/main/scripts/axis2server.bat
trunk/esb/java/modules/samples/src/main/scripts/build.xml
trunk/esb/java/pom.xml
trunk/esb/java/repository/conf/sample/resources/misc/client/axis2.xml
trunk/esb/java/repository/conf/sample/resources/misc/server/axis2.xml
trunk/esb/java/repository/conf/sample/synapse_sample_251.xml
Modified: trunk/esb/java/modules/core/pom.xml
==============================================================================
--- trunk/esb/java/modules/core/pom.xml (original)
+++ trunk/esb/java/modules/core/pom.xml Wed Jan 30 07:41:20 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.esb</groupId>
<artifactId>wso2-esb</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.wso2.esb</groupId>
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java Wed Jan 30 \
07:41:20 2008 @@ -52,13 +52,13 @@
}
ServiceBusConfiguration.getInstance();
try {
- String server_web_xml = \
System.getProperty(ServiceBusConstants.ESB_SERVER_WEB_XML);
- if (server_web_xml == null || "".equals(server_web_xml)) {
- server_web_xml = ServiceBusConstants.ESB_CONF_DIRECTORY + \
File.separator + + String serverWebXML = \
System.getProperty(ServiceBusConstants.ESB_SERVER_WEB_XML); + if \
(serverWebXML == null || "".equals(serverWebXML)) { + serverWebXML = \
ServiceBusConstants.ESB_CONF_DIRECTORY + File.separator + \
ServiceBusConstants.ESB_SERVER_WEB_XML; }
XmlConfigurationFactory.init(ServiceBusConstants.ESB_WEB_XML_KEY,
- server_web_xml, ServiceBusConstants.ESB_XML_NAMESPACE);
+ serverWebXML, ServiceBusConstants.ESB_XML_NAMESPACE);
} catch (ServerException e) {
log.error("Error loading server-web.xml", e);
}
@@ -84,7 +84,7 @@
TransportInDescription tinDesc = (TransportInDescription) iter.next();
TransportListener listener = tinDesc.getReceiver();
if (listener instanceof ManagementSupport) {
- ((ManagementSupport) listener).maintenenceShutdown(millis);
+ ((ManagementSupport) listener).pause();
}
}
try {
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java Wed \
Jan 30 07:41:20 2008 @@ -89,6 +89,7 @@
private String esbHomeLocation;
private JMXConnectorServer jmxConnectorServer;
private java.rmi.registry.Registry rmiRegistry;
+ private boolean hasAlreadyInit = false;
public static ServiceBusManager getInstance() {
if (instance == null) {
@@ -98,25 +99,17 @@
}
private ServiceBusManager() {
- this(ServiceBusConfiguration.getInstance());
- if (XmlConfigurationFactory.getXmlConfiguration(ServiceBusConstants.ESB_WEB_XML_KEY) \
== null) {
- try {
- String server_web_xml = \
System.getProperty(ServiceBusConstants.ESB_SERVER_WEB_XML);
- if (server_web_xml == null || "".equals(server_web_xml)) {
- server_web_xml = "conf" + File.separator + \
ServiceBusConstants.ESB_SERVER_WEB_XML;
- }
- XmlConfigurationFactory.init(ServiceBusConstants.ESB_WEB_XML_KEY,
- server_web_xml, ServiceBusConstants.ESB_XML_NAMESPACE);
- } catch (ServerException e) {
- log.error("Error loading server-web.xml", e);
- }
- }
}
public void init() {
- initSystemProperties();
+ initSystemProperties();
+ if (hasAlreadyInit) {
+ return;
+ }
createTempAxisWorkDirectory();
HibernateConfigCache.clearCache();
+ initServiceBusConfiguration();
+ hasAlreadyInit = true;
}
public void start() throws ServiceBusException {
@@ -170,6 +163,22 @@
stopJMXService();
}
+ private void initServiceBusConfiguration() {
+ this.esbConfiguration = ServiceBusConfiguration.getInstance();
+ if (XmlConfigurationFactory.getXmlConfiguration(ServiceBusConstants.ESB_WEB_XML_KEY) \
== null) { + try {
+ String serverWebXML = \
System.getProperty(ServiceBusConstants.ESB_SERVER_WEB_XML); + if \
(serverWebXML == null || "".equals(serverWebXML)) { + serverWebXML \
= "conf" + File.separator + ServiceBusConstants.ESB_SERVER_WEB_XML; + \
} + XmlConfigurationFactory.init(ServiceBusConstants.ESB_WEB_XML_KEY,
+ serverWebXML, ServiceBusConstants.ESB_XML_NAMESPACE);
+ } catch (ServerException e) {
+ log.error("Error loading server-web.xml", e);
+ }
+ }
+ }
+
private void addShutdownHook() {
shutdownHook = new Thread() {
public void run() {
@@ -194,10 +203,6 @@
return shutdownHook;
}
- public ServiceBusManager(ServiceBusConfiguration esbConfiguration) {
- this.esbConfiguration = esbConfiguration;
- }
-
public ServiceBusConfiguration getEsbConfiguration() {
return esbConfiguration;
}
@@ -518,24 +523,39 @@
}
private void startJMXService() {
+
String jmxPort = \
ServiceBusConfiguration.getInstance().getFirstProperty("Ports.JMX"); if (jmxPort != \
null) { + // only jmx support is available for jdk 1.5
String javaVersion = System.getProperty("java.version");
if (javaVersion.indexOf("1.4") != -1) { // In ESB, JMX is not supported \
on JDK 1.4 log.warn("JMX is not supported on JDK 1.4. " +
"Please use JDK 1.5 or newer version if you requre JMX \
functionality."); return;
}
- log.info("Starting JMX Connector");
+
+ log.info("Starting the JMX Connector");
+
int jmxPortInt = Integer.parseInt(jmxPort);
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+
+ while (true) {
+ //creating local registry
+ try {
+ rmiRegistry = LocateRegistry.createRegistry(jmxPortInt);
+ break;
+ } catch (Exception ignored) {
+ String msg = "Couldn't create a localregistry(RMI) : port " + \
jmxPortInt + + " already in use. Trying alternate";
+ log.warn(msg);
+ jmxPortInt++;
+ }
+ }
+ // Create an RMI connector and start it
try {
- rmiRegistry = LocateRegistry.createRegistry(jmxPortInt);
- // Create an RMI connector and start it
String jmxURL = "service:jmx:rmi:///jndi/rmi://" +
NetworkUtils.getLocalHostname() + ":" + jmxPortInt + "/esb";
JMXServiceURL url = new JMXServiceURL(jmxURL);
-
// Security credentials are included in the env Map
HashMap env = new HashMap();
env.put(JMXConnectorServer.AUTHENTICATOR, new \
ESBJMXAuthenticator()); @@ -544,9 +564,8 @@
jmxConnectorServer.start();
log.info("JMX Service URL : " + jmxURL);
} catch (Exception e) {
- String msg = "Could not initialize MBean server";
- log.error(msg, e);
- throw new ServiceBusException(msg, e);
+ String msg = "Couldn't initialize the JMX Connector on the port ' " \
+ jmxPort + " '"; + handleException(msg, e);
}
}
}
@@ -558,16 +577,14 @@
jmxConnectorServer.stop();
} catch (IOException e) {
String msg = "Error when Shutting down the JMX Connector ";
- log.error(msg, e);
- throw new ServiceBusException(msg, e);
+ handleException(msg, e);
}
}
try {
UnicastRemoteObject.unexportObject(rmiRegistry, true);
} catch (NoSuchObjectException e) {
String msg = "Error when stoping localregistry(RMI)";
- log.error(msg, e);
- throw new ServiceBusException(msg, e);
+ handleException(msg, e);
}
}
@@ -577,7 +594,7 @@
if (jmxAgentName == null || "".equals(jmxAgentName)) {
jmxAgentName = "org.wso2.esb";
}
-
+
registerMBean(mbs, new ServerView(),
jmxAgentName + ":Type=Admin,ConnectorName=ServerAdmin");
registerMBean(mbs, new ServerStatusView(),
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/jmx/mbean/ServerStatusView.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/jmx/mbean/ServerStatusView.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/jmx/mbean/ServerStatusView.java Wed \
Jan 30 07:41:20 2008 @@ -30,34 +30,43 @@
public class ServerStatusView implements ServerStatusViewMBean {
- private ServerStatus serverStatus;
+ private final ServerStatus serverStatus;
public ServerStatusView() {
- try {
- this.serverStatus = new ServerStatus(
- ServiceBusManager.getInstance().getConfigurationContext().getAxisConfiguration());
- } catch (AxisFault axisFault) {
- throw new ServiceBusException("Error initiating ServerStatusView", \
axisFault);
- }
+ this.serverStatus = new ServerStatus();
}
public String viewSystemUpTime() {
- return serverStatus.getSystemUpTime();
+ update();
+ return this.serverStatus.getSystemUpTime();
}
public String viewServerStartTime() {
- return serverStatus.getServerStartTime();
+ update();
+ return this.serverStatus.getServerStartTime();
}
public String viewServerName() {
- return serverStatus.getServerName();
+ update();
+ return this.serverStatus.getServerName();
}
public String viewFreeMemory() {
- return serverStatus.getFreeMemory();
+ update();
+ return this.serverStatus.getFreeMemory();
}
public String viewTotalMemory() {
- return serverStatus.getTotalMemory();
+ update();
+ return this.serverStatus.getTotalMemory();
+ }
+
+ private void update() {
+ try {
+ this.serverStatus.updateStates(
+ ServiceBusManager.getInstance().getConfigurationContext().getAxisConfiguration());
+ } catch (AxisFault axisFault) {
+ throw new ServiceBusException("Error initiating ServerStatusView", \
axisFault); + }
}
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java Wed \
Jan 30 07:41:20 2008 @@ -398,16 +398,48 @@
String endpointName = endpointElement.getAttributeValue(new \
QName("name"));
log.info("Updating the definition of the endpoint : " + endpointName);
- if (endpointName != null &&
- !("".equals(endpointName)) &&
- getSynapseConfiguration().getEndpoint(endpointName.trim()) == \
null) { + if (endpointName == null) {
handleFault(log,
- "The endpoint named '" + endpointName + "' does not exist", \
null);
- } else {
- Endpoint endpoint = EndpointAbstractFactory.getEndpointFactroy(
- endpointElement).createEndpoint(endpointElement, false);
- getSynapseConfiguration().addEndpoint(endpointName.trim(), \
endpoint); + "The endpoint named cannot be null", null);
}
+
+ if ("".equals(endpointName)) {
+ handleFault(log,
+ "The endpoint named cannot be empty ", null);
+ }
+
+ Endpoint previousEndpoint = \
getSynapseConfiguration().getEndpoint(endpointName.trim()); +
+ if (previousEndpoint == null) {
+ handleFault(log,
+ "The endpoint named '" + endpointName + "' does not exist", \
null); + }
+
+ int staisticsState = SynapseConstants.STATISTICS_UNSET;
+ if (previousEndpoint instanceof AddressEndpoint) {
+ staisticsState = ((AddressEndpoint) previousEndpoint).getEndpoint()
+ .getStatisticsState();
+ } else if (previousEndpoint instanceof WSDLEndpoint) {
+ staisticsState = ((WSDLEndpoint) previousEndpoint).getEndpoint()
+ .getStatisticsState();
+ }
+
+ Endpoint endpoint = EndpointAbstractFactory.getEndpointFactroy(
+ endpointElement).createEndpoint(endpointElement, false);
+ if (endpoint == null) {
+ handleFault(log, "Newly created endpoint is null ", null);
+ }
+
+ if (endpoint instanceof AddressEndpoint) {
+ ((AddressEndpoint) endpoint).getEndpoint()
+ .setStatisticsState(staisticsState);
+ } else if (endpoint instanceof WSDLEndpoint) {
+ ((WSDLEndpoint) endpoint).getEndpoint()
+ .setStatisticsState(staisticsState);
+ }
+
+ getSynapseConfiguration().addEndpoint(endpointName.trim(), endpoint);
+
log.info("Updated the definition of the endpoint : " + endpointName);
return true;
} else {
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java Wed \
Jan 30 07:41:20 2008 @@ -18,6 +18,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseConstants;
@@ -231,6 +232,19 @@
if(!proxy.isStartOnLoad()) {
proxy.stop(getSynapseConfiguration());
}
+
+ if (proxy != null) {
+ if (proxy.getTargetInLineInSequence() != null) {
+ \
proxy.getTargetInLineInSequence().init(getSynapseEnvironment()); + \
} + if (proxy.getTargetInLineOutSequence() != null) {
+ \
proxy.getTargetInLineOutSequence().init(getSynapseEnvironment()); + \
} + if (proxy.getTargetInLineFaultSequence() != null) {
+ \
proxy.getTargetInLineFaultSequence().init(getSynapseEnvironment()); + \
} + }
+
getSynapseConfiguration().addProxyService(proxy.getName(), \
proxy);
} catch (AxisFault af) {
@@ -294,6 +308,19 @@
getSynapseConfiguration().getProxyService(
proxyName).start(getSynapseConfiguration());
}
+
+ ProxyService proxy = \
getSynapseConfiguration().getProxyService(proxyName); + if \
(proxy != null) { + if (proxy.getTargetInLineInSequence() \
!= null) { + \
proxy.getTargetInLineInSequence().init(getSynapseEnvironment()); + \
} + if (proxy.getTargetInLineOutSequence() != null) {
+ \
proxy.getTargetInLineOutSequence().init(getSynapseEnvironment()); + \
} + if (proxy.getTargetInLineFaultSequence() != null) {
+ \
proxy.getTargetInLineFaultSequence().init(getSynapseEnvironment()); + \
} + }
} catch (Exception e) {
log.error("Unable to save changes made for the proxy service \
: " @@ -312,6 +339,8 @@
}
}
+
+
} else {
handleFault(log, "Unable to save proxy service. Invalid definition", \
null); }
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java Wed \
Jan 30 07:41:20 2008 @@ -43,7 +43,9 @@
private static Log log = LogFactory.getLog(ServerAdmin.class);
public ServerStatus getStatus() throws AxisFault {
- return new ServerStatus(getAxisConfig());
+ ServerStatus serverStatus = new ServerStatus();
+ serverStatus.updateStates(getAxisConfig());
+ return serverStatus;
}
public ServerData getServerData() throws AxisFault {
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/tos/ServerStatus.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/tos/ServerStatus.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/tos/ServerStatus.java Wed \
Jan 30 07:41:20 2008 @@ -49,7 +49,7 @@
private long maxResponseTime;
private SimpleDateFormat dateFormatter = new SimpleDateFormat(
- "yyyy-MM-dd HH:mm:ss");
+ "yyyy-MM-dd HH:mm:ss");
/**
* Generate server status data reading necessary information from the
@@ -58,7 +58,7 @@
* @param axisConfig
* @throws AxisFault
*/
- public ServerStatus(AxisConfiguration axisConfig) throws AxisFault {
+ public void updateStates(AxisConfiguration axisConfig) throws AxisFault {
Parameter systemStartTime = \
axisConfig.getParameter(StatisticsConstants.SERVER_START_TIME); long startTime = \
((Long) systemStartTime.getValue()).longValue(); @@ -77,19 +77,19 @@
}
responseCount =
- ((org.wso2.statistics.Counter) axisConfig.
- \
getParameter(StatisticsConstants.GLOBAL_RESPONSE_COUNTER).getValue()).
- getCount();
+ ((org.wso2.statistics.Counter) axisConfig.
+ getParameter(StatisticsConstants.GLOBAL_RESPONSE_COUNTER).getValue()).
+ getCount();
faultCount =
- ((org.wso2.statistics.Counter) axisConfig.
- \
getParameter(StatisticsConstants.GLOBAL_FAULT_COUNTER).getValue()).
- getCount();
+ ((org.wso2.statistics.Counter) axisConfig.
+ getParameter(StatisticsConstants.GLOBAL_FAULT_COUNTER).getValue()).
+ getCount();
- freeMemory = formatMemoryValue(Runtime.getRuntime().freeMemory());
+ freeMemory = formatMemoryValue(Runtime.getRuntime().freeMemory());
totalMemory = formatMemoryValue(Runtime.getRuntime().totalMemory());
AxisServiceGroup asg =
- axisConfig.getServiceGroup(org.wso2.esb.ServiceBusConstants.ADMIN_SERVICE_GROUP);
+ axisConfig.getServiceGroup(org.wso2.esb.ServiceBusConstants.ADMIN_SERVICE_GROUP);
int adminservicecout = 0;
int activeServices = 0;
@@ -102,14 +102,14 @@
AxisService axisService = (AxisService) iter.next();
Parameter parameter =
- \
axisService.getParameter(StatisticsConstants.SERVICE_REQUEST_COUNTER); + \
axisService.getParameter(StatisticsConstants.SERVICE_REQUEST_COUNTER);
if (parameter != null) {
totalRequestForAdmin += ((Counter) parameter.getValue()).getCount();
}
Parameter faultCounterParameter =
- \
axisService.getParameter(StatisticsConstants.SERVICE_FAULT_COUNTER); + \
axisService.getParameter(StatisticsConstants.SERVICE_FAULT_COUNTER);
if (faultCounterParameter != null) {
totalFaultCountForAdmin += ((Counter) \
faultCounterParameter.getValue()).getCount(); @@ -134,12 +134,12 @@
}
// counter includes Synapse Service as well
- // Following code only Shows the awailable proxy services.
- requestCount -= totalRequestForAdmin;
+ // Following code only Shows the awailable proxy services.
+ requestCount -= totalRequestForAdmin;
responseCount -= totalResponseFromAdmin;
- faultCount -= totalFaultCountForAdmin;
- this.services = activeServices - adminservicecout - 1;
- serverName = org.wso2.esb.ServiceBusConstants.ESB_INSTANCE;
+ faultCount -= totalFaultCountForAdmin;
+ this.services = activeServices - adminservicecout - 1;
+ serverName = org.wso2.esb.ServiceBusConstants.ESB_INSTANCE;
avgResponseTime = \
StatisticsModule.responseTimeProcessor.getAvgResponseTime();
maxResponseTime = \
StatisticsModule.responseTimeProcessor.getMaxResponseTime(); @@ -168,20 +168,20 @@
StringBuffer sb = new StringBuffer();
long remainder = seconds;
- int days = (int) remainder / (60*60*24);
- remainder = remainder - days*60*60*24;
+ int days = (int) remainder / (60 * 60 * 24);
+ remainder = remainder - days * 60 * 60 * 24;
if (days > 0) {
sb.append(" ").append(days).append(days == 1 ? " day" : " days");
}
- int hours = (int) remainder / (60*60);
- remainder = remainder - hours*60*60;
+ int hours = (int) remainder / (60 * 60);
+ remainder = remainder - hours * 60 * 60;
if (hours > 0) {
sb.append(" ").append(hours).append(hours == 1 ? " hr" : " hrs");
}
int minutes = (int) remainder / (60);
- remainder = remainder - minutes*60;
+ remainder = remainder - minutes * 60;
if (minutes > 0) {
sb.append(" ").append(minutes).append(minutes == 1 ? " min" : " mins");
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java Wed \
Jan 30 07:41:20 2008 @@ -64,7 +64,7 @@
String esbhome = resolveEsbHome(servletConfig);
if (esbhome != null || !"".equals(esbhome)) {
System.setProperty(ServiceBusConstants.ESB_HOME, esbhome);
- ServiceBusManager.getInstance().initSystemProperties();
+ ServiceBusManager.getInstance().init();
try {
URL url = new URL("file:" + esbhome + File.separator
+ ServiceBusConstants.ESB_CONF_DIRECTORY + "log4j.properties");
Modified: trunk/esb/java/modules/distribution/pom.xml
==============================================================================
--- trunk/esb/java/modules/distribution/pom.xml (original)
+++ trunk/esb/java/modules/distribution/pom.xml Wed Jan 30 07:41:20 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.esb</groupId>
<artifactId>wso2-esb</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.wso2.esb</groupId>
@@ -35,28 +35,6 @@
<build>
<plugins>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>init</id>
- <phase>initialize</phase>
- <configuration>
- <tasks>
- <mkdir dir="target"/>
- <mkdir dir="target/temp"/>
- <mkdir dir="target/temp/lib"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>-->
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -160,6 +138,34 @@
</copy>
<mkdir dir="target/temp/lib/extensions"/>
+ <mkdir dir="target/temp/docs"/>
+ <mkdir dir="target/temp/docs/styles"/>
+ <mkdir dir="target/temp/docs/images"/>
+ <copy file="../../src/site/xdoc/administratorguide.xml"
+ \
tofile="target/temp/docs/administratorguide.html"/> + \
<copy file="../../src/site/xdoc/ESB_Configuration_Language.xml" + \
tofile="target/temp/docs/ESB_Configuration_Language.html"/> + \
<copy file="../../src/site/xdoc/docs_index.xml" + \
tofile="target/temp/docs/docs_index.html"/> + <copy \
file="../../src/site/xdoc/ESB_Extending.xml" + \
tofile="target/temp/docs/ESB_Extending.html"/> + <copy \
file="../../src/site/xdoc/index.xml" + \
tofile="target/temp/docs/index.html"/> + <copy \
file="../../src/site/xdoc/installationguide.xml" + \
tofile="target/temp/docs/installationguide.html"/> + <copy \
file="../../src/site/xdoc/ESB_QuickStart.xml" + \
tofile="target/temp/docs/ESB_QuickStart.html"/> + <copy \
file="../../src/site/xdoc/ESB_Samples.xml" + \
tofile="target/temp/docs/ESB_Samples.html"/> + <copy \
file="../../src/site/xdoc/ESB_Samples_Setup.xml" + \
tofile="target/temp/docs/ESB_Samples_Setup.html"/> + <copy \
file="../../src/site/xdoc/setting-java-home.xml" + \
tofile="target/temp/docs/setting-java-home.html"/> + <copy \
file="../../src/site/resources/css/site.css" + \
tofile="target/temp/docs/styles/dist-docs.css"/> + <copy \
todir="target/temp/docs/images"> + <fileset \
dir="../../src/site/resources/images"/> + </copy>
</tasks>
</configuration>
<goals>
@@ -192,26 +198,6 @@
</executions>
</plugin>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>init</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <delete dir="target/temp"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>-->
-
</plugins>
</build>
</project>
Modified: trunk/esb/java/modules/distribution/src/main/assembly/bin.xml
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml Wed Jan 30 07:41:20 \
2008 @@ -59,13 +59,6 @@
<directory>src/main/bin</directory>
<outputDirectory>wso2esb-${wso2.esb.version}/bin</outputDirectory>
<includes>
- <include>run-wso2-esb-service.bat</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/bin</directory>
- <outputDirectory>wso2esb-${wso2.esb.version}/bin</outputDirectory>
- <includes>
<include>wso2-esb-daemon.sh</include>
</includes>
<fileMode>755</fileMode>
@@ -98,11 +91,11 @@
</excludes>
</fileSet>
<fileSet>
- <directory>src/main/docs</directory>
+ <directory>target/temp/docs</directory>
<outputDirectory>wso2esb-${wso2.esb.version}/docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>src/main/docs</directory>
+ <directory>target/temp/docs</directory>
<outputDirectory>wso2esb-${wso2.esb.version}/webapp/docs</outputDirectory>
</fileSet>
<fileSet>
@@ -127,19 +120,27 @@
<include>libwrapper-solaris-x86-32.so</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../../patches</directory>
+ <outputDirectory>wso2esb-${wso2.esb.version}/webapp/WEB-INF/lib/patches</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ <include>patches.txt</include>
+ </includes>
+ </fileSet>
<fileSet>
<directory>../../registry</directory>
<outputDirectory>wso2esb-${wso2.esb.version}/registry</outputDirectory>
</fileSet>
- <fileSet>
- <directory>src/main/release/docs</directory>
- <outputDirectory>wso2esb-${wso2.esb.version}/docs</outputDirectory>
- <includes>
- <include>administratorguide.html</include>
- </includes>
- </fileSet>
+ <!--<fileSet>-->
+ <!--<directory>src/main/release/docs</directory>-->
+ <!--<outputDirectory>wso2esb-${wso2.esb.version}/docs</outputDirectory>-->
+ <!--<includes>-->
+ <!--<include>administratorguide.html</include>-->
+ <!--</includes>-->
+ <!--</fileSet>-->
<fileSet>
<directory>src/main/release</directory>
Modified: trunk/esb/java/modules/distribution/src/main/assembly/src.xml
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/assembly/src.xml (original)
+++ trunk/esb/java/modules/distribution/src/main/assembly/src.xml Wed Jan 30 07:41:20 \
2008 @@ -24,18 +24,20 @@
</formats>
<fileSets>
- <!--
<fileSet>
<directory>src/main/release</directory>
- <outputDirectory>synapse-${synapse.version}-src</outputDirectory>
+ <outputDirectory>wso2esb-${wso2esb.version}-src</outputDirectory>
<includes>
- <include>DISCLAIMER</include>
<include>LICENSE</include>
<include>NOTICE</include>
<include>README.txt</include>
<include>BUILDING.txt</include>
</includes>
- </fileSet>-->
+ </fileSet>
+ <fileSet>
+ <directory>./../../patches</directory>
+ <outputDirectory>wso2esb-${wso2esb.version}-src/patches</outputDirectory>
+ </fileSet>
<fileSet>
<directory>./../..</directory>
<outputDirectory>wso2esb-${wso2esb.version}-src</outputDirectory>
Modified: trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.sh
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.sh (original)
+++ trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.sh Wed Jan 30 07:41:20 \
2008 @@ -166,4 +166,4 @@
echo "Using JAVA_HOME: $JAVA_HOME"
echo "Using SYNAPSE_XML: $ESB_XML"
-$JAVA_HOME/bin/java $ESB_XML -Djava.io.tmpdir=$ESB_HOME/work/temp/esb \
-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration \
-Desb.home=$ESB_HOME -Desb.xml=$ESB_HOME/webapp/WEB-INF/classes/conf/server.xml \
-Daxis2.xml=$ESB_HOME/webapp/WEB-INF/classes/conf/axis2.xml \
-Daxis2.repo=$ESB_HOME/repository -Djava.endorsed.dirs=$ESB_ENDORSED \
-Djmx.agent.name=org.wso2.esb -Dcom.sun.management.jmxremote $XDEBUG -classpath \
$ESB_CLASSPATH org.wso2.esb.ServiceBus START \ No newline at end of file
+$JAVA_HOME/bin/java -server -Xms128M -Xmx128M $ESB_XML \
-Dresolve.root=$ESB_HOME/repository -Djava.io.tmpdir=$ESB_HOME/work/temp/esb \
-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration \
-Desb.home=$ESB_HOME -Desb.xml=$ESB_HOME/webapp/WEB-INF/classes/conf/server.xml \
-Daxis2.xml=$ESB_HOME/webapp/WEB-INF/classes/conf/axis2.xml \
-Daxis2.repo=$ESB_HOME/repository -Djava.endorsed.dirs=$ESB_ENDORSED \
-Djmx.agent.name=org.wso2.esb -Dcom.sun.management.jmxremote $XDEBUG -classpath \
$ESB_CLASSPATH org.wso2.esb.ServiceBus START \ No newline at end of file
Modified: trunk/esb/java/modules/distribution/src/main/conf/axis2.xml
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/axis2.xml (original)
+++ trunk/esb/java/modules/distribution/src/main/conf/axis2.xml Wed Jan 30 07:41:20 \
2008 @@ -157,7 +157,12 @@
supports optional|require or defaults to none -->
</transportReceiver>
- <transportReceiver name="vfs" \
class="org.apache.synapse.transport.vfs.VFSTransportListener"/> + \
<transportReceiver name="vfs" \
class="org.apache.synapse.transport.vfs.VFSTransportListener"/> +
+ <transportReceiver name="mailto" \
class="org.apache.synapse.transport.mail.MailTransportListener"> + <!-- \
configure any optional POP3/IMAP properties + check com.sun.mail.pop3 and \
com.sun.mail.imap package documentation for more details--> + </transportReceiver>
<transportReceiver name="admin/https" \
class="org.wso2.esb.transport.tomcat.HttpsTransportListener"> <!--<parameter \
name="port" locked="false">9443</parameter>--> @@ -170,18 +175,21 @@
<parameter name="java.naming.factory.initial" \
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
<parameter name="java.naming.provider.url" \
locked="false">tcp://localhost:61616</parameter>
<parameter name="transport.jms.ConnectionFactoryJNDIName" \
locked="false">TopicConnectionFactory</parameter> + <parameter \
name="transport.jms.ConnectionFactoryType" locked="false">topic</parameter> \
</parameter>
<parameter name="myQueueConnectionFactory" locked="false">
<parameter name="java.naming.factory.initial" \
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
<parameter name="java.naming.provider.url" \
locked="false">tcp://localhost:61616</parameter>
<parameter name="transport.jms.ConnectionFactoryJNDIName" \
locked="false">QueueConnectionFactory</parameter> + <parameter \
name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter> \
</parameter>
<parameter name="default" locked="false">
<parameter name="java.naming.factory.initial" \
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
<parameter name="java.naming.provider.url" \
locked="false">tcp://localhost:61616</parameter>
<parameter name="transport.jms.ConnectionFactoryJNDIName" \
locked="false">QueueConnectionFactory</parameter> + <parameter \
name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter> \
</parameter> </transportReceiver>-->
@@ -189,7 +197,30 @@
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="jms" class="org.apache.synapse.transport.jms.JMSSender"/>
+ <transportSender name="jms" class="org.apache.synapse.transport.jms.JMSSender">
+ <!-- uncomment this and configure to use connection pools for sending \
messages + <parameter name="myTopicConnectionFactory">
+ <parameter \
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter \
name="java.naming.provider.url">tcp://localhost:61616</parameter> + \
<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
+ <parameter name="transport.jms.ConnectionFactoryType" \
locked="false">topic</parameter> + </parameter>
+
+ <parameter name="myQueueConnectionFactory">
+ <parameter \
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter \
name="java.naming.provider.url">tcp://localhost:61616</parameter> + \
<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ <parameter name="transport.jms.ConnectionFactoryType" \
locked="false">queue</parameter> + </parameter>
+
+ <parameter name="default">
+ <parameter \
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter \
name="java.naming.provider.url">tcp://localhost:61616</parameter> + \
<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ <parameter name="transport.jms.ConnectionFactoryType" \
locked="false">queue</parameter> + </parameter> -->
+ </transportSender>
+
<transportSender name="vfs" \
class="org.apache.synapse.transport.vfs.VFSTransportSender"/>
<!-- the non-blocking http transport based on HttpCore + NIO extensions -->
@@ -217,14 +248,16 @@
supports Strict|AllowAll|DefaultAndLocalhost or the default if none \
specified --> </transportSender>
- <!-- ================================================= -->
- <!-- Mail Transport Sender -->
- <!--Only need to uncomment the sender. Configuration is achieved with every \
client.
- At any instant mail host should be given. Sample configuration has been \
given.
- http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html-->
- <!-- ================================================= -->
- <!--<transportSender name="mailto" \
class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="mail.smtp.host">localhost</parameter>
+ <!-- Uncomment and configure the SMTP server information
+ check com.sun.mail.smtp package documentation for descriptions of properties
+ <transportSender name="mailto" \
class="org.apache.synapse.transport.mail.MailTransportSender"> + <parameter \
name="mail.smtp.host">smtp.gmail.com</parameter> + <parameter \
name="mail.smtp.port">587</parameter> + <parameter \
name="mail.smtp.starttls.enable">true</parameter> + <parameter \
name="mail.smtp.auth">true</parameter> + <parameter \
name="mail.smtp.user">synapse.demo.0</parameter> + <parameter \
name="mail.smtp.password">mailpassword</parameter> + <parameter \
name="mail.smtp.from">synapse.demo.0@gmail.com</parameter> </transportSender>-->
<!-- ================================================= -->
Modified: trunk/esb/java/modules/distribution/src/main/conf/server.xml
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/server.xml (original)
+++ trunk/esb/java/modules/distribution/src/main/conf/server.xml Wed Jan 30 07:41:20 \
2008 @@ -16,7 +16,7 @@
<Server xmlns="http://www.wso2.org/projects/esb">
- <Version>1.5</Version>
+ <Version>1.6</Version>
<!--
Axis2 related configurations
@@ -46,13 +46,6 @@
</Axis2Config>
<!--
- Command Listener - Listens to external commands
- -->
- <CommandListener>
- <Port>6667</Port>
- </CommandListener>
-
- <!--
The default admin accounts which will be created when WSO2 ESB
is started up for the first time.
You can change the usernames and passwords.
@@ -63,11 +56,13 @@
<Password>admin</Password>
<Description>admin</Description>
</User>
+ <!-- add multiple users
<User>
<Username>esb</Username>
<Password>esb</Password>
<Description>esb</Description>
</User>
+ -->
</ESBUsers>
<!--
@@ -79,23 +74,10 @@
Default SOAP Message monitoring settings
-->
<SOAPMessageMonitoring>
- <!--
- ON - Monitor all SOAP Messages.
- WARNING: Setting this on will
- have a performance hit, since all SOAP messages will be always
- completely built and stored in the database by the Axis2
- MessageMonitoringHandler, hence this option should be used with
- caution. However, this can be turned ON and OFF using the WSO2 ESB
- management console.
-
- OFF - Do not monitor SOAP message
- -->
<Status>OFF</Status>
</SOAPMessageMonitoring>
-
<FileUploadConfig>
-
<Mapping>
<Actions>
<Action>*</Action>
Modified: trunk/esb/java/modules/distribution/src/main/conf/wrapper.conf
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/wrapper.conf (original)
+++ trunk/esb/java/modules/distribution/src/main/conf/wrapper.conf Wed Jan 30 \
07:41:20 2008 @@ -44,12 +44,13 @@
wrapper.java.additional.9=-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration
wrapper.java.additional.10=-Dlog4j.configuration=file:webapp/WEB-INF/classes/conf/log4j.properties
wrapper.java.additional.11=-Djava.io.tmpdir=work/temp/esb
+wrapper.java.additional.12=-Dresolve.root=repository
# Initial Java Heap Size (in MB) - compute according to system
-#wrapper.java.initmemory=256
+wrapper.java.initmemory=128
# Maximum Java Heap Size (in MB) - compute according to system
-#wrapper.java.maxmemory=256
+wrapper.java.maxmemory=128
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=org.wso2.esb.ServiceBus
@@ -59,7 +60,7 @@
# Wrapper Logging Properties
#********************************************************************
# Format of output for the console. (See docs for formats)
-wrapper.console.format=PM
+wrapper.console.format=M
# Log Level for console output. (See docs for log levels)
wrapper.console.loglevel=INFO
@@ -68,7 +69,7 @@
wrapper.logfile=logs/wso2-esb-process.log
# Format of output for the log file. (See docs for formats)
-wrapper.logfile.format=LPTM
+wrapper.logfile.format=M
# Log Level for log file output. (See docs for log levels)
wrapper.logfile.loglevel=INFO
Modified: trunk/esb/java/modules/distribution/src/main/release/NOTICE
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/release/NOTICE (original)
+++ trunk/esb/java/modules/distribution/src/main/release/NOTICE Wed Jan 30 07:41:20 \
2008 @@ -1,6 +1,6 @@
-WSO2 Enterprise Service Bus (ESB)
+WSO2 Enterprise Service Bus (ESB) v1.6
-Copyright (c) 2006-2007 WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+Copyright (c) 2006-2008 WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
=========================================================================
@@ -19,7 +19,7 @@
COPYRIGHT NOTICES
-Copyright (c) 2006-2007, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+Copyright (c) 2006-2008, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
* WSO2 ESB binary is bundled with:
jaxen-1.1.1.jar
@@ -28,7 +28,6 @@
Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
jsch-0.1.31.jar
Copyright (c) 2002,2003,2004,2005,2006,2007 Atsuhiko Yamanaka, JCraft,Inc. All \
rights reserved.
- bcprov-jdk13-132.jar
bcprov-jdk15-132.jar
Copyright (c) 2000 - 2006 The Legion Of The Bouncy Castle \
(http://www.bouncycastle.org) wrapper-3.2.3.jar
Modified: trunk/esb/java/modules/distribution/src/main/release/README.txt
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/release/README.txt (original)
+++ trunk/esb/java/modules/distribution/src/main/release/README.txt Wed Jan 30 \
07:41:20 2008 @@ -1,4 +1,4 @@
-WSO2 Enterprise Service Bus (ESB), v 1.5 (November, 2007)
+WSO2 Enterprise Service Bus (ESB), v 1.6 (January, 2008)
=========================================================
WSO2 ESB is released under Apache Licence v2.0, which is available in the LICENSE \
file @@ -52,9 +52,22 @@
http://www.wso2.org/projects/esb/java
--------------------
+----------------
+Training
+================
+
+WSO2 Inc. offers a variety of professional Training Programs, including
+training on general Web services as well as WSO2 ESB, WSO2 WSAS, WSO2 Registry,
+WSO2 Mashup server, Apache Axis2 and Apache Synapse and a number of other products.
+
+For additional support information please refer to
+http://wso2.com/training/course-catalog/
+
+
+----------------
Support
-===================
+================
+
Any issues with this release can be reported through \
http://www.wso2.org/jira/browse/ESBJAVA
Developers can be reached by joining the mailing group esb-java-dev@wso2.org
@@ -63,3 +76,9 @@
Alternatively, questions can be raised using the forum http://wso2.org/forum/187 or \
the user mailing list esb-java-user@wso2.org
+WSO2 Inc. offers a variety of development and production support programs, ranging
+from Web-based support up through normal business hours, to premium 24x7 phone \
support. +
+For additional support information please refer to http://wso2.com/support/
+
+
Modified: trunk/esb/java/modules/distribution/src/main/release/release_notes.txt
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/release/release_notes.txt (original)
+++ trunk/esb/java/modules/distribution/src/main/release/release_notes.txt Wed Jan 30 \
07:41:20 2008 @@ -1,19 +1,31 @@
-WSO2 Enterprise Service Bus (ESB), v1.5 - Release Note - 12th November 2007
+WSO2 Enterprise Service Bus (ESB) v1.6 - Release Note - January 2008
===========================================================================
-WSO2 ESB is a lightweight, and high performance Enterprise Service Bus (ESB).
-Based on Apache Synapse and Apache Axis2 projects, it supports connectivity,
-transformation and mediation, and the management of Web services interactions.
+The WSO2 ESB is an ultra fast, light-weight and versatile Enterprise Service Bus
+based on the Apache Synapse ESB. It allows you to Connect, Manage and Transform
+service interactions between Web services, REST/POX services and Legacy systems
WSO2 ESB is released under the Apache License v2.0
-Check project Home page http://www.wso2.org/esb for additional information.
+Check project Home page http://wso2.org/esb for additional information.
--------------------------
New Features
==========================
-The 1.1 release
+The 1.6 release
+ * Ability to pin a proxy or a task to server instances
+ * Improved error handling in JMS transport
+ * New Mail transport that supports POP3/IMAP/SMTP
+ * Clustering support for the Cache/Throttle mediators
+ * Maintainance mode support for the HTTP/S transports
+ * JMX statistics monitoring and management support
+ * New mediator - Callout
+ * Improved REST/POX support
+ * Annotations support for POJOCommand mediator
+ * Ability to configure/edit unknwon mediators without a UI as raw XML
+
+The 1.5 release
* Apache VFS based file transport
* Scheduled Task support
* New mediators - XQuery, POJO Command, DB Report and DB Lookup
@@ -25,12 +37,13 @@
* General UI usability enhancements and fixes
The 1.0 release
- * Proxy services - facilitating transport, interface (WSDL/Schema/Policy), \
message format (SOAP/POX),
- QoS (WS-Security/RM) and optimization switching (MTOM/SwA)
+ * Proxy services - facilitating transport, interface (WSDL/Schema/Policy), \
message format + (SOAP/POX), QoS (WS-Security/RM) and optimization switching \
(MTOM/SwA)
* Non-blocking HTTP/HTTPS transport for ultrafast execution and support for many \
connections
* Integrated Registry/Repository, facilitating dynamic updating and reloading of \
the configuration and resources
- * Easily extended via custom Java class/Spring mediators, or BSF Scripting \
languages (JavaScript, Ruby, etc) + * Easily extended via custom Java class/Spring \
mediators, or BSF Scripting languages + (JavaScript, Ruby, etc)
* Load-balancing/Fail-over and Throttling support
* WS-Security, WS-Reliable Messaging, and Throttling configurable via \
WS-Policies
* JMS message support for binary, plain text, and XML payloads
@@ -42,56 +55,45 @@
Known Issues
=========================
-1. WSO2 ESB known issues and limitations deffered for the next release
+1. WSO2 ESB known issues and limitations
- ESBJAVA-309 - Unable to view/edit the sequences after clicking on the "Close" \
icon of the WSO2
- ESB Sequence Editor window of a sequence in the Integrated Registry
+ ESBJAVA-234 - After clicking on the "Close" button of the "Sequence Editor" \
window when adding + anonymous sequences to a Proxy Service, the mediators lost \
the next time you open the "Sequence + Editor" window
- ESBJAVA-308 - Incorrect information logged when executing a configuration which \
has a reference
- to a sequence which is exported into the Integrated Registry
+ ESBJAVA-351 - The average response time of "Server Statics" displayed as NaN \
under some instances
- ESBJAVA-304 - No options provided to select onReject and onAccept Sequences as \
reference keys
- when creating a sequence with the throttle mediator
+ ESBJAVA-268 - Unable to start the sample axis2server.bat on Windows
- ESBJAVA-270 - Unable to load the ESB Management console if JMS is enabled and \
the JMS server
- is not started
+ ESBJAVA-373 - [IE] When the wso2-esb.log is about 2MB and when trying to access \
System logs using + IE, the browser hangs and the CPU usage goes upto about 50%
- ESBJAVA-268 - Unable to start the axis2server.bat on Windows
+ ESBJAVA-309 - Unable to view/edit the sequences after clicking on the "Close" \
icon of the WSO2 + ESB Sequence Editor window of a sequence in the Integrated \
Registry
- ESBJAVA-258 - ESB hangs during startup if the actual service that a Proxy \
Service (created using
- a WSDL Endpoint) points to is down.
+ ESBJAVA-408 - Support improved renaming of files in VFS transport
- ESBJAVA-315 - The cache mediator does not function properly when configuration \
is created
- through Administration Console
- The Aggregator mediator currently does not have a configuration UI with this \
release of the ESB
-
+2. As the WSO2 ESB 1.6 depends on the Apache Synapse 1.1.1, it inherits the list of \
known issues of + the Apache Synapse 1.1.1 release listed below
-2. As the WSO2 ESB 1.5 depends on the Apache Synapse 1.1, it inherts the list of \
known issues of the
- Apache Synapse 1.1 release listed below
+ SYNAPSE-180 - Require the ability to throttle by concurrency within a cluster
SYNAPSE-174 - The non-blocking http/s transports cannot handle WS-RM requests
- - Caused by the NIO http/s transport being out of sync with the latest \
Sandesh2 codebase
- SYNAPSE-170 - VFS transport listener sample - In the response sent via email, \
all tags define the same namespace
- - Caused by an Axis2 Mail transport limitation
+ SYNAPSE-213 - Improve handling of input in XSLTMediator
- SYNAPSE-161 - Can't persuade Rampart to send certificate serial + issuer - only \
either BinaryToken or Identity
- - Issue related to Apache Rampart
+ SYNAPSE-211 - Improve performance in XSLTMediator when temporary files are used
- SYNAPSE-103 - WS-RM not returning response message
- - related to SYNAPSE-174
+ SYNAPSE-212 - XSLTMediator doesn't close/delete temporary files properly
The Synapse JMS implementation supports JMS 1.0.2b, however due to licensing \
issues we include
the JMS 1.1 spec JAR from Apache Geronimo (geronimo-jms_1.1_spec-1.1.jar) \
instead. If you have
any issues with JMS 1.0.x, please download the Sun JMS 1.0.2b JAR and replace \
supplied JAR from Geronimo.
- You may encounter a "java.net.UnknownHostException: java.sun.com" while starting \
the WSO2 ESB
- without a connection to the Internet. This is caused by the bundled Spring JAR \
file. If you
- will not be using the Spring mediator, you may remove this file from the lib \
directory.
-
-3. Dependencies are currently allowed to be removed while live references exists
+3. Dependencies are currently allowed to be removed from the admin console, while \
live references + remains
The ESB UI currently does not perform a check on references before the elements \
are allowed to be removed. Thus there is a possibility of defining references to \
non-existent endpoints, @@ -111,24 +113,34 @@
files xercesImpl-2.8.0.jar and xml-apis-1.3.03.jar in your \
<JDK>/jre/lib/endorsed/ directory.
-------------------------
-Reporting Problems
+------------------------
+Training
========================
-Issues can be reported using the public JIRA available at \
http://www.wso2.org/jira/browse/ESBJAVA
-
-------------------------
-Contact us
+WSO2 Inc. offers a variety of professional Training Programs, including training on \
general Web +services as well as WSO2 ESB, WSO2 WSAS, WSO2 Registry, WSO2 Mashup \
server, Apache Axis2 and +Apache Synapse and a number of other products.
+
+For additional support information please refer to \
http://wso2.com/training/course-catalog/ +
+
+------------------------
+Support
========================
-WSO2 ESB developers can be contacted via mailing lists:
-For Users : esb-java-user@wso2.org
- (Subscribed via an email to: esb-java-user-request@wso2.org with the subject \
"subscribe")
-For Developers : esb-java-dev@wso2.org
- (Subscribed via an email to: esb-java-dev-request@wso2.org with the subject \
"subscribe")
-For details on subscriptions see http://wso2.org/projects/esb/java#mail
+Any issues with this release can be reported through \
http://www.wso2.org/jira/browse/ESBJAVA +
+Developers can be reached by joining the mailing group esb-java-dev@wso2.org
+Refer to the product page at http://wso2.org/projects/esb/java for more information
+
+Alternatively, questions can be raised using the forum http://wso2.org/forum/187 or \
the user +mailing list esb-java-user@wso2.org
+
+WSO2 Inc. offers a variety of development and production support programs, ranging
+from Web-based support up through normal business hours, to premium 24x7 phone \
support. +
+For additional support information please refer to http://wso2.com/support/
-Alternatively, questions can also be raised in the forum http://wso2.org//forum/187
Thanks,
- WSO2 ESB Team
Modified: trunk/esb/java/modules/distribution/src/main/release/samples/README.txt
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/release/samples/README.txt (original)
+++ trunk/esb/java/modules/distribution/src/main/release/samples/README.txt Wed Jan \
30 07:41:20 2008 @@ -1,10 +1,10 @@
-Samples of WSO2 Enterprise Service Bus (ESB), v 1.5 (November, 2007)
+Samples of WSO2 Enterprise Service Bus (ESB), v 1.6 (January, 2008)
====================================================================
--------------------
Pre-requisites
====================
-
+
A JDK version of 1.5.x or later is required to run the WSO2 ESB.
ActiveMQ 4.1.0 or later may be used with the JMS Tranport, and the ESB ships with \
all the @@ -14,9 +14,9 @@
components. Using the Mail transport will require configuration to suit your \
environment.
Install and run WSO2 ESB. See the installationguide.html in the doc folder for more \
details.
-
+
To compile and run the sample clients, an Ant version is required, and the 1.6.5 \
version is
-recommended.
+recommended.
----------------------
@@ -25,7 +25,7 @@
The samples provided with the installation are available in this samples sub \
directory. The [synapse] configuration files used for the samples are available in \
the 'repository/conf/sample' directory, and the associated resources within the \
resources sub-directory.
-
+
Sample Axis2 server to host backend service examples
====================================================
This distribution ships an integrated Axis2 sample server which could be used to \
start up the @@ -56,7 +56,7 @@
While the document above gives you a generic description on how to set up and run \
the WSO2 ESB samples, the document docs/ESB_Samples.html takes each sample, one by \
one and discusses the
-objective of the sample, its prerequisites, and its expected behavior when the \
sample is executed. +objective of the sample, its prerequisites, and its expected \
behavior when the sample is executed.
----------------
@@ -65,3 +65,20 @@
Please contact us through esb-java-user mailing list if you have any trouble running \
the samples.
Go to http://wso2.org/projects/esb/java#mail for subscription details.
+
+----------------
+Support
+================
+
+Any issues with this release can be reported through \
http://www.wso2.org/jira/browse/ESBJAVA +
+Developers can be reached by joining the mailing group esb-java-dev@wso2.org
+Refer to the product page at http://wso2.org/projects/esb/java for more information
+
+Alternatively, questions can be raised using the forum http://wso2.org/forum/187 or \
the user +mailing list esb-java-user@wso2.org
+
+WSO2 Inc. offers a variety of development and production support programs, ranging
+from Web-based support up through normal business hours, to premium 24x7 phone \
support. +
+For additional support information please refer to http://wso2.com/support/
Modified: trunk/esb/java/modules/distribution/src/main/www/about.html
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/about.html (original)
+++ trunk/esb/java/modules/distribution/src/main/www/about.html Wed Jan 30 07:41:20 \
2008 @@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <title>WSO2 Enterprise Service Bus (ESB) Management Console- About</title>
+ <title>WSO2 Enterprise Service Bus (ESB) Management Console - About</title>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<meta name="description" content="WSO2 Enterprise Service Bus (ESB)" />
<meta name="distribution" content="global" />
@@ -34,10 +34,9 @@
<h2>About WSO2 Enterprise Service Bus (ESB)</h2>
-<p>WSO2 Enterprise Service Bus (ESB) is a lightweight, XML and Web services
-centric enterprise service bus (ESB). Based on Apache Synapse it supports
-connectivity, transformation and mediation, and management of Web services
-interactions.</p>
+<p>The WSO2 ESB is an ultra fast, light-weight and versatile Enterprise Service Bus \
based on the + Apache Synapse ESB. It allows you to Connect, Manage and Transform \
service interactions + between Web services, REST/POX services and Legacy \
systems</p>
<p>For more information on the WSO2 ESB, or to get involved, please visit the
project page at <a
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/commons.js Wed \
Jan 30 07:41:20 2008 @@ -15,6 +15,9 @@
messageheader[TYPE_WARN] = "Warning Message";
messageheader[TYPE_ERROR] = "Error Message";
+var INVALID_NAME = "The value for the name contains invalid characters." +
+ " Only, alphanumeric , underscore , hyphen or dash characters are \
allowed. "; +
function initoverlaymanager() {
if (paneloverlaymanager == null) {
paneloverlaymanager = new YAHOO.widget.OverlayManager();
@@ -31,7 +34,10 @@
|| (code > 64 && code < 91)// capital
|| (code > 96 && code < 123)// simple
|| (code == 46) //dot
- || code == 95) // underscore
+ || (code == 95) // underscore
+ || (code == 2013) // en dash
+ || (code == 2014) // em dash
+ || (code == 45)) // minus sign - hyphen
{
}
else {
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js Wed \
Jan 30 07:41:20 2008 @@ -606,7 +606,7 @@
var name = document.getElementById(nameId.toString());
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid characters. \
Only, alphanumeric or underscore characters are allowed. ", TYPE_INFO); + \
esbwarning(INVALID_NAME, TYPE_INFO); }
var childepstr = dataToString(type);
if (childepstr != undefined && childepstr != null) {
@@ -620,7 +620,7 @@
var name = document.getElementById(nameId.toString());
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid characters. \
Only, alphanumeric or underscore characters are allowed. ", TYPE_INFO); + \
esbwarning(INVALID_NAME, TYPE_INFO); }
var childepstr = dataToString(type);
if (childepstr != undefined && childepstr != null) {
@@ -1259,8 +1259,7 @@
var name = document.getElementById(nameId.toString());
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var childepstr = dataToString(type);
@@ -1281,8 +1280,7 @@
var name = document.getElementById(nameId.toString());
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var childepstr = dataToString(type);
@@ -1306,8 +1304,7 @@
if (name != null && name.value != "") {
var value = trim(name.value);
if (!namevalidate(value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
if (uri != null && uri.value != "") {
@@ -1440,8 +1437,7 @@
var uri = document.getElementById("endpoint_address0");
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var inlinewsdlstr = null;
@@ -1630,8 +1626,7 @@
if (childepstr != undefined && childepstr != null) {
var value = trim(name.value);
if (!namevalidate(value)) {
- esbwarning("The value for the name contains invalid characters." \
+
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var body_xml = '<ns1:saveEndpoint \
xmlns:ns1="http://org.apache.synapse/xsd" xmlns:syn="' + SYNAPSE_NS + '">' + @@ \
-1652,8 +1647,7 @@ if (childepstr != undefined && childepstr != null) {
var value = trim(name.value);
if (!namevalidate(value)) {
- esbwarning("The value for the name contains invalid characters." \
+
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var body_xml = '<ns1:saveEndpoint \
xmlns:ns1="http://org.apache.synapse/xsd" xmlns:syn="' + SYNAPSE_NS + '">' + @@ \
-2116,12 +2110,20 @@
function saveEndpointForRegistry(type) {
var currentepobj = getXmlForAnonymousEndpoint(type);
-
- editFilePath = regTree.getSelected();
+ var currentpath = regTree.getSelected();
+ if (currentpath == null || currentpath == undefined) {
+ esbwarning("null entity", TYPE_ERROR);
+ return;
+ }
+ if (currentpath == "") {
+ esbwarning("Please select an item first", TYPE_ERROR);
+ return;
+ }
+ editFilePath = currentpath;
var body_xml = '<ns1:updateRegistryEntryValue \
xmlns:ns1="http://org.apache.synapse/xsd">' + '<regEntry>' +
- '<key>' + regTree.getSelected() + '</key>' +
+ '<key>' + currentpath + '</key>' +
'<value>' + currentepobj + '</value>' +
'</regEntry>' +
'</ns1:updateRegistryEntryValue>';
@@ -2269,7 +2271,7 @@
registrybrowser("saveindirectepkey", "dicardregistrybrowser", index, 1, \
panelId); }
function dicardregistrybrowser() {
- document.getElementById("panelRegistry").innerHTML = "";
+ document.getElementById("registryPanel").innerHTML = "";
}
function savermpolicykey(index) {
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js Wed \
Jan 30 07:41:20 2008 @@ -201,8 +201,7 @@
return;
}
if (!namevalidate(entryName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var valueId = document.getElementById("entry_value");
@@ -279,8 +278,7 @@
return;
}
if (!namevalidate(entryName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
var valueId = document.getElementById("entry_value");
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/esbregistry.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/esbregistry.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/esbregistry.js Wed \
Jan 30 07:41:20 2008 @@ -272,8 +272,7 @@
}
if (!namevalidate(newFolderName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
@@ -307,8 +306,7 @@
}
if (!namevalidate(newFolderName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
@@ -430,8 +428,7 @@
}
if (!namevalidate(newFileName)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
@@ -548,10 +545,19 @@
function editRegistryFile() {
var fileContent = document.getElementById("regEditFileContents").value;
-
+ var currentpath = regTree.getSelected();
+ if (currentpath == null || currentpath == undefined) {
+ esbwarning("null entity", TYPE_ERROR);
+ return;
+ }
+ if (currentpath == "") {
+ esbwarning("Please select an item first", TYPE_ERROR);
+ return;
+ }
+ editFilePath = currentpath;
var body_xml = '<ns1:updateRegistryEntryValue \
xmlns:ns1="http://org.apache.synapse/xsd">' + '<regEntry>' +
- '<key>'+ regTree.getSelected() +'</key>' +
+ '<key>' + currentpath + '</key>' +
'<value>' + fileContent + '</value>' +
'</regEntry>' +
'</ns1:updateRegistryEntryValue>';
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/aggregate_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/aggregate_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/aggregate_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -28,14 +28,6 @@
}
}
- var invalidElem = mediator.getElementsByTagName("invalidate");
- if (invalidElem == undefined || invalidElem.length == 0) {
- invalidElem = mediator.getElementsByTagName("syn:invalidate");
- if (invalidElem == undefined || invalidElem.length == 0) {
- mediator.appendChild(createesbelement("<syn:invalidate " + \
syn_ns_declaration + "/>"));
- }
- }
-
setnodepositions(internalmodel.sequence);
}
@@ -45,25 +37,23 @@
//alert(new XMLSerializer().serializeToString(mediator))
- var corelate_expr = document.getElementById("corelate_expr");
+ var correlate_expr = document.getElementById("correlate_expr");
var complete_time = document.getElementById("complete_time");
var complete_max = document.getElementById("complete_max");
var complete_min = document.getElementById("complete_min");
var aggregate_expr = document.getElementById("aggregate_expr");
- var invalidate_time = document.getElementById("invalidate_time");
var on_complete = document.getElementById("on_complete");
- var on_invalidate = document.getElementById("on_invalidate");
- if (corelate_expr != null && corelate_expr != undefined && corelate_expr.value \
!= undefined && corelate_expr.value != "") {
- var corelateOnElem = mediator.getElementsByTagName("corelateOn");
- if (corelateOnElem.length != 0) {
- corelateOnElem[0].setAttribute("expression", corelate_expr.value);
- } else {
- corelateOnElem = mediator.getElementsByTagName("syn:corelateOn");
- if (corelateOnElem.length != 0) {
- corelateOnElem[0].setAttribute("expression", corelate_expr.value);
+ if (correlate_expr != null && correlate_expr != undefined && \
correlate_expr.value != undefined && correlate_expr.value != "") { + var \
correlateOnElem = mediator.getElementsByTagName("correlateOn"); + if \
(correlateOnElem.length != 0) { + \
correlateOnElem[0].setAttribute("expression", correlate_expr.value); + } else \
{ + correlateOnElem = mediator.getElementsByTagName("syn:correlateOn");
+ if (correlateOnElem.length != 0) {
+ correlateOnElem[0].setAttribute("expression", correlate_expr.value);
} else {
- mediator.appendChild(createesbelement("<syn:corelateOn expression='" \
+ corelate_expr.value + "' " + syn_ns_declaration + "/>")); + \
mediator.appendChild(createesbelement("<syn:correlateOn expression='" + \
correlate_expr.value + "' " + syn_ns_declaration + "/>")); }
}
}
@@ -141,36 +131,7 @@
}
}
}
-
- if (invalidate_time != null && invalidate_time != undefined && \
invalidate_time.value != undefined && invalidate_time.value != "") {
- var invalidateElem = mediator.getElementsByTagName("invalidate");
- if (invalidateElem.length != 0) {
- invalidateElem[0].setAttribute("timeout", invalidate_time.value);
- } else {
- invalidateElem = mediator.getElementsByTagName("syn:invalidate");
- if (invalidateElem.length != 0) {
- invalidateElem[0].setAttribute("timeout", invalidateElem.value);
- } else {
- mediator.appendChild(createesbelement("<syn:invalidate timeout='" + \
invalidate_time.value + "' " + syn_ns_declaration + "/>"));
- }
- }
- }
-
- if (on_invalidate != null && on_invalidate != undefined && on_invalidate.value \
!= undefined && on_invalidate.value != "") {
- var invalidateElem2 = mediator.getElementsByTagName("invalidate");
- if (invalidateElem2.length != 0) {
- invalidateElem2[0].setAttribute("sequence", on_invalidate.value);
- removeunwantedchilds(invalidateElem2[0]);
- } else {
- invalidateElem2 = mediator.getElementsByTagName("syn:invalidate");
- if (invalidateElem2.length != 0) {
- invalidateElem2[0].setAttribute("sequencec", on_invalidate.value);
- removeunwantedchilds(invalidateElem2[0]);
- } else {
- mediator.appendChild(createesbelement("<syn:invalidate sequence='" + \
on_invalidate.value + "' " + syn_ns_declaration + "/>"));
- }
- }
- }
+
return true;
};
@@ -203,7 +164,7 @@
}
mediatorelementstring["aggregate"] = function aggregatestring() {
- return "<syn:aggregate \
xmlns:syn='http://ws.apache.org/ns/synapse'><syn:corelateOn/><syn:completeCondition/><syn:onComplete/><syn:invalidate/></syn:aggregate>";
+ return "<syn:aggregate \
xmlns:syn='http://ws.apache.org/ns/synapse'><syn:correlateOn/><syn:completeCondition/><syn:onComplete/></syn:aggregate>";
};
function oncompletefromregistry() {
@@ -255,55 +216,4 @@
mediator.getElementsByTagName("syn:onComplete")[0].removeAttribute("sequence");
}
editmediator(position);
-}
-
-function oninvalidatefromregistry() {
- var position = geteditingmediatorposition();
- var mediator = getnestedmediator(internalmodel.sequence, position);
- collectdata["aggregate"](mediator, false);
- registrybrowser("setinvalidatefromregistry", "dicardregistrybrowser", "", 1, \
"registryPanel");
-}
-
-function setinvalidatefromregistry() {
-
- var position = geteditingmediatorposition();
- var mediator = getnestedmediator(internalmodel.sequence, position);
-
- if (mediator.getElementsByTagName("invalidate")[0] != undefined) {
- mediator.getElementsByTagName("invalidate")[0].setAttribute("sequence", \
getRegistryKey());
- } else if (mediator.getElementsByTagName("syn:invalidate")[0] != undefined) {
- mediator.getElementsByTagName("syn:invalidate")[0].setAttribute("sequence", \
getRegistryKey());
- } else {
- mediator.appendChild(createesbelement("<syn:invalidate sequence='" + \
getRegistryKey() + "' \
xmlns:syn='http://ws.apache.org/ns/synapse'/>"));
- }
-
- dicardregistrybrowser(1);
-
- editmediator(position);
-}
-
-function aggregateinvalidatetoref() {
- var position = geteditingmediatorposition();
- var mediator = getnestedmediator(internalmodel.sequence, position);
- collectdata["aggregate"](mediator, false);
- if (mediator.getElementsByTagName("invalidate")[0] != undefined) {
- mediator.getElementsByTagName("invalidate")[0].setAttribute("sequence", "");
- } else if (mediator.getElementsByTagName("syn:invalidate")[0] != undefined) {
- mediator.getElementsByTagName("syn:invalidate")[0].setAttribute("sequence", \
"");
- } else {
- mediator.appendChild(createesbelement("<syn:invalidate sequence='' \
xmlns:syn='http://ws.apache.org/ns/synapse'/>"));
- }
- editmediator(position);
-}
-
-function aggregateinvalidatetoinline() {
- var position = geteditingmediatorposition();
- var mediator = getnestedmediator(internalmodel.sequence, position);
- collectdata["aggregate"](mediator, false);
- if (mediator.getElementsByTagName("invalidate")[0] != undefined) {
- mediator.getElementsByTagName("invalidate")[0].removeAttribute("sequence");
- } else if (mediator.getElementsByTagName("syn:invalidate")[0] != undefined) {
- mediator.getElementsByTagName("syn:invalidate")[0].removeAttribute("sequence");
- }
- editmediator(position);
}
\ No newline at end of file
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/callout_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/callout_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/callout_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -266,6 +266,24 @@
showNameSpaceEditor(position, attribute, inputID)
}
+function calloutsourcekeyfromregistry(position) {
+ var panelId = ("mypanel" + position).toString();
+ registrybrowser("savecalloutsourcekeyfromregistry", "dicardregistrybrowser", \
position, 1, panelId); +}
+
+function savecalloutsourcekeyfromregistry(position) {
+ var regKey = getRegistryKey();
+ var divcontrol = document.getElementById("registryPanel");
+ divcontrol.innerHTML = "";
+ if (regKey != null && regKey != undefined) {
+ var xquerykeyinput = document.getElementById("source_key");
+ if (xquerykeyinput != null && xquerykeyinput != undefined) {
+ xquerykeyinput.value = regKey;
+ }
+ }
+}
+
+
mediatorelementstring["callout"] = function logstring() {
return "<syn:callout xmlns:syn='http://ws.apache.org/ns/synapse' \
source_xpath='0' target_xpath='0'><syn:source/><syn:target/></syn:callout>"; };
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -545,9 +545,9 @@
var propertytype = \
propertytrs[j].children[1].children[0].options[
propertytrs[j].children[1].children[0].selectedIndex].value;
if (propertytype == "value") {
- propertystr += "value='" + \
propertytrs[j].children[2].children[0].value + "' "; + \
propertystr += "value='" + \
convertAllXmlSpecialChars(propertytrs[j].children[2].children[0].value) + "' "; } \
else if (propertytype == "expression") {
- propertystr += "expression='" + \
propertytrs[j].children[2].children[0].value + "' "; + \
propertystr += "expression='" + \
convertAllXmlSpecialChars(propertytrs[j].children[2].children[0].value) + "' "; }
if (namespce != undefined && namespce != null) {
for (var g = 0; g < namespce.length; g++) {
@@ -660,8 +660,13 @@
for (var j = 0; j < propertytrs.length; j++) {
if (window.ActiveXObject) {
if (propertytrs[j].children[0].children[0].value != "" && \
propertytrs[j].children[1].children[0].value != "") { + var name = \
trim(propertytrs[j].children[0].children[0].value); + if \
(!namevalidate(name)) { + esbwarning(INVALID_NAME, TYPE_INFO);
+ return false;
+ }
var propertystr = "<syn:result \
xmlns:syn='http://ws.apache.org/ns/synapse' name='"
- + propertytrs[j].children[0].children[0].value + "' ";
+ + name + "' ";
propertystr += "column='" + \
propertytrs[j].children[1].children[0].value + "' ";
statement.appendChild(createesbelement(propertystr + "/>"));
} else {
@@ -1015,10 +1020,15 @@
for (var j = 0; j < propertytrs.length; j++) {
if (window.ActiveXObject) {
if (propertytrs[j].children[0].children[0].value != "" && \
propertytrs[j].children[0].children[0].value != "Select A Value" && \
propertytrs[j].children[1].children[0].value != "") { + var name = \
trim(propertytrs[j].children[0].children[0].value); + if \
(!namevalidate(name)) { + esbwarning(INVALID_NAME, TYPE_INFO);
+ return false;
+ }
var propertystr = "<syn:property \
xmlns:syn='http://ws.apache.org/ns/synapse' name='"
- + propertytrs[j].children[0].children[0].value + "' ";
+ + name + "' ";
- propertystr += "value='" + \
propertytrs[j].children[1].children[0].value + "' "; + propertystr += \
"value='" + convertAllXmlSpecialChars(propertytrs[j].children[1].children[0].value) + \
"' ";
mediator.appendChild(createesbelement(propertystr + "/>"));
} else {
if (propertytrs[j].children[0].children[0].value == ""
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -549,9 +549,9 @@
var propertytype = \
propertytrs[j].children[1].children[0].options[
propertytrs[j].children[1].children[0].selectedIndex].value;
if (propertytype == "value") {
- propertystr += "value='" + \
propertytrs[j].children[2].children[0].value + "' "; + \
propertystr += "value='" + \
convertAllXmlSpecialChars(propertytrs[j].children[2].children[0].value) + "' "; } \
else if (propertytype == "expression") {
- propertystr += "expression='" + \
propertytrs[j].children[2].children[0].value + "' "; + \
propertystr += "expression='" + \
convertAllXmlSpecialChars(propertytrs[j].children[2].children[0].value) + "' "; }
if (namespce != undefined && namespce != null) {
for (var g = 0; g < namespce.length; g++) {
@@ -663,8 +663,13 @@
for (var j = 0; j < propertytrs.length; j++) {
if (window.ActiveXObject) {
if (propertytrs[j].children[0].children[0].value != "" && \
propertytrs[j].children[1].children[0].value != "") { + var name = \
trim(propertytrs[j].children[0].children[0].value); + if \
(!namevalidate(name)) { + esbwarning(INVALID_NAME, TYPE_INFO);
+ return false;
+ }
var propertystr = "<syn:result \
xmlns:syn='http://ws.apache.org/ns/synapse' name='"
- + propertytrs[j].children[0].children[0].value + "' ";
+ + name + "' ";
propertystr += "column='" + \
propertytrs[j].children[1].children[0].value + "' ";
statement.appendChild(createesbelement(propertystr + "/>"));
} else {
@@ -1018,10 +1023,15 @@
for (var j = 0; j < propertytrs.length; j++) {
if (window.ActiveXObject) {
if (propertytrs[j].children[0].children[0].value != "" && \
propertytrs[j].children[0].children[0].value != "Select A Value" && \
propertytrs[j].children[1].children[0].value != "") { + var name = \
trim(propertytrs[j].children[0].children[0].value); + if \
(!namevalidate(name)) { + esbwarning(INVALID_NAME, TYPE_INFO);
+ return false;
+ }
var propertystr = "<syn:property \
xmlns:syn='http://ws.apache.org/ns/synapse' name='"
- + propertytrs[j].children[0].children[0].value + "' ";
+ + name + "' ";
- propertystr += "value='" + \
propertytrs[j].children[1].children[0].value + "' "; + propertystr += \
"value='" + convertAllXmlSpecialChars(propertytrs[j].children[1].children[0].value) + \
"' ";
mediator.appendChild(createesbelement(propertystr + "/>"));
} else {
if (propertytrs[j].children[0].children[0].value == ""
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/header_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/header_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/header_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -27,8 +27,7 @@
if (name != null && name.value != "") {
if (!namevalidate(name.value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
mediator.setAttribute("name", name.value);
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/makefault_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/makefault_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/makefault_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -19,6 +19,14 @@
*/
var mediatorPosition;
+var currentsoapversion = "soap11"
+
+initedit["makefault"] = function initmakefaultedit(mediator) {
+ var version = mediator.getAttribute("version");
+ if (version != null && version != undefined) {
+ currentsoapversion = version;
+ }
+};
collectdata["makefault"] = function collectlogdata(mediator) {
@@ -28,7 +36,7 @@
} else {
selectedVersion = "soap12";
}
-
+
var reasonContent = document.getElementById("reasonContent").value;
var prefix = "";
@@ -58,23 +66,23 @@
var codeelem = mediator.getElementsByTagName(prefix + "code")[0];
mediator.removeChild(codeelem);
- if(selectedVersion == "soap11"){
+ if (selectedVersion == "soap11") {
mediator.appendChild(createesbelement("<syn:code value='sf11:" + \
codeValue
- + "' xmlns:sf11='http://schemas.xmlsoap.org/soap/envelope/' "
- + "xmlns:syn='http://ws.apache.org/ns/synapse'/>"));
- mediator.setAttribute("version","soap11");
+ + "' xmlns:sf11='http://schemas.xmlsoap.org/soap/envelope/' "
+ + "xmlns:syn='http://ws.apache.org/ns/synapse'/>"));
+ mediator.setAttribute("version", "soap11");
}
- if(selectedVersion == "soap12"){
+ if (selectedVersion == "soap12") {
mediator.appendChild(createesbelement("<syn:code value='sf12:" + \
codeValue
- + "' xmlns:sf12='http://www.w3.org/2003/05/soap-envelope' "
- + "xmlns:syn='http://ws.apache.org/ns/synapse'/>"));
- mediator.setAttribute("version","soap12");
+ + "' xmlns:sf12='http://www.w3.org/2003/05/soap-envelope' "
+ + "xmlns:syn='http://ws.apache.org/ns/synapse'/>"));
+ mediator.setAttribute("version", "soap12");
}
var reasonTypeValue = document.getElementById("reasonTypeValue");
var reasonelem = mediator.getElementsByTagName(prefix + "reason")[0];
-
+
if (reasonTypeValue.checked) {
if (reasonelem.getAttribute("expression") != null) {
reasonelem.removeAttribute("expression");
@@ -88,31 +96,31 @@
}
if (selectedVersion == "soap12") {
-
+
if (document.getElementById("node").value != "") {
mediator.appendChild(createesbelement(
- "<syn:node xmlns:syn='http://ws.apache.org/ns/synapse'>"
- + trim(document.getElementById("node").value) + \
"</syn:node>"));
- }
+ "<syn:node xmlns:syn='http://ws.apache.org/ns/synapse'>"
+ + trim(document.getElementById("node").value) + \
"</syn:node>")); + }
}
if (document.getElementById("role").value != "") {
mediator.appendChild(createesbelement(
- "<syn:role xmlns:syn='http://ws.apache.org/ns/synapse'>"
- + trim(document.getElementById("role").value) + \
"</syn:role>")); + "<syn:role \
xmlns:syn='http://ws.apache.org/ns/synapse'>" + + \
trim(document.getElementById("role").value) + "</syn:role>")); }
if (document.getElementById("detail") != null && \
document.getElementById("detail").value != "") { \
mediator.appendChild(createesbelement(
- "<syn:detail xmlns:syn='http://ws.apache.org/ns/synapse'>"
- + trim(document.getElementById("detail").value) + \
"</syn:detail>")); + "<syn:detail \
xmlns:syn='http://ws.apache.org/ns/synapse'>" + + \
trim(document.getElementById("detail").value) + "</syn:detail>")); }
} else {
esbwarning("Code and Reason must be specified", TYPE_INFO);
return false;
}
-
+ currentsoapversion = "soap11"
return true;
};
@@ -123,37 +131,80 @@
function changeVersion(version, position) {
- if (version == "soap11") {
- if (document.getElementById("soap12").checked) {
- document.getElementById("soap11").checked = true;
- document.getElementById("soap12").checked = false;
-
- var epdiv = document.getElementById("makefault_edit_div");
- var mediator = getnestedmediator(internalmodel.sequence, position);
+ if (currentsoapversion != version) {
+ currentsoapversion = version;
- if (epdiv != null && mediator != null) {
- mediator.setAttribute("version","soap11");
- processXML(mediator, "mediators/makefault_edit.xsl", epdiv);
- }
+ var epdiv = document.getElementById("makefault_edit_div");
+ var mediator = getnestedmediator(internalmodel.sequence, position);
+
+ clearAllAttributesOfMakeFaultMediator(mediator);
+
+ if (epdiv != null && mediator != null) {
+ mediator.setAttribute("version", version);
+ processXML(mediator, "mediators/makefault_edit.xsl", epdiv);
}
+
} else {
- if (document.getElementById("soap11").checked) {
- document.getElementById("soap11").checked = false;
- document.getElementById("soap12").checked = true;
-
- var epdiv = document.getElementById("makefault_edit_div");
- var mediator = getnestedmediator(internalmodel.sequence, position);
-
- if (epdiv != null && mediator != null) {
- mediator.setAttribute("version", "soap12")
- processXML(mediator, "mediators/makefault_edit.xsl", epdiv);
+ if (version == "soap11") {
+ if (document.getElementById("soap12").checked) {
+ document.getElementById("soap11").checked = true;
+ document.getElementById("soap12").checked = false;
+
+ var epdiv = document.getElementById("makefault_edit_div");
+ var mediator = getnestedmediator(internalmodel.sequence, position);
+
+
+ if (epdiv != null && mediator != null) {
+ mediator.setAttribute("version", "soap11");
+ processXML(mediator, "mediators/makefault_edit.xsl", epdiv);
+ }
+ }
+ } else {
+ if (document.getElementById("soap11").checked) {
+ document.getElementById("soap11").checked = false;
+ document.getElementById("soap12").checked = true;
+
+ var epdiv = document.getElementById("makefault_edit_div");
+ var mediator = getnestedmediator(internalmodel.sequence, position);
+
+ if (epdiv != null && mediator != null) {
+ mediator.setAttribute("version", "soap12")
+ processXML(mediator, "mediators/makefault_edit.xsl", epdiv);
+ }
}
- }
+ }
}
-
+ function clearAllAttributesOfMakeFaultMediator(mediator) {
+ var limit = mediator.childNodes.length;
+ for (var i = 0; i < limit; i++) {
+ var child = mediator.childNodes[i] ;
+ if (child != null && child != undefined) {
+ var name = child.nodeName;
+ if (name == "syn:code" || name == "code") {
+ child.removeAttribute("expression");
+ child.removeAttribute("value");
+ } else if (name == "syn:reason" || name == "reason") {
+ child.removeAttribute("expression");
+ child.removeAttribute("value");
+ } else if (name == "syn:node" || name == "node") {
+ while (child.childNodes != null && child.childNodes.length > 0) \
{ + child.removeChild(child.childNodes[child.childNodes.length \
- 1]); + }
+ } else if (name == "syn:role" || name == "role") {
+ while (child.childNodes != null && child.childNodes.length > 0) \
{ + child.removeChild(child.childNodes[child.childNodes.length \
- 1]); + }
+ } else if (name == "syn:detail" || name == "detail") {
+ while (child.childNodes != null && child.childNodes.length > 0) \
{ + child.removeChild(child.childNodes[child.childNodes.length \
- 1]); + }
+ }
+ }
+ }
+ }
}
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/pojoCommand_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/pojoCommand_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/pojoCommand_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -34,7 +34,7 @@
if (browsername.indexOf(IE_BROWSER_NAME) != -1) {
prefix = "syn:";
}
- // todo: need to check on IE possible IE issue
+
var existingprops = mediator.getElementsByTagName(prefix + "property");
while (existingprops.length > 0) {
var attrs = existingprops[0].attributes;
@@ -55,18 +55,91 @@
for (var i = 0; i < propertyNamess.length; i++) {
var propName_shown = propertyNamess[i].getAttribute("value");
var propName_real = propName_shown.charAt(0).toLowerCase() + \
propName_shown.substring(1, propName_shown.length);
- var propValue_real = document.getElementById("command_med_prop" + \
propName_real);
- var propType_real = document.getElementsByName("prop_type_" + \
propName_real)[0].value; + var propReadValue_real = \
document.getElementById("command_med_prop_read" + propName_real); + var \
propReadType_real = document.getElementsByName("prop_type_read_" + \
propName_real)[0].value; // todo: check 0 + var propUpdateValue_real = \
document.getElementById("command_med_prop_update" + propName_real); + var \
propUpdateType_real = document.getElementsByName("prop_type_update_" + \
propName_real)[0].value; + var read_value, update_value;
+ if (propReadValue_real != null) {
+ read_value = propReadValue_real.value;
+ } else {
+ read_value = "";
+ }
+
+ if (propUpdateValue_real != null) {
+ update_value = propUpdateValue_real.value;
+ } else {
+ update_value = "";
+ }
// alert(propValue_real.value)
- if (validate || (propValue_real != null && propValue_real.value != "")) {
+ if (propReadType_real != "none" || propUpdateType_real != "none") {
// var propchild = getsynproperty();
// alert(propValue_real)
var propchild = createesbelement("<syn:property \
xmlns:syn='http://ws.apache.org/ns/synapse'/>"); propchild.setAttribute("name", \
propName_real);
- if (propType_real == "value") {
- propchild.setAttribute("value", propValue_real.value);
- } else if (propType_real == "expression") {
- propchild.setAttribute("expression", propValue_real.value);
+ var propchild2 = null;
+ if (propReadType_real == "value" && propUpdateType_real == "message") {
+ // ReadValueUpdateMessage
+ propchild.setAttribute("value", read_value);
+ propchild.setAttribute("expression", update_value);
+ } else if (propReadType_real == "value" && propUpdateType_real == \
"context") { + // ReadValueUpdateContext
+ propchild.setAttribute("value", read_value);
+ propchild.setAttribute("context-name", update_value);
+ } else if (propReadType_real == "value" && propUpdateType_real == \
"none") { + // ReadValue
+ propchild.setAttribute("value", read_value);
+ } else if (propReadType_real == "message" && propUpdateType_real == \
"message") { + propchild.setAttribute("expression", read_value);
+ if (read_value == update_value) {
+ // ReadAndUpdateMessage
+ propchild.setAttribute("action", "ReadAndUpdateMessage")
+ } else {
+ // ReadMessage + UpdateMessage
+ propchild.setAttribute("action", "ReadMessage");
+ propchild2 = createesbelement("<syn:property \
xmlns:syn='http://ws.apache.org/ns/synapse'/>"); + \
propchild2.setAttribute("name", propName_real); + \
propchild2.setAttribute("expression", update_value); + \
propchild2.setAttribute("action", "UpdateMessage"); + \
} + } else if (propReadType_real == "message" && propUpdateType_real == \
"context") { + // ReadMessageAndUpdateContext
+ propchild.setAttribute("expression", read_value);
+ propchild.setAttribute("context-name", update_value);
+ propchild.setAttribute("action", "ReadMessage");
+ } else if (propReadType_real == "message" && propUpdateType_real == \
"none") { + // ReadMessage
+ propchild.setAttribute("expression", read_value);
+ propchild.setAttribute("action", "ReadMessage");
+ } else if (propReadType_real == "context" && propUpdateType_real == \
"message") { + // ReadContextAndUpdateMessage
+ propchild.setAttribute("context-name", read_value);
+ propchild.setAttribute("expression", update_value);
+ propchild.setAttribute("action", "ReadContext");
+ } else if (propReadType_real == "context" && propUpdateType_real == \
"context") { + propchild.setAttribute("context-name", read_value);
+ if (read_value == update_value) {
+ // ReadAndUpdateContext
+ propchild.setAttribute("action", "ReadAndUpdateContext")
+ } else {
+ // ReadContext + UpdateContext
+ propchild.setAttribute("action", "ReadContext");
+ propchild2 = createesbelement("<syn:property \
xmlns:syn='http://ws.apache.org/ns/synapse'/>"); + \
propchild2.setAttribute("name", propName_real); + \
propchild2.setAttribute("context-name", update_value); + \
propchild2.setAttribute("action", "UpdateContext"); + }
+ } else if (propReadType_real == "context" && propUpdateType_real == \
"none") { + // ReadContext
+ propchild.setAttribute("context-name", read_value);
+ propchild.setAttribute("action", "ReadContext");
+ } else if (propReadType_real == "none" && propUpdateType_real == \
"message") { + // UpdateMessage
+ propchild.setAttribute("expression", update_value);
+ propchild.setAttribute("action", "UpdateMessage")
+ } else if (propReadType_real == "none" && propUpdateType_real == \
"context") { + propchild.setAttribute("context-name", update_value);
+ propchild.setAttribute("action", "UpdateContext")
}
var attaching_ns = namespaces[propName_real];
if (attaching_ns != undefined) {
@@ -75,10 +148,16 @@
var nsparts = splitted_ns[j].split("###");
if (nsparts.length == 2) {
propchild.setAttribute("xmlns:" + nsparts[0], nsparts[1]);
+ if (propchild2 != null) {
+ propchild2.setAttribute("xmlns:" + nsparts[0], \
nsparts[1]); + }
}
}
}
mediator.appendChild(propchild);
+ if (propchild2 != null) {
+ mediator.appendChild(propchild2);
+ }
}
}
// alert((new XMLSerializer()).serializeToString(mediator))
@@ -160,6 +239,13 @@
processXML(mediator, "mediators/pojoCommand_edit.xsl", \
document.getElementById("command_edit_div")) }
+function reloadChanges() {
+ var position = geteditingmediatorposition();
+ var mediator = getnestedmediator(internalmodel.sequence, position);
+ collectdata["pojoCommand"](mediator);
+ editmediator(position);
+}
+
function removecommandmedprop(propname) {
// editing mediator position in the internal model
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property.js Wed \
Jan 30 07:41:20 2008 @@ -145,8 +145,7 @@
}
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
var propertystr = "<syn:property \
xmlns:syn='http://ws.apache.org/ns/synapse' name='" @@ -155,9 +154,9 @@
var propertytype = propertytrs[j].children[1].children[0].options[
propertytrs[j].children[1].children[0].selectedIndex].value;
if (propertytype == "value") {
- propertystr += "value='" + \
propertytrs[j].children[2].children[0].value + "' "; + propertystr += \
"value='" + convertAllXmlSpecialChars(propertytrs[j].children[2].children[0].value) + \
"' "; } else if (propertytype == "expression") {
- propertystr += "expression='" + \
propertytrs[j].children[2].children[0].value + "' "; + propertystr += \
"expression='" + convertAllXmlSpecialChars(propertytrs[j].children[2].children[0].value) \
+ "' "; }
if (namespaces[mediator.getAttribute("esb_med_pos").concat(".").concat(j)] \
!= undefined) {
var nss = \
namespaces[mediator.getAttribute("esb_med_pos").concat(".").concat(j)]; @@ -177,8 \
+176,7 @@ }
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
@@ -280,14 +278,13 @@
}
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
var featurestr = "<syn:feature \
xmlns:syn='http://ws.apache.org/ns/synapse' name='" + name + "' ";
- featurestr += "value='" + features[j].children[1].children[0].value + "' \
"; + featurestr += "value='" + \
convertAllXmlSpecialChars(features[j].children[1].children[0].value) + "' "; \
mediator.appendChild(createesbelement(featurestr + "/>")); } else {
var name = features[j].childNodes[0].childNodes[0].value;
@@ -298,8 +295,7 @@
}
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/property_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -53,19 +53,21 @@
esbwarning("The value or expression must be specified for the \
property mediator", TYPE_INFO); return false;
}
-
- var scope_element = document.getElementById("scope");
- if(scope_element != undefined && scope_element != null) {
- var scope_index = scope_element.selectedIndex;
- var scope = scope_element.options[scope_index].value;
- if (scope != "synapse") {
- mediator.setAttribute("scope", scope);
- }
- }
} else {
mediator.setAttribute("action", "remove");
}
+
+ var scope_element = document.getElementById("scope");
+ if(scope_element != undefined && scope_element != null) {
+ var scope_index = scope_element.selectedIndex;
+ var scope = scope_element.options[scope_index].value;
+ if (scope != "synapse") {
+ mediator.setAttribute("scope", scope);
+ } else {
+ mediator.removeAttribute("scope");
+ }
+ }
} else if(!validate) {
esbwarning("Property name must be specified", TYPE_INFO);
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/send_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/send_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/send_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -51,9 +51,10 @@
}
collectdata["send"] = function collectsenddata(mediator) {
+
if (mediator.childNodes.length > 0) {
if (currentepobj != undefined && currentepobj != null) {
- mediator.removeChild(mediator.childNodes[0]);
+ removepreviousendpoint(mediator);
mediator.appendChild(createesbelement(relpaceString(relpaceString(trim(currentepobj), \
"&", "&"), "&", "&"))); }
}
@@ -75,13 +76,30 @@
esbwarning("Cannot find a valid mediator", TYPE_WARN);
return;
}
+
if (mediator.childNodes.length > 0) {
- var ep = mediator.childNodes[0];
- if (ep == null || ep == undefined) {
+ var chlimit = mediator.childNodes.length;
+ var cindex = null;
+ for (var i = 0; i < chlimit; i++) {
+ var child = mediator.childNodes[i] ;
+ if (child != null && child != undefined) {
+ var name = child.nodeName;
+ if (name == "syn:endpoint" || name == "endpoint") {
+ cindex = i;
+ }
+ }
+ }
+ if (cindex != null) {
+ var ep = mediator.childNodes[cindex];
+ if (ep == null || ep == undefined) {
+ esbwarning("Endpoint cannot be found", TYPE_WARN);
+ return;
+ } else {
+ return ep;
+ }
+ } else {
esbwarning("Endpoint cannot be found", TYPE_WARN);
return;
- } else {
- return ep;
}
}
}
@@ -116,12 +134,7 @@
if (sendmediator_c_pos != null && sendmediator_c_pos != undefined) {
var mediator = getnestedmediator(internalmodel.sequence, \
sendmediator_c_pos); if (mediator.childNodes.length > 0) {
- for (var k=0; k<mediator.childNodes.length; k++) {
- previous_ep_value = mediator.childNodes[k];
- if (previous_ep_value != null && previous_ep_value != undefined && \
previous_ep_value.nodeName == "syn:endpoint") {
- mediator.removeChild(previous_ep_value);
- }
- }
+ removepreviousendpoint(mediator);
}
if (currentepobj != undefined && currentepobj != null) {
mediator.appendChild(createesbelement(currentepobj));
@@ -141,10 +154,7 @@
if (sendmediator_c_pos != null && sendmediator_c_pos != undefined) {
var mediator = getnestedmediator(internalmodel.sequence, \
sendmediator_c_pos); if (mediator.childNodes.length > 0) {
- previous_ep_value = mediator.childNodes[0];
- if (previous_ep_value != null && previous_ep_value != undefined) {
- mediator.removeChild(previous_ep_value);
- }
+ removepreviousendpoint(mediator);
}
var epdiv = document.getElementById("ep");
if (epdiv != null && mediator != null) {
@@ -153,3 +163,22 @@
}
}
+function removepreviousendpoint(mediator) {
+ var chlimit = mediator.childNodes.length;
+ var cindex = null;
+ for (var i = 0; i < chlimit; i++) {
+ var child = mediator.childNodes[i] ;
+ if (child != null && child != undefined) {
+ var name = child.nodeName;
+ if (name == "syn:endpoint" || name == "endpoint") {
+ cindex = i;
+ }
+ }
+ }
+ if (cindex != null) {
+ previous_ep_value = mediator.childNodes[cindex];
+ if (previous_ep_value != null && previous_ep_value != undefined) {
+ mediator.removeChild(previous_ep_value);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/throttle_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/throttle_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/throttle_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -61,7 +61,7 @@
var id = trim(thottleID.value);
if (!namevalidate(id)) {
esbwarning("The value for the ID contains invalid characters." +
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + " Only, alphanumeric , underscore \
or dash characters are allowed. ", TYPE_INFO); return false;
}
mediator.setAttribute("id", id);
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/xquery_mediator.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/xquery_mediator.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/xquery_mediator.js Wed \
Jan 30 07:41:20 2008 @@ -175,8 +175,7 @@
&& name != "") {
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid \
characters." +
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
@@ -189,13 +188,13 @@
if (propertytype == "value") {
var value = propertytrs[j].children[3].children[0].value;
if (value != null && value != undefined && trim(value) != \
"") {
- propertystr += "value='" + trim(value) + "' ";
+ propertystr += "value='" + \
convertAllXmlSpecialChars(trim(value)) + "' "; } else {
esbwarning("Varibale value must be defined for the \
variable type :" + propertytrs[j].children[0].children[0].value, TYPE_INFO); return \
false; }
} else if (propertytype == "expression") {
- propertystr += "expression='" + \
propertytrs[j].children[3].children[0].value + "' "; + \
propertystr += "expression='" + \
convertAllXmlSpecialChars(trim(propertytrs[j].children[3].children[0].value)) + "' "; \
} if (namespce != undefined && namespce != null) {
for (var g = 0; g < namespce.length; g++) {
@@ -255,8 +254,7 @@
&& name != "") {
name = trim(name);
if (!namevalidate(name)) {
- esbwarning("The value for the name contains invalid \
characters." +
- " Only, alphanumeric or underscore characters are \
allowed. ", TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return false;
}
var property;
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/proxyservices.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/proxyservices.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/proxyservices.js Wed \
Jan 30 07:41:20 2008 @@ -468,6 +468,8 @@
showgetproxynamediv(1);
} else {
+ clearnodepositions(internalmodel.proxy);
+
var elementxml = internalmodel.proxy.xml;
if (elementxml == undefined) {
elementxml = new XMLSerializer().serializeToString(internalmodel.proxy);
@@ -500,6 +502,8 @@
}
}
+ clearnodepositions(internalmodel.proxy);
+
var elementxml = internalmodel.proxy.xml;
if (elementxml == undefined) {
@@ -586,7 +590,7 @@
function setproxysavepanel(proxydiv) {
var savepanel = document.createElement("div");
-
+
savepanel.innerHTML = "<div class='description'>You must save changes to "
+ "the proxy service for it to be deployed</div>";
@@ -622,8 +626,7 @@
if (document.getElementById("proxy_name") != null && \
document.getElementById("proxy_name").value != "") { if \
(!namevalidate(document.getElementById("proxy_name").value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return -1;
}
internalmodel.proxyname = document.getElementById("proxy_name").value;
@@ -794,23 +797,20 @@
if (browsername.indexOf(IE_BROWSER_NAME) != -1) {
prefix = "syn:";
}
+ var wsdl = internalmodel.proxy.getElementsByTagName(prefix + "publishWSDL");
if (document.getElementById("wsdl_ref") != undefined) {
- var refwsdl = internalmodel.proxy.getElementsByTagName(prefix + \
"publishWSDL");
- if (refwsdl.length != 0) {
- internalmodel.proxy.removeChild(refwsdl[0]);
+ if (wsdl.length != 0) {
+ internalmodel.proxy.removeChild(wsdl[0]);
}
if (document.getElementById("wsdl_ref").value != "") {
internalmodel.proxy.appendChild(createesbelement(
"<syn:publishWSDL key='" + \
document.getElementById("wsdl_ref").value + "' \
xmlns:syn='http://ws.apache.org/ns/synapse'/>")); }
- }
-
- if (document.getElementById("wsdl_uri") != undefined) {
+ } else if (document.getElementById("wsdl_uri") != undefined) {
- var wsdl = internalmodel.proxy.getElementsByTagName(prefix + "publishWSDL");
if (wsdl.length != 0) {
internalmodel.proxy.removeChild(wsdl[0]);
}
@@ -820,6 +820,41 @@
"<syn:publishWSDL uri='" + \
document.getElementById("wsdl_uri").value + "' \
xmlns:syn='http://ws.apache.org/ns/synapse'/>")); }
}
+
+ wsdl = internalmodel.proxy.getElementsByTagName(prefix + "publishWSDL");
+ if (wsdl == null || wsdl == undefined || wsdl.length == 0) {
+ return;
+ }
+ var existingresources = wsdl[0].getElementsByTagName(prefix + "resource");
+ if (existingresources != null) {
+ while (existingresources.length > 0) {
+ var child = existingresources[existingresources.length - 1];
+ if (child != null) {
+ wsdl[0].removeChild(child);
+ }
+ }
+ }
+ var resources = document.getElementById("wsdl_resources_id");
+ if (resources != null) {
+ if (resources.childNodes != null && resources.childNodes.length != 0) {
+ for (var i = 0; i < resources.childNodes.length; i++) {
+ var resource = resources.childNodes[i];
+ if (resource != null) {
+ var location = resource.childNodes[0].childNodes[0].value;
+ var key = resource.childNodes[1].childNodes[0].value;
+ if (key != null && location != null) {
+ if (validate) {
+ if (key != "" && location != "") {
+ wsdl[0].appendChild(createesbelement("<syn:resource \
location='" + trim(location) + "' key='" + trim(key) + "' \
xmlns:syn='http://ws.apache.org/ns/synapse'/>")); + }
+ } else {
+ wsdl[0].appendChild(createesbelement("<syn:resource \
location='" + trim(location) + "' key='" + trim(key) + "' \
xmlns:syn='http://ws.apache.org/ns/synapse'/>")); + }
+ }
+ }
+ }
+ }
+ }
};
function geteditingposition() {
@@ -1043,7 +1078,19 @@
var proxywsdl = "";
if (wsdl.length != 0) {
- proxywsdl = wsdl[0].firstChild;
+ var chlimit = wsdl[0].childNodes.length;
+ for (var i = 0; i < chlimit; i++) {
+ var child = wsdl[0].childNodes[i] ;
+ if (child != null && child != undefined) {
+ var name = child.nodeName;
+ if (name != null) {
+ if (name.indexOf("resource") == -1) {
+ proxywsdl = child;
+ break;
+ }
+ }
+ }
+ }
}
addInLineProperties("proxy_wsdl", proxywsdl);
@@ -1274,7 +1321,7 @@
if (document.getElementById("editingDiv") != null || \
document.getElementById("editingDiv") != undefined) { \
document.getElementById("editingDiv").removeAttribute("id"); }
-
+
internalmodel.sequence = createesbelement("<syn:sequence name='' "
+ "xmlns:syn='http://ws.apache.org/ns/synapse'></syn:sequence>");
@@ -1457,16 +1504,23 @@
}
function setwsdlfromregistry() {
-
- document.getElementById("wsdl_ref").setAttribute("value", getRegistryKey());
+ var regKey = getRegistryKey();
dicardregistrybrowser(1);
+ document.getElementById("wsdl_ref").setAttribute("value", regKey);
+ if (proxydatacollect["step4"]() == -1) {
+ return;
+ }
+ addeditwrapper(4);
+ document.getElementById("wsdl_ref").setAttribute("value", regKey);
}
function settargetfromregistry(targettype) {
- document.getElementById(targettype).setAttribute("value", getRegistryKey());
+ var regkey = getRegistryKey();
+ document.getElementById(targettype).setAttribute("value", regkey);
dicardregistrybrowser(1);
proxydatacollect["step1"](null, true);
addeditwrapper(1);
+ document.getElementById(targettype).setAttribute("value", regkey);
}
function registrybrowser(saveFn, discardFn, param1, param2, panelId) {
@@ -1512,7 +1566,7 @@
+ "<tr><td></td><td><input type='button' id='createFolderButton' \
value='Create Folder' onclick='javascript: addRegistryFolderForSave(\"" + saveFn + \
"\",\"" + param1 + "\"); return false;' class='panelbutton_default' style='width: \
100px; height:20px;'/></td></tr></table></div>"
-
+
+ "</p>"
// + "<br/><div style='position:absolute;top:250px; "
@@ -1522,7 +1576,7 @@
// + "<div id='localregkey' style='position:absolute; border: 1px solid \
gray; top:280px; " // + "left:20px; width:620px; height:70px; \
overflow-x:auto; overflow-y:auto;'>" // + "</div>"
-
+
+ "</div><div><table style='margin-left: 210px;margin-top: \
150px;_margin-top: 40px;'><tbody><tr>" + "<td><input type='button' \
class='panelbutton_default' " @@ -1695,3 +1749,59 @@
}
}
}
+
+function deleteresource(location) {
+
+ if (proxydatacollect["step4"]() == -1) {
+ return;
+ }
+
+ var wsdl = internalmodel.proxy.getElementsByTagName("publishWSDL");
+ if (wsdl == null || wsdl == undefined || wsdl.length==0) {
+ wsdl = internalmodel.proxy.getElementsByTagName("syn:publishWSDL");
+ }
+ if (wsdl == null || wsdl == undefined || wsdl.length==0) {
+ return;
+ }
+ var child = wsdl[0].childNodes[location-1];
+ if (child == null || child == undefined) {
+ return;
+ }
+ wsdl[0].removeChild(child);
+ addeditwrapper(4);
+}
+
+function addresource() {
+
+ if (proxydatacollect["step4"]() == -1) {
+ return;
+ }
+
+ var wsdl = internalmodel.proxy.getElementsByTagName("publishWSDL");
+ if (wsdl == null || wsdl == undefined || wsdl.length == 0) {
+ wsdl = internalmodel.proxy.getElementsByTagName("syn:publishWSDL");
+ }
+ if (wsdl == null || wsdl == undefined || wsdl.length == 0) {
+ esbwarning("Resources only could be defined if either wsdl uri or registry \
key has been defined", TYPE_INFO); + return;
+ }
+
+ wsdl[0].appendChild(createesbelement("<syn:resource \
xmlns:syn='http://ws.apache.org/ns/synapse' location='' key=''></syn:resource>")); + \
addeditwrapper(4); +}
+
+function resourcekeyfromregistry(index) {
+ var panelId = ("mypanel" + index).toString();
+ registrybrowser("saveresourcekeyfromregistry", "dicardregistrybrowser", index, \
1, panelId); +}
+
+function saveresourcekeyfromregistry(index) {
+ var regKey = getRegistryKey();
+ var keyid = ("resource_key" + index).toString();
+ var divcontrol = document.getElementById("registryPanel");
+ divcontrol.innerHTML = "";
+ var resourceref = document.getElementById(keyid.toString());
+ if (resourceref != undefined && resourceref != null) {
+ resourceref.value = regKey;
+ }
+}
\ No newline at end of file
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/sequences.js Wed \
Jan 30 07:41:20 2008 @@ -824,8 +824,7 @@
if(document.getElementById("sequencename") != null && \
document.getElementById("sequencename").value != "") {
if (!namevalidate(document.getElementById("sequencename").value)) {
- esbwarning("The value for the name contains invalid characters." +
- " Only, alphanumeric or underscore characters are allowed. ", \
TYPE_INFO); + esbwarning(INVALID_NAME, TYPE_INFO);
return;
}
internalmodel.sequencename = document.getElementById("sequencename").value;
@@ -1002,10 +1001,21 @@
if(correctedSeq != null && correctedSeq != undefined && \
isValidXml(correctedSeq)){ fileContent = correctedSeq;
}
- editFilePath = regTree.getSelected();
+
+ var currentpath = regTree.getSelected();
+ if (currentpath == null || currentpath == undefined) {
+ esbwarning("null entity", TYPE_ERROR);
+ return;
+ }
+ if (currentpath == "") {
+ esbwarning("Please select an item first", TYPE_ERROR);
+ return;
+ }
+ editFilePath = currentpath;
+
var body_xml = '<ns1:updateRegistryEntryValue \
xmlns:ns1="http://org.apache.synapse/xsd">' + '<regEntry>' +
- '<key>'+ regTree.getSelected() +'</key>' +
+ '<key>' + currentpath + '</key>' +
'<value>' + fileContent + '</value>' +
'</regEntry>' +
'</ns1:updateRegistryEntryValue>';
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/menu.html
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/menu.html (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/menu.html Wed \
Jan 30 07:41:20 2008 @@ -22,4 +22,4 @@
<li class="sublinks menu-tracemessages"><a href="#" \
onclick="javascript:viewTraceLogs(); return false;" title="View trace logs">Trace \
Messages</a></li> <li class="sublinks menu-logsettings" \
style="border-bottom:none;"><a href="#" onclick="javascript:showLogConfig(); return \
false;" title="Manage log settings">Log Settings</a></li> </ul>
- <a href="http://ws.apache.org/synapse/" target="_blank" \
title="http://ws.apache.org/synapse/"><img \
src="extensions/core/images/synapse-PB-logo.jpg" \
style="padding-left:20px;margin-top:10px;" border="0" /></a> \ No newline at end of \
file + <a href="http://synapse.apache.org/" target="_blank" \
title="http://synapse.apache.org/"><img \
src="extensions/core/images/synapse-PB-logo.jpg" \
style="padding-left:20px;margin-top:10px;" border="0" /></a> \ No newline at end of \
file
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -33,12 +33,11 @@
<div class="inside-content">
<table border="0" cellpadding="0" cellspacing="0" class="data-table" \
style="width: 550px;"> <tbody>
-
- <tr>
- <td style="width: 200px;">Corelation Expression </td>
+ <tr>
+ <td style="width: 200px;">Aggregation Expression </td>
<td>
- <input type="text" id="corelate_expr" class="esb-edit">
- <xsl:attribute name="value"><xsl:value-of \
select="syn:corelateOn/@expression"/></xsl:attribute> + <input \
type="text" id="aggregate_expr" class="esb-edit"> + \
<xsl:attribute name="value"><xsl:value-of \
select="syn:onComplete/@expression"/></xsl:attribute> </input>
</td>
<td>
@@ -47,7 +46,7 @@
</a>
</td>
</tr>
-
+
<tr>
<td style="width: 200px;">Completion Timeout </td>
<td colspan="2">
@@ -56,7 +55,7 @@
</input>
</td>
</tr>
-
+
<tr>
<td style="width: 200px;">Completion Max-messages </td>
<td colspan="2">
@@ -65,7 +64,7 @@
</input>
</td>
</tr>
-
+
<tr>
<td style="width: 200px;">Completion Min-messages </td>
<td colspan="2">
@@ -74,12 +73,12 @@
</input>
</td>
</tr>
-
+
<tr>
- <td style="width: 200px;">Aggregation Expression </td>
+ <td style="width: 200px;">Corelation Expression </td>
<td>
- <input type="text" id="aggregate_expr" class="esb-edit">
- <xsl:attribute name="value"><xsl:value-of \
select="syn:onComplete/@expression"/></xsl:attribute> + <input \
type="text" id="correlate_expr" class="esb-edit"> + \
<xsl:attribute name="value"><xsl:value-of \
select="syn:correlateOn/@expression"/></xsl:attribute> </input>
</td>
<td>
@@ -89,19 +88,10 @@
</td>
</tr>
- <tr>
- <td style="width: 200px;">Invalidation Timeout </td>
- <td colspan="2">
- <input type="text" id="invalidate_time" class="esb-edit">
- <xsl:attribute name="value"><xsl:value-of \
select="syn:invalidate/@timeout"/></xsl:attribute>
- </input>
- </td>
- </tr>
-
</tbody>
</table>
- <div class="sub-small-title">On Complete </div>
+ <div class="sub-small-title">On Complete</div>
<xsl:choose>
<xsl:when test="syn:onComplete/@sequence">
@@ -138,43 +128,6 @@
</xsl:otherwise>
</xsl:choose>
- <div class="sub-small-title">On Invalidate </div>
-
- <xsl:choose>
- <xsl:when test="syn:invalidate/@sequence">
- <input type="button" value="Specify In-line" \
onclick="javascript: aggregateoninvalidatetoinline(); return false;" \
class="panelbutton_default"/>
- <table border="0" cellpadding="0" cellspacing="0" \
class="data-table">
- <tbody>
- <tr>
- <td style="width: 200px;">Sequence Ref </td>
- <td>
- <input type="text" class="esb-edit" \
id="on_invalidate" disabled="true">
- <xsl:attribute name="value">
- <xsl:value-of \
select="syn:invalidate/@sequence"/>
- </xsl:attribute>
- </input>
- <img \
src="extensions/core/images/registry_picker.gif" align="middle" hspace="20" \
title="Registry Browser" onclick="javascript:oninvalidatefromregistry(); return \
false;"/>
- </td>
- </tr>
- </tbody>
- </table>
- </xsl:when>
- <xsl:otherwise>
- <input type="button" value="Specify Reference" \
onclick="javascript: aggregateinvalidatetoref(); return false;" \
style="margin-top:5px;margin-bottom:5px;" class="panelbutton_default" \
/>
- <xsl:if test="count(syn:invalidate/child::*)=0">
- <xsl:call-template name="add_mediator_control">
- <xsl:with-param name="head_pos"
- \
select="concat(concat(syn:invalidate/@esb_med_pos, '.'), \
count(syn:invalidate/child::*))"/>
- </xsl:call-template>
- </xsl:if>
- <xsl:for-each select="syn:invalidate">
- <div class='indent'>
- <xsl:apply-templates/>
- </div>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
-
</div>
<!--</xsl:for-each>-->
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -32,40 +32,31 @@
<div id="common_table_content">
<table border="0" cellpadding="0" cellspacing="0" class="data-table">
<tbody>
-
- <tr>
- <td style="width: 200px;">Corelation Expression </td>
- <td><xsl:value-of select="syn:corelateOn/@expression"/></td>
+ <tr>
+ <td style="width: 200px;">Aggregation Expression </td>
+ <td><xsl:value-of select="syn:onComplete/@expression"/></td>
</tr>
-
<tr>
<td style="width: 200px;">Completion Timeout </td>
<td><xsl:value-of select="syn:completeCondition/@timeout"/></td>
</tr>
-
<tr>
<td style="width: 200px;">Completion Max-messages </td>
<td><xsl:value-of \
select="syn:completeCondition/syn:messageCount/@max"/></td> </tr>
-
<tr>
<td style="width: 200px;">Completion Min-messages </td>
<td><xsl:value-of \
select="syn:completeCondition/syn:messageCount/@min"/></td> </tr>
-
<tr>
- <td style="width: 200px;">Aggregation Expression </td>
- <td><xsl:value-of select="syn:onComplete/@expression"/></td>
- </tr>
-
- <tr>
- <td style="width: 200px;">Invalidation Timeout </td>
- <td><xsl:value-of select="syn:invalidate/@timeout"/></td>
+ <td style="width: 200px;">Correlation Expression </td>
+ <td><xsl:value-of select="syn:correlateOn/@expression"/></td>
</tr>
</tbody>
</table>
-
+ </div>
+
<div class="sub-small-title">On Complete </div>
<xsl:choose>
@@ -88,30 +79,6 @@
</xsl:otherwise>
</xsl:choose>
- <div class="sub-small-title">On Invalidate </div>
-
- <xsl:choose>
- <xsl:when test="syn:invalidate/@sequence">
- <table border="0" cellpadding="0" cellspacing="0" \
class="data-table">
- <tbody>
- <tr>
- <td style="width: 200px;">Sequence Ref </td>
- <td><xsl:value-of \
select="syn:invalidate/@sequence"/></td>
- </tr>
- </tbody>
- </table>
- </xsl:when>
- <xsl:otherwise>
- <xsl:for-each select="syn:invalidate">
- <div class='indent'>
- <xsl:apply-templates/>
- </div>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
-
- </div>
-
<!--</xsl:for-each>-->
</div>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/callout_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/callout_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/callout_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -135,7 +135,17 @@
</xsl:attribute>
</input>
</td>
- <td/>
+ <td>
+ <xsl:element name="img">
+ <xsl:attribute name="src">
+ \
extensions/core/images/registry_picker.gif + \
</xsl:attribute> + <xsl:attribute \
name="title">Registry Browser</xsl:attribute> + \
<xsl:attribute name="onClick"> + \
javascript:calloutsourcekeyfromregistry('<xsl:value-of \
select="@esb_med_pos"/>');return false; + \
</xsl:attribute> + </xsl:element>
+ </td>
</tr>
</tbody>
</table>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/class_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/class_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/class_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -21,85 +21,82 @@
<xsl:template match="syn:class" xmlns:syn="http://ws.apache.org/ns/synapse">
<div id="class_edit_div">
- <label class="content-header">
- <img src="extensions/core/images/class-mediator.gif"/>
- <xsl:text>Class Mediator</xsl:text>
- </label>
- <br/>
- <br/>
- <div id="xslt_edit" class="end-point-div">
- <br/>
- <table border="0" style="margin-left: 3em; width: 150px;">
- <tbody>
- <tr>
- <td>
- Name<font style='color: red;font-size: 8pt;'> *</font>
- </td>
- <td>
- <input type="text" class="esb-edit" size="40"
- id="class_name">
- <xsl:attribute name="value">
- <xsl:if test="not(@name)"></xsl:if>
- <xsl:if test="@name">
- <xsl:value-of select="@name"/>
- </xsl:if>
- </xsl:attribute>
- </input>
- </td>
- <td>
- <xsl:if test="not(syn:property)">
- <input type="button" href="#" onclick="javascript: \
loadclass(); return false;" style="margin-left: 3em;width:100px;" value="Load Class" \
class="panelbutton_default"/>
- </xsl:if>
- <xsl:if test="syn:property">
- <input type="button" href="#" onclick="javascript: \
loadclass(); return false;" style="margin-left: 3em;width:100px;" value="Reload \
Class" class="panelbutton_default"/>
- </xsl:if>
- </td>
- </tr>
- </tbody>
- </table>
- <xsl:if test="syn:property">
- <p>Properties defined for Class mediator</p>
+ <label class="content-header">
+ <img src="extensions/core/images/class-mediator.gif"/>
+ <xsl:text>Class Mediator</xsl:text>
+ </label>
+ <br/>
<br/>
- <div id="common_table_content">
- <table border="0" cellpadding="0" cellspacing="0" width="600">
- <tr>
- <th>Property Name</th>
- <th>Property Value</th>
- <th></th>
- </tr>
- <xsl:for-each select="syn:property">
- <tr>
- <xsl:attribute name="name">syn-property</xsl:attribute>
- <td>
- <input type="text" name="property_name" class="esb-edit small_textbox" \
disabled="true">
- <xsl:attribute name="value">
- <xsl:value-of select="concat(translate(substring(@name,1,1),
- 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ'),
- substring(@name,2,string-length(@name)))"/>
- </xsl:attribute>
- </input>
- </td>
- <td>
- <input type="text" class="esb-edit small_textbox">
- <xsl:attribute name="id">
- <xsl:value-of select="concat('class_med_prop', @name)"/>
- </xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of \
select="@value"/></xsl:attribute>
- </input>
- </td>
- <td>
- <xsl:attribute name="id"><xsl:value-of \
select="concat('namespaceCell',@esb_med_pos)"/></xsl:attribute>
- </td>
- <td><a href="#" id="delete_link">
- <xsl:attribute name="onclick">javascript: \
removeclassmedprop('<xsl:value-of select="@name"/>'); return \
false;</xsl:attribute>    </a></td>
- </tr>
- </xsl:for-each>
- </table>
+ <div id="xslt_edit" class="end-point-div">
+ <table border="0" style="margin-left: 3em; width: 150px;">
+ <tbody>
+ <tr>
+ <td>
+ Name<font style='color: red;font-size: \
8pt;'> *</font> + </td>
+ <td>
+ <input type="text" class="esb-edit" size="40"
+ id="class_name">
+ <xsl:attribute name="value">
+ <xsl:if test="not(@name)"></xsl:if>
+ <xsl:if test="@name">
+ <xsl:value-of select="@name"/>
+ </xsl:if>
+ </xsl:attribute>
+ </input>
+ </td>
+ <td>
+ <xsl:if test="not(syn:property)">
+ <input type="button" href="#" \
onclick="javascript: loadclass(); return false;" style="margin-left: \
3em;width:100px;" value="Load Class" class="panelbutton_default"/> + \
</xsl:if> + <xsl:if test="syn:property">
+ <input type="button" href="#" \
onclick="javascript: loadclass(); return false;" style="margin-left: \
3em;width:100px;" value="Reload Class" class="panelbutton_default"/> + \
</xsl:if> + </td>
+ </tr>
+ </tbody>
+ </table>
+ <xsl:if test="syn:property">
+ <p>Properties defined for Class mediator</p>
+ <br/>
+ <div id="common_table_content">
+ <table border="0" cellpadding="0" cellspacing="0" \
width="600"> + <tr>
+ <th>Property Name</th>
+ <th>Property Value</th>
+ <th></th>
+ </tr>
+ <xsl:for-each select="syn:property">
+ <tr>
+ <xsl:attribute \
name="name">syn-property</xsl:attribute> + <td>
+ <input type="text" name="property_name" \
class="esb-edit small_textbox" disabled="true"> + \
<xsl:attribute name="value"> + \
<xsl:value-of select="concat(translate(substring(@name,1,1), + \
'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ'), + \
substring(@name,2,string-length(@name)))"/> + \
</xsl:attribute> + </input>
+ </td>
+ <td>
+ <input type="text" class="esb-edit \
small_textbox"> + <xsl:attribute \
name="id"> + <xsl:value-of \
select="concat('class_med_prop', @name)"/> + \
</xsl:attribute> + <xsl:attribute \
name="value"><xsl:value-of select="@value"/></xsl:attribute> + \
</input> + </td>
+ <td>
+ <xsl:attribute name="id"><xsl:value-of \
select="concat('namespaceCell',@esb_med_pos)"/></xsl:attribute> + \
</td> + <td><a href="#" id="delete_link">
+ <xsl:attribute name="onclick">javascript: \
removeclassmedprop('<xsl:value-of select="@name"/>'); return \
false;</xsl:attribute>    </a></td> + \
</tr> + </xsl:for-each>
+ </table>
+ </div>
+ </xsl:if>
</div>
- </xsl:if>
- <br/>
- <br/>
- </div>
</div>
</xsl:template>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/commons.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/commons.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/commons.xsl Wed \
Jan 30 07:41:20 2008 @@ -86,6 +86,20 @@
</tr>
</xsl:template>
+
+ <xsl:template name="syn-resource-view">
+
+ <tr>
+ <td>
+ <xsl:value-of select="@location"/>
+ </td>
+ <td>
+ <xsl:value-of select="@key"/>
+ </td>
+ </tr>
+
+ </xsl:template>
+
<xsl:template name="syn-feature-edit">
<tr>
<xsl:attribute name="name">syn-feature</xsl:attribute>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/filter_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/filter_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/filter_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -27,8 +27,6 @@
<br/>
<br/>
<div id="filter_edit" class="end-point-div">
- <br/>
- <br/>
<table>
<tr>
<td>Specify As</td>
@@ -87,7 +85,6 @@
</tr>
</tbody>
</table>
- <br/>
</xsl:if>
</xsl:if>
<xsl:if test="not(@xpath) or @set_src">
@@ -132,7 +129,6 @@
</table>
</xsl:if>
</xsl:if>
- <br/><br/>
<xsl:if test="count(child::*)=0">
<xsl:call-template name="add_mediator_control">
<xsl:with-param name="head_pos"
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/header_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/header_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/header_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -21,7 +21,7 @@
<label class="content-header">
<img src="extensions/core/images/header-mediator.gif"/>
<xsl:call-template name="capitalize-first"/>
- <xsl:text>Mediator</xsl:text>
+ <xsl:text> Mediator</xsl:text>
</label>
<br/>
<br/>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/pojoCommand_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/pojoCommand_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/pojoCommand_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -28,7 +28,6 @@
<br/>
<br/>
<div id="xslt_edit" class="end-point-div">
- <br/>
<table border="0" style="margin-left: 3em; width: 150px;">
<tbody>
<tr>
@@ -61,17 +60,17 @@
<p>Properties defined for POJOCommand mediator</p>
<br/>
<div id="common_table_content">
- <table border="0" cellpadding="0" cellspacing="0" width="600">
+ <table border="0" cellpadding="0" cellspacing="0" width="1000">
<tr>
<th>Property Name</th>
- <th>Property Type</th>
- <th>Value / Expression</th>
- <th></th>
+ <th>Read Info</th>
+ <th>Update Info</th>
+ <th>Actions</th>
</tr>
<xsl:for-each select="syn:property">
<tr>
<xsl:attribute name="name">syn-property</xsl:attribute>
- <td>
+ <td rowspan="2">
<input type="text" name="property_name" class="esb-edit \
small_textbox" disabled="true"> <xsl:attribute name="value">
<xsl:value-of \
select="concat(translate(substring(@name,1,1), @@ -80,86 +79,121 @@
</xsl:attribute>
</input>
</td>
-
- <xsl:if test="@value">
- <td>
- <select class="esb-edit small_textbox">
- <xsl:attribute name="id"><xsl:value-of \
select="concat('propertyType',@esb_med_pos)"/></xsl:attribute>
- <xsl:attribute name="name"><xsl:value-of \
select="concat('prop_type_', @name)"/></xsl:attribute>
- <xsl:attribute name="onchange">
- \
javascript:showNamespaceButtonForProperties('<xsl:value-of \
select="@esb_med_pos"/>','propertyType','namespaceCell');;
- </xsl:attribute>
- <option value="value" \
selected="true">Value</option>
- <option value="expression">Expression</option>
- </select>
- </td>
- <td>
- <input type="text" class="esb-edit small_textbox">
+
+ <td>From:
+ <select class="esb-edit small_textbox">
+ <xsl:attribute name="id"><xsl:value-of \
select="concat('propertyReadType',@esb_med_pos)"/></xsl:attribute> + \
<xsl:attribute name="name"><xsl:value-of select="concat('prop_type_read_', \
@name)"/></xsl:attribute> + <xsl:attribute \
name="onchange"> + \
javascript:reloadChanges();return false; + \
</xsl:attribute> + <option value="none">- NONE \
-</option> + <option value="value">
+ <xsl:if test="@value">
+ <xsl:attribute \
name="selected">true</xsl:attribute> + </xsl:if>
+ Value
+ </option>
+ <option value="message">
+ <xsl:if test="not(@value) and \
@action!='UpdateMessage' and @expression"> + \
<xsl:attribute name="selected">true</xsl:attribute> + \
</xsl:if> + Message
+ </option>
+ <option value="context">
+ <xsl:if test="not(@value) and \
@action!='UpdateContext' and @context-name"> + \
<xsl:attribute name="selected">true</xsl:attribute> + \
</xsl:if> + Context
+ </option>
+ </select>
+ </td>
+ <td>To:
+ <select class="esb-edit small_textbox">
+ <xsl:attribute name="id"><xsl:value-of \
select="concat('propertyUpdateType',@esb_med_pos)"/></xsl:attribute> + \
<xsl:attribute name="name"><xsl:value-of select="concat('prop_type_update_', \
@name)"/></xsl:attribute> + <xsl:attribute \
name="onchange"> + \
javascript:reloadChanges();return false; + \
</xsl:attribute> + <option value="none">- NONE \
-</option> + <option value="message">
+ <xsl:if test="(@action!='ReadMessage' and \
@expression) or (@value and @expression)"> + \
<xsl:attribute name="selected">true</xsl:attribute> + \
</xsl:if> + Message
+ </option>
+ <option value="context">
+ <xsl:if test="(@action!='ReadContext' and \
@context-name) or (@value and @context-name)"> + \
<xsl:attribute name="selected">true</xsl:attribute> + \
</xsl:if> + Context
+ </option>
+ </select>
+ </td>
+ <td rowspan="2"><a href="#" id="delete_link">
+ <xsl:attribute \
name="onclick">javascript: removecommandmedprop('<xsl:value-of select="@name"/>'); \
return false;</xsl:attribute>    </a></td> \
+ </tr><tr>
+ <td>
+ <xsl:if test="@value">Value:
+ <input class="esb-edit small_textbox" type="text">
<xsl:attribute name="id">
- <xsl:value-of \
select="concat('command_med_prop', @name)"/> + \
<xsl:value-of select="concat('command_med_prop_read', @name)"/> + \
</xsl:attribute> + <xsl:attribute name="value">
+ <xsl:value-of select="@value"/>
</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of \
select="@value"/></xsl:attribute> </input>
- </td>
- <td>
- <xsl:attribute name="id"><xsl:value-of \
select="concat('namespaceCell',@esb_med_pos)"/></xsl:attribute>
- </td>
- </xsl:if>
-
- <xsl:if test="@expression">
- <td id="property_value">
- <select class="esb-edit small_textbox">
- <xsl:attribute name="id"><xsl:value-of \
select="concat('propertyType',@esb_med_pos)"/></xsl:attribute>
- <xsl:attribute name="name"><xsl:value-of \
select="concat('prop_type_', @name)"/></xsl:attribute>
- <xsl:attribute name="onchange">
- \
javascript:showNamespaceButtonForProperties('<xsl:value-of \
select="@esb_med_pos"/>','propertyType','namespaceCell');;
- </xsl:attribute>
- <option value="value">Value</option>
- <option value="expression" \
selected="true">Expression</option>
- </select>
- </td>
- <td>
- <input type="text" class="esb-edit small_textbox">
+ </xsl:if>
+ <xsl:if test="not(@value) and @expression and \
(@action='ReadMessage' or @action='UpdateContext' or \
@action='ReadAndUpdateMessage')">Expression: + <input \
class="esb-edit small_textbox" type="text"> <xsl:attribute name="id">
- <xsl:value-of \
select="concat('command_med_prop', @name)"/> + \
<xsl:value-of select="concat('command_med_prop_read', @name)"/> + \
</xsl:attribute> + <xsl:attribute name="value">
+ <xsl:value-of select="@expression"/>
</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of \
select="@expression"/></xsl:attribute> </input>
- </td>
- <td>
- <xsl:attribute name="id"><xsl:value-of \
select="concat('namespaceCell',@esb_med_pos)"/></xsl:attribute>
- <a title="Namespace Editor" class="ns_editor">
- <xsl:attribute name="onclick">
- \
javascript:showNameSpaceEditor('<xsl:value-of \
select="@esb_med_pos"/>','','');
- </xsl:attribute>
- <xsl:text>    </xsl:text>
- </a>
- </td>
- </xsl:if>
-
-
+ </xsl:if>
+ <xsl:if test="not(@value) and @context-name and \
(@action='ReadContext' or @action='UpdateMessage' or \
@action='ReadAndUpdateContext')">Context name: + \
<input class="esb-edit small_textbox" type="text"> + \
<xsl:attribute name="id"> + <xsl:value-of \
select="concat('command_med_prop_read', @name)"/> + \
</xsl:attribute> + <xsl:attribute name="value">
+ <xsl:value-of select="@context-name"/>
+ </xsl:attribute>
+ </input>
+ </xsl:if>
+ </td>
+ <td>
+ <xsl:if test="(@expression and (@action='UpdateMessage' \
or @action='ReadContext' or @action='ReadAndUpdateMessage')) or (@value and \
@expression)">Expression: + <input class="esb-edit \
small_textbox" type="text"> + <xsl:attribute \
name="id"> + <xsl:value-of \
select="concat('command_med_prop_update', @name)"/> + \
</xsl:attribute> + <xsl:attribute name="value">
+ <xsl:value-of select="@expression"/>
+ </xsl:attribute>
+ </input>
+ </xsl:if>
+ <xsl:if test="(@context-name and \
(@action='UpdateContext' or @action='ReadMessage' or @action='ReadAndUpdateContext')) \
or (@value and @context-name)">Context name: + <input \
class="esb-edit small_textbox" type="text"> + \
<xsl:attribute name="id"> + <xsl:value-of \
select="concat('command_med_prop_update', @name)"/> + \
</xsl:attribute> + <xsl:attribute name="value">
+ <xsl:value-of select="@context-name"/>
+ </xsl:attribute>
+ </input>
+ </xsl:if>
+ </td>
- <!--<td>-->
- <!--<input type="text" class="esb-edit small_textbox">-->
- <!--<xsl:attribute name="id">-->
- <!--<xsl:value-of select="concat('command_med_prop', \
@name)"/>-->
- <!--</xsl:attribute>-->
- <!--<xsl:attribute name="value"><xsl:value-of \
select="@value"/></xsl:attribute>-->
- <!--</input>-->
- <!--</td>-->
- <!--<td>-->
- <!--<xsl:attribute name="id"><xsl:value-of \
select="concat('namespaceCell',@esb_med_pos)"/></xsl:attribute>-->
- <!--</td>-->
- <td><a href="#" id="delete_link">
- <xsl:attribute name="onclick">javascript: \
removecommandmedprop('<xsl:value-of select="@name"/>'); return \
false;</xsl:attribute>    </a></td>
- </tr>
+ </tr>
</xsl:for-each>
</table>
</div>
</xsl:if>
- <br/>
- <br/>
</div>
</div>
</xsl:template>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/pojoCommand_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/pojoCommand_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/pojoCommand_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -54,12 +54,39 @@
<table border="0" cellpadding="0" cellspacing="0" width="600">
<tr>
<th>Property Name</th>
- <th>Property Type</th>
- <th>Value / Expression</th>
+ <th>Read Info</th>
+ <th>Update Info</th>
</tr>
<xsl:for-each select="syn:property">
- <xsl:call-template name="syn-property-view"/>
- </xsl:for-each>
+ <tr>
+ <td>
+ <xsl:value-of \
select="concat(translate(substring(@name,1,1), + \
'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ'), + \
substring(@name,2,string-length(@name)))"/> + </td>
+ <td>
+ <xsl:if test="@value">Value:
+ <xsl:value-of select="@value"/>
+ </xsl:if>
+ <xsl:if test="not(@value) and @expression and \
(@action='ReadMessage' or @action='UpdateContext' or \
@action='ReadAndUpdateMessage')">Expression: + \
<xsl:value-of select="@expression"/> + </xsl:if>
+ <xsl:if test="not(@value) and @context-name and \
(@action='ReadContext' or @action='UpdateMessage' or \
@action='ReadAndUpdateContext')">Context name: + \
<xsl:value-of select="@context-name"/> + </xsl:if>
+ </td>
+ <td>
+ <xsl:if test="(@expression and (@action='UpdateMessage' \
or @action='ReadContext' or @action='ReadAndUpdateMessage')) or (@value and \
@expression)">Expression: + <xsl:value-of \
select="@expression"/> + </xsl:if>
+ <xsl:if test="(@context-name and \
(@action='UpdateContext' or @action='ReadMessage' or @action='ReadAndUpdateContext')) \
or (@value and @context-name)">Context name: + \
<xsl:value-of select="@context-name"/> + </xsl:if>
+ </td>
+
+
+ </tr>
+ </xsl:for-each>
</table>
</div>
</xsl:if>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/property_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/property_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/property_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -22,60 +22,58 @@
<label class="content-header">
<img src="extensions/core/images/property-mediator.gif"/>
<xsl:call-template name="capitalize-first"/>
- <xsl:text>Mediator</xsl:text>
+ <xsl:text> Mediator</xsl:text>
</label>
<br/>
<br/>
- <!--For existing mediators-->
- <!--<xsl:if test="@name">-->
- <table border="0" style="margin-left: 3em; width: 650px;">
- <tbody>
- <tr>
- <td colspan="2">Name
- <font style='color: red;font-size: 8pt;'> *</font>
- </td>
- <td colspan="2">
- <input type="text" class="esb-edit" width="80px" \
id="name">
- <xsl:attribute name="value">
- <xsl:value-of select="@name"/>
- </xsl:attribute>
- </input>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <xsl:text>Action</xsl:text>
- </td>
- <td style="width: 100px;">
- <input id="set" name="action" type="radio">
- <xsl:attribute name="onClick">
- javascript: setPropertyAction('set'); return \
false; + <table border="0" style="margin-left: 3em; width: 650px;">
+ <tbody>
+ <tr>
+ <td colspan="2">Name
+ <font style='color: red;font-size: 8pt;'> *</font>
+ </td>
+ <td colspan="2">
+ <input type="text" class="esb-edit" width="80px" id="name">
+ <xsl:attribute name="value">
+ <xsl:value-of select="@name"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <xsl:text>Action</xsl:text>
+ </td>
+ <td style="width: 100px;">
+ <input id="set" name="action" type="radio">
+ <xsl:attribute name="onClick">
+ javascript: setPropertyAction('set'); return false;
+ </xsl:attribute>
+ <xsl:if test="not(@action) or @action != 'remove'">
+ <xsl:attribute name="checked">
+ true
</xsl:attribute>
- <xsl:if test="not(@action) or @action != 'remove'">
- <xsl:attribute name="checked">
- true
- </xsl:attribute>
- </xsl:if>
- </input>
- Set
- </td>
- <td>
- <input id="remove" name="action" type="radio">
- <xsl:attribute name="onClick">
- javascript: setPropertyAction('remove'); return \
false; + </xsl:if>
+ </input>
+ Set
+ </td>
+ <td>
+ <input id="remove" name="action" type="radio">
+ <xsl:attribute name="onClick">
+ javascript: setPropertyAction('remove'); return \
false; + </xsl:attribute>
+ <xsl:if test="@action = 'remove'">
+ <xsl:attribute name="checked">
+ true
</xsl:attribute>
- <xsl:if test="@action = 'remove'">
- <xsl:attribute name="checked">
- true
- </xsl:attribute>
- </xsl:if>
- </input>
- Remove
- </td>
- <td></td>
- </tr>
- <xsl:if test="not(@action) or @action != 'remove'">
+ </xsl:if>
+ </input>
+ Remove
+ </td>
+ <td></td>
+ </tr>
+ <xsl:if test="not(@action) or @action != 'remove'">
<tr>
<td>
<input id="value" name="type" type="radio">
@@ -129,146 +127,31 @@
</td>
</tr>
- <tr>
- <td colspan="2">
- <xsl:text>Scope</xsl:text>
- </td>
- <td colspan="2">
- <select class="esb-edit" width="100px" id="scope">
- <option value="synapse">Synapse</option>
- <option value="transport">
- <xsl:if test="@scope='transport'">
- <xsl:attribute \
name="selected">true</xsl:attribute>
- </xsl:if>
- Transport
- </option>
- <option value="axis2">
- <xsl:if test="@scope='axis2'">
- <xsl:attribute \
name="selected">true</xsl:attribute>
- </xsl:if>
- Axis2
- </option>
- </select>
- </td>
- </tr>
- </xsl:if>
- </tbody>
- </table>
- <!--</xsl:if>-->
-
- <!--For new additions-->
- <!--<xsl:if test="not(@name)">-->
- <!--<table border="0" style="margin-left: 3em; width: 650px;">-->
- <!--<tbody>-->
-
- <!--<tr>-->
- <!--<td colspan="2">Name-->
- <!--<font style='color: red;font-size: \
8pt;'> *</font>-->
- <!--</td>-->
- <!--<td colspan="2">-->
- <!--<input id="name" type="text" class="esb-edit" \
width="80px"/>-->
- <!--</td>-->
- <!--</tr>-->
- <!--<tr>-->
- <!--<td colspan="2">-->
- <!--<xsl:text>Action</xsl:text>-->
- <!--</td>-->
- <!--<td colspan="2">-->
- <!--<table cellpadding="0" cellspacing="0" \
border="0">-->
- <!--<tr> -->
- <!--<td>-->
- <!--<input id="set" name="action" type="radio">-->
- <!--<xsl:if test="@action = 'set' or not(@action \
= 'remove')">-->
- <!--<xsl:attribute name="checked">-->
- <!--true-->
- <!--</xsl:attribute>-->
- <!--</xsl:if>-->
- <!--</input>-->
- <!--Set-->
- <!--</td>-->
- <!--<td>-->
- <!--<input id="remove" name="action" \
type="radio">-->
- <!--<xsl:if test="@action = 'remove'">-->
- <!--<xsl:attribute name="checked">-->
- <!--true-->
- <!--</xsl:attribute>-->
- <!--</xsl:if>-->
- <!--</input>-->
- <!--Remove-->
- <!--</td>-->
- <!--</tr>-->
- <!--</table>-->
- <!--</td>-->
- <!--</tr>-->
- <!--<tr>-->
- <!--<td>-->
- <!--<input id="value" name="type" type="radio">-->
- <!--<xsl:attribute name="onClick">-->
- \
<!--javascript:showNamespaceButton('<xsl:value-of \
select="@esb_med_pos"/>','','','namespaceButtonCell','false');-->
- <!--</xsl:attribute>-->
- <!--<xsl:if test="@value or not(@expression)">-->
- <!--<xsl:attribute name="checked">-->
- <!--true-->
- <!--</xsl:attribute>-->
- <!--</xsl:if>-->
- <!--</input>-->
- <!--Value-->
- <!--</td>-->
- <!--<td>-->
- <!--<input id="expression" name="type" type="radio" \
value="expression">-->
- <!--<xsl:attribute name="onClick">-->
- \
<!--javascript:showNamespaceButton('<xsl:value-of \
select="@esb_med_pos"/>','','','namespaceButtonCell','true');-->
- <!--</xsl:attribute>-->
- <!--<xsl:if test="@expression">-->
- <!--<xsl:attribute name="checked">-->
- <!--true-->
- <!--</xsl:attribute>-->
- <!--</xsl:if>-->
- <!--</input>-->
- <!--Expression-->
- <!--</td>-->
- <!--<td style="width:200px;">-->
- <!--<input id="val_ex" type="text" class="esb-edit" \
width="80px"/>-->
- <!--</td>-->
- <!--<td id="namespaceButtonCell" align="left">-->
- <!--<xsl:if test="@expression">-->
- <!--<a title="Namespace Editor" \
class="ns_editor">-->
- <!--<xsl:attribute name="onclick">-->
- \
<!--javascript:showNameSpaceEditor('<xsl:value-of \
select="@esb_med_pos"/>');-->
- <!--</xsl:attribute>-->
- \
<!--<xsl:text>    </xsl:text>-->
- <!--</a>-->
- <!--</xsl:if>-->
- <!--</td>-->
-
- <!--</tr>-->
- <!--<tr>-->
- <!--<td colspan="2">-->
- <!--<xsl:text>Scope</xsl:text>-->
- <!--</td>-->
- <!--<td colspan="2">-->
- <!--<select class="esb-edit" width="100px" \
id="scope">-->
- <!--<option value="synapse">Synapse</option>-->
- <!--<option value="transport">-->
- <!--<xsl:if test="@scope='transport'">-->
- <!--<xsl:attribute \
name="selected">true</xsl:attribute>-->
- <!--</xsl:if>-->
- <!--Transport-->
- <!--</option>-->
- <!--<option value="axis2">-->
- <!--<xsl:if test="@scope='axis2'">-->
- <!--<xsl:attribute \
name="selected">true</xsl:attribute>-->
- <!--</xsl:if>-->
- <!--Axis2-->
- <!--</option>-->
- <!--</select>-->
- <!--</td>-->
- <!--</tr>-->
-
-
- <!--</tbody>-->
- <!--</table>-->
- <!--</xsl:if>-->
+ </xsl:if>
+ <tr>
+ <td colspan="2">
+ <xsl:text>Scope</xsl:text>
+ </td>
+ <td colspan="2">
+ <select class="esb-edit" width="100px" id="scope">
+ <option value="synapse">Synapse</option>
+ <option value="transport">
+ <xsl:if test="@scope='transport'">
+ <xsl:attribute \
name="selected">true</xsl:attribute> + </xsl:if>
+ Transport
+ </option>
+ <option value="axis2">
+ <xsl:if test="@scope='axis2'">
+ <xsl:attribute \
name="selected">true</xsl:attribute> + </xsl:if>
+ Axis2
+ </option>
+ </select>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</xsl:template>
</xsl:stylesheet>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/property_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/property_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/property_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -27,75 +27,71 @@
<br></br>
<xsl:if test="@name">
- <div id="common_table_content">
- <table border="0" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <th>Property</th>
- <th>Value</th>
- </tr>
-
- <tr>
- <td>Name</td>
- <td>
- <xsl:value-of select="@name"/>
- </td>
- </tr>
-
- <tr>
- <td>
- <xsl:text>Action</xsl:text>
- </td>
- <td>
- <xsl:if test="@action = 'set' or not(@action = \
'remove')">
- <xsl:text>set</xsl:text>
+ <div id="common_table_content">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr>
+ <th>Property</th>
+ <th>Value</th>
+ </tr>
+
+ <tr>
+ <td>Name</td>
+ <td><xsl:value-of select="@name"/></td>
+ </tr>
+
+ <tr>
+ <td>
+ <xsl:text>Action</xsl:text>
+ </td>
+ <td>
+ <xsl:if test="@action = 'set' or not(@action = \
'remove')"> + <xsl:text>set</xsl:text>
</xsl:if>
<xsl:if test="@action = 'remove'">
- <xsl:text>remove</xsl:text>
+ <xsl:text>remove</xsl:text>
</xsl:if>
+ </td>
+ </tr>
- </td>
- </tr>
+ <xsl:if test="not(@action) or @action!='remove'">
+ <xsl:if test="@value">
+ <tr>
+ <td>
+ <xsl:text>Value</xsl:text>
+ </td>
+ <td>
+ <xsl:value-of select="@value"/>
+ </td>
+ </tr>
+ </xsl:if>
+
+ <xsl:if test="@expression">
+ <tr>
+ <td>
+ <xsl:text>Expression</xsl:text>
+ </td>
+ <td>
+ <xsl:value-of select="@expression"/>
+ </td>
+ </tr>
+ </xsl:if>
+ </xsl:if>
+
+ <xsl:if test="@scope">
+ <tr>
+ <td>
+ <xsl:text>Scope</xsl:text>
+ </td>
+ <td>
+ <xsl:value-of select="@scope"/>
+ </td>
+ </tr>
+ </xsl:if>
- <xsl:if test="not(@action) or @action!='remove'">
-
- <xsl:if test="@value">
- <tr>
- <td>
- <xsl:text>Value</xsl:text>
- </td>
- <td>
- <xsl:value-of select="@value"/>
- </td>
- </tr>
- </xsl:if>
-
- <xsl:if test="@expression">
- <tr>
- <td>
- <xsl:text>Expression</xsl:text>
- </td>
- <td>
- <xsl:value-of select="@expression"/>
- </td>
- </tr>
- </xsl:if>
-
- <xsl:if test="@scope">
- <tr>
- <td>
- <xsl:text>Scope</xsl:text>
- </td>
- <td>
- <xsl:value-of select="@scope"/>
- </td>
- </tr>
- </xsl:if>
- </xsl:if>
-
- </tbody>
- </table>
+ </tbody>
+ </table>
</div>
</xsl:if>
-</xsl:template>
+ </xsl:template>
</xsl:stylesheet>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/send_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/send_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/send_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -21,7 +21,7 @@
<label class="content-header">
<img src="extensions/core/images/send-mediator.gif"/>
<xsl:call-template name="capitalize-first"/>
- <xsl:text>Mediator</xsl:text>
+ <xsl:text> Mediator</xsl:text>
</label>
<br/>
<br/>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/spring_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/spring_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/spring_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -27,7 +27,6 @@
<br/>
<br/>
<div id="spring_edit" class="end-point-div">
- <br/>
<table border="0" style="margin-left: 3em; width: 150px;">
<tbody>
<tr>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/switch_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/switch_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/switch_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -23,43 +23,39 @@
<label class="content-header">
<img src="extensions/core/images/switch-mediator.gif"/> \
<xsl:call-template name="capitalize-first"/> <xsl:text> Mediator</xsl:text>
- </label><br/>
+ </label>
<br/>
<br/>
- <table><tr><td>
- <label style="margin-left:3em;">Source XPath<font style='color: \
red;font-size: 8pt;'> *</font></label>
- </td>
- <td>
- <input type="text" style="margin-left: 8em;" id="source_val" \
class="esb-edit">
- <xsl:attribute name="value"><xsl:value-of \
select="@source"/></xsl:attribute>
- </input>
- </td>
- <td>
- <a title="Namespace Editor" class="ns_editor">
- <xsl:attribute name="onclick">
- javascript:showNameSpaceEditor('<xsl:value-of \
select="@esb_med_pos"/>','','');
- </xsl:attribute>
- <xsl:text>    </xsl:text>
- </a>
- </td>
- </tr></table>
- <br/>
- <!--<xsl:for-each select="syn:case">-->
- <!--<xsl:call-template name="panel_control"><xsl:with-param \
name="head_pos" select="@esb_med_pos"/></xsl:call-template>-->
- <!--<div class="indent">-->
- <!--<xsl:attribute name="id"><xsl:value-of \
select="concat('mediatordiv', @esb_med_pos)"/></xsl:attribute>-->
- <!--<label class="content-header"><img \
src="extensions/core/images/switch-mediator.gif"/> Switch \
Case</label>-->
- <div class="indent"><xsl:apply-templates/></div>
- <!--</div>-->
- <!--</xsl:for-each>-->
+ <table>
+ <tr>
+ <td>
+ <label style="margin-left:3em;">Source XPath<font style='color: \
red;font-size: 8pt;'> *</font></label> + </td>
+ <td>
+ <input type="text" style="margin-left: 8em;" id="source_val" \
class="esb-edit"> + <xsl:attribute name="value"><xsl:value-of \
select="@source"/></xsl:attribute> + </input>
+ </td>
+ <td>
+ <a title="Namespace Editor" class="ns_editor">
+ <xsl:attribute name="onclick">
+ javascript:showNameSpaceEditor('<xsl:value-of \
select="@esb_med_pos"/>','',''); + </xsl:attribute>
+ <xsl:text>    </xsl:text>
+ </a>
+ </td>
+ </tr>
+ </table>
+
+ <div class="indent"><xsl:apply-templates/></div>
<div class='nested-mediator-add'><xsl:attribute \
name="id">mediator-add<xsl:value-of select="@esb_med_pos"/></xsl:attribute> <img \
src='extensions/core/images/add_mediator.gif'>
<xsl:attribute name="onclick">javascript:addcase("<xsl:value-of \
select="@esb_med_pos"/>");return false;</xsl:attribute> </img>
<label class='styled-link'> Add Case </label>
- </div><br/><br/>
+ </div><br/>
<xsl:if test="not(syn:default)">
<div class='nested-mediator-add'><xsl:attribute \
name="id">mediator-add<xsl:value-of select="@esb_med_pos"/></xsl:attribute> @@ -67,7 \
+63,7 @@
<xsl:attribute \
name="onclick">javascript:adddefault("<xsl:value-of select="@esb_med_pos"/>");return \
false;</xsl:attribute> </img>
<label class='styled-link'> Add Default </label>
- </div><br/><br/>
+ </div><br/>
</xsl:if>
<xsl:for-each select="syn:default">
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/switch_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/switch_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/switch_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -21,7 +21,7 @@
<label class="content-header">
<img src="extensions/core/images/switch-mediator.gif"/> \
<xsl:call-template name="capitalize-first"/> <xsl:text> Mediator</xsl:text>
- </label><br/>
+ </label>
<br/>
<br/>
@@ -31,25 +31,17 @@
<xsl:if test="@source!=''"><xsl:value-of select="@source"/></xsl:if>
<xsl:if test="@source=''">Not specified</xsl:if>
</label>
-
- <br/>
- <!--<xsl:for-each select="syn:case">-->
- <!--<xsl:call-template name="panel_control"><xsl:with-param \
name="head_pos" select="@esb_med_pos"/></xsl:call-template>-->
- <!--<div class="indent">-->
- <!--<xsl:attribute name="id"><xsl:value-of \
select="concat('mediatordiv', @esb_med_pos)"/></xsl:attribute>-->
- <!--<label class="content-header"><img \
src="extensions/core/images/switch-mediator.gif"/> Switch \
Case</label>-->
- <div class="indent">
- <xsl:apply-templates/>
- </div>
- <!--</div>-->
- <!--</xsl:for-each>-->
+ <br/><br/>
+ <div class="indent">
+ <xsl:apply-templates/>
+ </div>
<div class='nested-mediator-add'><xsl:attribute \
name="id">mediator-add<xsl:value-of select="@esb_med_pos"/></xsl:attribute> <img \
src='extensions/core/images/add_mediator.gif'>
<xsl:attribute name="onclick">javascript:addcase("<xsl:value-of \
select="@esb_med_pos"/>");return false;</xsl:attribute> </img>
<label class='styled-link'> Add Case </label>
- </div><br/><br/>
+ </div><br/>
<xsl:if test="not(syn:default)">
<div class='nested-mediator-add'><xsl:attribute \
name="id">mediator-add<xsl:value-of select="@esb_med_pos"/></xsl:attribute> @@ -57,7 \
+49,7 @@
<xsl:attribute \
name="onclick">javascript:adddefault("<xsl:value-of select="@esb_med_pos"/>");return \
false;</xsl:attribute> </img>
<label class='styled-link'> Add Default </label>
- </div><br/><br/>
+ </div><br/>
</xsl:if>
<xsl:for-each select="syn:default">
@@ -87,7 +79,8 @@
<xsl:if test="@regex!=''"><xsl:value-of select="@regex"/></xsl:if>
<xsl:if test="@regex=''">Not specified</xsl:if>
</label>
- <div class="indent"><xsl:apply-templates/></div>
+ <br/>
+ <div class="indent"><xsl:apply-templates/></div>
<xsl:if test="count(child::*)=0">
<xsl:call-template name="add_mediator_control">
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/throttle_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/throttle_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/throttle_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -240,10 +240,10 @@
</xsl:with-param>
</xsl:call-template>
</div>
+ <br/>
</xsl:otherwise>
</xsl:choose>
</div>
- <br/>
</xsl:for-each>
</xsl:if>
</div>
@@ -358,10 +358,10 @@
</xsl:with-param>
</xsl:call-template>
</div>
+ <br/>
</xsl:otherwise>
</xsl:choose>
</div>
- <br/>
</xsl:for-each>
</xsl:if>
</div>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/throttle_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/throttle_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/throttle_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -26,7 +26,6 @@
<br/>
<br/>
<xsl:if test="@id">
- <br/>
<div class="indent">
<label>Thottle Group ID</label>
<xsl:element name="input">
@@ -45,10 +44,9 @@
<br/>
</xsl:if>
<xsl:if test="syn:policy/@key">
- <br/>
<div class="indent" ><label>Referring Policy</label>
<xsl:element name="input">
- <xsl:attribute name="style">margin-left: 55px;</xsl:attribute>
+ <xsl:attribute name="style">margin-left: 60px;</xsl:attribute>
<xsl:attribute name="type">text</xsl:attribute>
<xsl:attribute name="size">20</xsl:attribute>
<xsl:attribute name="class">esb-edit_disabled</xsl:attribute>
@@ -62,7 +60,6 @@
</xsl:element>
</div>
<br/>
- <br/>
</xsl:if>
<xsl:if test="syn:policy/*">
<br/>
@@ -115,9 +112,9 @@
</xsl:with-param>
</xsl:call-template>
</div>
+ <br/>
</xsl:otherwise>
- </xsl:choose>
- <br/>
+ </xsl:choose>
</xsl:for-each>
<xsl:if test="@onReject">
<div class="indent" > <label class="sub-small-title">On \
Rejection</label></div> @@ -155,9 +152,9 @@
</xsl:with-param>
</xsl:call-template>
</div>
+ <br/>
</xsl:otherwise>
</xsl:choose>
- <br/>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
\ No newline at end of file
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/validate_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/validate_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/validate_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -28,7 +28,6 @@
<br/>
<br/>
<div id="script_edit" class="end-point-div">
- <br/>
<xsl:if test="count(self::node()//syn:schema)!=0">
<p>Schema Keys defined for Validate Mediator</p>
<br/>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/validate_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/validate_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/validate_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -21,11 +21,10 @@
<label class="content-header">
<img src="extensions/core/images/validate-mediator.gif"/>
<xsl:call-template name="capitalize-first"/>
- <xsl:text>Mediator</xsl:text>
+ <xsl:text> Mediator</xsl:text>
</label>
<br/>
<xsl:if test="syn:schema">
- <br/>
<div id="common_table_content">
<table border="0" cellpadding="0" cellspacing="0">
<tbody>
@@ -63,10 +62,9 @@
</tbody>
</table>
</div>
- <br/>
- <br/>
<xsl:if test="syn:feature">
+ <br/>
<p>Xerces-J validator <a \
href="http://xerces.apache.org/xerces2-j/features.html"
target="_blank">features</a> \
(optional)</p> <br/>
@@ -85,7 +83,7 @@
<br/>
</xsl:if>
<xsl:for-each select="syn:on-fail">
- <br/><label style="font-size:13px;">On validation failure</label><br/>
+ <label style="font-size:13px;">On validation failure</label><br/>
<xsl:if test="count(child::*)=0">
<xsl:call-template name="add_mediator_control">
<xsl:with-param name="head_pos"
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_misc_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_misc_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_misc_edit.xsl Wed \
Jan 30 07:41:20 2008 @@ -40,7 +40,7 @@
</td>
</tr>
<tr>
- <td style="width:160px;" class="indent-small \
form-sub-field">Reference key</td> + <td style="width:160px;" \
class="indent-small">Reference key</td> <td align="left">
<input id="wsdl_ref" type="text" size="20" \
class="esb-edit_disabled"> <xsl:attribute name="DISABLED"/>
@@ -61,7 +61,7 @@
</td>
</tr>
<tr>
- <td class="indent-small form-sub-field" \
style="width:160px;"> + <td class="indent-small" \
style="width:160px;"> Source URL
</td>
<td>
@@ -109,9 +109,48 @@
</xsl:otherwise>
</xsl:choose>
</table>
+ <xsl:if test="count(self::node()//syn:resource)!=0">
+ <div style="margin-left:20px;">Resources</div>
+ <div id="common_table_content">
+ <table border="0" cellpadding="0" cellspacing="0" \
style="margin-left:10px;"> + <thead>
+ <tr>
+ <th>Location</th>
+ <th>Key</th>
+ <th/>
+ <th/>
+ </tr>
+ </thead>
+ <tbody id="wsdl_resources_id">
+ <xsl:call-template name="resource_keys_template">
+ <xsl:with-param name="value">
+ <xsl:value-of
+ select="count(self::node()//syn:resource)"/>
+ </xsl:with-param>
+ <xsl:with-param name="limit">
+ <xsl:value-of
+ select="count(self::node()//syn:resource)"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ </tbody>
+ </table>
+ </div>
+ </xsl:if>
+ <xsl:if test="(syn:publishWSDL/@uri) or (syn:publishWSDL/@key) or \
((syn:publishWSDL) and not(syn:publishWSDL/@uri) and not(syn:publishWSDL/@key))"> + \
<!--<label class="sub-small-title">Add Reference</label> --> + \
<xsl:element name="input"> + <xsl:attribute \
name="type">button</xsl:attribute> + <xsl:attribute \
name="class">panelbutton_default</xsl:attribute> + <xsl:attribute \
name="href">#</xsl:attribute> + <xsl:attribute \
name="style">margin-left: 20px;</xsl:attribute> + <xsl:attribute \
name="value">Add Reference</xsl:attribute> + <xsl:attribute \
name="onClick">javascript:addresource();return false; + \
</xsl:attribute> + </xsl:element>
+ </xsl:if>
<table cellpadding="0" cellspacing="0" border="0" class="data-table">
<tr>
- <td style="width:170px;">Load service on startup</td>
+ <td style="width:170px;height:40px;">Load service on startup</td>
<td>
<xsl:choose>
<xsl:when test="@startOnLoad != 'true'">
@@ -125,5 +164,65 @@
</tr>
</table>
</xsl:template>
+ <xsl:template name="resource_keys_template">
+ <xsl:param name="value"/>
+ <xsl:param name="limit"/>
+ <xsl:if test="$value != 0">
+ <xsl:call-template name="resource_key_template">
+ <xsl:with-param name="index" select="($limit +1) - $value"/>
+ </xsl:call-template>
+ <xsl:call-template name="resource_keys_template">
+ <xsl:with-param name="value" select="$value - 1"/>
+ <xsl:with-param name="limit" select="$limit"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:template>
+ <xsl:template name="resource_key_template" \
xmlns:syn="http://ws.apache.org/ns/synapse"> + <xsl:param name="index"/>
+ <tr>
+ <td>
+ <input type="text" class="esb-edit" size="40"
+ id="location">
+ <xsl:attribute name="value">
+ <xsl:value-of \
select="self::node()//syn:resource[$index]/@location"/> + \
</xsl:attribute> + </input>
+ </td>
+ <td>
+ <input type="text" size="40" name="resource_key"
+ class="esb-edit_disabled">
+ <xsl:attribute name="id">
+ <xsl:value-of select="concat('resource_key',$index)"/>
+ </xsl:attribute>
+ <xsl:attribute name="value">
+ <xsl:value-of \
select="self::node()//syn:resource[$index]/@key"/> + \
</xsl:attribute> + <xsl:attribute name="DISABLED"/>
+ </input>
+ </td>
+ <td>
+ <xsl:element name="img">
+ <xsl:attribute name="style">margin-left: 3em;</xsl:attribute>
+ <xsl:attribute name="src">
+ extensions/core/images/registry_picker.gif
+ </xsl:attribute>
+ <xsl:attribute name="title">Registry
+ Browser
+ </xsl:attribute>
+ <xsl:attribute name="onClick">
+ javascript:resourcekeyfromregistry('<xsl:value-of \
select="$index"/>');return false; + </xsl:attribute>
+ </xsl:element>
+ </td>
+ <td>
+ <a href='#' id='delete_link'>
+ <xsl:attribute name="onclick">
+ javascript:deleteresource('<xsl:value-of \
select="$index"/>');return false; + </xsl:attribute>
+     
+ </a>
+ </td>
+ </tr>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_misc_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_misc_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_misc_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -24,7 +24,7 @@
<!--<label class="content-description">-->
<!--Configure miscellaneous options for the proxy service.-->
<!--</label>-->
-
+
<xsl:if test="syn:publishWSDL">
<table cellpadding="0" cellspacing="0" border="0" class="data-table">
<tr>
@@ -58,10 +58,32 @@
</xsl:otherwise>
</xsl:choose>
</table>
+ <br/>
+ <xsl:if test="count(self::node()//syn:resource)!=0">
+ <div style="margin-left:20px;">Resources</div>
+ <div id="common_table_content">
+ <table style="margin-left:10px;">
+ <tr>
+ <th>Location</th>
+ <th>Key</th>
+ </tr>
+ <xsl:call-template name="resources_view_template">
+ <xsl:with-param name="value">
+ <xsl:value-of
+ select="count(self::node()//syn:resource)"/>
+ </xsl:with-param>
+ <xsl:with-param name="limit">
+ <xsl:value-of
+ select="count(self::node()//syn:resource)"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ </table>
+ </div>
+ </xsl:if>
</xsl:if>
<table cellpadding="0" cellspacing="0" border="0" class="data-table">
<tr>
- <td style="width:170px;">Load service on startup</td>
+ <td style="width:170px;margin-left:20px;">Load service on startup</td>
<td>
<xsl:choose>
<xsl:when test="@startOnLoad != 'true'">
@@ -75,5 +97,31 @@
</tr>
</table>
</xsl:template>
+ <xsl:template name="resources_view_template">
+ <xsl:param name="value"/>
+ <xsl:param name="limit"/>
+ <xsl:if test="$value != 0">
+ <xsl:call-template name="resource_view_template">
+ <xsl:with-param name="index" select="($limit +1) - $value"/>
+ </xsl:call-template>
+ <xsl:call-template name="resources_view_template">
+ <xsl:with-param name="value" select="$value - 1"/>
+ <xsl:with-param name="limit" select="$limit"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:template>
+ <xsl:template name="resource_view_template" \
xmlns:syn="http://ws.apache.org/ns/synapse"> + <xsl:param name="index"/>
+ <xsl:if test="(self::node()//syn:resource[$index]/@location) and \
(self::node()//syn:resource[$index]/@key)"> + <tr>
+ <td>
+ <xsl:value-of \
select="self::node()//syn:resource[$index]/@location"/> + </td>
+ <td>
+ <xsl:value-of select="self::node()//syn:resource[$index]/@key"/>
+ </td>
+ </tr>
+ </xsl:if>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_transport_view.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_transport_view.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/proxyservices/proxy_transport_view.xsl Wed \
Jan 30 07:41:20 2008 @@ -44,14 +44,17 @@
<xsl:if test="child::syn:parameter">
- <p>Service Parameters</p><br/>
- <table><thead><th>Name</th><th>Value</th></thead>
+ <p class="sub-small-title">Service Parameters</p>
+ <div id="common_table_content">
+ <table width="600" cellspacing="0" cellpadding="0" border="0">
+ <thead><th>Name</th><th>Value</th></thead>
<tbody>
<xsl:for-each select="syn:parameter">
<xsl:call-template name="view-parameter"/>
</xsl:for-each>
</tbody>
</table>
+ </div>
</xsl:if>
</xsl:template>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/system_status.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/system_status.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/system_status.xsl Wed \
Jan 30 07:41:20 2008 @@ -72,11 +72,10 @@
</table>
</div>
<div id="homeText" style="text-align:justify;padding-right:10px;">
- <p>The WSO2 ESB is a lightweight and high performance engine for managing, \
monitoring,
- routing and transforming interactions of your Service Oriented Architecture \
(SOA).
- It is based on the <a target="_blank" \
href="http://ws.apache.org/synapse">Apache Synapse</a> project.
- The management console allows you to configure
- the message/service mediation and recurring tasks through a simple web-based \
interface. + <p>The WSO2 ESB is an ultra fast, light-weight and versatile \
Enterprise Service Bus + based on the <a target="_blank" \
href="http://synapse.apache.org/">Apache Synapse ESB</a>. + It allows you to \
Connect, Manage and Transform + service interactions between Web services, \
REST/POX services and Legacy systems.
Refer the <a target="_blank" href="/docs/ESB_QuickStart.html">Quick Start \
Guide</a> for more information on getting started.
</p>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl Wed \
Jan 30 07:41:20 2008 @@ -36,12 +36,12 @@
<tr>
<td>
<xsl:text>View</xsl:text>
- </td>
- <td>
+
<xsl:element name="select">
<xsl:attribute \
name="onchange">javascript:viewSingleLogLevel(); return \
false;</xsl:attribute>
<xsl:attribute \
name="id">logLevelID</xsl:attribute>
<xsl:attribute \
name="class">log-select</xsl:attribute> + \
<xsl:attribute name="style">margin-left:5px;</xsl:attribute>
<xsl:if test="@level">
<xsl:element \
name="option">
<xsl:attribute \
name="value"> @@ -160,37 +160,37 @@
</xsl:if>
</xsl:element>
</td>
- <td>
+ <td align="right" \
style="text-align:right;">
<xsl:text>Ignore \
Case</xsl:text>
- </td>
- <td>
+
<xsl:element name="input">
<xsl:attribute \
name="type">checkbox</xsl:attribute>
<xsl:attribute \
name="id">ignore_case</xsl:attribute> + \
<xsl:attribute name="style">margin-left:5px;</xsl:attribute>
<xsl:if \
test="@ignoreCase='true'">
<xsl:attribute \
name="checked">checked</xsl:attribute> </xsl:if>
</xsl:element>
</td>
- <td>
+ <td \
style="text-align:right;width:260px;">
<xsl:element name="input">
<xsl:attribute \
name="id">logkeyword</xsl:attribute>
- <xsl:attribute \
name="type">text</xsl:attribute>
- <xsl:attribute \
name="size">40</xsl:attribute> + \
<xsl:attribute name="type">text</xsl:attribute>
<xsl:attribute \
name="class">log-select</xsl:attribute> + \
<xsl:attribute \
name="style">margin-right:5px;width:200px;</xsl:attribute>
<xsl:attribute \
name="value">
<xsl:value-of \
select="@keyword"/>
</xsl:attribute>
<xsl:attribute \
name="onKeyPress">submitenter(event)</xsl:attribute> </xsl:element>
- </td>
- <td>
+
<a href="#" \
id="search_link">
<xsl:attribute \
name="onClick">javascript:searchLog(); return false;</xsl:attribute>
<xsl:attribute \
name="title">Search Log</xsl:attribute>
<xsl:attribute \
name="alt">Search Log </xsl:attribute>
    
- </a></td>
+ </a>
+ </td>
</tr>
</tbody>
</table>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewtracelogs.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewtracelogs.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewtracelogs.xsl Wed \
Jan 30 07:41:20 2008 @@ -33,38 +33,37 @@
<table border="0" style="width:98%;">
<tbody>
<tr>
- <td style="width:50px;"></td>
- <td>
+ <td align="right" \
style="text-align: right;width:410px;">
<xsl:text>Ignore \
Case</xsl:text>
- </td>
- <td>
+
<xsl:element name="input">
<xsl:attribute \
name="type">checkbox</xsl:attribute>
<xsl:attribute \
name="id">ignore_case</xsl:attribute> + \
<xsl:attribute name="style">margin-left:5px;</xsl:attribute>
<xsl:if \
test="@ignoreCase='true'">
<xsl:attribute \
name="checked">checked</xsl:attribute> </xsl:if>
</xsl:element>
</td>
- <td>
+ <td align="right" \
style="text-align:right;">
<xsl:element name="input">
<xsl:attribute \
name="id">tracekeyword</xsl:attribute>
<xsl:attribute \
name="type">text</xsl:attribute>
- <xsl:attribute \
name="size">40</xsl:attribute>
<xsl:attribute \
name="class">log-select</xsl:attribute> + \
<xsl:attribute \
name="style">margin-right:5px;width:200px;</xsl:attribute>
<xsl:attribute \
name="value">
<xsl:value-of \
select="@keyword"/>
</xsl:attribute>
<xsl:attribute \
name="onKeyPress">submitentertrace(event)</xsl:attribute> </xsl:element>
- </td>
- <td>
+
<a href="#" \
id="search_link">
<xsl:attribute \
name="onClick">javascript:searchTrace(); return \
false;</xsl:attribute>
<xsl:attribute \
name="title">Search Log</xsl:attribute>
<xsl:attribute \
name="alt">Search Log </xsl:attribute>
    
- </a></td>
+ </a>
+ </td>
</tr>
</tbody>
</table>
Modified: trunk/esb/java/modules/distribution/src/main/www/faq.html
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/faq.html (original)
+++ trunk/esb/java/modules/distribution/src/main/www/faq.html Wed Jan 30 07:41:20 \
2008 @@ -41,11 +41,10 @@
<p><strong>Some views of the management console are garbled for me. Why? How
do I avoid this?</strong><br />
-The WSO2 ESB Management console works best with Mozilla Firefox 2 and IE 6,
-on a 1024x768 resolution. However it has not been fully tested with IE 7 yet.
-Since console is dependent on browser based XSLT processing it may not appear
-correctly on some/other Web browsers. Switching to a WSO2 ESB supported
-browser would solve your problem.</p>
+The WSO2 ESB Management console works best with Mozilla Firefox 2 and IE 6 or 7,
+on a 1024x768 resolution. Since console is dependent on browser based XSLT \
processing +sometimes it may not appear correctly on some/other Web browsers. \
Switching to a WSO2 +ESB supported browser would solve your problem.</p>
<hr />
<p><strong>How can I edit the default administration account
Modified: trunk/esb/java/modules/samples/pom.xml
==============================================================================
--- trunk/esb/java/modules/samples/pom.xml (original)
+++ trunk/esb/java/modules/samples/pom.xml Wed Jan 30 07:41:20 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.esb</groupId>
<artifactId>wso2-esb</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.wso2.esb</groupId>
Modified: trunk/esb/java/modules/samples/src/main/scripts/axis2server.bat
==============================================================================
--- trunk/esb/java/modules/samples/src/main/scripts/axis2server.bat (original)
+++ trunk/esb/java/modules/samples/src/main/scripts/axis2server.bat Wed Jan 30 \
07:41:20 2008 @@ -57,6 +57,7 @@
if ""%1""==""-http"" goto httpport
if ""%1""==""-https"" goto httpsport
if ""%1""==""-name"" goto servername
+if ""%1""==""-xdebug"" goto xdebug
shift
goto setupArgs
@@ -79,40 +80,56 @@
shift
goto setupArgs
+rem is there is a -xdebug in the options
+:xdebug
+set _XDEBUG="wrapper.java.additional.7=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+shift
+goto setupArgs
+
:noJavaHome
if "%_JAVACMD%" == "" set _JAVACMD=java.exe
echo JAVA_HOME environment variable is set incorrectly or Java runtime could not be \
located. echo Please set the JAVA_HOME variable appropriately
goto end
+
:runAxis2
-rem set the classes by looping through the libs
-setlocal EnableDelayedExpansion
-set AXIS2_CLASS_PATH="%AXIS2_HOME%/../../webapp/WEB-INF/classes/conf"
-FOR %%C in ("%AXIS2_HOME%\..\..\webapp\WEB-INF\lib\*.jar") DO set \
AXIS2_CLASS_PATH="%%~fC";!AXIS2_CLASS_PATH!
-
-rem use proper bouncy castle version for the JDK
-
-"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.4" >NUL
-IF ERRORLEVEL 1 goto checkJdk15
-echo Using Bouncy castle JAR for Java 1.4
-FOR %%C in ("%AXIS2_HOME%\..\..\webapp\WEB-INF\lib\bcprov-jdk13*.jar") DO set \
AXIS2_CLASS_PATH="%%~fC";!AXIS2_CLASS_PATH!
-goto runServer
-
-:checkJdk15
-"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.5" >NUL
-IF ERRORLEVEL 1 goto runServer
-echo Using Bouncy castle JAR for Java 1.5
-FOR %%C in ("%AXIS2_HOME%\..\..\webapp\WEB-INF\lib\bcprov-jdk15*.jar") DO set \
AXIS2_CLASS_PATH="%%~fC";!AXIS2_CLASS_PATH!
-
-:runServer
-set AXIS2_ENDORSED=%AXIS2_HOME%\..\..\tomcat\lib\endorsed
-echo Using JAVA_HOME %JAVA_HOME%
-echo Using AXIS2_HOME %AXIS2_HOME%
cd %AXIS2_HOME%
-"%_JAVACMD%" %_HTTPPORT% %_HTTPSPORT% %_SERVERNAME% %JAVA_OPTS% -cp \
"%AXIS2_CLASS_PATH%" -Djava.io.tmpdir=%AXIS2_HOME%\..\..\work\temp\sampleServer \
-Djava.endorsed.dirs="%AXIS2_ENDORSED%" samples.util.SampleAxis2Server -repo \
"%AXIS2_HOME%\repository" -conf \
"%AXIS2_HOME%\repository\conf\axis2.xml"
-goto end
+echo "Starting Sample Axis2 Server ..."
+echo Using AXIS2_HOME: %AXIS2_HOME%
+echo Using JAVA_HOME: %JAVA_HOME%
+
+rem Decide on the wrapper binary.
+set _WRAPPER_BASE=wrapper
+set _WRAPPER_DIR=%AXIS2_HOME%..\..\bin\native\
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_WRAPPER_DIR%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-32.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%-windows-x86-64.exe
+echo %_WRAPPER_DIR%%_WRAPPER_BASE%.exe
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%AXIS2_HOME%..\..\webapp\WEB-INF\classes\conf\sample-server-wrapper.conf"
+
+rem
+rem Start the Wrapper
+rem
+:startup
+"%_WRAPPER_EXE%" -c %_WRAPPER_CONF% wrapper.java.additional.1=%_HTTPPORT% \
wrapper.java.additional.2=%_HTTPSPORT% wrapper.java.additional.3=%_SERVERNAME% \
%_XDEBUG% +
+if not errorlevel 1 goto :eof
+pause
:end
set _JAVACMD=
Modified: trunk/esb/java/modules/samples/src/main/scripts/build.xml
==============================================================================
--- trunk/esb/java/modules/samples/src/main/scripts/build.xml (original)
+++ trunk/esb/java/modules/samples/src/main/scripts/build.xml Wed Jan 30 07:41:20 \
2008 @@ -183,6 +183,7 @@
<target name="init">
<mkdir dir="${class.dir}"/>
+ <mkdir dir="./../../work/temp/sampleClient"/>
<path id="javac.classpath">
<pathelement path="${class.dir}"/>
<pathelement path="../../webapp/WEB-INF/lib"/>
Modified: trunk/esb/java/pom.xml
==============================================================================
--- trunk/esb/java/pom.xml (original)
+++ trunk/esb/java/pom.xml Wed Jan 30 07:41:20 2008
@@ -21,7 +21,7 @@
<groupId>org.wso2.esb</groupId>
<artifactId>wso2-esb</artifactId>
<packaging>pom</packaging>
- <version>1.6-SNAPSHOT</version>
+ <version>1.6</version>
<name>WSO2 Enterprise Service Bus (ESB)</name>
<url>http://www.wso2.org/projects/esb/java</url>
<licenses>
@@ -36,21 +36,21 @@
</organization>
<issueManagement>
<system>JIRA</system>
- <url>http://www.wso2.org/jira/browse/ESBJAVA</url>
+ <url>http://wso2.org/jira/browse/ESBJAVA</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>WSO2 ESB Developer List</name>
- <subscribe>esb-java-dev-request@wso2.org</subscribe>
- <unsubscribe>esb-java-dev-request@lists.wso2.com</unsubscribe>
- <archive>http://www.wso2.org/mailarchive/esb-java-dev/</archive>
+ <subscribe>esb-java-dev-request@wso2.org?subject=subscribe</subscribe>
+ <unsubscribe>esb-java-dev-request@wso2.org?subject=unsubscribe</unsubscribe>
+ <archive>http://wso2.org/mailarchive/esb-java-dev/</archive>
</mailingList>
<mailingList>
<name>WSO2 ESB User List</name>
- <subscribe>esb-java-user-request@wso2.org</subscribe>
- <unsubscribe>esb-java-user-request@wso2.org</unsubscribe>
- <archive>http://www.wso2.org/mailarchive/esb-java-user/</archive>
+ <subscribe>esb-java-user-request@wso2.org?subject=subscribe</subscribe>
+ <unsubscribe>esb-java-user-request@wso2.org?subject=unsubscribe</unsubscribe>
+ <archive>http://wso2.org/mailarchive/esb-java-user/</archive>
</mailingList>
</mailingLists>
@@ -58,99 +58,187 @@
<developer>
<name>Sanjiva Weerawarana</name>
<id>sanjiva</id>
- <email>sanjiva@wso2.org</email>
- <organization>WSO2</organization>
+ <email>sanjiva AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
</developer>
<developer>
<name>Davanum Srinivas</name>
<id>dims</id>
- <email>dims@wso2.org</email>
- <organization>WSO2</organization>
+ <email>davanum AT gmail DOT com</email>
</developer>
<developer>
<name>Paul Fremantle</name>
<id>paul</id>
- <email>paul@wso2.org</email>
- <organization>WSO2</organization>
+ <email>paul AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ </developer>
+ <developer>
+ <name>Jonathan Marsh</name>
+ <id>jonathan</id>
+ <email>jonathan AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ </developer>
+ <developer>
+ <name>Glen Daniels</name>
+ <id>glen</id>
+ <email>glen AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ </developer>
+ <developer>
+ <name>Asankha Perera</name>
+ <id>asankha</id>
+ <email>asankha AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Software Architect</role>
+ <role>Product Manager</role>
+ </roles>
</developer>
<developer>
<name>Eran Chinthaka</name>
<id>chinthaka</id>
- <email>chinthaka@wso2.org</email>
- <organization>WSO2</organization>
+ <email>chinthaka AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
<url>http://www.apache.org/~chinthaka</url>
+ <roles>
+ <role>Senior Software Engineer</role>
+ </roles>
</developer>
<developer>
<name>Deepal Jayasinghe</name>
<id>deepal</id>
- <email>deepal@wso2.org</email>
- <organization>WSO2</organization>
+ <email>deepal AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
<url>http://www.apache.org/~deepal</url>
+ <roles>
+ <role>Technical Lead</role>
+ </roles>
</developer>
<developer>
<name>Ajith Ranabahu</name>
<id>ajith</id>
- <email>ajith@wso2.org</email>
- <organization>WSO2</organization>
+ <email>ajith AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
<url>http://www.apache.org/~ajith</url>
+ <roles>
+ <role>Senior Software Engineer</role>
+ </roles>
</developer>
<developer>
<name>Ruchith Fernando</name>
<id>ruchith</id>
- <email>ruchithf@wso2.org</email>
- <organization>WSO2</organization>
+ <email>ruchith AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Technical Lead</role>
+ </roles>
</developer>
<developer>
<name>Saminda Abeyruwan</name>
<id>saminda</id>
- <email>saminda@wso2.org</email>
- <organization>WSO2</organization>
+ <email>saminda AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Senior Software Engineer</role>
+ </roles>
</developer>
<developer>
<name>Chamil Thanthrimudalige</name>
<id>chamil</id>
- <email>chamil@wso2.org</email>
- <organization>WSO2</organization>
</developer>
<developer>
<name>Chamikara Jayalath</name>
<id>chamikara</id>
- <email>chamikara@wso2.org</email>
- <organization>WSO2</organization>
+ <email>chamikara AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Senior Software Engineer</role>
+ </roles>
</developer>
<developer>
<name>Sanka Samaranayake</name>
<id>sanka</id>
- <email>sanka@wso2.org</email>
- <organization>WSO2</organization>
+ <email>sanka AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Software Engineer</role>
+ </roles>
</developer>
<developer>
<name>Afkham Azeez</name>
<id>azeez</id>
- <email>azeez@wso2.org</email>
- <organization>WSO2</organization>
+ <email>azeez AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Software Architect</role>
+ </roles>
</developer>
<developer>
<name>Ruwan Linton</name>
<id>ruwan</id>
- <email>ruwan@wso2.org</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Asankha Perera</name>
- <id>asankha</id>
- <email>asankha@wso2.org</email>
- <organization>WSO2</organization>
+ <email>ruwan AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Software Engineer</role>
+ </roles>
</developer>
<developer>
<name>Indika Kumara</name>
- <email>indika@wso2.org</email>
- <organization>WSO2</organization>
+ <id>indika</id>
+ <email>indika AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Software Engineer</role>
+ </roles>
</developer>
<developer>
<name>Chathura Ekanayake</name>
- <email>chathura@wso2.org</email>
- <organization>WSO2</organization>
+ <id>chathura</id>
+ <email>chathura AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Software Engineer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Charitha Kankanamge</name>
+ <id>charitha</id>
+ <email>charitha AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>QA Manager</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Evanthika Amarasiri</name>
+ <id>evanthika</id>
+ <email>evanthika AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>QA Engineer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Upul Godage</name>
+ <id>upul</id>
+ <email>upul AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>Senior Software Engineer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Kasun Samarasinghe</name>
+ <id>kasun</id>
+ </developer>
+ <developer>
+ <name>Chanaka Jayasena</name>
+ <id>chanaka</id>
+ <email>chanaka AT wso2 DOT com</email>
+ <organization>WSO2 Inc.</organization>
+ <roles>
+ <role>UI Engineer</role>
+ </roles>
</developer>
</developers>
@@ -627,7 +715,22 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.2</version>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
+
</build>
<modules>
@@ -655,7 +758,7 @@
<server.short.name>WSO2 ESB</server.short.name>
<!-- WSO2 components -->
- <wso2.esb.version>1.6-SNAPSHOT</wso2.esb.version>
+ <wso2.esb.version>1.6</wso2.esb.version>
<wso2commons.version>1.2</wso2commons.version>
<wso2.adminui.version>1.2</wso2.adminui.version>
<wso2.adminui.version.graphs>1.1</wso2.adminui.version.graphs>
@@ -671,7 +774,7 @@
<!-- Synapse and related components -->
<synapse.version>1.1.1</synapse.version>
- <jakarta.httpcore.nio.version>4.0-alpha7-609527</jakarta.httpcore.nio.version>
+ <jakarta.httpcore.nio.version>4.0-beta1</jakarta.httpcore.nio.version>
<smack.version>2.2.1</smack.version>
<!-- Axis2 1.2 and its dependencies -->
Modified: trunk/esb/java/repository/conf/sample/resources/misc/client/axis2.xml
==============================================================================
--- trunk/esb/java/repository/conf/sample/resources/misc/client/axis2.xml (original)
+++ trunk/esb/java/repository/conf/sample/resources/misc/client/axis2.xml Wed Jan 30 \
07:41:20 2008 @@ -172,38 +172,28 @@
<parameter \
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
<parameter \
name="java.naming.provider.url">tcp://localhost:61616</parameter>
<parameter \
name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter> \
+ <parameter name="transport.jms.ConnectionFactoryType" \
locked="false">topic</parameter> </parameter>
<parameter name="myQueueConnectionFactory">
<parameter \
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
<parameter \
name="java.naming.provider.url">tcp://localhost:61616</parameter>
<parameter \
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter> \
+ <parameter name="transport.jms.ConnectionFactoryType" \
locked="false">queue</parameter> </parameter>
<parameter name="default">
<parameter \
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
<parameter \
name="java.naming.provider.url">tcp://localhost:61616</parameter>
<parameter \
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter> \
+ <parameter name="transport.jms.ConnectionFactoryType" \
locked="false">queue</parameter> </parameter>
</transportReceiver>-->
- <!-- ================================================= -->
- <!-- Mail Transport Listener -->
- <!-- This is a sample configuration. It assumes a mail server running in \
localhost.
- Listener pops messages that comes to the email address red@localhost. \
Users
- password is red. Listener connect to the server every 3000 milliseconds.
- Parameters with "transport." prefix is Axis2 specific. Others are all from \
Java Mail API.
- http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
- -->
- <!-- ================================================= -->
- <!--<transportReceiver name="mailto" \
class="org.apache.axis2.transport.mail.SimpleMailListener">
- <parameter name="mail.pop3.host">localhost</parameter>
- <parameter name="mail.pop3.user">red</parameter>
- <parameter name="mail.store.protocol">pop3</parameter>
- <parameter name="transport.mail.pop3.password">red</parameter>
- <parameter name="transport.mail.replyToAddress">red@localhost</parameter>
- <parameter name="transport.listener.interval">3000</parameter>
- </transportReceiver>-->
+ <transportReceiver name="mailto" \
class="org.apache.synapse.transport.mail.MailTransportListener"> + <!-- \
configure any optional POP3/IMAP properties + check com.sun.mail.pop3 and \
com.sun.mail.imap package documentation for more details--> + </transportReceiver>
<!--Uncomment if you want to have TCP transport support-->
<!--transportReceiver name="tcp"
@@ -239,15 +229,16 @@
<transportSender name="jms"
class="org.apache.synapse.transport.jms.JMSSender"/>
- <!-- ================================================= -->
- <!-- Mail Transport Sender -->
- <!--Only need to uncomment the sender. Configuration is achieved with every \
client.
- At any instant mail host should be given. Sample configuration has been \
given.
- http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
- -->
- <!-- ================================================= -->
- <!--<transportSender name="mailto" \
class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="mail.smtp.host">localhost</parameter>
+ <!-- configure the SMTP server information
+ check com.sun.mail.smtp package documentation for descriptions of properties-->
+ <!--<transportSender name="mailto" \
class="org.apache.synapse.transport.mail.MailTransportSender"> + <parameter \
name="mail.smtp.host">smtp.gmail.com</parameter> + <parameter \
name="mail.smtp.port">587</parameter> + <parameter \
name="mail.smtp.starttls.enable">true</parameter> + <parameter \
name="mail.smtp.auth">true</parameter> + <parameter \
name="mail.smtp.user">synapse.demo.0</parameter> + <parameter \
name="mail.smtp.password">mailpassword</parameter> + <parameter \
name="mail.smtp.from">synapse.demo.0@gmail.com</parameter> </transportSender>-->
<!-- ================================================= -->
Modified: trunk/esb/java/repository/conf/sample/resources/misc/server/axis2.xml
==============================================================================
--- trunk/esb/java/repository/conf/sample/resources/misc/server/axis2.xml (original)
+++ trunk/esb/java/repository/conf/sample/resources/misc/server/axis2.xml Wed Jan 30 \
07:41:20 2008 @@ -174,38 +174,28 @@
<parameter \
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
<parameter \
name="java.naming.provider.url">tcp://localhost:61616</parameter>
<parameter \
name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter> \
+ <parameter name="transport.jms.ConnectionFactoryType" \
locked="false">topic</parameter> </parameter>
<parameter name="myQueueConnectionFactory">
<parameter \
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
<parameter \
name="java.naming.provider.url">tcp://localhost:61616</parameter>
<parameter \
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter> \
+ <parameter name="transport.jms.ConnectionFactoryType" \
locked="false">queue</parameter> </parameter>
<parameter name="default">
<parameter \
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
<parameter \
name="java.naming.provider.url">tcp://localhost:61616</parameter>
<parameter \
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter> \
+ <parameter name="transport.jms.ConnectionFactoryType" \
locked="false">queue</parameter> </parameter>
</transportReceiver>-->
- <!-- ================================================= -->
- <!-- Mail Transport Listener -->
- <!-- This is a sample configuration. It assumes a mail server running in \
localhost.
- Listener pops messages that comes to the email address red@localhost. \
Users
- password is red. Listener connect to the server every 3000 milliseconds.
- Parameters with "transport." prefix is Axis2 specific. Others are all from \
Java Mail API.
- http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
- -->
- <!-- ================================================= -->
- <!--<transportReceiver name="mailto" \
class="org.apache.synapse.transport.mail.SimpleMailListener">
- <parameter name="mail.pop3.host">localhost</parameter>
- <parameter name="mail.pop3.user">red</parameter>
- <parameter name="mail.store.protocol">pop3</parameter>
- <parameter name="transport.mail.pop3.password">red</parameter>
- <parameter name="transport.mail.replyToAddress">red@localhost</parameter>
- <parameter name="transport.listener.interval">3000</parameter>
- </transportReceiver>-->
+ <transportReceiver name="mailto" \
class="org.apache.synapse.transport.mail.MailTransportListener"> + <!-- \
configure any optional POP3/IMAP properties + check com.sun.mail.pop3 and \
com.sun.mail.imap package documentation for more details--> + </transportReceiver>
<!-- ================================================= -->
<!-- Transport Outs -->
@@ -241,14 +231,15 @@
<transportSender name="jms"
class="org.apache.synapse.transport.jms.JMSSender"/>
- <!-- ================================================= -->
- <!-- Mail Transport Sender -->
- <!--Only need to uncomment the sender. Configuration is achieved with every \
client.
- At any instant mail host should be given. Sample configuration has been \
given.
- http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html-->
- <!-- ================================================= -->
- <!--<transportSender name="mailto" \
class="org.apache.axis2.transport.mail.MailTransportSender">
- <parameter name="mail.smtp.host">localhost</parameter>
+ <!-- Uncomment and configure the SMTP server information
+ check com.sun.mail.smtp package documentation for descriptions of properties
+ <transportSender name="mailto" \
class="org.apache.synapse.transport.mail.MailTransportSender"> + <parameter \
name="mail.smtp.host">smtp.gmail.com</parameter> + <parameter \
name="mail.smtp.port">587</parameter> + <parameter \
name="mail.smtp.starttls.enable">true</parameter> + <parameter \
name="mail.smtp.user">synapse.test.0</parameter> + <parameter \
name="mail.smtp.password">mailpassword</parameter> + <parameter \
name="mail.smtp.auth">true</parameter> </transportSender>-->
<!-- ================================================= -->
Modified: trunk/esb/java/repository/conf/sample/synapse_sample_251.xml
==============================================================================
--- trunk/esb/java/repository/conf/sample/synapse_sample_251.xml (original)
+++ trunk/esb/java/repository/conf/sample/synapse_sample_251.xml Wed Jan 30 07:41:20 \
2008 @@ -23,7 +23,7 @@
<proxy name="StockQuoteProxy" transports="http">
<target>
<endpoint>
- <address \
uri="jms:/SimpleStockQuoteService?transport.jms.ConnectionFactoryJNDIName=QueueConnect \
ionFactory&java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&java.naming.provider.url=tcp://localhost:61616"/>
+ <address uri="jms:/SimpleStockQuoteService?transport.jms.ConnectionFactoryJNDI \
Name=QueueConnectionFactory&java.naming.factory.initial=org.apache.activemq.jndi.A \
ctiveMQInitialContextFactory&java.naming.provider.url=tcp://localhost:61616&transport.jms.DestinationType=queue"/>
</endpoint>
<inSequence>
<property action="set" name="OUT_ONLY" value="true"/>
_______________________________________________
Esb-java-dev mailing list
Esb-java-dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic