January 2011 - savara-commits - Jboss List Archives

Build failed in Hudson: jbosstools-savara-1.1_trunk #157

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/157/> ------------------------------------------ [...truncated 17750 lines...] [INFO] artifact org.eclipse:text: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse:text: checking for updates from repository.jboss.org [INFO] artifact org.eclipse:text: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse:text: checking for updates from central [INFO] artifact org.eclipse.core:filesystem: checking for updates from glassfish [INFO] artifact org.eclipse.core:filesystem: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:filesystem: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:filesystem: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:filesystem: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:filesystem: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:filesystem: checking for updates from central [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from glassfish [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.wst.common:uriresolver: checking for updates from central [INFO] artifact org.eclipse.core:runtime: checking for updates from glassfish [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from central [INFO] artifact org.eclipse.core:resources: checking for updates from glassfish [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:resources: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:resources: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:resources: checking for updates from central [INFO] artifact org.eclipse.emf:common: checking for updates from glassfish [INFO] artifact org.eclipse.emf:common: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.emf:common: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.emf:common: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.emf:common: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.emf:common: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.emf:common: checking for updates from central [INFO] artifact org.eclipse.core:runtime: checking for updates from glassfish [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from central [INFO] artifact com.ibm:icu: checking for updates from glassfish [INFO] artifact com.ibm:icu: checking for updates from jboss-deprecated [INFO] artifact com.ibm:icu: checking for updates from jboss-developer-repository-group [INFO] artifact com.ibm:icu: checking for updates from snapshots.jboss.org [INFO] artifact com.ibm:icu: checking for updates from repository.jboss.org [INFO] artifact com.ibm:icu: checking for updates from jboss-public-repository-group [INFO] artifact com.ibm:icu: checking for updates from central [INFO] artifact org.eclipse.core:runtime: checking for updates from glassfish [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:runtime: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:runtime: checking for updates from central [INFO] artifact org.eclipse.core:resources: checking for updates from glassfish [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-deprecated [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-developer-repository-group [INFO] artifact org.eclipse.core:resources: checking for updates from snapshots.jboss.org [INFO] artifact org.eclipse.core:resources: checking for updates from repository.jboss.org [INFO] artifact org.eclipse.core:resources: checking for updates from jboss-public-repository-group [INFO] artifact org.eclipse.core:resources: checking for updates from central [INFO] Expanding: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/m2-r...> into <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:generate (generate-docbook) @ samplesguide --- [INFO] Processing en-US -> pdf redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...]> Jan 20, 2011 8:19:18 AM org.apache.fop.events.LoggingEventListener processEvent WARNING: Font "Symbol,normal,700" not found. Substituting with "Symbol,normal,400". Jan 20, 2011 8:19:18 AM org.apache.fop.events.LoggingEventListener processEvent WARNING: Font "ZapfDingbats,normal,700" not found. Substituting with "ZapfDingbats,normal,400". Jan 20, 2011 8:19:18 AM org.apache.fop.events.LoggingEventListener processEvent WARNING: Line 1 of a paragraph overflows the available area by 2500 millipoints. (See position -1:-1) [INFO] Processing en-US -> html redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...]> [INFO] Processing en-US -> html_single redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...]> [INFO] [INFO] >>> maven-source-plugin:2.1.2:jar (attach-sources) @ samplesguide >>> [INFO] [INFO] <<< maven-source-plugin:2.1.2:jar (attach-sources) @ samplesguide <<< [INFO] [INFO] --- maven-source-plugin:2.1.2:jar (attach-sources) @ samplesguide --- [INFO] No sources in project. Archive not created. [INFO] [INFO] --- maven-install-plugin:2.3.1:install (default-install) @ samplesguide --- [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/m2-r...> [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/m2-r...> [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Savara::Distribution 1.1.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-source-... Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-source-p... Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-source-plugi... Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-source-plugi... (632 B at 0.7 KB/sec) Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (952 B at 0.7 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-surefir... Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-surefire... Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-surefire-plu... Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-surefire-plu... (837 B at 0.9 KB/sec) Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (2 KB at 0.5 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-assembl... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-assembl... (185 KB at 229.5 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ distribution --- [INFO] [INFO] --- maven-assembly-plugin:2.2-beta-2:single (bin) @ distribution --- Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-assembl... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-assembl... (17 KB at 38.1 KB/sec) Downloading: http://repository.jboss.org/maven2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.... Downloaded: http://repository.jboss.org/maven2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.... (657 B at 2.1 KB/sec) Downloading: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-archiver/1.... Downloaded: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-archiver/1.... (2 KB at 5.5 KB/sec) Downloading: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-io/1.0-alph... Downloaded: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-io/1.0-alph... (2 KB at 4.9 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/maven-archiver/2.2/ma... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/maven-archiver/2.2/ma... (2 KB at 4.3 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-shared-c... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-shared-c... (2 KB at 4.0 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-common-a... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-common-a... (2 KB at 4.0 KB/sec) Downloading: http://repository.jboss.org/maven2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.... Downloading: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-archiver/1.... Downloading: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-io/1.0-alph... Downloading: http://repository.jboss.org/maven2/org/apache/maven/maven-archiver/2.2/ma... Downloading: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-common-a... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/maven-archiver/2.2/ma... (10 KB at 15.8 KB/sec) Downloading: http://repository.jboss.org/maven2/org/apache/maven/reporting/maven-repor... Downloaded: http://repository.jboss.org/maven2/org/apache/maven/shared/maven-common-a... (27 KB at 26.8 KB/sec) Downloading: http://repository.jboss.org/maven2/doxia/doxia-sink-api/1.0-alpha-4/doxia... Downloaded: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-io/1.0-alph... (31 KB at 25.6 KB/sec) Downloaded: http://repository.jboss.org/maven2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.... (113 KB at 91.1 KB/sec) Downloaded: http://repository.jboss.org/maven2/org/apache/maven/reporting/maven-repor... (7 KB at 9.3 KB/sec) Downloaded: http://repository.jboss.org/maven2/org/codehaus/plexus/plexus-archiver/1.... (169 KB at 123.7 KB/sec) Downloaded: http://repository.jboss.org/maven2/doxia/doxia-sink-api/1.0-alpha-4/doxia... (5 KB at 6.5 KB/sec) [INFO] Reading assembly descriptor: src/main/assembly/bin.xml [INFO] Processing DependencySet (output=modules) [WARNING] Cannot include project artifact: org.jboss.savara:distribution:pom:1.1.0-SNAPSHOT; it doesn't have an associated file or directory. [INFO] Building zip: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/157/art...> [WARNING] Configuration options: 'appendAssemblyId' is set to false, and 'classifier' is missing. Instead of attaching the assembly file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...,> it will become the file for main project artifact. NOTE: If multiple descriptors or descriptor-formats are provided for this project, the value of this file will be non-deterministic! [INFO] [INFO] --- maven-assembly-plugin:2.2-beta-2:single (distribution-package-source) @ distribution --- [INFO] Reading assembly descriptor: src/main/assembly/src.xml [INFO] Building zip: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/157/art...> [WARNING] Configuration options: 'appendAssemblyId' is set to false, and 'classifier' is missing. Instead of attaching the assembly file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...,> it will become the file for main project artifact. NOTE: If multiple descriptors or descriptor-formats are provided for this project, the value of this file will be non-deterministic! [WARNING] Replacing pre-existing project main-artifact file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/157/art...> with assembly file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/157/art...> [INFO] [INFO] >>> maven-source-plugin:2.1.2:jar (attach-sources) @ distribution >>> [INFO] [INFO] <<< maven-source-plugin:2.1.2:jar (attach-sources) @ distribution <<< [INFO] [INFO] --- maven-source-plugin:2.1.2:jar (attach-sources) @ distribution --- [INFO] [INFO] --- maven-install-plugin:2.3.1:install (default-install) @ distribution --- [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/m2-r...> [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Savara ............................................ SUCCESS [36.604s] [INFO] Savara::Validators ................................ SUCCESS [4.961s] [INFO] Savara::Validators::JBoss ......................... SUCCESS [5.088s] [INFO] Savara::Validators::JBoss::Common ................. SUCCESS [28:14.961s] [INFO] Savara::Validators::JBoss::ESB .................... SUCCESS [26.862s] [INFO] Savara::Validators::JBoss::WS-Native .............. SUCCESS [2:59.851s] [INFO] Savara::Tools ..................................... SUCCESS [0.060s] [INFO] Savara::Tools::Plugins ............................ SUCCESS [0.010s] [INFO] Savara::Tools::Plugins::ScribbleCore .............. SUCCESS [1:21.183s] [INFO] Savara::Tools::Plugins::ContractModel ............. SUCCESS [7.814s] [INFO] Savara::Tools::Plugins::ScribbleConversationModel . SUCCESS [8.192s] [INFO] Savara::Tools::Plugins::ScribbleConversationParser SUCCESS [3.635s] [INFO] Savara::Tools::Plugins::ScribbleExpressionXPath ... SUCCESS [4.766s] [INFO] Savara::Tools::Plugins::ScribbleEclipse ........... SUCCESS [16.766s] [INFO] Savara::Tools::Plugins::Pi4SOACDM ................. SUCCESS [10.061s] [INFO] Savara::Tools::Plugins::ProtocolContract .......... SUCCESS [6.896s] [INFO] Savara::Tools::Plugins::ToolsTAPModel ............. SUCCESS [14.921s] [INFO] Savara::Tools::Plugins::ToolsTAPValidation ........ SUCCESS [9.624s] [INFO] Savara::Tools::Plugins::ToolsTAPValidation ........ SUCCESS [8.112s] [INFO] Savara::Tools::Plugins::ScribbleLangModel ......... SUCCESS [8.228s] [INFO] Savara::Tools::Plugins::ToolsWSDL ................. SUCCESS [6.477s] [INFO] Savara::Tools::Plugins::ToolsBPEL ................. SUCCESS [7.093s] [INFO] Savara::Tools::Plugins::ToolsValidator ............ SUCCESS [6.654s] [INFO] Savara::Tools::Plugins::ToolsBPMN ................. SUCCESS [9.578s] [INFO] Savara::Tools::Plugins::ToolsMonitor .............. SUCCESS [7.101s] [INFO] Savara::Tools::Plugins::ScribbleConformance ....... SUCCESS [5.859s] [INFO] Savara::Tools::Plugins::ScribbleConversationComparator SUCCESS [9.776s] [INFO] Savara::Tools::Plugins::ScribbleConversationExportText SUCCESS [6.641s] [INFO] Savara::Tools::Plugins::ScribbleConversationProjector SUCCESS [7.209s] [INFO] Savara::Tools::Plugins::ScribbleConversationValidation SUCCESS [7.850s] [INFO] Savara::Tools::Features ........................... SUCCESS [0.005s] [INFO] Savara::Tools::Features::ScribbleProtocol ......... SUCCESS [3.776s] [INFO] Savara::Tools::Features::SavaraTools .............. SUCCESS [8.373s] [INFO] Savara::Tools::Tests .............................. SUCCESS [0.005s] [INFO] Savara::Tools::Tests::ProtocolContract ............ SUCCESS [6:42.044s] [INFO] Savara::Tools::Tests::ToolsWSDL ................... SUCCESS [27.261s] [INFO] Savara::Tools::Site ............................... SUCCESS [9.595s] [INFO] Savara::Docs ...................................... SUCCESS [10.990s] [INFO] Savara::Docs::UserGuide ........................... SUCCESS [30:15.920s] [INFO] Savara::Docs::GettingStartedGuide ................. SUCCESS [21:20.950s] [INFO] Savara::Docs::SamplesGuide ........................ SUCCESS [22:54.829s] [INFO] Savara::Distribution .............................. SUCCESS [16.306s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 2:05:23.405s [INFO] Finished at: Thu Jan 20 08:19:37 EST 2011 [INFO] Final Memory: 187M/607M [INFO] ------------------------------------------------------------------------ [jbosstools-savara-1.1_trunk] $ bash -xe /tmp/hudson9176883740244269875.sh + . <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/buil...> ++ STAGINGDIR=<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/resu...> ++ JOBNAMEREDUX=jbosstools-savara-1.1_trunk ++ JOBNAMEREDUX=savara-1.1_trunk ++ [[ No == \Y\e\s ]] ++ ZIPSUFFIX=SNAPSHOT ++ SNAPNAME=jbosstools-savara-1.1_trunk-Update-SNAPSHOT.zip ++ SRCSNAME=jbosstools-savara-1.1_trunk-Sources-SNAPSHOT.zip ++ SUFFNAME=-Update-SNAPSHOT.zip ++ [[ '' == '' ]] ++ DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools ++ rm -fr <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/results> ++ mkdir -p <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/resu...> ++ z= ++ [[ -d <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...> ]] ++ [[ -d <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/sour...> ]] ++ mkdir -p <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/resu...> ++ bl=<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/resu...> ++ wget -q http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/157/con... -O <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/resu...> ++ rl=<http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/resu...> ++ rm -f <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/resu...> <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/resu...> ++ wget -q --no-clobber -O <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/resu...> 'http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/api/xml...' <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.1_trunk/ws/buil...>: line 58: 967 Aborted wget -q --no-clobber -O ${rl}.xml "http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/api/xml?wrapper=changeS..." Terminating xvnc. [jbosstools-savara-1.1_trunk] $ vncserver -kill :15 Killing Xvnc process ID 20269 Archiving artifacts Recording test results

13 years, 8 months

1
3
0 / 0

savara SVN: r598 - in branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity: services and 1 other directory.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-19 18:31:05 -0500 (Wed, 19 Jan 2011) New Revision: 598 Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityLogService.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityNotificationService.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityQueryService.java Log: Initial APIs for the activity log, notification and query services (currently no query methods on query service). Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityLogService.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityLogService.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityLogService.java 2011-01-19 23:31:05 UTC (rev 598) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.activity.services; + +import org.savara.activity.model.Activity; +import org.savara.activity.validation.ActivityValidationManager; +import org.savara.common.config.Configuration; + +/** + * This interface represents the activity log service, + * used to store activity events in a persistence store. + * + */ +public interface ActivityLogService { + + /** + * This method initializes the log service using + * the supplied configuration. + * + * @param config + */ + public void initialize(Configuration config); + + /** + * This method sets the activity validation manager to be used to + * validate any logged activity events. + * + * @param manager The manager + */ + public void setActivityValidationManager(ActivityValidationManager manager); + + /** + * This method sets the optional activity notification service to use + * to publish newly logged activity records. + * + * @param notifer The notification service + */ + public void setActivityNotificationService(ActivityNotificationService notifer); + + /** + * This method logs the activity record. + * + * @param activity The activity + */ + public void log(Activity activity); + + /** + * This method closes the log service. + */ + public void close(); + +} Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityNotificationService.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityNotificationService.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityNotificationService.java 2011-01-19 23:31:05 UTC (rev 598) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.activity.services; + +import org.savara.activity.model.Activity; +import org.savara.common.config.Configuration; + +/** + * This interface represents the activity notification service, + * used to publish activity records after they have been + * recorded. + * + */ +public interface ActivityNotificationService { + + /** + * This method initializes the notification service using + * the supplied configuration. + * + * @param config + */ + public void initialize(Configuration config); + + /** + * This method publishes the supplied activity event. + * + * @param activity The activity event + */ + public void publish(Activity activity); + + /** + * This method closes the notification service. + */ + public void close(); + +} Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityQueryService.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityQueryService.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityQueryService.java 2011-01-19 23:31:05 UTC (rev 598) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.activity.services; + +import org.savara.common.config.Configuration; + +/** + * This interface represents the activity query service, + * used to query activity records in a persistence store. + * + */ +public interface ActivityQueryService { + + /** + * This method initializes the query service using + * the supplied configuration. + * + * @param config + */ + public void initialize(Configuration config); + + /** + * This method closes the query service. + */ + public void close(); + +}

13 years, 8 months

1
0
0 / 0

savara SVN: r597 - in branches/experimental/2.0.x/bundles: org.savara.activity/schema and 12 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-19 16:23:21 -0500 (Wed, 19 Jan 2011) New Revision: 597 Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityAnalyser.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManager.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManagerFactory.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidator.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/DefaultActivityValidationManager.java branches/experimental/2.0.x/bundles/org.savara.activity/src/test/ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/DefaultActivityValidationManagerTest.java Modified: branches/experimental/2.0.x/bundles/org.savara.activity/.classpath branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/osgi/Activator.java branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/ Log: Updates to activity model and addition of activity validation framework. Modified: branches/experimental/2.0.x/bundles/org.savara.activity/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/.classpath 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/.classpath 2011-01-19 21:23:21 UTC (rev 597) @@ -1,11 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java" including="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> - <classpathentry kind="src" path="/org.savara.common"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> -</classpath> \ No newline at end of file + <classpathentry including="**/*.java" kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test/java"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> + <classpathentry kind="src" path="/org.savara.common"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-19 21:23:21 UTC (rev 597) @@ -3,10 +3,13 @@ <complexType name="Activity" abstract="true"> <sequence> - <element name="analysis" type="tns:Analysis" minOccurs="0" maxOccurs="unbounded"></element> + <element name="analysis" type="tns:Analysis" minOccurs="0" + maxOccurs="unbounded"> + </element> </sequence> <attribute name="componentName" type="string"></attribute> - <attribute name="instanceId" type="string"></attribute> + <attribute name="componentInstanceId" type="string"></attribute> + <attribute name="conversationInstanceId" type="string"></attribute> <attribute name="timestamp" type="dateTime"></attribute> </complexType> Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // @@ -32,7 +32,8 @@ * <element name="analysis" type="{http://www.savara.org/activity}Analysis" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="componentName" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="componentInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="conversationInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> * </restriction> * </complexContent> @@ -55,8 +56,10 @@ protected List<Analysis> analysis; @XmlAttribute(name = "componentName") protected String componentName; - @XmlAttribute(name = "instanceId") - protected String instanceId; + @XmlAttribute(name = "componentInstanceId") + protected String componentInstanceId; + @XmlAttribute(name = "conversationInstanceId") + protected String conversationInstanceId; @XmlAttribute(name = "timestamp") @XmlSchemaType(name = "dateTime") protected XMLGregorianCalendar timestamp; @@ -115,30 +118,54 @@ } /** - * Gets the value of the instanceId property. + * Gets the value of the componentInstanceId property. * * @return * possible object is * {@link String } * */ - public String getInstanceId() { - return instanceId; + public String getComponentInstanceId() { + return componentInstanceId; } /** - * Sets the value of the instanceId property. + * Sets the value of the componentInstanceId property. * * @param value * allowed object is * {@link String } * */ - public void setInstanceId(String value) { - this.instanceId = value; + public void setComponentInstanceId(String value) { + this.componentInstanceId = value; } /** + * Gets the value of the conversationInstanceId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getConversationInstanceId() { + return conversationInstanceId; + } + + /** + * Sets the value of the conversationInstanceId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setConversationInstanceId(String value) { + this.conversationInstanceId = value; + } + + /** * Gets the value of the timestamp property. * * @return Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // @@ -37,6 +37,14 @@ } /** + * Create an instance of {@link MessageReceived } + * + */ + public MessageReceived createMessageReceived() { + return new MessageReceived(); + } + + /** * Create an instance of {@link EndpointActivity } * */ @@ -45,11 +53,11 @@ } /** - * Create an instance of {@link MessageSent } + * Create an instance of {@link InstanceFinished } * */ - public MessageSent createMessageSent() { - return new MessageSent(); + public InstanceFinished createInstanceFinished() { + return new InstanceFinished(); } /** @@ -61,22 +69,14 @@ } /** - * Create an instance of {@link MessageReceived } + * Create an instance of {@link MessageSent } * */ - public MessageReceived createMessageReceived() { - return new MessageReceived(); + public MessageSent createMessageSent() { + return new MessageSent(); } /** - * Create an instance of {@link InstanceFinished } - * - */ - public InstanceFinished createInstanceFinished() { - return new InstanceFinished(); - } - - /** * Create an instance of {@link Error } * */ Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-01-19 21:23:21 UTC (rev 597) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.18 at 05:58:36 PM GMT +// Generated on: 2011.01.19 at 06:07:44 PM GMT // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/osgi/Activator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/osgi/Activator.java 2011-01-19 10:12:28 UTC (rev 596) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/osgi/Activator.java 2011-01-19 21:23:21 UTC (rev 597) @@ -1,12 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ package org.savara.activity.osgi; +import java.util.Properties; +import java.util.logging.Logger; + import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTracker; +import org.savara.activity.validation.ActivityAnalyser; +import org.savara.activity.validation.ActivityValidationManager; +import org.savara.activity.validation.ActivityValidationManagerFactory; +import org.savara.activity.validation.ActivityValidator; public class Activator implements BundleActivator { private static BundleContext context; + private org.osgi.util.tracker.ServiceTracker m_activityAnalyserTracker=null; + private org.osgi.util.tracker.ServiceTracker m_activityValidatorTracker=null; + + private static final Logger _log=Logger.getLogger(Activator.class.getName()); + static BundleContext getContext() { return context; } @@ -17,6 +48,48 @@ */ public void start(BundleContext bundleContext) throws Exception { Activator.context = bundleContext; + + Properties props = new Properties(); + + // Register activity validation manager + final ActivityValidationManager avm=ActivityValidationManagerFactory.getActivityValidationManager(); + + context.registerService(ActivityValidationManager.class.getName(), + avm, props); + + _log.fine("Registered Activity Validation Manager"); + + m_activityValidatorTracker = new ServiceTracker(context, + ActivityValidator.class.getName(), null) { + + public Object addingService(ServiceReference ref) { + Object ret=super.addingService(ref); + + _log.fine("Activity validator has been added: "+ret); + + avm.addActivityValidator((ActivityValidator)ret); + + return(ret); + } + }; + + m_activityValidatorTracker.open(); + + m_activityAnalyserTracker = new ServiceTracker(context, + ActivityAnalyser.class.getName(), null) { + + public Object addingService(ServiceReference ref) { + Object ret=super.addingService(ref); + + _log.fine("Activity analyser has been added: "+ret); + + avm.addActivityAnalyser((ActivityAnalyser)ret); + + return(ret); + } + }; + + m_activityAnalyserTracker.open(); } /* Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityAnalyser.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityAnalyser.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityAnalyser.java 2011-01-19 21:23:21 UTC (rev 597) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.activity.validation; + +import org.savara.activity.model.Activity; + +/** + * This interface is used to provide activity analysis capabilities. + * + */ +public interface ActivityAnalyser { + + /** + * This method analyses the supplied activity. + * + * @param activity The activity to be analysed + */ + public void analyse(Activity activity); + +} Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManager.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManager.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManager.java 2011-01-19 21:23:21 UTC (rev 597) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.activity.validation; + +import org.savara.activity.model.Activity; + +/** + * This interface represents the activity validation manager + * responsible for managing a set of analysers and validators, + * and applying a supplied activity against them. The analysers + * are applied prior to the validators, to derived additional + * information that may be required during validation. + */ +public interface ActivityValidationManager { + + /** + * This method adds a new activity validator. + * + * @param validator The validator + */ + public void addActivityValidator(ActivityValidator validator); + + /** + * This method removes an existing activity validator. + * + * @param validator The validator + */ + public void removeActivityValidator(ActivityValidator validator); + + /** + * This method adds a new activity analyser. + * + * @param analyser The analyser + */ + public void addActivityAnalyser(ActivityAnalyser analyser); + + /** + * This method removes an existing activity analyser. + * + * @param analyser The analyser + */ + public void removeActivityAnalyser(ActivityAnalyser analyser); + + /** + * This method processes the supplied activity event against + * any predefined analysers and validators. + * + * @param activity The activity event to be processed + */ + public void process(Activity activity); + +} Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManagerFactory.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManagerFactory.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManagerFactory.java 2011-01-19 21:23:21 UTC (rev 597) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.activity.validation; + +/** + * This class provides a factory for the ActivityValidationManager + * component. + * + */ +public class ActivityValidationManagerFactory { + + private static ActivityValidationManager m_instance= + new DefaultActivityValidationManager(); + + /** + * This method returns the activity validation manager. + * + * @return The activity validation manager + */ + public static ActivityValidationManager getActivityValidationManager() { + return(m_instance); + } +} Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidator.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidator.java 2011-01-19 21:23:21 UTC (rev 597) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.activity.validation; + +import org.savara.activity.model.Activity; + +/** + * This interface is used to provide activity validation capabilities. + * + */ +public interface ActivityValidator { + + /** + * This method validates the supplied activity. + * + * @param activity The activity to be validated + */ + public void validate(Activity activity); + +} Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/DefaultActivityValidationManager.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/DefaultActivityValidationManager.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/DefaultActivityValidationManager.java 2011-01-19 21:23:21 UTC (rev 597) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.activity.validation; + +import org.savara.activity.model.Activity; + +/** + * This class implements a default activity validation manager + * responsible for managing a set of analysers and validators, + * and applying a supplied activity against them. The analysers + * are applied prior to the validators, to derived additional + * information that may be required during validation. + */ +public class DefaultActivityValidationManager implements ActivityValidationManager { + + private java.util.List<ActivityValidator> m_validators=new java.util.Vector<ActivityValidator>(); + private java.util.List<ActivityAnalyser> m_analysers=new java.util.Vector<ActivityAnalyser>(); + + protected java.util.List<ActivityAnalyser> getAnalysers() { + return(m_analysers); + } + + protected java.util.List<ActivityValidator> getValidators() { + return(m_validators); + } + + /** + * This method adds a new activity validator. + * + * @param validator The validator + */ + public void addActivityValidator(ActivityValidator validator) { + m_validators.add(validator); + } + + /** + * This method removes an existing activity validator. + * + * @param validator The validator + */ + public void removeActivityValidator(ActivityValidator validator) { + m_validators.remove(validator); + } + + /** + * This method adds a new activity analyser. + * + * @param analyser The analyser + */ + public void addActivityAnalyser(ActivityAnalyser analyser) { + m_analysers.add(analyser); + } + + /** + * This method removes an existing activity analyser. + * + * @param analyser The analyser + */ + public void removeActivityAnalyser(ActivityAnalyser analyser) { + m_analysers.remove(analyser); + } + + /** + * This method processes the supplied activity event against + * any predefined analysers and validators. + * + * @param activity The activity event to be processed + */ + public void process(Activity activity) { + for (ActivityAnalyser aa : m_analysers) { + aa.analyse(activity); + } + for (ActivityValidator av : m_validators) { + av.validate(activity); + } + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/DefaultActivityValidationManagerTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/DefaultActivityValidationManagerTest.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/DefaultActivityValidationManagerTest.java 2011-01-19 21:23:21 UTC (rev 597) @@ -0,0 +1,124 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.activity.validation; + +import org.junit.Test; +import org.savara.activity.model.Activity; +import org.savara.activity.model.MessageSent; + +import static org.junit.Assert.*; + +public class DefaultActivityValidationManagerTest { + + @Test + public void testAddRemoveAnalyser() { + DefaultActivityValidationManager avm=new DefaultActivityValidationManager(); + + TestAnalyser ta=new TestAnalyser(); + avm.addActivityAnalyser(ta); + + if (avm.getAnalysers().contains(ta) == false) { + fail("Analyser not found"); + } + + avm.removeActivityAnalyser(ta); + + if (avm.getAnalysers().contains(ta) == true) { + fail("Analyser not removed"); + } + } + + @Test + public void testAddRemoveValidator() { + DefaultActivityValidationManager avm=new DefaultActivityValidationManager(); + + TestValidator tv=new TestValidator(); + avm.addActivityValidator(tv); + + if (avm.getValidators().contains(tv) == false) { + fail("Validator not found"); + } + + avm.removeActivityValidator(tv); + + if (avm.getValidators().contains(tv) == true) { + fail("Validator not removed"); + } + } + + @Test + public void testAnalysisBeforeValidate() { + ActivityValidationManager avm=new DefaultActivityValidationManager(); + + TestOrderAnalyserValidator tav=new TestOrderAnalyserValidator(); + + avm.addActivityAnalyser(tav); + avm.addActivityValidator(tav); + + Activity act=new MessageSent(); + + avm.process(act); + } + + public class TestAnalyser implements ActivityAnalyser { + + private Activity m_activity=null; + + public Activity getActivity() { + return(m_activity); + } + + public void analyse(Activity activity) { + m_activity = activity; + } + + } + + public class TestValidator implements ActivityValidator { + + private Activity m_activity=null; + + public Activity getActivity() { + return(m_activity); + } + + public void validate(Activity activity) { + m_activity = activity; + } + } + + public class TestOrderAnalyserValidator implements ActivityAnalyser, ActivityValidator { + + private Activity m_activity=null; + + public void validate(Activity activity) { + if (m_activity != activity) { + // Should be activity that was analysed + fail("Activity did not match"); + } + } + + public void analyse(Activity activity) { + if (m_activity != null) { + fail("Activity should not be set"); + } + m_activity = activity; + } + + } +} Property changes on: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms ___________________________________________________________________ Name: svn:ignore + bin target

13 years, 8 months

1
0
0 / 0

savara SVN: r596 - branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-19 05:12:28 -0500 (Wed, 19 Jan 2011) New Revision: 596 Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java Log: Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java 2011-01-18 20:59:27 UTC (rev 595) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java 2011-01-19 10:12:28 UTC (rev 596) @@ -204,7 +204,6 @@ return(m_started.contains(pid)); } - @Override public void sessionStarted(ProtocolId pid, ConversationInstanceId cid) { m_started.add(pid); } @@ -213,19 +212,16 @@ return(m_finished.contains(pid)); } - @Override public void sessionFinished(ProtocolId pid, ConversationInstanceId cid) { m_finished.add(pid); } - @Override public void messageSent(ProtocolId pid, ConversationInstanceId cid, Message mesg, Result result) { // TODO Auto-generated method stub } - @Override public void messageReceived(ProtocolId pid, ConversationInstanceId cid, Message mesg, Result result) { // TODO Auto-generated method stub

13 years, 8 months

1
0
0 / 0

savara SVN: r595 - in branches/experimental/2.0.x/bundles: org.savara.monitor.sstore.rdbms and 11 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-18 15:59:27 -0500 (Tue, 18 Jan 2011) New Revision: 595 Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.classpath branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.project branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.settings/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.settings/org.eclipse.jdt.core.prefs branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.settings/org.eclipse.pde.core.prefs branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/Copyright.txt branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/META-INF/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/build.properties branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java Modified: branches/experimental/2.0.x/bundles/pom.xml Log: Added OSGi bundle skeleton for RDBMS implementation of the monitor's SessionStore interface. Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.classpath (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.classpath 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.project =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.project (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.project 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.savara.monitor.sstore.rdbms</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.settings/org.eclipse.jdt.core.prefs 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,8 @@ +#Tue Jan 18 20:30:57 GMT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.settings/org.eclipse.pde.core.prefs =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.settings/org.eclipse.pde.core.prefs (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/.settings/org.eclipse.pde.core.prefs 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,5 @@ +#Tue Jan 18 20:30:57 GMT 2011 +eclipse.preferences.version=1 +pluginProject.equinox=false +pluginProject.extensions=false +resolve.requirebundle=false Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/Copyright.txt =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/Copyright.txt (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/Copyright.txt 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,17 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/META-INF/MANIFEST.MF (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/META-INF/MANIFEST.MF 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: SAVARA Monitor SessionStore RDBMS +Bundle-SymbolicName: org.savara.monitor.sstore.rdbms +Bundle-Version: 2.0.0.SNAPSHOT +Bundle-Activator: org.savara.monitor.sstore.rdbms.osgi.Activator +Bundle-Vendor: www.savara.org +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: org.osgi.framework;version="1.3.0" +Require-Bundle: org.savara.common, + org.savara.monitor Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/build.properties =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/build.properties (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/build.properties 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,4 @@ +source.. = src/main/java/ +output.. = bin/ +bin.includes = META-INF/,\ + . Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/pom.xml 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,39 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.savara.bundles</groupId> + <artifactId>org.savara.monitor.sstore.rdbms</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Savara::Bundles::Monitor-SessionStore-RDBMS</name> + + <parent> + <groupId>org.savara</groupId> + <artifactId>bundles</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + + <dependencies> + <dependency> + <groupId>org.savara.bundles</groupId> + <artifactId>org.savara.common</artifactId> + <version>${savara.version}</version> + </dependency> + <dependency> + <groupId>org.savara.bundles</groupId> + <artifactId>org.savara.monitor</artifactId> + <version>${savara.version}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${osgi.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/RDBMSSessionStore.java 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,107 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.monitor.sstore.rdbms; + +import org.savara.common.config.Configuration; +import org.savara.monitor.ConversationInstanceId; +import org.savara.monitor.ProtocolId; +import org.savara.monitor.SessionStore; + +/** + * This class defines the RDBMS implementation of the SessionStore + * interface. + * + */ +public class RDBMSSessionStore implements SessionStore { + + /** + * This method sets the configuration for use by the session + * store. + * + * @param config The configuration + * @throws IOException Failed to initialize session store + */ + public void initialize(Configuration config) throws java.io.IOException { + } + + /** + * This method returns a new session associated with + * the supplied protocol and conversation instance id. + * + * @param pid The protocol id + * @param cid The conversation instance id + * @return The session + * @throws IllegalArgumentException Protocol or conversation instance id is invalid + * @throws IOException Failed to create new session + */ + public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid) + throws IllegalArgumentException, java.io.IOException { + return(null); + } + + /** + * This method returns an existing session associated with + * the supplied protocol and conversation instance id. + * + * @param pid The protocol id + * @param cid The conversation instance id + * @return The session + * @throws IllegalArgumentException Protocol or conversation instance id is invalid + * @throws IOException Failed to retrieve session + */ + public java.io.Serializable find(ProtocolId pid, ConversationInstanceId cid) + throws IllegalArgumentException, java.io.IOException { + return(null); + } + + /** + * This method removes an existing session associated + * with the supplied protocol and conversation instance id. + * + * @param pid The protocol id + * @param cid The conversation instance id + * @throws IllegalArgumentException Conversation instance id is invalid or unknown + * @throws java.io.IOException Failed to remove existing session + */ + public void remove(ProtocolId pid, ConversationInstanceId cid) + throws IllegalArgumentException, java.io.IOException { + } + + /** + * This method updates an existing session associated + * with the supplied protocol and conversation instance id. + * + * @param pid The protocol id + * @param cid The conversation instance id + * @param session The session + * @throws IllegalArgumentException Conversation instance id is invalid or unknown + * @throws java.io.IOException Failed to update existing session + */ + public void update(ProtocolId pid, ConversationInstanceId cid, + java.io.Serializable session) throws IllegalArgumentException, + java.io.IOException { + } + + /** + * This method closes the session store. + * + * @throws java.io.IOException Failed to close the session store + */ + public void close() throws java.io.IOException { + } +} Added: branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor.sstore.rdbms/src/main/java/org/savara/monitor/sstore/rdbms/osgi/Activator.java 2011-01-18 20:59:27 UTC (rev 595) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.monitor.sstore.rdbms.osgi; + +import java.util.Properties; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceRegistration; +import org.savara.monitor.SessionStore; +import org.savara.monitor.sstore.rdbms.RDBMSSessionStore; + +public class Activator implements BundleActivator { + + private static BundleContext context; + + private ServiceRegistration m_serviceRegistration=null; + + static BundleContext getContext() { + return context; + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext bundleContext) throws Exception { + Activator.context = bundleContext; + + // Register the SessionStore implementation + Properties props = new Properties(); + + SessionStore ss=new RDBMSSessionStore(); + + m_serviceRegistration = context.registerService(SessionStore.class.getName(), + ss, props); +} + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext bundleContext) throws Exception { + Activator.context = null; + + m_serviceRegistration.unregister(); + } + +} Modified: branches/experimental/2.0.x/bundles/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/pom.xml 2011-01-18 20:27:34 UTC (rev 594) +++ branches/experimental/2.0.x/bundles/pom.xml 2011-01-18 20:59:27 UTC (rev 595) @@ -25,6 +25,7 @@ <module>org.savara.common</module> <module>org.savara.contract</module> <module>org.savara.monitor</module> + <module>org.savara.monitor.sstore.rdbms</module> <module>org.savara.pi4soa.cdm</module> <module>org.savara.scenario</module> <module>org.savara.wsdl</module>

13 years, 8 months

1
0
0 / 0

savara SVN: r594 - in branches/experimental/2.0.x/bundles: org.savara.scenario and 2 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-18 15:27:34 -0500 (Tue, 18 Jan 2011) New Revision: 594 Added: branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/ branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/org.eclipse.jdt.core.prefs Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath branches/experimental/2.0.x/bundles/org.savara.wsdl/.project Log: Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-18 20:26:53 UTC (rev 593) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-18 20:27:34 UTC (rev 594) @@ -245,171 +245,143 @@ return(f_clearInteraction ? null : m_interaction); } - @Override public void assign(Assign assign) { // TODO Auto-generated method stub } - @Override public void choiceStart(org.pi4soa.cdl.Choice choice) { if (m_interaction == null && choice != m_parent) { f_clearInteraction = true; } } - @Override public void choiceEnd(org.pi4soa.cdl.Choice choice) { // TODO Auto-generated method stub } - @Override public void choreographyStart(Choreography choreography) { // TODO Auto-generated method stub } - @Override public void choreographyEnd(Choreography choreography) { // TODO Auto-generated method stub } - @Override public void conditionalStart(Conditional conditional) { if (m_interaction == null && conditional != m_parent) { f_clearInteraction = true; } } - @Override public void conditionalEnd(Conditional conditional) { // TODO Auto-generated method stub } - @Override public void exceptionHandlerStart(ExceptionHandler handler) { // TODO Auto-generated method stub } - @Override public void exceptionHandlerEnd(ExceptionHandler handler) { // TODO Auto-generated method stub } - @Override public void exceptionWorkUnitStart(ExceptionWorkUnit workunit) { // TODO Auto-generated method stub } - @Override public void exceptionWorkUnitEnd(ExceptionWorkUnit workunit) { // TODO Auto-generated method stub } - @Override public void finalizerStart(FinalizerHandler finalizer) { // TODO Auto-generated method stub } - @Override public void finalizerEnd(FinalizerHandler finalizer) { // TODO Auto-generated method stub } - @Override public void finalize(Finalize finalize) { // TODO Auto-generated method stub } - @Override public void interaction(Interaction interaction) { if (m_interaction == null) { m_interaction = interaction; } } - @Override public void noAction(NoAction noAction) { // TODO Auto-generated method stub } - @Override public void packageStart(Package pack) { // TODO Auto-generated method stub } - @Override public void packageEnd(Package pack) { // TODO Auto-generated method stub } - @Override public void parallelStart(Parallel parallel) { // TODO Auto-generated method stub } - @Override public void parallelEnd(Parallel parallel) { // TODO Auto-generated method stub } - @Override public void perform(Perform perform) { perform.getChoreography().visit(this); } - @Override public void sequenceStart(Sequence sequence) { // TODO Auto-generated method stub } - @Override public void sequenceEnd(Sequence sequence) { // TODO Auto-generated method stub } - @Override public void silentAction(SilentAction silentAction) { // TODO Auto-generated method stub } - @Override public void whenStart(org.pi4soa.cdl.When when) { // TODO Auto-generated method stub } - @Override public void whenEnd(org.pi4soa.cdl.When when) { // TODO Auto-generated method stub } - @Override public void whileStart(While whileElem) { // TODO Auto-generated method stub } - @Override public void whileEnd(While whileElem) { // TODO Auto-generated method stub Added: branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/org.eclipse.jdt.core.prefs 2011-01-18 20:27:34 UTC (rev 594) @@ -0,0 +1,5 @@ +#Tue Jan 18 20:19:43 GMT 2011 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-18 20:26:53 UTC (rev 593) +++ branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-18 20:27:34 UTC (rev 594) @@ -1,16 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry including="**/*.java" kind="src" path="src/main/java"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> - <classpathentry kind="src" path="/org.savara.contract"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.savara.common"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> + <classpathentry kind="src" path="/org.savara.common"/> + <classpathentry kind="src" path="/org.savara.contract"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/.project =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.wsdl/.project 2011-01-18 20:26:53 UTC (rev 593) +++ branches/experimental/2.0.x/bundles/org.savara.wsdl/.project 2011-01-18 20:27:34 UTC (rev 594) @@ -2,7 +2,8 @@ <name>org.savara.wsdl</name> <comment>The SAVARA project. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> <projects> - <project>org.savara.contract.model</project> + <project>org.savara.common</project> + <project>org.savara.contract</project> </projects> <buildSpec> <buildCommand>

13 years, 8 months

1
0
0 / 0

savara SVN: r593 - in branches/experimental/2.0.x/bundles: org.savara.activity/.settings and 6 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-18 15:26:53 -0500 (Tue, 18 Jan 2011) New Revision: 593 Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.settings/ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.settings/org.eclipse.jdt.core.prefs Modified: branches/experimental/2.0.x/bundles/org.savara.activity/.classpath branches/experimental/2.0.x/bundles/org.savara.activity/.project branches/experimental/2.0.x/bundles/org.savara.activity/.settings/org.eclipse.jdt.core.prefs branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath branches/experimental/2.0.x/bundles/org.savara.bpel/.project branches/experimental/2.0.x/bundles/org.savara.contract/.classpath branches/experimental/2.0.x/bundles/org.savara.contract/.project branches/experimental/2.0.x/bundles/org.savara.monitor/.classpath branches/experimental/2.0.x/bundles/org.savara.monitor/.project branches/experimental/2.0.x/bundles/org.savara.monitor/.settings/org.eclipse.jdt.core.prefs branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.classpath branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.project Log: Modified: branches/experimental/2.0.x/bundles/org.savara.activity/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/.classpath 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.activity/.classpath 2011-01-18 20:26:53 UTC (rev 593) @@ -1,7 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="output" path="bin"/> -</classpath> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> + <classpathentry kind="src" path="/org.savara.common"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.activity/.project =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/.project 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.activity/.project 2011-01-18 20:26:53 UTC (rev 593) @@ -1,28 +1,22 @@ -<?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.savara.activity</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>org.savara.activity</name> + <comment>The SAVARA project. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>org.savara.common</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.activity/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/.settings/org.eclipse.jdt.core.prefs 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.activity/.settings/org.eclipse.jdt.core.prefs 2011-01-18 20:26:53 UTC (rev 593) @@ -1,8 +1,8 @@ -#Fri Jan 14 18:07:00 GMT 2011 +#Tue Jan 18 20:19:42 GMT 2011 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.compliance=1.5 Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-18 20:26:53 UTC (rev 593) @@ -1,24 +1,25 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry including="**/*.java" kind="src" path="src/main/java"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> - <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> - <classpathentry kind="src" path="/org.savara.contract"/> - <classpathentry kind="src" path="/org.savara.wsdl"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/jaxb-api-2.1.jar"/> - <classpathentry kind="lib" path="lib/jaxb-impl-2.1.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.savara.common"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> + <classpathentry kind="src" path="/org.savara.common"/> + <classpathentry kind="src" path="/org.savara.contract"/> + <classpathentry kind="src" path="/org.savara.wsdl"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/.project =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/.project 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/.project 2011-01-18 20:26:53 UTC (rev 593) @@ -2,8 +2,8 @@ <name>org.savara.bpel</name> <comment>The SAVARA project. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> <projects> - <project>org.savara.contract.model</project> - <project>org.savara.core</project> + <project>org.savara.common</project> + <project>org.savara.contract</project> <project>org.savara.wsdl</project> </projects> <buildSpec> Modified: branches/experimental/2.0.x/bundles/org.savara.contract/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-18 20:26:53 UTC (rev 593) @@ -1,14 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry including="**/*.java" kind="src" path="src/main/java"/> - <classpathentry including="**/*.java" kind="src" path="src/test/java"/> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/org.savara.common"/> - <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> + <classpathentry kind="src" path="/org.savara.common"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.contract/.project =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.contract/.project 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.contract/.project 2011-01-18 20:26:53 UTC (rev 593) @@ -1,7 +1,9 @@ <projectDescription> <name>org.savara.contract</name> <comment>The SAVARA project. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects/> + <projects> + <project>org.savara.common</project> + </projects> <buildSpec> <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/.classpath 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/.classpath 2011-01-18 20:26:53 UTC (rev 593) @@ -1,9 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/test/java"/> - <classpathentry kind="output" path="bin"/> - <classpathentry kind="var" path="M2_REPO/org/savara/bundles/org.savara.common/2.0.0-SNAPSHOT/org.savara.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> + <classpathentry kind="src" path="/org.savara.common"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol.monitor/2.0.0-SNAPSHOT/org.scribble.protocol.monitor-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol.monitor/2.0.0-SNAPSHOT/org.scribble.protocol.monitor-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/.project =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/.project 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/.project 2011-01-18 20:26:53 UTC (rev 593) @@ -1,28 +1,22 @@ -<?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.savara.monitor</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>org.savara.monitor</name> + <comment>The SAVARA project. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>org.savara.common</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/.settings/org.eclipse.jdt.core.prefs 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/.settings/org.eclipse.jdt.core.prefs 2011-01-18 20:26:53 UTC (rev 593) @@ -1,8 +1,8 @@ -#Fri Jan 14 11:34:01 GMT 2011 +#Tue Jan 18 20:19:42 GMT 2011 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.compliance=1.5 Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.classpath 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.classpath 2011-01-18 20:26:53 UTC (rev 593) @@ -1,9 +1,27 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/test/java"/> - <classpathentry kind="src" path="src/test/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/savara/dependencies/eclipse/emf-common/2.3.0/emf-common-2.3.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/savara/dependencies/eclipse/emf-ecore/2.3.1/emf-ecore-2.3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/savara/dependencies/eclipse/emf-ecore-xmi/2.3.1/emf-ecore-xmi-2.3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/pi4soa/org.pi4soa.cdl/3.1.0.Final/org.pi4soa.cdl-3.1.0.Final.jar"/> + <classpathentry kind="var" path="M2_REPO/org/pi4soa/org.pi4soa.common/3.1.0.Final/org.pi4soa.common-3.1.0.Final.jar"/> + <classpathentry kind="src" path="/org.savara.common"/> + <classpathentry kind="src" path="/org.savara.contract"/> + <classpathentry kind="src" path="/org.savara.wsdl"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol.projection/2.0.0-SNAPSHOT/org.scribble.protocol.projection-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol.projection/2.0.0-SNAPSHOT/org.scribble.protocol.projection-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.project =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.project 2011-01-18 20:11:14 UTC (rev 592) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.project 2011-01-18 20:26:53 UTC (rev 593) @@ -1,28 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.savara.pi4soa.cdm</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>org.savara.pi4soa.cdm</name> + <comment>The SAVARA project. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>org.savara.common</project> + <project>org.savara.contract</project> + <project>org.savara.wsdl</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.settings/org.eclipse.jdt.core.prefs =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/.settings/org.eclipse.jdt.core.prefs 2011-01-18 20:26:53 UTC (rev 593) @@ -0,0 +1,5 @@ +#Tue Jan 18 20:19:43 GMT 2011 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5

13 years, 8 months

1
0
0 / 0

savara SVN: r592 - in branches/experimental/2.0.x/bundles: org.savara.activity/src/main/java/org/savara/activity/model and 7 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-18 15:11:14 -0500 (Tue, 18 Jan 2011) New Revision: 592 Added: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/Configuration.java branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/DefaultConfiguration.java Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.monitor/.classpath branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java Log: Update the activity schema to make the endpoint address explicit, and message activity include whether it represents a request, and also create a configuration interface and default impl. Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-01-18 20:11:14 UTC (rev 592) @@ -13,7 +13,7 @@ <complexType name="EndpointActivity"> <complexContent> <extension base="tns:Activity"> - <attribute name="endpointName" type="string"></attribute> + <attribute name="endpointAddress" type="string"></attribute> </extension> </complexContent> </complexType> @@ -35,7 +35,8 @@ </sequence> <attribute name="operationName" type="string"></attribute> <attribute name="faultName" type="string"></attribute> - <attribute name="type" type="string"></attribute> + <attribute name="messageType" type="string"></attribute> + <attribute name="request" type="boolean" default="true"></attribute> </extension> </complexContent> </complexType> Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/EndpointActivity.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // @@ -24,7 +24,7 @@ * <complexType name="EndpointActivity"> * <complexContent> * <extension base="{http://www.savara.org/activity}Activity"> - * <attribute name="endpointName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="endpointAddress" type="{http://www.w3.org/2001/XMLSchema}string" /> * </extension> * </complexContent> * </complexType> @@ -41,31 +41,31 @@ extends Activity { - @XmlAttribute(name = "endpointName") - protected String endpointName; + @XmlAttribute(name = "endpointAddress") + protected String endpointAddress; /** - * Gets the value of the endpointName property. + * Gets the value of the endpointAddress property. * * @return * possible object is * {@link String } * */ - public String getEndpointName() { - return endpointName; + public String getEndpointAddress() { + return endpointAddress; } /** - * Sets the value of the endpointName property. + * Sets the value of the endpointAddress property. * * @param value * allowed object is * {@link String } * */ - public void setEndpointName(String value) { - this.endpointName = value; + public void setEndpointAddress(String value) { + this.endpointAddress = value; } } Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/LifecycleActivity.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageActivity.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // @@ -31,7 +31,8 @@ * </sequence> * <attribute name="operationName" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="faultName" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="messageType" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="request" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /> * </extension> * </complexContent> * </complexType> @@ -58,8 +59,10 @@ protected String operationName; @XmlAttribute(name = "faultName") protected String faultName; - @XmlAttribute(name = "type") - protected String type; + @XmlAttribute(name = "messageType") + protected String messageType; + @XmlAttribute(name = "request") + protected Boolean request; /** * Gets the value of the value property. @@ -134,27 +137,55 @@ } /** - * Gets the value of the type property. + * Gets the value of the messageType property. * * @return * possible object is * {@link String } * */ - public String getType() { - return type; + public String getMessageType() { + return messageType; } /** - * Sets the value of the type property. + * Sets the value of the messageType property. * * @param value * allowed object is * {@link String } * */ - public void setType(String value) { - this.type = value; + public void setMessageType(String value) { + this.messageType = value; } + /** + * Gets the value of the request property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isRequest() { + if (request == null) { + return true; + } else { + return request; + } + } + + /** + * Sets the value of the request property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setRequest(Boolean value) { + this.request = value; + } + } Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // @@ -37,11 +37,11 @@ } /** - * Create an instance of {@link Error } + * Create an instance of {@link EndpointActivity } * */ - public Error createError() { - return new Error(); + public EndpointActivity createEndpointActivity() { + return new EndpointActivity(); } /** @@ -53,6 +53,14 @@ } /** + * Create an instance of {@link InstanceStarted } + * + */ + public InstanceStarted createInstanceStarted() { + return new InstanceStarted(); + } + + /** * Create an instance of {@link MessageReceived } * */ @@ -69,27 +77,19 @@ } /** - * Create an instance of {@link ProtocolAnalysis } + * Create an instance of {@link Error } * */ - public ProtocolAnalysis createProtocolAnalysis() { - return new ProtocolAnalysis(); + public Error createError() { + return new Error(); } /** - * Create an instance of {@link InstanceStarted } + * Create an instance of {@link ProtocolAnalysis } * */ - public InstanceStarted createInstanceStarted() { - return new InstanceStarted(); + public ProtocolAnalysis createProtocolAnalysis() { + return new ProtocolAnalysis(); } - /** - * Create an instance of {@link EndpointActivity } - * - */ - public EndpointActivity createEndpointActivity() { - return new EndpointActivity(); - } - } Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-01-18 20:11:14 UTC (rev 592) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.01.16 at 06:29:35 PM GMT +// Generated on: 2011.01.18 at 05:58:36 PM GMT // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) Modified: branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF 2011-01-18 20:11:14 UTC (rev 592) @@ -9,7 +9,8 @@ Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.scribble.common, org.scribble.protocol -Export-Package: org.savara.common.model.change, +Export-Package: org.savara.common.config, + org.savara.common.model.change, org.savara.common.model.generator, org.savara.common.model.util, org.savara.common.util Added: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/Configuration.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/Configuration.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/Configuration.java 2011-01-18 20:11:14 UTC (rev 592) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.common.config; + +/** + * This interface provides configuration information for the + * Savara bundles. + * + */ +public interface Configuration { + + /** + * This method returns the property associated with the + * supplied name. + * + * @param name The name + * @return The value, or null if not defined + */ + public String getProperty(String name); + +} Added: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/DefaultConfiguration.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/DefaultConfiguration.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/DefaultConfiguration.java 2011-01-18 20:11:14 UTC (rev 592) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.common.config; + +/** + * This class provides the default implementation of the + * Configuration interface. + * + */ +public class DefaultConfiguration implements Configuration { + + private java.util.Properties m_properties=new java.util.Properties(); + + /** + * The default constructor. + */ + public DefaultConfiguration() { + } + + /** + * This constructor provides the initial properties for the + * configuration. + * + * @param props The properties + */ + public DefaultConfiguration(java.util.Properties props) { + m_properties = props; + } + + /** + * This method returns the property associated with the + * supplied name. + * + * @param name The name + * @return The value, or null if not defined + */ + public String getProperty(String name) { + return(m_properties.getProperty(name)); + } +} Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/.classpath 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/.classpath 2011-01-18 20:11:14 UTC (rev 592) @@ -5,4 +5,5 @@ <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="output" path="bin"/> + <classpathentry kind="var" path="M2_REPO/org/savara/bundles/org.savara.common/2.0.0-SNAPSHOT/org.savara.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> </classpath> Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/META-INF/MANIFEST.MF 2011-01-18 20:11:14 UTC (rev 592) @@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.scribble.protocol.monitor, - org.junit + org.junit, + org.savara.common Export-Package: org.savara.monitor, org.savara.monitor.impl Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/SessionStore.java 2011-01-18 20:11:14 UTC (rev 592) @@ -17,6 +17,8 @@ */ package org.savara.monitor; +import org.savara.common.config.Configuration; + /** * This interface represents a session store responsible for * persisting information about conversation instances being @@ -26,6 +28,15 @@ public interface SessionStore { /** + * This method sets the configuration for use by the session + * store. + * + * @param config The configuration + * @throws IOException Failed to initialize session store + */ + public void initialize(Configuration config) throws java.io.IOException; + + /** * This method returns a new session associated with * the supplied protocol and conversation instance id. * @@ -77,4 +88,11 @@ java.io.Serializable session) throws IllegalArgumentException, java.io.IOException; + /** + * This method closes the session store. + * + * @throws java.io.IOException Failed to close the session store + */ + public void close() throws java.io.IOException; + } Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java 2011-01-18 14:58:04 UTC (rev 591) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java 2011-01-18 20:11:14 UTC (rev 592) @@ -17,6 +17,7 @@ */ package org.savara.monitor.impl; +import org.savara.common.config.Configuration; import org.savara.monitor.ConversationInstanceId; import org.savara.monitor.ProtocolId; import org.savara.monitor.SessionStore; @@ -27,6 +28,23 @@ private java.util.Map<ProtocolId,java.util.Map<ConversationInstanceId,java.io.Serializable>> m_sessions= new java.util.HashMap<ProtocolId,java.util.Map<ConversationInstanceId, java.io.Serializable>>(); + /** + * This method sets the configuration for use by the session + * store. + * + * @param config The configuration + * @throws IOException Failed to initialize session store + */ + public void initialize(Configuration config) throws java.io.IOException { + } + + /** + * This method adds a new session. + * + * @param pid The protocol id + * @param cid The conversation instance id + * @param session The session + */ protected void addSession(ProtocolId pid, ConversationInstanceId cid, java.io.Serializable session) { java.util.Map<ConversationInstanceId,java.io.Serializable> sessions= m_sessions.get(pid); @@ -158,4 +176,12 @@ sessions.put(cid, session); } + /** + * This method closes the session store. + * + * @throws java.io.IOException Failed to close the session store + */ + public void close() throws java.io.IOException { + } + }

13 years, 8 months

1
0
0 / 0

savara SVN: r591 - in branches/experimental/2.0.x: distribution and 9 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-18 09:58:04 -0500 (Tue, 18 Jan 2011) New Revision: 591 Added: branches/experimental/2.0.x/distribution/src/files/jbossesb/jbossesb-properties-savara.xml branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-client-config-savara.xml branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-endpoint-config-savara.xml branches/experimental/2.0.x/integration/ Removed: branches/experimental/2.0.x/distribution/src/files/jbossesb/jbossesb-properties-validator.xml branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-client-config-validator.xml branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-endpoint-config-validator.xml branches/experimental/2.0.x/validators/ Modified: branches/experimental/2.0.x/distribution/pom.xml branches/experimental/2.0.x/distribution/src/main/assembly/bin.xml branches/experimental/2.0.x/distribution/src/main/assembly/src.xml branches/experimental/2.0.x/distribution/src/main/release/install/build.xml branches/experimental/2.0.x/integration/jboss/common/pom.xml branches/experimental/2.0.x/integration/jboss/esb/pom.xml branches/experimental/2.0.x/integration/jboss/pom.xml branches/experimental/2.0.x/integration/jboss/wsnative/pom.xml branches/experimental/2.0.x/integration/pom.xml branches/experimental/2.0.x/pom.xml Log: Renamed 'validators' folder to 'integration' to reflect that other platform specific integrations may be required, other than just for validators. So this folder should just represent the integration of Savara capabilities into those environments. Modified: branches/experimental/2.0.x/distribution/pom.xml =================================================================== --- branches/experimental/2.0.x/distribution/pom.xml 2011-01-17 23:21:49 UTC (rev 590) +++ branches/experimental/2.0.x/distribution/pom.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -39,22 +39,22 @@ <dependencies> <dependency> - <groupId>org.savara.validators</groupId> - <artifactId>savara-validator-jboss</artifactId> + <groupId>org.savara.integration</groupId> + <artifactId>savara-jboss</artifactId> <version>${pom.version}</version> <classifier>dist</classifier> <type>zip</type> </dependency> <dependency> - <groupId>org.savara.validators</groupId> - <artifactId>savara-validator-jbossesb</artifactId> + <groupId>org.savara.integration</groupId> + <artifactId>savara-jbossesb</artifactId> <version>${pom.version}</version> <classifier>dist</classifier> <type>zip</type> </dependency> <dependency> - <groupId>org.savara.validators</groupId> - <artifactId>savara-validator-jbossws-native</artifactId> + <groupId>org.savara.integration</groupId> + <artifactId>savara-jbossws-native</artifactId> <version>${pom.version}</version> <classifier>dist</classifier> <type>zip</type> Copied: branches/experimental/2.0.x/distribution/src/files/jbossesb/jbossesb-properties-savara.xml (from rev 558, branches/experimental/2.0.x/distribution/src/files/jbossesb/jbossesb-properties-validator.xml) =================================================================== --- branches/experimental/2.0.x/distribution/src/files/jbossesb/jbossesb-properties-savara.xml (rev 0) +++ branches/experimental/2.0.x/distribution/src/files/jbossesb/jbossesb-properties-savara.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<esb + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd"> + <properties name="core"> + <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/> + <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.esb.bind.address}:1099"/> + <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/> + <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/> + <property name="org.jboss.soa.esb.mime.text.types" value="text/*;application/xml;application/*-xml"/> + <property name="jboss.esb.invm.scope.default" value="NONE"/> + </properties> + <properties name="security"> + <property name="org.jboss.soa.esb.services.security.implementationClass" value="org.jboss.internal.soa.esb.services.security.JaasSecurityService"/> + <property name="org.jboss.soa.esb.services.security.callbackHandler" value="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/> + +  + <property name="org.jboss.soa.esb.services.security.sealAlgorithm" value="TripleDES"/> + <property name="org.jboss.soa.esb.services.security.sealKeySize" value="168"/> + +  + <property name="org.jboss.soa.esb.services.security.contextTimeout" value="30000"/> + <property name="org.jboss.soa.esb.services.security.contextPropagatorImplementationClass" value="org.jboss.internal.soa.esb.services.security.JBossASContextPropagator"/> + +  + <property name="org.jboss.soa.esb.services.security.publicKeystore" value="/publicKeyStore"/> + <property name="org.jboss.soa.esb.services.security.publicKeystorePassword" value="testKeystorePassword"/> + <property name="org.jboss.soa.esb.services.security.publicKeyAlias" value="testAlias"/> + <property name="org.jboss.soa.esb.services.security.publicKeyPassword" value="testPassword"/> + <property name="org.jboss.soa.esb.services.security.publicKeyTransformation" value="RSA/ECB/PKCS1Padding"/> + + </properties> + <properties name="registry"> + <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/> + <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/> + <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/> + <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/> + <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/> + <property name="org.jboss.soa.esb.registry.user" value="root"/> + <property name="org.jboss.soa.esb.registry.password" value="root"/> +  + <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/> + <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/> + <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/> + +  + <property name="org.jboss.soa.esb.registry.interceptors" value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor"/> +  + +  + <property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/> + <property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/> + +  + <property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/> + </properties> + <properties name="transports" depends="core"> + <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/> + <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/> + <property name="org.jboss.soa.esb.mail.smtp.password" value=""/> + <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/> + <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/> + <property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/> + <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/> + <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/> + <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/> +  + <property name="org.jboss.soa.esb.invm.expiryTime" value="300000"/> + +  +  + </properties> + <properties name="connection"> + <property name="min-pool-size" value="5"/> + <property name="max-pool-size" value="10"/> + <property name="blocking-timeout-millis" value="5000"/> + <property name="abandoned-connection-timeout" value="10000"/> + <property name="abandoned-connection-time-interval" value="30000"/> + </properties> + <properties name="jca"> + <property name="org.jboss.soa.esb.jca.activation.mapper.jms-ra.rar" value="org.jboss.soa.esb.listeners.jca.JBossActivationMapper"/> + <property name="org.jboss.soa.esb.jca.activation.mapper.wmq.jmsra.rar" value="org.jboss.soa.esb.listeners.jca.WMQActivationMapper"/> + </properties> + + <properties name="dbstore"> + +  +  + <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/> + +  + <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/> + +  + <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/> + <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/> + <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/> + <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/> + <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/> + <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/> + <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/> +  + <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/> + <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/> + + </properties> + <properties name="filters"> + <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/> + <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/> + <property name="org.jboss.soa.esb.filter.10" value="org.savara.validator.jbossesb.JBossESBInterceptor" /> + </properties> + + <properties name="rules"> +  + <property name="org.jboss.soa.esb.services.rules.continueState" value="false"/> + </properties> +</esb> Deleted: branches/experimental/2.0.x/distribution/src/files/jbossesb/jbossesb-properties-validator.xml =================================================================== --- branches/experimental/2.0.x/distribution/src/files/jbossesb/jbossesb-properties-validator.xml 2011-01-17 23:21:49 UTC (rev 590) +++ branches/experimental/2.0.x/distribution/src/files/jbossesb/jbossesb-properties-validator.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -1,153 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<esb - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd"> - <properties name="core"> - <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/> - <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.esb.bind.address}:1099"/> - <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/> - <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/> - <property name="org.jboss.soa.esb.mime.text.types" value="text/*;application/xml;application/*-xml"/> - <property name="jboss.esb.invm.scope.default" value="NONE"/> - </properties> - <properties name="security"> - <property name="org.jboss.soa.esb.services.security.implementationClass" value="org.jboss.internal.soa.esb.services.security.JaasSecurityService"/> - <property name="org.jboss.soa.esb.services.security.callbackHandler" value="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/> - -  - <property name="org.jboss.soa.esb.services.security.sealAlgorithm" value="TripleDES"/> - <property name="org.jboss.soa.esb.services.security.sealKeySize" value="168"/> - -  - <property name="org.jboss.soa.esb.services.security.contextTimeout" value="30000"/> - <property name="org.jboss.soa.esb.services.security.contextPropagatorImplementationClass" value="org.jboss.internal.soa.esb.services.security.JBossASContextPropagator"/> - -  - <property name="org.jboss.soa.esb.services.security.publicKeystore" value="/publicKeyStore"/> - <property name="org.jboss.soa.esb.services.security.publicKeystorePassword" value="testKeystorePassword"/> - <property name="org.jboss.soa.esb.services.security.publicKeyAlias" value="testAlias"/> - <property name="org.jboss.soa.esb.services.security.publicKeyPassword" value="testPassword"/> - <property name="org.jboss.soa.esb.services.security.publicKeyTransformation" value="RSA/ECB/PKCS1Padding"/> - - </properties> - <properties name="registry"> - <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/> - <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/> - <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/> - <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/> - <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/> - <property name="org.jboss.soa.esb.registry.user" value="root"/> - <property name="org.jboss.soa.esb.registry.password" value="root"/> -  - <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/> - <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/> - <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/> - -  - <property name="org.jboss.soa.esb.registry.interceptors" value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor"/> -  - -  - <property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/> - <property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/> - -  - <property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/> - </properties> - <properties name="transports" depends="core"> - <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/> - <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/> - <property name="org.jboss.soa.esb.mail.smtp.password" value=""/> - <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/> - <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/> - <property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/> - <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/> - <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/> - <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/> -  - <property name="org.jboss.soa.esb.invm.expiryTime" value="300000"/> - -  -  - </properties> - <properties name="connection"> - <property name="min-pool-size" value="5"/> - <property name="max-pool-size" value="10"/> - <property name="blocking-timeout-millis" value="5000"/> - <property name="abandoned-connection-timeout" value="10000"/> - <property name="abandoned-connection-time-interval" value="30000"/> - </properties> - <properties name="jca"> - <property name="org.jboss.soa.esb.jca.activation.mapper.jms-ra.rar" value="org.jboss.soa.esb.listeners.jca.JBossActivationMapper"/> - <property name="org.jboss.soa.esb.jca.activation.mapper.wmq.jmsra.rar" value="org.jboss.soa.esb.listeners.jca.WMQActivationMapper"/> - </properties> - - <properties name="dbstore"> - -  -  - <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/> - -  - <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/> - -  - <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/> - <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/> - <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/> - <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/> - <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/> - <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/> - <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/> -  - <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/> - <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/> - - </properties> - <properties name="filters"> - <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/> - <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/> - <property name="org.jboss.soa.esb.filter.10" value="org.savara.validator.jbossesb.JBossESBInterceptor" /> - </properties> - - <properties name="rules"> -  - <property name="org.jboss.soa.esb.services.rules.continueState" value="false"/> - </properties> -</esb> Copied: branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-client-config-savara.xml (from rev 558, branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-client-config-validator.xml) =================================================================== --- branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-client-config-savara.xml (rev 0) +++ branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-client-config-savara.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 schema/jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Standard Client</config-name> + <pre-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>SAVARA JBossWS-Native Service Validator Interceptor</javaee:handler-name> + <javaee:handler-class>org.savara.validator.jbosswsnative.JBossWSNativeClientInterceptor</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </pre-handler-chains> + <feature>http://org.jboss.ws/dispatch/validate</feature> + <property> + <property-name>http://org.jboss.ws/http#chunksize</property-name> + <property-value>2048</property-value> + </property> + </client-config> + + <client-config> + <config-name>HTTP 1.0 Client</config-name> + <feature>http://org.jboss.ws/dispatch/validate</feature> + </client-config> + + <client-config> + <config-name>Standard WSAddressing Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Standard SOAP 1.2 WSAddressing Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + + <client-config> + <config-name>Standard WSSecurity Client</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + +</jaxws-config> Deleted: branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-client-config-validator.xml =================================================================== --- branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-client-config-validator.xml 2011-01-17 23:21:49 UTC (rev 590) +++ branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-client-config-validator.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 schema/jaxws-config_2_0.xsd"> - - <client-config> - <config-name>Standard Client</config-name> - <pre-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>SAVARA JBossWS-Native Service Validator Interceptor</javaee:handler-name> - <javaee:handler-class>org.savara.validator.jbosswsnative.JBossWSNativeClientInterceptor</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </pre-handler-chains> - <feature>http://org.jboss.ws/dispatch/validate</feature> - <property> - <property-name>http://org.jboss.ws/http#chunksize</property-name> - <property-value>2048</property-value> - </property> - </client-config> - - <client-config> - <config-name>HTTP 1.0 Client</config-name> - <feature>http://org.jboss.ws/dispatch/validate</feature> - </client-config> - - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - - <client-config> - <config-name>Standard SOAP 1.2 WSAddressing Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - - <client-config> - <config-name>Standard WSSecurity Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - -</jaxws-config> Copied: branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-endpoint-config-savara.xml (from rev 558, branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-endpoint-config-validator.xml) =================================================================== --- branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-endpoint-config-savara.xml (rev 0) +++ branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-endpoint-config-savara.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 schema/jaxws-config_2_0.xsd"> + + <endpoint-config> + <config-name>Standard Endpoint</config-name> + <pre-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>SAVARA JBossWS-Native Service Validator Interceptor</javaee:handler-name> + <javaee:handler-class>org.savara.validator.jbosswsnative.JBossWSNativeServerInterceptor</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </pre-handler-chains> + </endpoint-config> + +  + <endpoint-config> + <config-name>.NET friendly Endpoint</config-name> + <feature>http://org.jboss.ws/binding/wsdl/dotnet</feature> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSAddressing Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>Standard SOAP 1.2 WSAddressing Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSAddressing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + + <endpoint-config> + <config-name>Standard WSSecurity Endpoint</config-name> + <post-handler-chains> + <javaee:handler-chain> + <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings> + <javaee:handler> + <javaee:handler-name>WSSecurity Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>Recording Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config> Deleted: branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-endpoint-config-validator.xml =================================================================== --- branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-endpoint-config-validator.xml 2011-01-17 23:21:49 UTC (rev 590) +++ branches/experimental/2.0.x/distribution/src/files/jbossws-native/standard-jaxws-endpoint-config-validator.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 schema/jaxws-config_2_0.xsd"> - - <endpoint-config> - <config-name>Standard Endpoint</config-name> - <pre-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>SAVARA JBossWS-Native Service Validator Interceptor</javaee:handler-name> - <javaee:handler-class>org.savara.validator.jbosswsnative.JBossWSNativeServerInterceptor</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </pre-handler-chains> - </endpoint-config> - -  - <endpoint-config> - <config-name>.NET friendly Endpoint</config-name> - <feature>http://org.jboss.ws/binding/wsdl/dotnet</feature> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - - <endpoint-config> - <config-name>Standard SOAP 1.2 WSAddressing Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSSecurity Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurity Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.wsf.framework.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - -</jaxws-config> Modified: branches/experimental/2.0.x/distribution/src/main/assembly/bin.xml =================================================================== --- branches/experimental/2.0.x/distribution/src/main/assembly/bin.xml 2011-01-17 23:21:49 UTC (rev 590) +++ branches/experimental/2.0.x/distribution/src/main/assembly/bin.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -100,9 +100,9 @@ <outputDirectory>modules</outputDirectory> <unpack>true</unpack> <includes> - <include>org.savara.validators:savara-validator-jboss:zip:dist</include> - <include>org.savara.validators:savara-validator-jbossesb:zip:dist</include> - <include>org.savara.validators:savara-validator-jbossws-native:zip:dist</include> + <include>org.savara.integration:savara-jboss:zip:dist</include> + <include>org.savara.integration:savara-jbossesb:zip:dist</include> + <include>org.savara.integration:savara-jbossws-native:zip:dist</include> </includes> </dependencySet> Modified: branches/experimental/2.0.x/distribution/src/main/assembly/src.xml =================================================================== --- branches/experimental/2.0.x/distribution/src/main/assembly/src.xml 2011-01-17 23:21:49 UTC (rev 590) +++ branches/experimental/2.0.x/distribution/src/main/assembly/src.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -58,8 +58,8 @@ </excludes> </fileSet> <fileSet> - <directory>../validators</directory> - <outputDirectory>/validators</outputDirectory> + <directory>../bundles</directory> + <outputDirectory>/bundles</outputDirectory> <excludes> <exclude>**/.project</exclude> <exclude>**/.classpath</exclude> @@ -73,6 +73,21 @@ </excludes> </fileSet> <fileSet> + <directory>../integration</directory> + <outputDirectory>/integration</outputDirectory> + <excludes> + <exclude>**/.project</exclude> + <exclude>**/.classpath</exclude> + <exclude>**/.settings</exclude> + <exclude>**/.settings/**/*</exclude> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + <exclude>**/*.iml</exclude> + <exclude>**/*.ipr</exclude> + <exclude>**/*.iws</exclude> + </excludes> + </fileSet> + <fileSet> <directory>../tools</directory> <outputDirectory>/tools</outputDirectory> <excludes> Modified: branches/experimental/2.0.x/distribution/src/main/release/install/build.xml =================================================================== --- branches/experimental/2.0.x/distribution/src/main/release/install/build.xml 2011-01-17 23:21:49 UTC (rev 590) +++ branches/experimental/2.0.x/distribution/src/main/release/install/build.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -1,4 +1,4 @@ -<project name="SAVARA_Validator_Installer" default="deploy" basedir="."> +<project name="SAVARA_Installer" default="deploy" basedir=".">  <property name="org.jboss.as.deployment.properties" location="deployment.properties"/> @@ -26,31 +26,31 @@ </target> <target name="deploy" depends="check.deploy.props,register-jbossesb-interceptor,register-jbossws-native-interceptor" - description="Deploys SAVARA Validator to the server"> - <echo message="Deploy SAVARA Validators to JBossAS" /> - <copy todir="${deploy.dir}/savara-validator-jboss.sar"> - <fileset dir="${modules}/savara-validator-jboss.sar"/> + description="Deploys SAVARA to the server"> + <echo message="Deploy SAVARA to JBossAS" /> + <copy todir="${deploy.dir}/savara-jboss.sar"> + <fileset dir="${modules}/savara-jboss.sar"/> </copy> - <copy todir="${deploy.dir}/savara-validator-jbossesb.esb"> - <fileset dir="${modules}/savara-validator-jbossesb.esb"/> + <copy todir="${deploy.dir}/savara-jbossesb.esb"> + <fileset dir="${modules}/savara-jbossesb.esb"/> </copy> - <copy todir="${deploy.dir}/savara-validator-jbossws-native.sar"> - <fileset dir="${modules}/savara-validator-jbossws-native.sar"/> + <copy todir="${deploy.dir}/savara-jbossws-native.sar"> + <fileset dir="${modules}/savara-jbossws-native.sar"/> </copy> </target> <target name="undeploy" depends="unregister-jbossesb-interceptor,unregister-jbossws-native-interceptor" - description="Undeploys SAVARA Validator"> - <echo message="Undeploy the SAVARA Validators from JBossAS" /> - <delete dir="${deploy.dir}/savara-validator-jboss.sar" /> - <delete dir="${deploy.dir}/savara-validator-jbossesb.esb" /> - <delete dir="${deploy.dir}/savara-validator-jbossws-native.sar" /> + description="Undeploys SAVARA"> + <echo message="Undeploy the SAVARA from JBossAS" /> + <delete dir="${deploy.dir}/savara-jboss.sar" /> + <delete dir="${deploy.dir}/savara-jbossesb.esb" /> + <delete dir="${deploy.dir}/savara-jbossws-native.sar" /> </target> <target name="register-jbossesb-interceptor"> <echo message="register the jbossesb interceptor" /> <delete file="${deployers.dir}/esb.deployer/jbossesb-properties.xml" /> - <copy file="${modules}/conf/jbossesb/jbossesb-properties-validator.xml" tofile="${deployers.dir}/esb.deployer/jbossesb-properties.xml" /> + <copy file="${modules}/conf/jbossesb/jbossesb-properties-savara.xml" tofile="${deployers.dir}/esb.deployer/jbossesb-properties.xml" /> </target> <target name="unregister-jbossesb-interceptor"> @@ -63,9 +63,9 @@ <echo message="register the jbossws-native interceptor" /> <delete file="${deployers.dir}/jbossws.deployer/META-INF/standard-jaxws-client-config.xml" /> <delete file="${deployers.dir}/jbossws.deployer/META-INF/standard-jaxws-endpoint-config.xml" /> - <copy file="${modules}/conf/jbossws-native/standard-jaxws-client-config-validator.xml" + <copy file="${modules}/conf/jbossws-native/standard-jaxws-client-config-savara.xml" tofile="${deployers.dir}/jbossws.deployer/META-INF/standard-jaxws-client-config.xml" /> - <copy file="${modules}/conf/jbossws-native/standard-jaxws-endpoint-config-validator.xml" + <copy file="${modules}/conf/jbossws-native/standard-jaxws-endpoint-config-savara.xml" tofile="${deployers.dir}/jbossws.deployer/META-INF/standard-jaxws-endpoint-config.xml" /> </target> Copied: branches/experimental/2.0.x/integration (from rev 558, branches/experimental/2.0.x/validators) Modified: branches/experimental/2.0.x/integration/jboss/common/pom.xml =================================================================== --- branches/experimental/2.0.x/validators/jboss/common/pom.xml 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/integration/jboss/common/pom.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -2,14 +2,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.savara.validators</groupId> - <artifactId>savara-validator-jboss</artifactId> + <groupId>org.savara.integration</groupId> + <artifactId>savara-jboss</artifactId> <version>2.0.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>Savara::Validators::JBoss::Common</name> + <name>Savara::Integration::JBoss::Common</name> <parent> - <groupId>org.savara.validators</groupId> + <groupId>org.savara.integration</groupId> <artifactId>jboss</artifactId> <version>2.0.0-SNAPSHOT</version> </parent> @@ -79,7 +79,7 @@ <goal>single</goal> </goals> <configuration> - <finalName>savara-validator-jboss.sar</finalName> + <finalName>savara-jboss.sar</finalName> <appendAssemblyId>true</appendAssemblyId> <descriptors> <descriptor>src/main/configs/common-assembly.xml</descriptor> Modified: branches/experimental/2.0.x/integration/jboss/esb/pom.xml =================================================================== --- branches/experimental/2.0.x/validators/jboss/esb/pom.xml 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/integration/jboss/esb/pom.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -2,22 +2,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.savara.validators</groupId> - <artifactId>savara-validator-jbossesb</artifactId> + <groupId>org.savara.integration</groupId> + <artifactId>savara-jbossesb</artifactId> <version>2.0.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>Savara::Validators::JBoss::ESB</name> + <name>Savara::Integration::JBoss::ESB</name> <parent> - <groupId>org.savara.validators</groupId> + <groupId>org.savara.integration</groupId> <artifactId>jboss</artifactId> <version>2.0.0-SNAPSHOT</version> </parent> <dependencies> <dependency> - <groupId>org.savara.validators</groupId> - <artifactId>savara-validator-jboss</artifactId> + <groupId>org.savara.integration</groupId> + <artifactId>savara-jboss</artifactId> <version>${savara.version}</version> </dependency> <dependency> @@ -53,7 +53,7 @@ <goal>single</goal> </goals> <configuration> - <finalName>savara-validator-jbossesb.esb</finalName> + <finalName>savara-jbossesb.esb</finalName> <appendAssemblyId>true</appendAssemblyId> <descriptors> <descriptor>src/main/configs/esb-assembly.xml</descriptor> Modified: branches/experimental/2.0.x/integration/jboss/pom.xml =================================================================== --- branches/experimental/2.0.x/validators/jboss/pom.xml 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/integration/jboss/pom.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -4,15 +4,15 @@ <modelVersion>4.0.0</modelVersion> - <groupId>org.savara.validators</groupId> + <groupId>org.savara.integration</groupId> <artifactId>jboss</artifactId> <packaging>pom</packaging> - <name>Savara::Validators::JBoss</name> + <name>Savara::Integration::JBoss</name> <version>2.0.0-SNAPSHOT</version> <parent> <groupId>org.savara</groupId> - <artifactId>validators</artifactId> + <artifactId>integration</artifactId> <version>2.0.0-SNAPSHOT</version> </parent> Modified: branches/experimental/2.0.x/integration/jboss/wsnative/pom.xml =================================================================== --- branches/experimental/2.0.x/validators/jboss/wsnative/pom.xml 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/integration/jboss/wsnative/pom.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -2,22 +2,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.savara.validators</groupId> - <artifactId>savara-validator-jbossws-native</artifactId> + <groupId>org.savara.integration</groupId> + <artifactId>savara-jbossws-native</artifactId> <version>2.0.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>Savara::Validators::JBoss::WS-Native</name> + <name>Savara::Integration::JBoss::WS-Native</name> <parent> - <groupId>org.savara.validators</groupId> + <groupId>org.savara.integration</groupId> <artifactId>jboss</artifactId> <version>2.0.0-SNAPSHOT</version> </parent> <dependencies> <dependency> - <groupId>org.savara.validators</groupId> - <artifactId>savara-validator-jboss</artifactId> + <groupId>org.savara.integration</groupId> + <artifactId>savara-jboss</artifactId> <version>${savara.version}</version> </dependency> <dependency> @@ -66,7 +66,7 @@ <goal>single</goal> </goals> <configuration> - <finalName>savara-validator-jbossws-native.sar</finalName> + <finalName>savara-jbossws-native.sar</finalName> <appendAssemblyId>true</appendAssemblyId> <descriptors> <descriptor>src/main/configs/ws-native-assembly.xml</descriptor> Modified: branches/experimental/2.0.x/integration/pom.xml =================================================================== --- branches/experimental/2.0.x/validators/pom.xml 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/integration/pom.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -5,9 +5,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.savara</groupId> - <artifactId>validators</artifactId> + <artifactId>integration</artifactId> <packaging>pom</packaging> - <name>Savara::Validators</name> + <name>Savara::Integration</name> <version>2.0.0-SNAPSHOT</version> <parent> Modified: branches/experimental/2.0.x/pom.xml =================================================================== --- branches/experimental/2.0.x/pom.xml 2011-01-17 23:21:49 UTC (rev 590) +++ branches/experimental/2.0.x/pom.xml 2011-01-18 14:58:04 UTC (rev 591) @@ -53,8 +53,8 @@ </properties> <modules> - <module>validators</module> <module>bundles</module> + <module>integration</module> <module>docs</module> <module>distribution</module> </modules>

13 years, 8 months

1
0
0 / 0

savara SVN: r590 - in branches/experimental/2.0.x/bundles/org.savara.monitor/src: test/java/org/savara/monitor/impl and 1 other directory.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-17 18:21:49 -0500 (Mon, 17 Jan 2011) New Revision: 590 Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryProtocolRepository.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java Log: Added some tests for the monitor. Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-17 21:04:43 UTC (rev 589) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/DefaultMonitor.java 2011-01-17 23:21:49 UTC (rev 590) @@ -102,6 +102,48 @@ public boolean sent(ProtocolId pid, ConversationInstanceId cid, Message mesg) throws ProtocolUnknownException, java.io.IOException { + return(processMessage(pid, cid, mesg, true)); + } + + /** + * This method is used to indicate that a message has been + * received and should be monitored against the configured + * behaviour. + * + * If the conversation instance id is not explicitly + * specified, then the protocol monitor will be responsible + * for deriving the appropriate value. + * + * @param pid The protocol id + * @param cid The optional conversation instance id + * @param mesg The message + * @return Whether the message was valid + * @throws ProtocolUnknownException Unknown protocol name or role + * @throws IOException Failed to create or retrieve session + */ + public boolean received(ProtocolId pid, ConversationInstanceId cid, Message mesg) + throws ProtocolUnknownException, + java.io.IOException { + return(processMessage(pid, cid, mesg, false)); + } + + /** + * This method is used to process a message against a protocol monitor. + * + * If the conversation instance id is not explicitly + * specified, then the protocol monitor will be responsible + * for deriving the appropriate value. + * + * @param pid The protocol id + * @param cid The optional conversation instance id + * @param mesg The message + * @param sent Whether to process the message as a sent message + * @return Whether the message was valid + * @throws ProtocolUnknownException Unknown protocol name or role + * @throws IOException Failed to create or retrieve session + */ + protected boolean processMessage(ProtocolId pid, ConversationInstanceId cid, Message mesg, boolean sent) + throws ProtocolUnknownException, java.io.IOException { boolean ret=false; if (pid == null) { @@ -128,11 +170,11 @@ if (session == null) { session = m_sessionStore.create(pid, cid); - + // Try to create new session if (session instanceof Session) { m_monitor.initialize(context, desc, (Session)session); - + if (m_monitorListener != null) { m_monitorListener.sessionStarted(pid, cid); } @@ -148,12 +190,12 @@ if (m_monitorListener != null) { m_monitorListener.messageSent(pid, cid, mesg, result); } - + if (((Session)session).isFinished()) { if (m_monitorListener != null) { m_monitorListener.sessionFinished(pid, cid); } - + m_sessionStore.remove(pid, cid); } else { m_sessionStore.update(pid, cid, session); @@ -162,41 +204,7 @@ throw new java.io.IOException("Inappropriate session type returned"); } - // Should instance id be derived from message, or supplied - // with message? If simulating, then identity should be - // fixed. - - // Protocol name and role needs to be distinguished when - // storing session, as a single conversation, with a - // particular business id, may be monitored against - // multiple protocols/roles - - - return(ret); } - /** - * This method is used to indicate that a message has been - * received and should be monitored against the configured - * behaviour. - * - * If the conversation instance id is not explicitly - * specified, then the protocol monitor will be responsible - * for deriving the appropriate value. - * - * @param pid The protocol id - * @param cid The optional conversation instance id - * @param mesg The message - * @return Whether the message was valid - * @throws ProtocolUnknownException Unknown protocol name or role - * @throws IOException Failed to create or retrieve session - */ - public boolean received(ProtocolId pid, ConversationInstanceId cid, Message mesg) - throws ProtocolUnknownException, - java.io.IOException { - boolean ret=false; - - return(ret); - } } Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryProtocolRepository.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryProtocolRepository.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemoryProtocolRepository.java 2011-01-17 23:21:49 UTC (rev 590) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.monitor.impl; + +import org.savara.monitor.ProtocolId; +import org.savara.monitor.ProtocolRepository; +import org.savara.monitor.ProtocolUnknownException; +import org.scribble.protocol.monitor.model.Description; + +/** + * This is the in-memory implementation of the protocol repository. + * + */ +public class InMemoryProtocolRepository implements ProtocolRepository { + + private java.util.Map<ProtocolId,Description> m_descriptions= + new java.util.HashMap<ProtocolId,Description>(); + + public InMemoryProtocolRepository() { + } + + public void addProtocol(ProtocolId pid, Description desc) { + m_descriptions.put(pid, desc); + } + + public Description getProtocol(ProtocolId pid) throws ProtocolUnknownException { + if (m_descriptions.containsKey(pid) == false) { + throw new ProtocolUnknownException("Protocol '"+pid+"' not known"); + } + + return(m_descriptions.get(pid)); + } +} Modified: branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java 2011-01-17 21:04:43 UTC (rev 589) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/main/java/org/savara/monitor/impl/InMemorySessionStore.java 2011-01-17 23:21:49 UTC (rev 590) @@ -27,6 +27,21 @@ private java.util.Map<ProtocolId,java.util.Map<ConversationInstanceId,java.io.Serializable>> m_sessions= new java.util.HashMap<ProtocolId,java.util.Map<ConversationInstanceId, java.io.Serializable>>(); + protected void addSession(ProtocolId pid, ConversationInstanceId cid, java.io.Serializable session) { + java.util.Map<ConversationInstanceId,java.io.Serializable> sessions= + m_sessions.get(pid); + + if (sessions == null) { + sessions = new java.util.HashMap<ConversationInstanceId,java.io.Serializable>(); + m_sessions.put(pid, sessions); + + } else if (sessions.containsKey(cid)) { + throw new IllegalArgumentException("Conversation instance id already in use"); + } + + sessions.put(cid, session); + } + /** * This method returns a new session associated with * the supplied protocol and conversation instance id. @@ -45,20 +60,9 @@ throw new IllegalArgumentException("Conversation instance id not specified"); } - java.util.Map<ConversationInstanceId,java.io.Serializable> sessions= - m_sessions.get(pid); - - if (sessions == null) { - sessions = new java.util.HashMap<ConversationInstanceId,java.io.Serializable>(); - m_sessions.put(pid, sessions); - - } else if (sessions.containsKey(cid)) { - throw new IllegalArgumentException("Conversation instance id already in use"); - } - java.io.Serializable ret=new DefaultSession(); - sessions.put(cid, ret); + addSession(pid, cid, ret); return(ret); } Added: branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.monitor/src/test/java/org/savara/monitor/impl/DefaultMonitorTest.java 2011-01-17 23:21:49 UTC (rev 590) @@ -0,0 +1,237 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.monitor.impl; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.savara.monitor.ConversationInstanceId; +import org.savara.monitor.Message; +import org.savara.monitor.MonitorListener; +import org.savara.monitor.ProtocolId; +import org.scribble.protocol.monitor.DefaultSession; +import org.scribble.protocol.monitor.ProtocolMonitorFactory; +import org.scribble.protocol.monitor.Result; +import org.scribble.protocol.monitor.Session; +import org.scribble.protocol.monitor.model.Description; + +public class DefaultMonitorTest { + + @Test + public void testNoProtocolRepository() { + DefaultMonitor mon=new DefaultMonitor(); + + DefaultMessage mesg=new DefaultMessage(); + + ProtocolId pid=new ProtocolId("name", "role"); + + ConversationInstanceId cid=new ConversationInstanceId("cid"); + + mon.setProtocolMonitor(ProtocolMonitorFactory.createProtocolMonitor()); + mon.setSessionStore(new InMemorySessionStore()); + + try { + mon.processMessage(pid, cid, mesg, true); + fail("Should have generated illegal state exception"); + } catch(IllegalStateException ise) { + // Expected + } catch(Exception e) { + fail("Unexpected: "+e); + } + } + + @Test + public void testNoSessionStore() { + DefaultMonitor mon=new DefaultMonitor(); + + DefaultMessage mesg=new DefaultMessage(); + + ProtocolId pid=new ProtocolId("name", "role"); + + ConversationInstanceId cid=new ConversationInstanceId("cid"); + + mon.setProtocolMonitor(ProtocolMonitorFactory.createProtocolMonitor()); + + InMemoryProtocolRepository rep=new InMemoryProtocolRepository(); + mon.setProtocolRepository(rep); + + try { + mon.processMessage(pid, cid, mesg, true); + fail("Should have generated illegal state exception"); + } catch(IllegalStateException ise) { + // Expected + } catch(Exception e) { + fail("Unexpected: "+e); + } + } + + @Test + public void testProcessMessage() { + DefaultMonitor mon=new DefaultMonitor(); + + DefaultMessage mesg=new DefaultMessage(); + + ProtocolId pid=new ProtocolId("name", "role"); + + ConversationInstanceId cid=new ConversationInstanceId("cid"); + + mon.setProtocolMonitor(ProtocolMonitorFactory.createProtocolMonitor()); + + InMemoryProtocolRepository rep=new InMemoryProtocolRepository(); + rep.addProtocol(pid, new Description()); + mon.setProtocolRepository(rep); + + InMemorySessionStore store=new InMemorySessionStore(); + mon.setSessionStore(store); + + try { + mon.processMessage(pid, cid, mesg, true); + } catch(Exception e) { + fail("Unexpected: "+e); + } + } + + @Test + public void testProcessMessageWithExistingSession() { + DefaultMonitor mon=new DefaultMonitor(); + + DefaultMessage mesg=new DefaultMessage(); + + ProtocolId pid=new ProtocolId("name", "role"); + + ConversationInstanceId cid=new ConversationInstanceId("cid"); + + mon.setProtocolMonitor(ProtocolMonitorFactory.createProtocolMonitor()); + + InMemoryProtocolRepository rep=new InMemoryProtocolRepository(); + rep.addProtocol(pid, new Description()); + mon.setProtocolRepository(rep); + + InMemorySessionStore store=new InMemorySessionStore(); + + DefaultSession s1=new DefaultSession(); + + try { + store.create(pid, cid); + store.update(pid, cid, s1); + } catch(Exception e) { + fail("Failed: "+e); + } + + mon.setSessionStore(store); + + try { + mon.processMessage(pid, cid, mesg, true); + } catch(Exception e) { + fail("Unexpected: "+e); + } + } + + @Test + public void testSingleMessageSession() { + DefaultMonitor mon=new DefaultMonitor(); + + DefaultMessage mesg=new DefaultMessage(); + + ProtocolId pid=new ProtocolId("name", "role"); + + ConversationInstanceId cid=new ConversationInstanceId("cid"); + + mon.setProtocolMonitor(ProtocolMonitorFactory.createProtocolMonitor()); + + InMemoryProtocolRepository rep=new InMemoryProtocolRepository(); + rep.addProtocol(pid, new Description()); + mon.setProtocolRepository(rep); + + InMemorySessionStore store=new InMemorySessionStore() { + public java.io.Serializable create(ProtocolId pid, ConversationInstanceId cid) + throws IllegalArgumentException, java.io.IOException { + + DefaultSession s1=new DefaultSession() { + public boolean isFinished() { + return(true); + } + }; + + addSession(pid, cid, s1); + + return(s1); + } + }; + + TestMonitorListener tl=new TestMonitorListener(); + + mon.setMonitorListener(tl); + + mon.setSessionStore(store); + + try { + mon.processMessage(pid, cid, mesg, true); + } catch(Exception e) { + fail("Unexpected: "+e); + } + + if (tl.hasSessionStarted(pid) == false) { + fail("Session not started"); + } + + if (tl.hasSessionFinished(pid) == false) { + fail("Session not finished"); + } + } + + public class TestMonitorListener implements MonitorListener { + + private java.util.List<ProtocolId> m_started=new java.util.Vector<ProtocolId>(); + private java.util.List<ProtocolId> m_finished=new java.util.Vector<ProtocolId>(); + + public boolean hasSessionStarted(ProtocolId pid) { + return(m_started.contains(pid)); + } + + @Override + public void sessionStarted(ProtocolId pid, ConversationInstanceId cid) { + m_started.add(pid); + } + + public boolean hasSessionFinished(ProtocolId pid) { + return(m_finished.contains(pid)); + } + + @Override + public void sessionFinished(ProtocolId pid, ConversationInstanceId cid) { + m_finished.add(pid); + } + + @Override + public void messageSent(ProtocolId pid, ConversationInstanceId cid, + Message mesg, Result result) { + // TODO Auto-generated method stub + + } + + @Override + public void messageReceived(ProtocolId pid, ConversationInstanceId cid, + Message mesg, Result result) { + // TODO Auto-generated method stub + + } + + } +} +

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

savara-commits January 2011