August 2010 - savara-commits - Jboss List Archives

savara SVN: r355 - trunk/tools/plugins/org.jboss.savara.tools.bpmn.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-08-17 09:59:36 -0400 (Tue, 17 Aug 2010) New Revision: 355 Modified: trunk/tools/plugins/org.jboss.savara.tools.bpmn/ Log: Ignore classes. Property changes on: trunk/tools/plugins/org.jboss.savara.tools.bpmn ___________________________________________________________________ Name: svn:ignore + bin

15 years, 8 months

1
0
0 / 0

Build failed in Hudson: savara #19

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/savara/19/changes> Changes: [objectiser] SAVARA-117 - needed to update bundled version of pi4soa jars. ------------------------------------------ [...truncated 1580 lines...] [INFO] ------------------------------------------------------------------------ [INFO] Building Savara::Docs::UserGuide 1.1.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.4:clean (default-clean) @ userguide --- [INFO] Deleting <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:resources (default-resources) @ userguide --- [INFO] Expanding: <http://hudson.qa.jboss.com/hudson/job/savara/ws/m2-repository/org/jboss/j...> into <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:generate (default-generate) @ userguide --- [INFO] Processing en-US -> pdf redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...]> [INFO] creating FOP user-config DOM [INFO] Processing en-US -> html redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...]> [INFO] Processing en-US -> html_single redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...]> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:bundle (default-bundle) @ userguide --- [INFO] Building jar: <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:resources (generate-docbook) @ userguide --- [INFO] Expanding: <http://hudson.qa.jboss.com/hudson/job/savara/ws/m2-repository/org/jboss/j...> into <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:generate (generate-docbook) @ userguide --- [INFO] Processing en-US -> pdf redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...]> [INFO] Processing en-US -> html redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...]> [INFO] Processing en-US -> html_single redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...]> [INFO] [INFO] >>> maven-source-plugin:2.1.2:jar (attach-sources) @ userguide >>> [INFO] [INFO] <<< maven-source-plugin:2.1.2:jar (attach-sources) @ userguide <<< [INFO] [INFO] --- maven-source-plugin:2.1.2:jar (attach-sources) @ userguide --- [INFO] No sources in project. Archive not created. [INFO] [INFO] --- maven-install-plugin:2.3.1:install (default-install) @ userguide --- [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/userguide/ta...> to <http://hudson.qa.jboss.com/hudson/job/savara/ws/m2-repository/org/jboss/s...> [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Savara::Docs::GettingStartedGuide 1.1.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.4:clean (default-clean) @ gettingstartedguide --- [INFO] Deleting <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:resources (default-resources) @ gettingstartedguide --- [INFO] Expanding: <http://hudson.qa.jboss.com/hudson/job/savara/ws/m2-repository/org/jboss/j...> into <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:generate (default-generate) @ gettingstartedguide --- [INFO] Processing en-US -> pdf redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...]> [INFO] Processing en-US -> html redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...]> [INFO] Processing en-US -> html_single redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...]> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:bundle (default-bundle) @ gettingstartedguide --- [INFO] Building jar: <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:resources (generate-docbook) @ gettingstartedguide --- [INFO] Expanding: <http://hudson.qa.jboss.com/hudson/job/savara/ws/m2-repository/org/jboss/j...> into <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:generate (generate-docbook) @ gettingstartedguide --- [INFO] Processing en-US -> pdf redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...]> [INFO] Processing en-US -> html redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...]> [INFO] Processing en-US -> html_single redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...]> [INFO] [INFO] >>> maven-source-plugin:2.1.2:jar (attach-sources) @ gettingstartedguide >>> [INFO] [INFO] <<< maven-source-plugin:2.1.2:jar (attach-sources) @ gettingstartedguide <<< [INFO] [INFO] --- maven-source-plugin:2.1.2:jar (attach-sources) @ gettingstartedguide --- [INFO] No sources in project. Archive not created. [INFO] [INFO] --- maven-install-plugin:2.3.1:install (default-install) @ gettingstartedguide --- [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/gettingstart...> to <http://hudson.qa.jboss.com/hudson/job/savara/ws/m2-repository/org/jboss/s...> [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Savara::Docs::SamplesGuide 1.1.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.4:clean (default-clean) @ samplesguide --- [INFO] Deleting <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/samplesguide...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:resources (default-resources) @ samplesguide --- [INFO] Expanding: <http://hudson.qa.jboss.com/hudson/job/savara/ws/m2-repository/org/jboss/j...> into <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/samplesguide...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:generate (default-generate) @ samplesguide --- [INFO] Processing en-US -> pdf redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/samplesguide...]> [INFO] Processing en-US -> html redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/samplesguide...]> [INFO] Processing en-US -> html_single redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/samplesguide...]> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:bundle (default-bundle) @ samplesguide --- [INFO] Building jar: <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/samplesguide...> [INFO] [INFO] --- maven-jdocbook-plugin:2.2.3:resources (generate-docbook) @ samplesguide --- [INFO] Expanding: <http://hudson.qa.jboss.com/hudson/job/savara/ws/m2-repository/org/jboss/j...> into <http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/samplesguide...> [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/savara/ws/sources/docs/samplesguide...]> [INFO] Processing en-US -> html redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/samplesguide...]> [INFO] Processing en-US -> html_single redirecting output to file [<http://hudson.qa.jboss.com/hudson/job/savara/ws/sources/docs/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] [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/savara/ws/sources/docs/samplesguide...> to <http://hudson.qa.jboss.com/hudson/job/savara/ws/m2-repository/org/jboss/s...> [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Skipping Savara::Distribution [INFO] This project has been banned from the build due to previous failures. [INFO] ------------------------------------------------------------------------ [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Savara ............................................ SUCCESS [1.060s] [INFO] Savara::Validators ................................ SUCCESS [0.042s] [INFO] Savara::Validators::JBossESB ...................... FAILURE [26.870s] [INFO] Savara::Tools ..................................... SUCCESS [0.352s] [INFO] Savara::Tools::Plugins ............................ SUCCESS [0.044s] [INFO] Savara::Tools::Plugins::ScribbleCore .............. SUCCESS [47.232s] [INFO] Savara::Tools::Plugins::ContractModel ............. SUCCESS [3.141s] [INFO] Savara::Tools::Plugins::ScribbleConversationModel . SUCCESS [3.510s] [INFO] Savara::Tools::Plugins::ScribbleConversationParser SUCCESS [3.348s] [INFO] Savara::Tools::Plugins::ScribbleExpressionXPath ... SUCCESS [3.606s] [INFO] Savara::Tools::Plugins::ScribbleEclipse ........... SUCCESS [4.348s] [INFO] Savara::Tools::Plugins::Pi4SOACDM ................. SUCCESS [4.100s] [INFO] Savara::Tools::Plugins::ProtocolContract .......... SUCCESS [3.433s] [INFO] Savara::Tools::Plugins::ScribbleLangModel ......... SUCCESS [2.711s] [INFO] Savara::Tools::Plugins::ToolsWSDL ................. SUCCESS [3.293s] [INFO] Savara::Tools::Plugins::ToolsBPEL ................. SUCCESS [6.980s] [INFO] Savara::Tools::Plugins::ToolsValidator ............ SUCCESS [3.665s] [INFO] Savara::Tools::Plugins::Pi4SOABPMN ................ SUCCESS [4.039s] [INFO] Savara::Tools::Plugins::Pi4SOAMonitor ............. SUCCESS [7.478s] [INFO] Savara::Tools::Plugins::ScribbleConformance ....... SUCCESS [5.362s] [INFO] Savara::Tools::Plugins::ScribbleConversationComparator SUCCESS [3.984s] [INFO] Savara::Tools::Plugins::ScribbleConversationEclipse SUCCESS [3.889s] [INFO] Savara::Tools::Plugins::ScribbleConversationExportText SUCCESS [3.291s] [INFO] Savara::Tools::Plugins::ScribbleConversationProjector SUCCESS [3.935s] [INFO] Savara::Tools::Plugins::ScribbleConversationValidation SUCCESS [2.842s] [INFO] Savara::Tools::Plugins::ScribbleLangComparator .... SUCCESS [2.549s] [INFO] Savara::Tools::Features ........................... SUCCESS [0.052s] [INFO] Savara::Tools::Features::SavaraTools .............. SUCCESS [2.160s] [INFO] Savara::Tools::Tests .............................. SUCCESS [0.045s] [INFO] Savara::Tools::Tests::ProtocolContract ............ SUCCESS [59.099s] [INFO] Savara::Tools::Tests::ToolsWSDL ................... SUCCESS [42.705s] [INFO] Savara::Tools::Site ............................... SUCCESS [11.039s] [INFO] Savara::Docs ...................................... SUCCESS [0.092s] [INFO] Savara::Docs::UserGuide ........................... SUCCESS [1:04.041s] [INFO] Savara::Docs::GettingStartedGuide ................. SUCCESS [49.995s] [INFO] Savara::Docs::SamplesGuide ........................ SUCCESS [38.863s] [INFO] Savara::Distribution .............................. SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 10:04.617s [INFO] Finished at: Tue Jul 27 10:35:42 EDT 2010 [INFO] Final Memory: 173M/495M [INFO] ------------------------------------------------------------------------ [WARNING] The requested profile "jboss-nexus" could not be activated because it does not exist. [ERROR] Failed to execute goal on project savara-validator-jbossesb: Missing: ---------- 1) org.jboss.savara.dependencies.pi4soa:pi4soa-cdl:jar:3.1.0.M1 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.jboss.savara.dependencies.pi4soa -DartifactId=pi4soa-cdl -Dversion=3.1.0.M1 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.jboss.savara.dependencies.pi4soa -DartifactId=pi4soa-cdl -Dversion=3.1.0.M1 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.jboss.savara.validators:savara-validator-jbossesb:pom:1.1.0-SNAPSHOT 2) org.jboss.savara.dependencies.pi4soa:pi4soa-cdl:jar:3.1.0.M1 2) org.jboss.savara.dependencies.pi4soa:pi4soa-common:jar:3.1.0.M1 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.jboss.savara.dependencies.pi4soa -DartifactId=pi4soa-common -Dversion=3.1.0.M1 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.jboss.savara.dependencies.pi4soa -DartifactId=pi4soa-common -Dversion=3.1.0.M1 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.jboss.savara.validators:savara-validator-jbossesb:pom:1.1.0-SNAPSHOT 2) org.jboss.savara.dependencies.pi4soa:pi4soa-common:jar:3.1.0.M1 3) org.jboss.savara.dependencies.pi4soa:pi4soa-service:jar:3.1.0.M1 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.jboss.savara.dependencies.pi4soa -DartifactId=pi4soa-service -Dversion=3.1.0.M1 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.jboss.savara.dependencies.pi4soa -DartifactId=pi4soa-service -Dversion=3.1.0.M1 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.jboss.savara.validators:savara-validator-jbossesb:pom:1.1.0-SNAPSHOT 2) org.jboss.savara.dependencies.pi4soa:pi4soa-service:jar:3.1.0.M1 ---------- 3 required artifacts are missing. for artifact: org.jboss.savara.validators:savara-validator-jbossesb:pom:1.1.0-SNAPSHOT from the specified remote repositories: jboss-deprecated (https://repository.jboss.org/nexus/content/repositories/deprecated/, releases=true, snapshots=false), jboss-developer-repository-group (https://repository.jboss.org/nexus/content/groups/developer/, releases=true, snapshots=true), jboss-public-repository-group (https://repository.jboss.org/nexus/content/groups/public/, releases=true, snapshots=true), central (http://repo1.maven.org/maven2, releases=true, snapshots=false) -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MultipleArtifactsNotFoun... [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :savara-validator-jbossesb Terminating xvnc. [savara] $ vncserver -kill :15 Killing Xvnc process ID 15680 Archiving artifacts Recording test results

15 years, 8 months

1
6
0 / 0

savara SVN: r354 - in trunk: tools and 1 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-08-17 05:01:36 -0400 (Tue, 17 Aug 2010) New Revision: 354 Modified: trunk/pom.xml trunk/tools/pom.xml trunk/validators/jbossesb/pom.xml Log: Updated build versions and removed unnecessary dependencies. Also commented out distribution management sections as there are no artifacts that should be published at present. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-17 08:43:21 UTC (rev 353) +++ trunk/pom.xml 2010-08-17 09:01:36 UTC (rev 354) @@ -41,7 +41,7 @@ <savara.version>1.1.0-SNAPSHOT</savara.version> <pi4soa.version>3.1.0-SNAPSHOT</pi4soa.version> <junit.version>4.4</junit.version> - <rosetta.version>4.5</rosetta.version> + <rosetta.version>4.7</rosetta.version> <log4j.version>1.2.14</log4j.version> <mvel.version>1.3.4-java1.5</mvel.version> </properties> @@ -112,33 +112,6 @@ </plugins> </build> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId> - <artifactId>jbossesb-rosetta</artifactId> - <version>${rosetta.version}</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> - <groupId>org.mvel</groupId> - <artifactId>mvel</artifactId> - <version>${mvel.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <reporting> <plugins> <plugin> @@ -175,6 +148,7 @@ </repository> </repositories> +  + </project> Modified: trunk/tools/pom.xml =================================================================== --- trunk/tools/pom.xml 2010-08-17 08:43:21 UTC (rev 353) +++ trunk/tools/pom.xml 2010-08-17 09:01:36 UTC (rev 354) @@ -22,6 +22,7 @@ <module>site</module> </modules> + + <repositories> <repository> <id>pi4soa</id> Modified: trunk/validators/jbossesb/pom.xml =================================================================== --- trunk/validators/jbossesb/pom.xml 2010-08-17 08:43:21 UTC (rev 353) +++ trunk/validators/jbossesb/pom.xml 2010-08-17 09:01:36 UTC (rev 354) @@ -18,16 +18,19 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <version>${log4j.version}</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.overlord.dependencies.org.jboss.esb</groupId> + <groupId>org.jboss.savara.dependencies.esb</groupId> <artifactId>jbossesb-rosetta</artifactId> + <version>${rosetta.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency>

15 years, 8 months

1
0
0 / 0

savara SVN: r353 - in trunk: tools/features/org.jboss.savara.tools.feature and 1 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-08-17 04:43:21 -0400 (Tue, 17 Aug 2010) New Revision: 353 Modified: trunk/pom.xml trunk/tools/features/org.jboss.savara.tools.feature/feature.xml trunk/validators/jbossesb/pom.xml Log: Updated to use newly published pi4soa snapshot. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-16 17:53:31 UTC (rev 352) +++ trunk/pom.xml 2010-08-17 08:43:21 UTC (rev 353) @@ -36,6 +36,16 @@ <timezone>+1</timezone> </developer> </developers> + + <properties> + <savara.version>1.1.0-SNAPSHOT</savara.version> + <pi4soa.version>3.1.0-SNAPSHOT</pi4soa.version> + <junit.version>4.4</junit.version> + <rosetta.version>4.5</rosetta.version> + <log4j.version>1.2.14</log4j.version> + <mvel.version>1.3.4-java1.5</mvel.version> + </properties> + <modules> <module>validators</module> <module>tools</module> @@ -102,14 +112,6 @@ </plugins> </build> - <properties> - <savara-version>1.1.0-SNAPSHOT</savara-version> - <junit.version>4.4</junit.version> - <rosetta.version>4.5</rosetta.version> - <log4j.version>1.2.14</log4j.version> - <mvel.version>1.3.4-java1.5</mvel.version> - </properties> - <dependencyManagement> <dependencies> <dependency> Modified: trunk/tools/features/org.jboss.savara.tools.feature/feature.xml =================================================================== --- trunk/tools/features/org.jboss.savara.tools.feature/feature.xml 2010-08-16 17:53:31 UTC (rev 352) +++ trunk/tools/features/org.jboss.savara.tools.feature/feature.xml 2010-08-17 08:43:21 UTC (rev 353) @@ -219,14 +219,14 @@ unpack="false"/> <plugin - id="org.pi4soa.bpmn" + id="org.jboss.savara.tools.bpmn" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.pi4soa.monitor" + id="org.jboss.savara.tools.monitor" download-size="0" install-size="0" version="0.0.0" Modified: trunk/validators/jbossesb/pom.xml =================================================================== --- trunk/validators/jbossesb/pom.xml 2010-08-16 17:53:31 UTC (rev 352) +++ trunk/validators/jbossesb/pom.xml 2010-08-17 08:43:21 UTC (rev 353) @@ -31,24 +31,19 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.tools</groupId> + <groupId>org.pi4soa</groupId> <artifactId>org.pi4soa.common</artifactId> - <version>3.1.0</version> -  + <version>${pi4soa.version}</version> </dependency> <dependency> - <groupId>org.jboss.tools</groupId> + <groupId>org.pi4soa</groupId> <artifactId>org.pi4soa.cdl</artifactId> - <version>3.1.0</version> - <type>eclipse-plugin</type> -  + <version>${pi4soa.version}</version> </dependency> <dependency> - <groupId>org.jboss.tools</groupId> + <groupId>org.pi4soa</groupId> <artifactId>org.pi4soa.service</artifactId> - <version>3.1.0.v20100727-0348-H31-M1</version> - <type>eclipse-plugin</type> -  + <version>${pi4soa.version}</version> </dependency> <dependency>

15 years, 8 months

1
0
0 / 0

savara SVN: r352 - in trunk/tools/plugins: org.jboss.savara.tools.bpmn and 4 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-08-16 13:53:31 -0400 (Mon, 16 Aug 2010) New Revision: 352 Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/pom.xml trunk/tools/plugins/org.jboss.savara.tools.monitor/pom.xml trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/PreferenceInitializer.java Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/TxnMonitor.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferencePage.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferences.java trunk/tools/plugins/pom.xml Log: SAVARA-119 - added preference configuration for JNDI and JMS properties. No longer require Java project or pi4soa.xml within the user project. Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/pom.xml (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/pom.xml 2010-08-16 17:53:31 UTC (rev 352) @@ -0,0 +1,16 @@ +<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.jboss.savara.tools</groupId> + <artifactId>org.jboss.savara.tools.bpmn</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + <name>Savara::Tools::Plugins::ToolsBPMN</name> + + <parent> + <groupId>org.jboss.savara.tools</groupId> + <artifactId>plugins</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + +</project> Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml 2010-08-16 15:23:43 UTC (rev 351) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml 2010-08-16 17:53:31 UTC (rev 352) @@ -55,4 +55,10 @@ </page> </extension> + <extension + point="org.eclipse.core.runtime.preferences"> + <initializer + class="org.jboss.savara.tools.monitor.preferences.PreferenceInitializer"> + </initializer> + </extension> </plugin> Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/pom.xml (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/pom.xml 2010-08-16 17:53:31 UTC (rev 352) @@ -0,0 +1,16 @@ +<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.jboss.savara.tools</groupId> + <artifactId>org.jboss.savara.tools.monitor</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + <name>Savara::Tools::Plugins::ToolsMonitor</name> + + <parent> + <groupId>org.jboss.savara.tools</groupId> + <artifactId>plugins</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + +</project> Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/TxnMonitor.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/TxnMonitor.java 2010-08-16 15:23:43 UTC (rev 351) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/TxnMonitor.java 2010-08-16 17:53:31 UTC (rev 352) @@ -55,6 +55,28 @@ // Obtain service tracker client m_trackerClient = new JMSServiceTrackerClient(); + // Check if system properties have been provided for JNDI + if (System.getProperty("java.naming.factory.initial") != null) { + m_trackerClient.setJNDIInitialContextFactory(System.getProperty("java.naming.factory.initial")); + } + + if (System.getProperty("java.naming.provider.url") != null) { + m_trackerClient.setJNDIProviderURL(System.getProperty("java.naming.provider.url")); + } + + if (System.getProperty("java.naming.factory.url.pkgs") != null) { + m_trackerClient.setJNDIFactoryURLPackages(System.getProperty("java.naming.factory.url.pkgs")); + } + + if (System.getProperty("java.messaging.factory") != null) { + m_trackerClient.setJMSConnectionFactory(System.getProperty("java.messaging.factory")); + } + + if (System.getProperty("java.messaging.destination") != null) { + m_trackerClient.setJMSDestination(System.getProperty("java.messaging.destination")); + } + + // Add correlator as listener to the tracker m_trackerClient.addServiceTrackerListener(m_correlator); //System.err.println(""); @@ -311,7 +333,7 @@ private static TxnMonitor m_instance=null; private ServiceCorrelator m_correlator=null; - private ServiceTrackerClient m_trackerClient=null; + private JMSServiceTrackerClient m_trackerClient=null; private java.util.Hashtable m_eventLists=new java.util.Hashtable(); private java.util.Vector m_listeners=new java.util.Vector(); private String m_cdlFile = null; Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java 2010-08-16 15:23:43 UTC (rev 351) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java 2010-08-16 17:53:31 UTC (rev 352) @@ -130,6 +130,19 @@ logger.fine("Launching monitor with args: "+pgmArgs); String vmArgs = getVMArguments(configuration); + + vmArgs += " -Djava.naming.factory.initial="+MonitorPreferences.getJNDIFactoryInitial(); + vmArgs += " -Djava.naming.provider.url="+MonitorPreferences.getJNDIProviderURL(); + + String pkgs=MonitorPreferences.getJNDIFactoryInitial(); + + if (pkgs != null && pkgs.trim().length() > 0) { + vmArgs += " -Djava.naming.factory.url.pkgs="+MonitorPreferences.getJNDIFactoryURLPackages(); + } + + vmArgs += " -Djava.messaging.factory="+MonitorPreferences.getJMSFactory(); + vmArgs += " -Djava.messaging.destination="+MonitorPreferences.getJMSDestination(); + ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs); // VM-specific attributes Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferencePage.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferencePage.java 2010-08-16 15:23:43 UTC (rev 351) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferencePage.java 2010-08-16 17:53:31 UTC (rev 352) @@ -57,6 +57,17 @@ addField(new PathEditor( MonitorPreferences.MONITOR_LIBRARIES, "&Library Paths", "Library paths required to monitor target platform", getFieldEditorParent())); + + addField(new StringFieldEditor(MonitorPreferences.JNDI_FACTORY_INITIAL, + "JNDI Initial Context Factory", getFieldEditorParent())); + addField(new StringFieldEditor(MonitorPreferences.JNDI_PROVIDER_URL, + "JNDI Provider URL", getFieldEditorParent())); + addField(new StringFieldEditor(MonitorPreferences.JNDI_FACTORY_URL_PKGS, + "JNDI Factory URL Packages", getFieldEditorParent())); + addField(new StringFieldEditor(MonitorPreferences.JMS_FACTORY, + "JMS Connection Factory", getFieldEditorParent())); + addField(new StringFieldEditor(MonitorPreferences.JMS_DESTINATION, + "JMS Destination", getFieldEditorParent())); } /* (non-Javadoc) Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferences.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferences.java 2010-08-16 15:23:43 UTC (rev 351) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferences.java 2010-08-16 17:53:31 UTC (rev 352) @@ -26,6 +26,11 @@ public class MonitorPreferences { public static final String MONITOR_LIBRARIES="savara.monitor.libraries"; + public static final String JNDI_FACTORY_INITIAL="savara.monitor.jndi.factory.initial"; + public static final String JNDI_PROVIDER_URL="savara.monitor.jndi.provider.url"; + public static final String JNDI_FACTORY_URL_PKGS="savara.monitor.jndi.factory.url.pkgs"; + public static final String JMS_FACTORY="savara.monitor.jms.factory"; + public static final String JMS_DESTINATION="savara.monitor.jms.destination"; public static String getLibraryPaths() { IPreferenceStore prefs= @@ -48,4 +53,40 @@ return(ret); } + + public static String getJNDIFactoryInitial() { + IPreferenceStore prefs= + org.jboss.savara.tools.monitor.eclipse.Activator.getDefault().getPreferenceStore(); + + return(prefs.getString(JNDI_FACTORY_INITIAL)); + } + + + public static String getJNDIProviderURL() { + IPreferenceStore prefs= + org.jboss.savara.tools.monitor.eclipse.Activator.getDefault().getPreferenceStore(); + + return(prefs.getString(JNDI_PROVIDER_URL)); + } + + public static String getJNDIFactoryURLPackages() { + IPreferenceStore prefs= + org.jboss.savara.tools.monitor.eclipse.Activator.getDefault().getPreferenceStore(); + + return(prefs.getString(JNDI_FACTORY_URL_PKGS)); + } + + public static String getJMSFactory() { + IPreferenceStore prefs= + org.jboss.savara.tools.monitor.eclipse.Activator.getDefault().getPreferenceStore(); + + return(prefs.getString(JMS_FACTORY)); + } + + public static String getJMSDestination() { + IPreferenceStore prefs= + org.jboss.savara.tools.monitor.eclipse.Activator.getDefault().getPreferenceStore(); + + return(prefs.getString(JMS_DESTINATION)); + } } Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/PreferenceInitializer.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/PreferenceInitializer.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/PreferenceInitializer.java 2010-08-16 17:53:31 UTC (rev 352) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY 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 along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.savara.tools.monitor.preferences; + +import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; +import org.eclipse.jface.preference.IPreferenceStore; + +/** + * Class used to initialize default preference values. + */ +public class PreferenceInitializer extends AbstractPreferenceInitializer { + + /* + * (non-Javadoc) + * + * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() + */ + public void initializeDefaultPreferences() { + IPreferenceStore store = org.jboss.savara.tools.monitor.eclipse.Activator.getDefault().getPreferenceStore(); + store.setDefault(MonitorPreferences.JNDI_FACTORY_INITIAL, "org.jnp.interfaces.NamingContextFactory"); + store.setDefault(MonitorPreferences.JNDI_PROVIDER_URL, "jnp://localhost:1099"); + store.setDefault(MonitorPreferences.JNDI_FACTORY_URL_PKGS, "org.jboss.naming:org.jnp.interfaces"); + store.setDefault(MonitorPreferences.JMS_FACTORY, "ConnectionFactory"); + store.setDefault(MonitorPreferences.JMS_DESTINATION, "topic/tracker"); + } + +} Modified: trunk/tools/plugins/pom.xml =================================================================== --- trunk/tools/plugins/pom.xml 2010-08-16 15:23:43 UTC (rev 351) +++ trunk/tools/plugins/pom.xml 2010-08-16 17:53:31 UTC (rev 352) @@ -21,8 +21,8 @@ <module>org.jboss.savara.tools.bpel</module> <module>org.jboss.savara.tools.validator</module> <module>org.jboss.savara.tools.wsdl</module> - <module>org.pi4soa.bpmn</module> - <module>org.pi4soa.monitor</module> + <module>org.jboss.savara.tools.bpmn</module> + <module>org.jboss.savara.tools.monitor</module> <module>org.scribble.conformance</module> <module>org.scribble.conversation.comparator</module> <module>org.scribble.conversation.eclipse</module>

15 years, 8 months

1
0
0 / 0

savara SVN: r351 - in trunk/tools/plugins: org.jboss.savara.tools.monitor and 6 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-08-16 11:23:43 -0400 (Mon, 16 Aug 2010) New Revision: 351 Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferencePage.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferences.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/preferences/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/preferences/SavaraPreferencePage.java Removed: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/ Modified: trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tools.monitor/ trunk/tools/plugins/org.jboss.savara.tools.monitor/.classpath trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tools.monitor/build.properties trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorAction.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java Log: SAVARA-119 - enable the user to setup the library path to use for JMS libraries. Allows flexibility in terms of JMS provider and version. Modified: trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF 2010-08-16 10:29:56 UTC (rev 350) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF 2010-08-16 15:23:43 UTC (rev 351) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Tools BPMN Plug-in Bundle-SymbolicName: org.jboss.savara.tools.bpmn;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.jboss.savara.tools.bpmn.eclipse.Activator Bundle-Vendor: www.jboss.org Bundle-Localization: plugin Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor ___________________________________________________________________ Name: svn:ignore + classes Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/.classpath =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/.classpath 2010-08-16 10:29:56 UTC (rev 350) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/.classpath 2010-08-16 15:23:43 UTC (rev 351) @@ -1,17 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/java"/> - <classpathentry exported="true" kind="lib" path="lib/log4j.jar"/> - <classpathentry exported="true" kind="lib" path="lib/trove.jar"/> - <classpathentry kind="lib" path="lib/jboss-serialization.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="lib" path="lib/jboss-client.jar"/> - <classpathentry kind="lib" path="lib/jboss-javaee.jar"/> - <classpathentry kind="lib" path="lib/jnp-client.jar"/> - <classpathentry kind="lib" path="lib/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="lib/jboss-messaging-client.jar"/> - <classpathentry kind="lib" path="lib/jboss-aop-client.jar"/> - <classpathentry kind="lib" path="lib/jboss-mdr.jar"/> <classpathentry kind="output" path="classes"/> </classpath> Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF 2010-08-16 10:29:56 UTC (rev 350) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF 2010-08-16 15:23:43 UTC (rev 351) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Tools Monitor Plug-in Bundle-SymbolicName: org.jboss.savara.tools.monitor;singleton:=true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.jboss.savara.tools.monitor.eclipse.Activator Bundle-Vendor: www.jboss.org Require-Bundle: org.eclipse.ui, @@ -21,21 +21,10 @@ org.eclipse.ui, org.eclipse.jdt.core, org.eclipse.emf.ecore, - org.pi4soa.common + org.pi4soa.common, + org.eclipse.wst.server.core, + org.eclipse.jst.server.core, + org.eclipse.jst.server.generic.core Eclipse-LazyStart: true -Bundle-ClassPath: ., - lib/concurrent.jar, - lib/javassist.jar, - lib/jboss-aop-client.jar, - lib/jboss-client.jar, - lib/jboss-common-core.jar, - lib/jboss-javaee.jar, - lib/jboss-logging-spi.jar, - lib/jboss-mdr.jar, - lib/jboss-messaging-client.jar, - lib/jboss-remoting.jar, - lib/jnp-client.jar, - lib/log4j.jar, - lib/trove.jar, - lib/jboss-serialization.jar +Bundle-ClassPath: . Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/build.properties =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/build.properties 2010-08-16 10:29:56 UTC (rev 350) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/build.properties 2010-08-16 15:23:43 UTC (rev 351) @@ -3,27 +3,11 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ - LICENSE.txt,\ - lib/,\ - lib/concurrent.jar,\ - lib/javassist.jar,\ - lib/jboss-aop-client.jar,\ - lib/jboss-client.jar,\ - lib/jboss-common-core.jar,\ - lib/jboss-javaee.jar,\ - lib/jboss-logging-spi.jar,\ - lib/jboss-mdr.jar,\ - lib/jboss-messaging-client.jar,\ - lib/jboss-remoting.jar,\ - lib/jnp-client.jar,\ - lib/log4j.jar,\ - lib/trove.jar,\ - lib/jboss-serialization.jar + LICENSE.txt src.includes = .classpath,\ .project,\ LICENSE.txt,\ META-INF/,\ build.properties,\ plugin.xml,\ - src/,\ - lib/ + src/ Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml 2010-08-16 10:29:56 UTC (rev 350) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml 2010-08-16 15:23:43 UTC (rev 351) @@ -39,5 +39,20 @@ </action> </objectContribution> </extension> - + + <extension + point="org.eclipse.ui.preferencePages"> + <page + class="org.jboss.savara.tools.preferences.SavaraPreferencePage" + id="org.jboss.savara.tools.preferences.SavaraPreferencePage" + name="Savara"> + </page> + <page + category="org.jboss.savara.tools.preferences.SavaraPreferencePage" + class="org.jboss.savara.tools.monitor.preferences.MonitorPreferencePage" + id="org.jboss.savara.tools.monitor.preferences.MonitorPreferencePage" + name="Monitor"> + </page> + </extension> + </plugin> Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorAction.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorAction.java 2010-08-16 10:29:56 UTC (rev 350) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorAction.java 2010-08-16 15:23:43 UTC (rev 351) @@ -36,6 +36,7 @@ import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.Launch; import org.eclipse.debug.core.DebugPlugin; +import org.jboss.savara.tools.monitor.preferences.MonitorPreferences; /** * This class invokes the monitor action on the selected @@ -44,6 +45,7 @@ */ public class MonitorAction implements IObjectActionDelegate { + private static final String SET_LIBRARY_PATHS = "Need to set library paths. See Window->Preferences->Savara->Monitor."; /** * This method implements the action's run method. * @@ -60,8 +62,12 @@ // with the resource if (ResourceUtil.hasErrors(res) == false) { - launch(res.getProject().getName(), + if (MonitorPreferences.isLibraryPathsDefined()) { + launch(res.getProject().getName(), res.getProjectRelativePath().toString()); + } else { + error(SET_LIBRARY_PATHS); + } } else { error(ERRORS_NO_TEST); Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java 2010-08-16 10:29:56 UTC (rev 350) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java 2010-08-16 15:23:43 UTC (rev 351) @@ -45,8 +45,13 @@ import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; import org.eclipse.jdt.launching.IVMInstall; import org.eclipse.jdt.launching.IVMRunner; +import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.jdt.launching.VMRunnerConfiguration; +import org.eclipse.jst.server.core.internal.GenericRuntime; +import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime; import org.eclipse.osgi.util.ManifestElement; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.ServerCore; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; import org.pi4soa.common.eclipse.BundleUtil; @@ -55,6 +60,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.Path; +import org.jboss.savara.tools.monitor.preferences.MonitorPreferences; /** * This class is responsible for launching a monitor against @@ -81,6 +87,7 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException { + if (monitor == null) { monitor = new NullProgressMonitor(); } @@ -337,6 +344,7 @@ } catch(Exception e) { // TODO: report error + //e.printStackTrace(); } buildClassPath("org.jboss.savara.tools.monitor", classpathEntries); @@ -349,6 +357,25 @@ buildClassPath("org.apache.xalan", classpathEntries); buildClassPath("org.apache.xml.serializer", classpathEntries); + // Access library paths to include all found jars + String paths=MonitorPreferences.getLibraryPaths(); + + java.util.StringTokenizer st=new java.util.StringTokenizer(paths, ":"); + + while (st.hasMoreTokens()) { + String libpath=st.nextToken(); + + java.io.File f=new java.io.File(libpath); + java.io.File[] childFiles=f.listFiles(); + + for (int i=0; i < childFiles.length; i++) { + if (childFiles[i].isFile() && childFiles[i].getName().endsWith(".jar")) { + classpathEntries.add(childFiles[i].getAbsolutePath()); + } + } + } + + // Return entries as an array ret = new String[classpathEntries.size()]; classpathEntries.copyInto(ret); Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferencePage.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferencePage.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferencePage.java 2010-08-16 15:23:43 UTC (rev 351) @@ -0,0 +1,68 @@ +/* + * Copyright 2005-10 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 30 March 2010 : Initial version created by gary + */ +package org.jboss.savara.tools.monitor.preferences; + +import org.eclipse.jface.preference.*; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.eclipse.ui.IWorkbench; + +/** + * This class represents a preference page that + * is contributed to the Preferences dialog. By + * subclassing <samp>FieldEditorPreferencePage</samp>, we + * can use the field support built into JFace that allows + * us to create a page that is small and knows how to + * save, restore and apply itself. + * <p> + * This page is used to modify preferences only. They + * are stored in the preference store that belongs to + * the main plug-in class. That way, preferences can + * be accessed directly via the preference store. + */ + +public class MonitorPreferencePage + extends FieldEditorPreferencePage + implements IWorkbenchPreferencePage { + + public MonitorPreferencePage() { + super(GRID); + setPreferenceStore(org.jboss.savara.tools.monitor.eclipse.Activator.getDefault().getPreferenceStore()); + setDescription("Preferences for the SAVARA Choreography Monitor"); + } + + /** + * Creates the field editors. Field editors are abstractions of + * the common GUI blocks needed to manipulate various types + * of preferences. Each field editor knows how to save and + * restore itself. + */ + public void createFieldEditors() { + addField(new PathEditor( + MonitorPreferences.MONITOR_LIBRARIES, + "&Library Paths", "Library paths required to monitor target platform", getFieldEditorParent())); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + public void init(IWorkbench workbench) { + } + +} \ No newline at end of file Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferences.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferences.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/preferences/MonitorPreferences.java 2010-08-16 15:23:43 UTC (rev 351) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY 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 along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.savara.tools.monitor.preferences; + +import org.eclipse.jface.preference.IPreferenceStore; + +public class MonitorPreferences { + + public static final String MONITOR_LIBRARIES="savara.monitor.libraries"; + + public static String getLibraryPaths() { + IPreferenceStore prefs= + org.jboss.savara.tools.monitor.eclipse.Activator.getDefault().getPreferenceStore(); + + return(prefs.getString(MONITOR_LIBRARIES)); + } + + public static boolean isLibraryPathsDefined() { + boolean ret=false; + + IPreferenceStore prefs= + org.jboss.savara.tools.monitor.eclipse.Activator.getDefault().getPreferenceStore(); + + String paths=prefs.getString(MONITOR_LIBRARIES); + + if (paths != null && paths.length() > 0) { + ret = true; + } + + return(ret); + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/preferences/SavaraPreferencePage.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/preferences/SavaraPreferencePage.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/preferences/SavaraPreferencePage.java 2010-08-16 15:23:43 UTC (rev 351) @@ -0,0 +1,64 @@ +/* + * Copyright 2005-10 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 30 March 2010 : Initial version created by gary + */ +package org.jboss.savara.tools.preferences; + +import org.eclipse.jface.preference.*; +import org.eclipse.ui.IWorkbenchPreferencePage; +import org.eclipse.ui.IWorkbench; + +/** + * This class represents a preference page that + * is contributed to the Preferences dialog. By + * subclassing <samp>FieldEditorPreferencePage</samp>, we + * can use the field support built into JFace that allows + * us to create a page that is small and knows how to + * save, restore and apply itself. + * <p> + * This page is used to modify preferences only. They + * are stored in the preference store that belongs to + * the main plug-in class. That way, preferences can + * be accessed directly via the preference store. + */ + +public class SavaraPreferencePage + extends FieldEditorPreferencePage + implements IWorkbenchPreferencePage { + + public SavaraPreferencePage() { + super(GRID); + setDescription("SAVARA Preferences"); + } + + /** + * Creates the field editors. Field editors are abstractions of + * the common GUI blocks needed to manipulate various types + * of preferences. Each field editor knows how to save and + * restore itself. + */ + public void createFieldEditors() { + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + public void init(IWorkbench workbench) { + } + +} \ No newline at end of file

15 years, 8 months

1
0
0 / 0

savara SVN: r350 - in trunk/tools/plugins: org.jboss.savara.tools.bpmn and 27 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-08-16 06:29:56 -0400 (Mon, 16 Aug 2010) New Revision: 350 Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/.classpath trunk/tools/plugins/org.jboss.savara.tools.bpmn/.project trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tools.bpmn/build.properties trunk/tools/plugins/org.jboss.savara.tools.bpmn/plugin.xml trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/Activator.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/ExportBPMNWizard.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/FolderSelectionPage.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNConfiguration.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNGenerationException.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNGenerator.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNModelFactory.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNNotationFactory.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/DefaultBPMNConfiguration.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/AbstractBPMNActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNDiagram.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNPool.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ChoiceActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ConditionalActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/JunctionActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ParallelActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/PerformActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ReceiveActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/SequenceActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/SimpleActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/WhenActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/WhileActivity.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/gmf/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/gmf/GMFBPMNNotationFactoryImpl.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/stp/ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/stp/STPBPMNModelFactoryImpl.java trunk/tools/plugins/org.jboss.savara.tools.monitor/ trunk/tools/plugins/org.jboss.savara.tools.monitor/.classpath trunk/tools/plugins/org.jboss.savara.tools.monitor/.project trunk/tools/plugins/org.jboss.savara.tools.monitor/LICENSE.txt trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/ trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tools.monitor/build.properties trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/ trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/concurrent.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/javassist.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-aop-client.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-client.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-common-core.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-javaee.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-logging-spi.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-mdr.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-messaging-client.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-remoting.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-serialization.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jnp-client.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/log4j.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/trove.jar trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml trunk/tools/plugins/org.jboss.savara.tools.monitor/src/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/CorrelationManagerListener.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ExchangeEvent.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/TxnMonitor.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/Activator.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorAction.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLaunchConfigurationConstants.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorMainTab.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorTabGroup.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ChannelJPanel.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ExchangeEventWrapper.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ExchangeEventsData.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/Monitor.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorExchangeEvent.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorFileFilter.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorMainPanel.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorMenuBar.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorTreeModelListener.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/SpringUtilities.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/XmlPrettyPrinter.java trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelclosed.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelempty.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelleaf.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelopen.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/errorsleaf.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/issuesclosed.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/issuesempty.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/issuesopen.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/monitor.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnclosed.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnempty.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnleaf.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnopen.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/unexpectedleaf.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/warningsleaf.png trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/table/ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/table/TableSorter.java Log: Refactored pi4soa BPMN and monitor plugins to be consistently named as Savara tools. Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/.classpath =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/.classpath (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/.classpath 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/.project =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/.project (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/.project 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.savara.tools.bpmn</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: trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,18 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: JBoss SAVARA Tools BPMN Plug-in +Bundle-SymbolicName: org.jboss.savara.tools.bpmn;singleton:=true +Bundle-Version: 3.0.0.qualifier +Bundle-Activator: org.jboss.savara.tools.bpmn.eclipse.Activator +Bundle-Vendor: www.jboss.org +Bundle-Localization: plugin +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.pi4soa.service, + org.pi4soa.cdl, + org.eclipse.stp.bpmn, + org.eclipse.gmf.runtime.notation, + org.eclipse.core.resources, + org.pi4soa.common +Eclipse-LazyStart: true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/build.properties =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/build.properties (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/build.properties 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,5 @@ +source.. = src/java/ +output.. = classes/ +bin.includes = META-INF/,\ + .,\ + plugin.xml Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/plugin.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/plugin.xml (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/plugin.xml 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.2"?> +<plugin> + <extension + point="org.eclipse.ui.exportWizards"> + <wizard + class="org.jboss.savara.tools.bpmn.eclipse.ExportBPMNWizard" + name="BPMN" + id="org.jboss.savara.tools.bpmn.exportbpmnwizard"/> + </extension> + +</plugin> Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/Activator.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/Activator.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/Activator.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,50 @@ +package org.jboss.savara.tools.bpmn.eclipse; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.savara.tools.bpmn"; + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/ExportBPMNWizard.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/ExportBPMNWizard.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/ExportBPMNWizard.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,150 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Feb 1, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.eclipse; + +import java.io.File; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.pi4soa.cdl.CDLDefinitions; +import org.pi4soa.cdl.ParticipantType; +import org.pi4soa.common.resource.FileSystemArtifactManager; +import org.pi4soa.common.resource.eclipse.ResourceUtil; +import org.pi4soa.service.ServiceDefinitions; +import org.pi4soa.service.behavior.ServiceDescription; +import org.pi4soa.service.behavior.projection.BehaviorProjection; + +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.IExportWizard; +import org.eclipse.ui.IWorkbench; +import org.eclipse.core.resources.*; +import org.jboss.savara.tools.bpmn.generation.BPMNGenerator; +import org.jboss.savara.tools.bpmn.generation.DefaultBPMNConfiguration; + + +/** + * This class implements the Eclipse ExportWizrd for exporting + * a CDL object model to a BPMN representation. + */ +public class ExportBPMNWizard extends Wizard implements IExportWizard { + + /** + * This method is invoked when the 'finish' button is + * pressed on the export wizard. + */ + public boolean performFinish() { + boolean ret=true; + + // Export CDL's service endpoint projections to folder + if (m_cdlFile != null) { + + // Load the CDL object model + try { + org.pi4soa.cdl.Package cdlpack= + org.pi4soa.cdl.eclipse.Activator.getPackage(m_cdlFile); + + BPMNGenerator generator=new BPMNGenerator(); + + generator.generate(cdlpack, null, + m_selectionPage.getFolderName(), + new DefaultBPMNConfiguration()); + + } catch(Exception e) { + + // Record error message on wizard page + m_selectionPage.setErrorMessage("Failed to export Choreography to BPMN: "+e); + + logger.log(Level.SEVERE, + "Failed to export Choreography to BPMN", e); + ret = false; + } + } + + return(ret); + } + + /** + * This method is used to initialize the export wizard. + * + * @param workbench The workbench + * @param selection The selected item(s) + */ + public void init(IWorkbench workbench, IStructuredSelection selection) { + String errMesg=null; + + // Create the selection page + m_selectionPage = new FolderSelectionPage(PAGE_NAME, + "Select a folder as the destination for "+ + "the exported BPMN"); + + // Check that a single CDL file has been selected + if (selection != null) { + + // Check element is a file + if (selection.getFirstElement() instanceof IFile) { + + m_cdlFile = (IFile)selection.getFirstElement(); + + // Check the file extension is valid + if (m_cdlFile.getFileExtension().equals( + CDLDefinitions.CDL_FILE_EXTENSION)) { + + // Make sure there are no markers associated + // with the resource + if (ResourceUtil.hasErrors(m_cdlFile)) { + errMesg = RESOURCE_ERROR; + } + } else { + errMesg = RESOURCE_NOT_CDL_ERROR; + } + } else { + errMesg = RESOURCE_NOT_FILE_ERROR; + } + } else { + errMesg = RESOURCE_NOT_SELECTED_ERROR; + } + + // Check if an error should be reported + if (errMesg != null) { + m_selectionPage.setErrorMessage(errMesg); + } + } + + /** + * This method configures the pages associated with + * the CDL export wizard. + */ + public void addPages() { + addPage(m_selectionPage); + } + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.bpmn.eclipse"); + private IFile m_cdlFile=null; + private FolderSelectionPage m_selectionPage=null; + + private static final String BEHAVIOR_EXTENSION = ServiceDefinitions.SERVICE_ENDPOINT_FILE_EXTENSION; + + private static String PAGE_NAME="Export BPMN"; + private static String RESOURCE_NOT_SELECTED_ERROR="A resource has not been selected"; + private static String RESOURCE_NOT_FILE_ERROR="The selected resource is not a file"; + private static String RESOURCE_NOT_CDL_ERROR="The selected file is not a valid CDL object model"; + private static String RESOURCE_ERROR="Invalid CDL cannot be exported as BPMN"; +} \ No newline at end of file Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/FolderSelectionPage.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/FolderSelectionPage.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/eclipse/FolderSelectionPage.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,169 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Feb 1, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.eclipse; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.DirectoryDialog; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; + +/** + * This class represents the wizard page for selecting + * a folder. + */ +class FolderSelectionPage extends org.eclipse.jface.wizard.WizardPage { + + /** + * Constructor for the folder selection page. + * + * @param pageName The page name + * @param description The description + */ + public FolderSelectionPage(String pageName, + String description) { + super(pageName); + setTitle(pageName); + setDescription(description); + setPageComplete(false); + } + + /** + * Create the control for the selection page. + * + * @param parent The parent component + */ + public void createControl(Composite parent) { + + // Identify the shell + m_shell = parent.getShell(); + + // Create the composite component + Composite composite = new Composite(parent, SWT.NONE); + composite.setLayout(new GridLayout()); + composite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_VERTICAL | GridData.VERTICAL_ALIGN_FILL)); + + // Create the text field for entering the + // path to the folder + m_text = new Text(composite, SWT.SINGLE | SWT.BORDER); + m_text.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL)); + + // Ensure there is no error before setting up the + // text listener + if (getErrorMessage() == null) { + m_text.addModifyListener(new ModifyListener() { + + public void modifyText(ModifyEvent e) { + String errMesg=null; + + try { + // Setup file associated with entered + // name + java.io.File file= + new java.io.File(m_text.getText()); + + // Check that the folder exists + if (file.exists() == false) { + errMesg = "The folder does not exist"; + } else if (file.isDirectory() == false) { + errMesg = "A folder should be selected"; + } + } catch(Exception e2) { + // Ignore + } + + // Check if error has been found + if (errMesg != null) { + setErrorMessage(errMesg); + setPageComplete(false); + } else { + setErrorMessage(null); + setPageComplete(true); + } + } + }); + } + + // Create a 'browse' button + m_button=new Button(composite, 0); + + m_button.setText("Browse"); + m_button.setToolTipText("Browse file system to locate destination folder"); + + m_button.addSelectionListener(new org.eclipse.swt.events.SelectionListener() { + public void widgetSelected(SelectionEvent evt) { + DirectoryDialog dialog=new DirectoryDialog(m_shell); + + String filename=dialog.open(); + + if (filename != null) { + + filename = preProcessFilename(filename); + m_text.setText(filename); + } + } + + public void widgetDefaultSelected(SelectionEvent evt) { + } + }); + + if (getErrorMessage() != null) { + m_button.setEnabled(false); + m_text.setEnabled(false); + m_text.setEditable(false); + } + + setControl(composite); + } + + /** + * This method preprocesses the filename before it is + * used. + * + * @param filename The original filename + * @return The pre-processed filename + */ + protected String preProcessFilename(String filename) { + return(filename); + } + + /** + * This method returns the folder path that has been + * entered by the user. + * + * @return The folder name + */ + public String getFolderName() { + if (m_text == null) { + return(null); + } + return(m_text.getText()); + } + + private Text m_text=null; + private Shell m_shell=null; + private Button m_button=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNConfiguration.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNConfiguration.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNConfiguration.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,39 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation; + +/** + * This interface represents the configuration information used + * by the BPMN projection to determine what model components and + * features should be included. + * + */ +public interface BPMNConfiguration { + + /** + * This method returns the UML export format to be used. The list + * of valid export formats is available using the + * #UMLGenerator.getExportFormats() method. + * + * @return The export format, or null if the default is being used. + */ + public String getExportFormat(); + +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNGenerationException.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNGenerationException.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNGenerationException.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,50 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation; + +/** + * This class represents a BPMN generation exception. + * + */ +public class BPMNGenerationException extends Exception { + + private static final long serialVersionUID = -8580109779260853013L; + + /** + * This constructor initializes the UML generation exception + * with a message. + * + * @param mesg The message + */ + public BPMNGenerationException(String mesg) { + super(mesg); + } + + /** + * This constructor initializes the UML generation exception + * with a message and associated exception. + * + * @param mesg The message + * @param t The associated exception + */ + public BPMNGenerationException(String mesg, Throwable t) { + super(mesg, t); + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNGenerator.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNGenerator.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNGenerator.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,945 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation; + +import java.util.logging.Logger; + +import org.jboss.savara.tools.bpmn.generation.components.*; +import org.pi4soa.cdl.CDLManager; +import org.pi4soa.service.behavior.ActivityType; +import org.pi4soa.service.behavior.Assign; +import org.pi4soa.service.behavior.AtomicUnit; +import org.pi4soa.service.behavior.BehaviorDescription; +import org.pi4soa.service.behavior.BehaviorVisitor; +import org.pi4soa.service.behavior.Choice; +import org.pi4soa.service.behavior.CompletionHandler; +import org.pi4soa.service.behavior.Conditional; +import org.pi4soa.service.behavior.ExceptionHandler; +import org.pi4soa.service.behavior.Finalize; +import org.pi4soa.service.behavior.Parallel; +import org.pi4soa.service.behavior.Perform; +import org.pi4soa.service.behavior.RaiseException; +import org.pi4soa.service.behavior.Receive; +import org.pi4soa.service.behavior.RepetitionType; +import org.pi4soa.service.behavior.Send; +import org.pi4soa.service.behavior.Sequence; +import org.pi4soa.service.behavior.ServiceDescription; +import org.pi4soa.service.behavior.StructuralType; +import org.pi4soa.service.behavior.TimedUnit; +import org.pi4soa.service.behavior.Unobservable; +import org.pi4soa.service.behavior.VariableDeclaration; +import org.pi4soa.service.behavior.When; +import org.pi4soa.service.behavior.While; +import org.pi4soa.service.behavior.projection.BehaviorProjection; +import org.pi4soa.service.session.internal.LookaheadElement; +import org.pi4soa.service.session.internal.Predicate; + +/** + * This class provides the functionality for converting a + * choreography description into a BPMN representation. + * + */ +public class BPMNGenerator { + + public static void main(String[] args) { + + // Check for optional parameters + int pos=0; + int num=args.length; + String[] participant=null; + + for (; pos < num && args[pos].charAt(0) == '-'; pos++) { + String option=args[pos].substring(1); + if (option.equals("p")) { + if (participant != null) { + System.err.println("Cannot specify participant more than once"); + System.exit(1); + } else if (pos+1 >= num) { + System.err.println("Participant not defined"); + System.exit(1); + } else { + pos++; + participant = new String[]{args[pos]}; + } + } else { + System.err.println("Unknown option "+args[pos]); + System.err.println(USAGE_MESSAGE); + System.exit(1); + } + } + + // Check parameters + if (num - pos != 2) { + System.err.println(USAGE_MESSAGE); + System.exit(1); + } + + String choreographyFile=args[pos]; + String outputFolder=args[pos+1]; + org.pi4soa.cdl.Package choreography=null; + + // Load the choreography + try { + choreography = CDLManager.load(choreographyFile); + + } catch(Exception e) { + System.err.println("Failed to load choreography: "+e); + e.printStackTrace(); + System.exit(1); + } + + try { + BPMNGenerator generator=new BPMNGenerator(); + + generator.generate(choreography, participant, outputFolder, + new DefaultBPMNConfiguration()); + + } catch(Exception e) { + System.err.println("Failed to generate UML: "+e); + e.printStackTrace(); + System.exit(3); + } + } + + /** + * This is the constructor for the UML generator. + * + */ + public BPMNGenerator() { + } + + /** + * This method generates the UML representation for the + * supplied choreography. If the optional participant + * is specified, then only the UML representation for + * that participant will be generated, otherwise all + * participants associated with the choreography will be + * generated. + * + * @param choreography The choreography + * @param participants The optional participant names + * @param folder The folder where the model/diagrams will + * be stored + * @param config The UML configuration + * @exception BPMNGenerationException Failed to generate + */ + public void generate(org.pi4soa.cdl.Package choreography, + String[] participants, String folder, + BPMNConfiguration config) throws BPMNGenerationException { + + if (participants == null) { + java.util.List pTypes= + choreography.getTypeDefinitions().getParticipantTypes(); + + participants = new String[pTypes.size()]; + + for (int i=0; i < pTypes.size(); i++) { + participants[i] = ((org.pi4soa.cdl.ParticipantType)pTypes. + get(i)).getName(); + } + } + + // Create the model + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model=null; + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation=null; + + try { + model = new org.jboss.savara.tools.bpmn.generation.stp.STPBPMNModelFactoryImpl(); + notation = new org.jboss.savara.tools.bpmn.generation.gmf.GMFBPMNNotationFactoryImpl(); + + generateModel(model, notation, choreography, config, folder); + + } catch(Exception e) { + throw new BPMNGenerationException("Failed to generate UML model", e); + } + + /* + if (diagrams.size() > 0) { + Object diagram=diagrams.get(0); + + try { + + // Output the UML2 model to the supplied stream + final org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl xmi = + new org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl(); + xmi.getContents().add(diagram); + + xmi.doSave(ostream, xmi.getDefaultLoadOptions()); + + ostream.close(); + + } catch(Exception e) { + throw new BPMNGenerationException("Failed to convert to XMI", e); + } + } + */ + // Just need to store as EMF based file + /* + try { + java.io.ByteArrayOutputStream bs=new java.io.ByteArrayOutputStream(); + + // Output the UML2 model to the supplied stream + final org.eclipse.emf.ecore.xmi.impl.EMOFResourceImpl xmi = + new org.eclipse.emf.ecore.xmi.impl.EMOFResourceImpl(); + xmi.getContents().add(model); + + xmi.doSave(bs, xmi.getDefaultLoadOptions()); + + bs.close(); + + UMLExportFormatter formatter=getExportFormatter(config.getExportFormat()); + if (formatter != null) { + formatter.export(bs, ostream); + } else { + throw new UMLException("Unable to find UML export formatter for '"+ + config.getExportFormat()+"'"); + } + + } catch(UMLException UMLex) { + throw UMLex; + + } catch(Exception e) { + throw new UMLException("Failed to convert to XMI", e); + } + */ + } + + /** + * This method generates the model information associated + * with the supplied choreography description. + * + * @param model The model + * @param cdlpack The choreography description + * @param config The MDA configuration + * @return The list of diagrams + * @throws BPMNGenerationException Failed to generate model + */ + public void generateModel(BPMNModelFactory model, + BPMNNotationFactory notation, org.pi4soa.cdl.Package cdlpack, + BPMNConfiguration config, String folder) throws BPMNGenerationException { + try { + java.util.List participants=cdlpack.getTypeDefinitions().getParticipantTypes(); + + BPMNModelVisitor visitor= + new BPMNModelVisitor(org.pi4soa.common.xml.XMLUtils.getLocalname( + cdlpack.getName()), + model, notation, folder); + + for (int i=0; i < participants.size(); i++) { + org.pi4soa.cdl.ParticipantType partType= + (org.pi4soa.cdl.ParticipantType) + cdlpack.getTypeDefinitions().getParticipantTypes().get(i); + + org.pi4soa.service.behavior.ServiceDescription sdesc= + BehaviorProjection.projectServiceDescription(cdlpack, + partType, null); + + visitor.setParticipant(partType.getName()); + + sdesc.visit(visitor); + } + + visitor.completeModels(); + + } catch(Exception e) { + throw new BPMNGenerationException("Failed to generate BPMN model", e); + } + } + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.bpmn.generation"); + + private static final String USAGE_MESSAGE = "Usage: BPMNGenerator [-p Participant] " + + "ChoreographyFile OutputFolder"; + + // NOTE: Currently uses the Activity Model constructs + public class BPMNModelVisitor implements BehaviorVisitor { + + /** + * The constructor the BPMN model visitor. + * + */ + public BPMNModelVisitor(String choreoName, + BPMNModelFactory model, BPMNNotationFactory notation, + String folder) { + m_choreoName = choreoName; + m_modelFactory = model; + m_notationFactory = notation; + m_folder = folder; + } + + /** + * This method sets the name associated with the participant + * being projected. + * + * @param participant The participant + */ + public void setParticipant(String participant) { + m_participant = participant; + } + + /** + * This method visits the abstract activity. This will be + * performed after performing the specific visit method + * for the real type, but before performing the visit + * on any other activities that may be contained within + * this activity type. + * + * @param elem The activity type + */ + public void activityType(ActivityType elem) { + + } + + /** + * This method visits the assign activity. + * + * @param elem The assign + */ + public void assign(Assign elem) { + + BPMNActivity umls=getBPMNActivity(); + if (umls != null) { + new SimpleActivity(elem, + umls, m_modelFactory, m_notationFactory); + } + } + + /** + * This method starts visiting the atomic unit element. + * + * @param elem The atomic unit + */ + public void atomicUnitStart(AtomicUnit elem) { + + } + + /** + * This method ends visiting the atomic unit element. + * + * @param elem The atomic unit + */ + public void atomicUnitEnd(AtomicUnit elem) { + + } + + /** + * This method starts visiting the behavior description element. + * + * @param elem The behavior description + */ + public void behaviorDescriptionStart(BehaviorDescription elem) { + + try { + BPMNDiagram diagram=getBPMNModel(elem, m_folder); + + String participant=m_participant; + + if (org.pi4soa.common.util.NamesUtil.isSet(elem.getParticipant())) { + participant += " ["+elem.getParticipant()+"]"; + } + + BPMNPool pool=diagram.createPool(participant); + + //diagram.initialize(elem); + + pushBPMNActivity(pool); + } catch(Exception e) { + logger.severe("Failed to get state machine " + + "for behavior '"+elem+"': "+e); + } + } + + /** + * This method ends visiting the behavior description element. + * + * @param elem The behavior description + */ + public void behaviorDescriptionEnd(BehaviorDescription elem) { + + BPMNActivity umls=getBPMNActivity(); + + if (umls != null) { + umls.childrenComplete(); + } + + popUMLActivity(); + } + + /** + * This method starts visiting the choice element. + * + * @param elem The choice + */ + public void choiceStart(Choice elem) { + + try { + pushBPMNActivity(new ChoiceActivity(elem, + getBPMNActivity(), m_modelFactory, m_notationFactory)); + + } catch(Exception e) { + logger.severe("Failed to create choice state: "+e); + } + } + + /** + * This method ends visiting the choice element. + * + * @param elem The choice + */ + public void choiceEnd(Choice elem) { + + popUMLActivity(); + } + + /** + * This method starts visiting the completion handler element. + * + * @param elem The completion handler + */ + public void completionHandlerStart(CompletionHandler elem) { + + /* + try { + BPMNActivity bdstate=getBPMNModel(elem, m_folder); + + pushBPMNActivity(bdstate); + } catch(Exception e) { + logger.severe("Failed to get state machine for " + + "completion handler '"+elem+"': "+e); + } + */ + } + + /** + * This method ends visiting the completion handler element. + * + * @param elem The completion handler + */ + public void completionHandlerEnd(CompletionHandler elem) { + + /* + BPMNActivity umls=getBPMNActivity(); + + if (umls != null) { + umls.childrenComplete(); + } + + popUMLActivity(); + */ + } + + /** + * This method starts visiting the conditional element. + * + * @param elem The conditional + */ + public void conditionalStart(Conditional elem) { + + try { + pushBPMNActivity(new ConditionalActivity(elem, + getBPMNActivity(), m_modelFactory, m_notationFactory)); + + pushBPMNActivity(new SequenceActivity(elem, + getBPMNActivity(), m_modelFactory, m_notationFactory)); + + } catch(Exception e) { + logger.severe("Failed to create conditional state: "+e); + } + } + + /** + * This method ends visiting the conditional element. + * + * @param elem The conditional + */ + public void conditionalEnd(Conditional elem) { + + popUMLActivity(); + popUMLActivity(); + } + + /** + * This method starts visiting the exception handler element. + * + * @param elem The exception handler + */ + public void exceptionHandlerStart(ExceptionHandler elem) { + + /* + try { + BPMNActivity bdstate=getBPMNModel(elem); + + pushBPMNActivity(bdstate); + } catch(Exception e) { + logger.severe("Failed to get state machine for " + + "exception handler '"+elem+"': "+e); + } + */ + } + + /** + * This method ends visiting the exception handler element. + * + * @param elem The exception handler + */ + public void exceptionHandlerEnd(ExceptionHandler elem) { + + /* + BPMNActivity umls=getBPMNActivity(); + + if (umls != null) { + umls.childrenComplete(); + } + + popUMLActivity(); + */ + } + + /** + * This method visits the finalize activity. + * + * @param elem The finalize + */ + public void finalize(Finalize elem) { + + BPMNActivity umls=getBPMNActivity(); + if (umls != null) { + SimpleActivity state=new SimpleActivity(elem, + umls, m_modelFactory, m_notationFactory); + + /* + try { + StateMachineState subMachine= + getStateMachineState(elem.getCompletionHandler()); + state.setSubStateMachine(subMachine); + } catch(Exception e) { + logger.severe("Failed to get state machine: "+e); + } + */ + } + } + + /** + * This method starts visiting the parallel element. + * + * @param elem The parallel + */ + public void parallelStart(Parallel elem) { + + try { + pushBPMNActivity(new ParallelActivity(elem, + getBPMNActivity(), m_modelFactory, m_notationFactory)); + + } catch(Exception e) { + logger.severe("Failed to create parallel state: "+e); + } + } + + /** + * This method ends visiting the parallel element. + * + * @param elem The parallel + */ + public void parallelEnd(Parallel elem) { + + popUMLActivity(); + } + + /** + * This method visits the perform activity. + * + * @param elem The perform + */ + public void perform(Perform elem) { + + BPMNActivity umls=getBPMNActivity(); + if (umls != null) { + PerformActivity state=new PerformActivity(elem, + umls, m_modelFactory, m_notationFactory); + + if (elem instanceof LookaheadElement) { + LookaheadElement lookahead=(LookaheadElement)elem; + boolean f_send=false; + boolean f_receive=false; + + java.util.Iterator iter=lookahead.getPreConditions().iterator(); + while (iter.hasNext()) { + Predicate pred=(Predicate)iter.next(); + + if (pred.isMessagePredicate()) { + + if (pred.isReceiveLookaheadPredicate()) { + f_receive = true; + } else { + f_send = true; + } + } + } + + if (f_send && !f_receive) { + umls.getBPMNDiagram().registerInitiatingPerform(elem, state); + } else if (!f_send && f_receive) { + umls.getBPMNDiagram().registerInitiatedPerform(elem, state); + } + } + } + } + + /** + * This method visits the raise exception activity. + * + * @param elem The raise exception + */ + public void raiseException(RaiseException elem) { + + BPMNActivity umls=getBPMNActivity(); + if (umls != null) { + new SimpleActivity(elem, umls, m_modelFactory, m_notationFactory); + } + } + + /** + * This method visits the receive activity. + * + * @param elem The receive + */ + public void receive(Receive elem) { + + BPMNActivity umls=getBPMNActivity(); + if (umls != null) { + ReceiveActivity sa= + new ReceiveActivity(elem, umls, m_modelFactory, m_notationFactory); + + // Register the receive to enable links to be established + // with an appropriate send + BPMNDiagram amodel=umls.getBPMNDiagram(); + amodel.registerReceiveActivity(elem, sa); + } + } + + /** + * This method starts visiting the repetition type abstract element. + * + * @param elem The repetition type + */ + public void repetitionTypeStart(RepetitionType elem) { + + } + + /** + * This method ends visiting the repetition type abstract element. + * + * @param elem The repetition type + */ + public void repetitionTypeEnd(RepetitionType elem) { + + } + + /** + * This method visits the send activity. + * + * @param elem The send + */ + public void send(Send elem) { + + BPMNActivity umls=getBPMNActivity(); + if (umls != null) { + SimpleActivity sa= + new SimpleActivity(elem, umls, m_modelFactory, m_notationFactory); + + // Register the send to enable links to be established + // with an appropriate receive + BPMNDiagram amodel=umls.getBPMNDiagram(); + amodel.registerSendActivity(elem, sa); + } + } + + /** + * This method starts visiting the sequence element. + * + * @param elem The sequence + */ + public void sequenceStart(Sequence elem) { + + try { + pushBPMNActivity(new SequenceActivity(elem, + getBPMNActivity(), m_modelFactory, m_notationFactory)); + + } catch(Exception e) { + logger.severe("Failed to create sequence state: "+e); + } + } + + /** + * This method ends visiting the sequence element. + * + * @param elem The sequence + */ + public void sequenceEnd(Sequence elem) { + + popUMLActivity(); + } + + /** + * This method starts visiting the service description element. + * + * @param elem The service description + */ + public void serviceDescriptionStart(ServiceDescription elem) { + + } + + /** + * This method ends visiting the service description element. + * + * @param elem The service description + */ + public void serviceDescriptionEnd(ServiceDescription elem) { + + } + + /** + * This method starts visiting the structural type abstract element. + * + * @param elem The structural type + */ + public void structuralTypeStart(StructuralType elem) { + + } + + /** + * This method ends visiting the structural type abstract element. + * + * @param elem The structural type + */ + public void structuralTypeEnd(StructuralType elem) { + + /* + BPMNActivity umls=getBPMNActivity(); + + if (umls != null) { + umls.childrenComplete(); + } + */ + } + + /** + * This method starts visiting the timed unit element. + * + * @param elem The timed unit + */ + public void timedUnitStart(TimedUnit elem) { + + } + + /** + * This method ends visiting the timed unit element. + * + * @param elem The timed unit + */ + public void timedUnitEnd(TimedUnit elem) { + + } + + /** + * This method visits the unobservable activity. + * + * @param elem The unobservable + */ + public void unobservable(Unobservable elem) { + + BPMNActivity umls=getBPMNActivity(); + if (umls != null) { + new SimpleActivity(elem, umls, m_modelFactory, m_notationFactory); + } + } + + /** + * This method visits the variable declaration activity. + * + * @param elem The variable declaration + */ + public void variableDeclaration(VariableDeclaration elem) { + + } + + /** + * This method starts visiting the when element. + * + * @param elem The when + */ + public void whenStart(When elem) { + + try { + pushBPMNActivity(new WhenActivity(elem, + getBPMNActivity(), m_modelFactory, m_notationFactory)); + + pushBPMNActivity(new SequenceActivity(elem, + getBPMNActivity(), m_modelFactory, m_notationFactory)); + } catch(Exception e) { + logger.severe("Failed to create when Activity: "+e); + } + } + + /** + * This method ends visiting the when element. + * + * @param elem The when + */ + public void whenEnd(When elem) { + + popUMLActivity(); + popUMLActivity(); + } + + /** + * This method starts visiting the while element. + * + * @param elem The while + */ + public void whileStart(While elem) { + + try { + pushBPMNActivity(new WhileActivity(elem, + getBPMNActivity(), m_modelFactory, m_notationFactory)); + + pushBPMNActivity(new SequenceActivity(elem, + getBPMNActivity(), m_modelFactory, m_notationFactory)); + + } catch(Exception e) { + logger.severe("Failed to create while Activity: "+e); + } + } + + /** + * This method ends visiting the while element. + * + * @param elem The while + */ + public void whileEnd(While elem) { + + popUMLActivity(); + + popUMLActivity(); + } + + /** + * This method returns a Activity machine Activity for the supplied + * behavior type. If one already exists, then it will be + * returned, otherwise one will be created. + * + * @param elem The behavior type + * @return The Activity machine state + */ + protected BPMNDiagram getBPMNModel( + BehaviorDescription elem, String folder) throws BPMNGenerationException { + String name=BPMNDiagram.getName(elem); + + BPMNDiagram ret=(BPMNDiagram) + m_activityModels.get(name); + + if (ret == null) { + ret = new BPMNDiagram(m_choreoName, name, + null, m_modelFactory, m_notationFactory, folder); + + m_activityModels.put(name, ret); + } + + // Create activity partition for service + /* + org.eclipse.uml2.uml.ActivityPartition partition = + (org.eclipse.uml2.uml.ActivityPartition) + ret.getTopLevelActivity().createGroup( + UMLPackage.eINSTANCE.getActivityPartition()); + partition.setName(org.pi4soa.common.xml.XMLUtils.getLocalname( + elem.getServiceDescription().getName())); + ret.setCurrentPartition(partition); + */ + + return(ret); + } + + /** + * This method pushes the supplied UML activity + * onto a stack. + * + * @param sms The activity + */ + protected void pushBPMNActivity(BPMNActivity umls) { + m_umlActivityStack.insertElementAt(umls, 0); + } + + /** + * This method returns the UML activity found at the + * top of the stack. + * + * @return The activity + */ + protected BPMNActivity getBPMNActivity() { + BPMNActivity ret=null; + + if (m_umlActivityStack.size() > 0) { + ret = (BPMNActivity)m_umlActivityStack.get(0); + } + + return(ret); + } + + /** + * This method returns the UML activity from the + * top of the stack. + * + */ + protected void popUMLActivity() { + BPMNActivity umls=getBPMNActivity(); + + if (umls != null) { + umls.childrenComplete(); + } + + if (m_umlActivityStack.size() > 0) { + m_umlActivityStack.remove(0); + } + } + + /** + * This method completes the construction of the activity + * models. + * + */ + public void completeModels() throws BPMNGenerationException { + java.util.Enumeration iter=m_activityModels.elements(); + + while (iter.hasMoreElements()) { + BPMNDiagram amodel=(BPMNDiagram)iter.nextElement(); + + amodel.completeModel(); + } + } + + private BPMNModelFactory m_modelFactory=null; + private BPMNNotationFactory m_notationFactory=null; + private String m_folder=null; + private String m_choreoName=null; + private String m_participant=null; + private java.util.Vector m_umlActivityStack=new java.util.Vector(); + private java.util.Hashtable m_activityModels=new java.util.Hashtable(); + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNModelFactory.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNModelFactory.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNModelFactory.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,97 @@ +/* + * Copyright 2005-6 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 26 Jan 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation; + +import org.pi4soa.service.behavior.ActivityType; + +public interface BPMNModelFactory { + + public String getFileExtension(); + + public void saveModel(String fileName, Object diagram) + throws BPMNGenerationException; + + public Object createDiagram(); + + public Object createPool(Object diagram, String name); + + public Object createInitialNode(Object container); + + public Object createSimpleTask(Object container, ActivityType activity); + + public Object createDataBasedXORGateway(Object container); + + public Object createEventBasedXORGateway(Object container); + + public Object createANDGateway(Object container); + + public Object createFinalNode(Object container); + + public Object createControlLink(Object container, + Object fromNode, Object toNode, + String conditionalExpression); + + public Object createMessageLink(Object container, + Object fromNode, Object toNode, + org.pi4soa.service.behavior.Receive receive); + + public Object setLinkExpression(Object link, String expression); + + public boolean isDecision(Object node); + + /** + * This method determines if the supplied node is a join. This + * is true, if the node is a data or event based gateway, + * and as incoming edges. This is based on the fact that only + * a join gateway, at the point this method is invoked, would + * have incoming links, otherwise any other gateway would be + * assumed to be the initial gateway in a conditional grouping + * construct. + * + * @param node + * @return Whether the node is a join + */ + public boolean isJoin(Object node); + + public boolean isTerminal(Object node); + + public void setLabel(Object entity, String label); + + public Object getSource(Object link); + + public void setSource(Object link, Object node); + + public Object getTarget(Object link); + + public void setTarget(Object link, Object node); + + public java.util.List getInboundControlLinks(Object node); + + public java.util.List getOutboundControlLinks(Object node); + + public java.util.List getInboundMessageLinks(Object node); + + public java.util.List getOutboundMessageLinks(Object node); + + public void delete(Object entity); + + public boolean isDeleted(Object entity); + +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNNotationFactory.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNNotationFactory.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/BPMNNotationFactory.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,49 @@ +/* + * Copyright 2005-6 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 30 Jan 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation; + + +public interface BPMNNotationFactory { + + public String getFileExtension(); + + public void saveNotation(String modelFileName, Object diagramModel, + String notationFileName, Object diagramNotation) + throws BPMNGenerationException; + + public Object createDiagram(BPMNModelFactory factory, + Object diagramModel, int x, int y, int width, int height); + + public Object createPool(BPMNModelFactory factory, + Object poolModel, Object diagramNotation, + int x, int y, int width, int height); + + public Object createTask(BPMNModelFactory factory, + Object taskModel, Object parentNotation, + int x, int y, int width, int height); + + public Object createJunction(BPMNModelFactory factory, + Object junctionModel, Object parentNotation, + int x, int y, int width, int height); + + public Object createMessageLink(BPMNModelFactory factory, + Object linkModel, Object diagramNotation); + +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/DefaultBPMNConfiguration.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/DefaultBPMNConfiguration.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/DefaultBPMNConfiguration.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,57 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation; + +/** + * This class provides the default implementation for the + * BPMN configuration interface. + * + */ +public class DefaultBPMNConfiguration implements BPMNConfiguration { + + /** + * This is the default constructor. + * + */ + public DefaultBPMNConfiguration() { + } + + /** + * This method returns the UML export format to be used. The list + * of valid export formats is available using the + * #UMLGenerator.getExportFormats() method. + * + * @return The export format, or null if the default is being used. + */ + public String getExportFormat() { + return(m_exportFormat); + } + + /** + * This method sets the export format. + * + * @param format The export format + */ + public void setExportFormat(String format) { + m_exportFormat = format; + } + + private String m_exportFormat=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/AbstractBPMNActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/AbstractBPMNActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/AbstractBPMNActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,317 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +public abstract class AbstractBPMNActivity implements BPMNActivity { + + /** + * This is the constructor for the default BPMN activity. + * + * @param parent The parent + */ + public AbstractBPMNActivity(BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) { + m_parent = parent; + m_modelFactory = model; + m_notationFactory = notation; + + if (parent instanceof AbstractBPMNActivity) { + ((AbstractBPMNActivity)parent).addChildState(this); + } + } + + /** + * This method returns the parent BPMN activity. + * + * @return The parent + */ + public BPMNActivity getParent() { + return(m_parent); + } + + /** + * This method returns the container associated with the + * activity. + * + * @return The container + */ + public Object getContainer() { + return(m_parent.getContainer()); + } + + /** + * This method returns the model. + * + * @return The model + */ + protected org.jboss.savara.tools.bpmn.generation.BPMNModelFactory getModelFactory() { + return(m_modelFactory); + } + + /** + * This method returns the notation factory. + * + * @return The notation factory + */ + protected org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory getNotationFactory() { + return(m_notationFactory); + } + + /** + * This method adds a child BPMN state. + * + * @param child The child BPMN state + */ + protected void addChildState(BPMNActivity child) { + m_childStates.add(child); + } + + /** + * This method returns the list of child states. + * + * @return The child states + */ + protected java.util.Vector getChildStates() { + return(m_childStates); + } + + /** + * This method indicates that the BPMN state for the + * child nodes is complete. + * + */ + public void childrenComplete() { + } + + /** + * This method returns the containing BPMN diagram. + * + * @return The BPMN diagram + */ + public BPMNDiagram getBPMNDiagram() { + BPMNDiagram ret=null; + + if (m_parent != null) { + ret = m_parent.getBPMNDiagram(); + } + + return(ret); + } + + /** + * This method returns the BPMN Activity Model. + * + * @return The activity model + */ + /* + public Activity getTopLevelActivity() { + Activity ret=null; + + if (m_parent != null) { + ret = m_parent.getTopLevelActivity(); + } + + return(ret); + } + */ + + /** + * This method returns the BPMN Activity Partition. + * + * @return The activity model + */ + /* + public ActivityPartition getActivityPartition() { + ActivityPartition ret=null; + + if (m_parent != null) { + ret = m_parent.getActivityPartition(); + } + + return(ret); + } + */ + + /** + * This method causes a transition to be established from + * the supplied BPMN state to the current state, applying + * any relevant information (such as event triggers + * or conditios) to the transition as appropriate. + * + * @param fromNode The source node + * @param expression The optional conditional expression + * @return The edge + */ + public Object transitionFrom(BPMNActivity fromNode, + String conditionalExpression) { + Object ret=getModelFactory().createControlLink(getContainer(), + fromNode.getEndNode(), + getStartNode(), conditionalExpression); + + /* + Activity activity=getTopLevelActivity(); + ActivityEdge ret=(ActivityEdge) + activity.createEdge(null, UMLPackage.eINSTANCE.getControlFlow()); + ret.getInPartitions().add(getActivityPartition()); + + ret.setSource(fromNode.getEndNode()); + ret.setTarget(getStartNode()); + */ + + return(ret); + } + + /** + * This method joins a list of sequential child BPMN states with transitions. + * + * @param children The list of child BPMN states + */ + public void transitionSequentialNodes() { + int width=0; + int height=0; + + if (getChildStates().size() > 0) { + BPMNActivity v1=(BPMNActivity)getChildStates().get(0); + width += v1.getWidth(); + height = v1.getHeight(); + } + + for (int i=1; i < getChildStates().size(); i++) { + BPMNActivity v1=(BPMNActivity)getChildStates().get(i-1); + BPMNActivity v2=(BPMNActivity)getChildStates().get(i); + + width += v2.getWidth(); + + width += HORIZONTAL_GAP; // Gap + + if (height < v2.getHeight()) { + height = v2.getHeight(); + } + + Object endNode=v1.getEndNode(); + + if (v1.canDeleteEndNode() && + (getModelFactory().isJoin(endNode) || // instanceof org.eclipse.uml2.uml.MergeNode || + getModelFactory().isTerminal(endNode))) { // instanceof org.eclipse.uml2.uml.FlowFinalNode) { + + // Move the incoming transitions from the junction + // to the next state + java.util.List list=getModelFactory().getInboundControlLinks(endNode); + for (int j=list.size()-1; j >= 0; j--) { + Object transition=list.get(j); + + getModelFactory().setTarget(transition, v2.getStartNode()); + //transition.setTarget(v2.getStartNode()); + } + + // Remove Junction + getModelFactory().delete(endNode); + + } else { + v2.transitionFrom(v1, null); + } + } + + //height += VERTICAL_GAP; // Gap + + setWidth(width); + setHeight(height); +//System.out.println("THIS: children="+m_childStates.size()+ +// " this="+this+" width="+width+" height="+height); + } + + public int getX() { + return(m_x); + } + + public void setX(int x) { +//System.out.println("SETX: this="+this+" x="+x); + m_x = x; + } + + public int getY() { + return(m_y); + } + + public void setY(int y) { +//System.out.println("SETY: this="+this+" y="+y); + m_y = y; + } + + public int getWidth() { + return(m_width); + } + + public void setWidth(int width) { + m_width = width; + } + + public int getHeight() { + return(m_height); + } + + public void setHeight(int height) { + m_height = height; + } + + public void adjustWidth(int width) { + float percentChange=width/getWidth(); + + //setWidth(width); + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + int cur=act.getWidth(); + int newWidth=(int)((float)cur * percentChange); + + act.adjustWidth(newWidth); + + int change=act.getWidth()-cur; + + setWidth(getWidth()+change); + } + } + + public void calculatePosition(int x, int y) { + setX(x); + setY(y); + } + + public void draw(Object parent) { + } + + public boolean canDeleteEndNode() { + return(true); + } + + public static final int VERTICAL_GAP = 40; + public static final int HORIZONTAL_GAP = 50; + + private BPMNActivity m_parent=null; + private org.jboss.savara.tools.bpmn.generation.BPMNModelFactory m_modelFactory=null; + private org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory m_notationFactory=null; + private java.util.Vector m_childStates=new java.util.Vector(); + private int m_x=0; + private int m_y=0; + private int m_width=0; + private int m_height=0; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,138 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +/** + * This interface represents the generic capabilities of a state + * managing component in the CDL to BPMN transformation. + * + */ +public interface BPMNActivity { + + /** + * This method returns the parent BPMN activity. + * + * @return The parent + */ + public BPMNActivity getParent(); + + /** + * This method returns the container object associated + * with this activity. + * + * @return The container + */ + public Object getContainer(); + + /** + * This method indicates that the BPMN state for the + * child nodes is complete. + * + */ + public void childrenComplete(); + + /** + * This method returns the BPMN top level Activity. + * + * @return The top level activity + */ + //public Activity getTopLevelActivity(); + + /** + * This method returns the containing ActivityModel. + * + * @return The activity model + */ + public BPMNDiagram getBPMNDiagram(); + + /** + * This method returns the BPMN Activity Partition. + * + * @return The activity model + */ + //public ActivityPartition getActivityPartition(); + + /** + * This method returns the start node for the activites + * represented by this UML activity implementation. + * + * @return The starting node + */ + public Object getStartNode(); + + /** + * This method returns the end node for the activities + * represented by this BPMN activity implementation. + * + * @return The ending node + */ + public Object getEndNode(); + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState(); + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState(); + + /** + * This method causes a transition to be established from + * the supplied BPMN state to the current state, applying + * any relevant information (such as event triggers + * or conditios) to the transition as appropriate. + * + * @param fromNode The source node + * @param expression The optional conditional expression + * @return The edge + */ + public Object transitionFrom(BPMNActivity fromNode, String expression); + + public int getX(); + + public void setX(int x); + + public int getY(); + + public void setY(int y); + + public int getWidth(); + + public void setWidth(int width); + + public int getHeight(); + + public void setHeight(int height); + + public void adjustWidth(int width); + + public void calculatePosition(int x, int y); + + public void draw(Object parent); + + public boolean canDeleteEndNode(); + +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNDiagram.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNDiagram.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNDiagram.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,465 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +import org.jboss.savara.tools.bpmn.generation.BPMNGenerationException; +import org.pi4soa.common.util.NamesUtil; +import org.pi4soa.service.behavior.BehaviorDescription; +import org.pi4soa.service.behavior.BehaviorType; +import org.pi4soa.service.behavior.CompletionHandler; +import org.pi4soa.service.behavior.ExceptionHandler; + +/** + * This class represents the state information associated with + * the construction of a BPMN Activity model. + * + */ +public class BPMNDiagram extends AbstractBPMNActivity { + + /** + * This is the constructor for the activity model. + * + * @param choreoName The choreography name + * @param diagramName The diagram name + * @param parent The parent activity + * @param model The model factory + * @param folder The output folder + * @exception BPMNGenerationException Failed to construct activity model + */ + public BPMNDiagram(String choreoName, String diagramName, + BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation, + String folder) throws BPMNGenerationException { + super(parent, model, notation); + + m_name = choreoName+"_"+diagramName; + + m_diagram = model.createDiagram(); + m_folder = folder; + } + + /** + * This method returns the container associated with the + * activity. + * + * @return The container + */ + public Object getContainer() { + return(m_container); + } + + /** + * This method sets the container associated with the + * BPMN model. + * + * @param container The container + */ + public BPMNPool createPool(String participant) { + BPMNPool ret=new BPMNPool(m_diagram, participant, + this, getModelFactory(), getNotationFactory()); + + if (m_pools.containsKey(participant)) { + m_duplicatePools.add(ret); + } else { + m_pools.put(participant, ret); + } + + return(ret); + } + + /** + * This method returns the state machine name to be used for the + * supplied behavior type. + * + * @param elem The behavior type + * @return The name + */ + public static String getName(BehaviorType elem) { + String ret=elem.getName(); + + if (elem instanceof BehaviorDescription) { + ret = ((BehaviorDescription)elem).getName(); + + if (org.pi4soa.common.util.NamesUtil.isSet( + ((BehaviorDescription)elem).getParticipant()) && + ret.endsWith("_"+((BehaviorDescription)elem).getParticipant())) { + + ret = ret.substring(0, ret.length()- + ((BehaviorDescription)elem).getParticipant().length()-1); + } + + } else if (elem instanceof CompletionHandler) { + ret = getName(((CompletionHandler)elem). + getEnclosingBehaviorDescription())+"["+ + ret+"]"; + + } else if (elem instanceof ExceptionHandler) { + String excType=((ExceptionHandler)elem).getExceptionType(); + if (NamesUtil.isSet(excType) == false) { + excType = "default"; + } + + ret = getName(((ExceptionHandler)elem). + getEnclosingBehaviorDescription())+"[exception="+ + excType+"]"; + } + + return(ret); + } + + /** + * This method determines whether the supplied behavior type + * should result in a root entry/exit point from the + * state machine. + * + * @param elem The behavior type + * @return Whether it is a root + */ + protected boolean isRoot(BehaviorType elem) { + boolean ret=false; + + if (elem instanceof BehaviorDescription && + ((BehaviorDescription)elem).isRoot()) { + ret = true; + } + + return(ret); + } + + /** + * This method returns the containing ActivityModel. + * + * @return The activity model + */ + public BPMNDiagram getBPMNDiagram() { + return(this); + } + + /** + * This method returns the start node for the activites + * represented by this BPMN activity implementation. + * + * @return The starting node + */ + public Object getStartNode() { + //return(m_initialState.getStartNode()); + return(null); + } + + /** + * This method returns the end node for the activities + * represented by this BPMN activity implementation. + * + * @return The ending node + */ + public Object getEndNode() { + //return(m_finalState.getEndNode()); + return(null); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + return(null); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + return(null); + } + + /** + * This method registers a send activity against the BPMN representation. + * + * @param send The send activity + * @param activity The BPMN representation + */ + public void registerSendActivity(org.pi4soa.service.behavior.Send send, + BPMNActivity activity) { + if (isPoolDuplicate(activity) == false) { + m_sendActivities.put(send, activity); + } + } + + /** + * This method registers a receive activity against the BPMN representation. + * + * @param recv The receive activity + * @param activity The BPMN representation + */ + public void registerReceiveActivity(org.pi4soa.service.behavior.Receive recv, + BPMNActivity activity) { + if (isPoolDuplicate(activity) == false) { + m_receiveActivities.put(recv.getGlobalDescriptionURI(), activity); + } + } + + /** + * This method registers an initiating perform activity + * against the BPMN representation. + * + * @param perform The perform activity + * @param activity The BPMN representation + */ + public void registerInitiatingPerform(org.pi4soa.service.behavior.Perform perform, + BPMNActivity activity) { + m_initiatingPerforms.put(perform.getGlobalDescriptionURI(), activity); + } + + /** + * This method registers an initiated perform activity + * against the BPMN representation. + * + * @param perform The perform activity + * @param activity The BPMN representation + */ + public void registerInitiatedPerform(org.pi4soa.service.behavior.Perform perform, + BPMNActivity activity) { + m_initiatedPerforms.put(perform.getGlobalDescriptionURI(), activity); + } + + /** + * This method determines if the supplied activity is + * associated with a duplicate pool that will be deleted. + * + * @param activity The activity + * @return Whether the activity is associated with a + * duplicate pool + */ + protected boolean isPoolDuplicate(BPMNActivity activity) { + boolean ret=false; + + while (activity != null && (activity instanceof BPMNPool) + == false) { + activity = activity.getParent(); + } + + if (activity != null) { + ret = m_duplicatePools.contains(activity); + } + + return(ret); + } + + /** + * This method completes the generation of the model. + * + */ + public void completeModel() throws BPMNGenerationException { + java.util.Enumeration iter=m_sendActivities.keys(); + java.util.Vector messageLinks=new java.util.Vector(); + + while (iter.hasMoreElements()) { + org.pi4soa.service.behavior.Send send= + (org.pi4soa.service.behavior.Send)iter.nextElement(); + + BPMNActivity sendActivity=(BPMNActivity) + m_sendActivities.get(send); + ReceiveActivity receiveActivity=(ReceiveActivity) + m_receiveActivities.get(send.getGlobalDescriptionURI()); + + if (sendActivity != null && receiveActivity != null) { + + if (m_sendReceiveAsControlLink) { + + if (m_controlFromSendOnly) { + // Break links to the receive node, as control will + // be from the sending participant + receiveActivity.breakLinks(); + } + + // Create control flow between the activities + /* + Activity activity=getTopLevelActivity(); + ActivityEdge ret=(ActivityEdge) + activity.createEdge(null, UMLPackage.eINSTANCE.getControlFlow()); + + ret.setSource(sendActivity.getEndNode()); + ret.setTarget(receiveActivity.getStartNode()); + + ret.setName(send.getOperationName()); + */ + messageLinks.add(getModelFactory(). + createMessageLink(m_diagram, + sendActivity.getEndNode(), + receiveActivity.getStartNode(), + receiveActivity.getReceive())); + + // Check if the receive and send activities have a link to the + // same node, in which case remove the link from the send + checkForRedundantTargetLinks(sendActivity, receiveActivity); + } + } + } + + // Process initiating and initiated performs + /* GPB: COMMENT OUT PERFORM LINKS FOR NOW + iter = m_initiatingPerforms.keys(); + + while (iter.hasMoreElements()) { + String key=(String)iter.nextElement(); + + PerformActivity initiatingPerform=(PerformActivity) + m_initiatingPerforms.get(key); + PerformActivity initiatedPerform=(PerformActivity) + m_initiatedPerforms.get(key); + + if (initiatingPerform != null && initiatedPerform != null) { + + if (m_performedAsControlLink) { + + if (m_controlFromInitiatingPerformOnly) { + // Break links to the receive node, as control will + // be from the initiating participant + initiatedPerform.breakLinks(); + } + + // Create control flow between the activities + Activity activity=getTopLevelActivity(); + + ActivityEdge ret=(ActivityEdge) + activity.createEdge(null, UMLPackage.eINSTANCE.getControlFlow()); + + ret.setSource(initiatingPerform.getEndNode()); + ret.setTarget(initiatedPerform.getStartNode()); + + // Check if the initiating and initiated performs have a link to the + // same node, in which case remove the link from the initiating/ + checkForRedundantTargetLinks(initiatingPerform, initiatedPerform); + + } + + if (m_performedAsDependencyLink) { + initiatingPerform.getEndNode().createDependency( + initiatedPerform.getStartNode()); + } + } + } + */ + + // Delete duplicate pools + for (int i=0; i < m_duplicatePools.size(); i++) { + BPMNPool pool=(BPMNPool)m_duplicatePools.get(i); + getModelFactory().delete(pool.getContainer()); + getChildStates().remove(pool); + } + + // Draw diagram + int cury=0; + + for (int i=0; i < getChildStates().size(); i++) { + BPMNPool pool=(BPMNPool)getChildStates().get(i); + + pool.calculatePosition(0, cury); + + cury += (pool.getHeight()+100); + } + + getModelFactory().saveModel(m_folder+ + java.io.File.separator+m_name+"."+ + getModelFactory().getFileExtension(), m_diagram); + + // Construct notation + Object diagramNotation=getNotationFactory().createDiagram(getModelFactory(), m_diagram, + getX(), getY(), getWidth(), getHeight()); + + for (int i=0; i < getChildStates().size(); i++) { + BPMNPool pool=(BPMNPool)getChildStates().get(i); + + pool.draw(diagramNotation); + } + + /* GPB: 25/4/08 + * Don't generate message links, as diagram infers them + * anyway - and in the latest version the link positions + * the label incorrectly. If using the default message + * link is an issue, then need to investigate how to + * get label positioned correctly. + for (int i=0; i < messageLinks.size(); i++) { + Object mesglink=messageLinks.get(i); + + getNotationFactory().createMessageLink(getModelFactory(), + mesglink, diagramNotation); + } + */ + + getNotationFactory().saveNotation(m_folder+ + java.io.File.separator+m_name+"."+ + getModelFactory().getFileExtension(), m_diagram, + m_folder+java.io.File.separator+m_name+"."+ + getNotationFactory().getFileExtension(), diagramNotation); + } + + protected void checkForRedundantTargetLinks(BPMNActivity source, BPMNActivity target) { + + // Check if the target and source activities have a link to the + // same node, in which case remove the link from the source + java.util.List outgoing1=getModelFactory().getOutboundControlLinks(target.getStartNode()); + + for (int i=0; i < outgoing1.size(); i++) { + Object ae1=outgoing1.get(i); + + java.util.List outgoing2=getModelFactory().getOutboundControlLinks(source.getStartNode()); + boolean f_found=false; + + for (int j=0; f_found==false && j < outgoing2.size(); j++){ + Object ae2=outgoing2.get(j); + + if (getModelFactory().getTarget(ae1) == + getModelFactory().getTarget(ae2)) { + f_found = true; + + getModelFactory().delete(ae2); + } + } + } + } + + //private boolean m_completed=false; + private String m_name=null; + private Object m_diagram=null; + private String m_folder=null; + private Object m_container=null; + //private java.util.Hashtable m_pools=new java.util.Hashtable(); + //private BPMNActivity m_initialState=null; + //private BPMNActivity m_finalState=null; + private java.util.Hashtable m_sendActivities=new java.util.Hashtable(); + private java.util.Hashtable m_receiveActivities=new java.util.Hashtable(); + private java.util.Hashtable m_initiatingPerforms=new java.util.Hashtable(); + private java.util.Hashtable m_initiatedPerforms=new java.util.Hashtable(); + + private java.util.Hashtable m_pools=new java.util.Hashtable(); + private java.util.Vector m_duplicatePools=new java.util.Vector(); + + private boolean m_sendReceiveAsControlLink=true; + private boolean m_controlFromSendOnly=false; + + //private boolean m_performedAsControlLink=true; + //private boolean m_performedAsDependencyLink=false; + //private boolean m_controlFromInitiatingPerformOnly=false; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNPool.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNPool.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/BPMNPool.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,184 @@ +/* + * Copyright 2005-6 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 29 Jan 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +import org.jboss.savara.tools.bpmn.generation.BPMNGenerationException; +import org.pi4soa.service.behavior.BehaviorDescription; +import org.pi4soa.service.behavior.Choice; + +public class BPMNPool extends AbstractBPMNActivity { + + /** + * This constructor initializes the pool state. + * + * @param diagram The diagram + * @param name The pool name + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public BPMNPool(Object diagram, String name, + BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) { + super(parent, model, notation); + + initialize(diagram, name); + } + + /** + * This method performs the initialization of the + * activity model. + * + * @param diagram The diagram + * @param name The pool name + */ + public void initialize(Object diagram, String name) { + + m_pool = getModelFactory().createPool(diagram, name); + + /* + m_activityModel = (org.eclipse.uml2.uml.Activity) + servicePackage.createPackagedElement(null, + UMLPackage.eINSTANCE.getActivity()); + + m_activityModel.setName(getName(elem)); + */ + + // Create initial state + /* + org.eclipse.uml2.uml.InitialNode initialState= + (org.eclipse.uml2.uml.InitialNode) + m_activityModel.createNode(null, UMLPackage.eINSTANCE.getInitialNode()); + + m_initialState = new SimpleActivity(initialState, this); + */ + m_initialState = new JunctionActivity(getModelFactory().createInitialNode(getContainer()), + this, getModelFactory(), getNotationFactory()); + + // Create final state + /* + org.eclipse.uml2.uml.FlowFinalNode finalState= + (org.eclipse.uml2.uml.FlowFinalNode) + m_activityModel.createNode(null, UMLPackage.eINSTANCE.getFlowFinalNode()); + + m_finalState = new SimpleActivity(finalState, this); + */ + m_finalState = new JunctionActivity(getModelFactory().createFinalNode(getContainer()), + this, getModelFactory(), getNotationFactory()); + + } + + /** + * This method returns the container associated with the + * activity. + * + * @return The container + */ + public Object getContainer() { + return(m_pool); + } + + public Object getStartNode() { + return(m_initialState.getStartNode()); + } + + public Object getEndNode() { + return(m_finalState.getEndNode()); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + return(m_initialState); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + return(m_finalState); + } + + /** + * This method indicates that the BPMN state for the + * child nodes is complete. + * + */ + public void childrenComplete() { + + if (m_completed == false) { + + // Move the final state to the end of the list + if (getChildStates().remove(m_finalState)) { + getChildStates().add(m_finalState); + } + + // Join the child state vertex with transitions + transitionSequentialNodes(); + + // Add padding + setHeight(getHeight()+(VERTICAL_GAP*2)); + + m_completed = true; + } + } + + public void calculatePosition(int x, int y) { + int curx=0; + int midy=(getHeight()/2); + + setX(x); + setY(y+VERTICAL_GAP); + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.calculatePosition(curx, midy-(act.getHeight()/2)); + + curx += (act.getWidth()+HORIZONTAL_GAP); + } + } + + public void draw(Object parent) { + + // Construct notation + Object notation=getNotationFactory().createPool(getModelFactory(), m_pool, + parent, getX(), getY(), getWidth(), getHeight()); + + //m_initialState.draw(notation); + //m_finalState.draw(notation); + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.draw(notation); + } + } + + private boolean m_completed=false; + private Object m_pool=null; + private BPMNActivity m_initialState=null; + private BPMNActivity m_finalState=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ChoiceActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ChoiceActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ChoiceActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,320 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +import org.jboss.savara.tools.bpmn.generation.*; +import org.pi4soa.service.behavior.Choice; + +/** + * This class represents a selection of states within a + * BPMN state machine. + * + */ +public class ChoiceActivity extends AbstractBPMNActivity { + + /** + * This constructor initializes the choice state. + * + * @param choice The choice + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public ChoiceActivity(Choice choice, BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) + throws BPMNGenerationException { + super(parent, model, notation); + + initialize(choice); + } + + /** + * This method performs the initialization of the + * choice state. + * + * @param elem The choice + * @throws BPMNGenerationException Failed to initialize + */ + protected void initialize(Choice elem) throws BPMNGenerationException { + + // Get region + //Activity region=getTopLevelActivity(); + + // Determine if choice is event based, or data based + boolean dataBased=true; + + java.util.List children=elem.getActivityTypes(); + for (int i=0; i < children.size(); i++) { + org.pi4soa.service.behavior.ActivityType act= + (org.pi4soa.service.behavior.ActivityType)children.get(i); + + if (act instanceof org.pi4soa.service.behavior.StructuralType) { + org.pi4soa.service.behavior.StructuralType st= + (org.pi4soa.service.behavior.StructuralType)act; + + if ((st.isConditionalGroupingConstruct() == false || + (st.isConditionalGroupingConstruct() && + st.isConditionObservable() == false)) && + st.isPredicateExtensionRequired() == false) { + dataBased = false; + } + + /* + String expr=null; + + if (st instanceof org.pi4soa.service.behavior.Conditional) { + expr = ((org.pi4soa.service.behavior.Conditional)st).getExpression(); + } else if (st instanceof org.pi4soa.service.behavior.While) { + expr = ((org.pi4soa.service.behavior.While)st).getExpression(); + } else if (st instanceof org.pi4soa.service.behavior.When) { + expr = ((org.pi4soa.service.behavior.When)st).getExpression(); + } + + if (expr != null && expr.trim().length() == 0) { + expr = ""; + } + + m_expressions.add(expr); + */ + } + } + + // If not data-based, then clear list of expressions + /* + if (dataBased == false) { + m_expressions.clear(); + } + */ + + // Create choice state + Object choiceState=null; + + if (dataBased) { + choiceState=getModelFactory().createDataBasedXORGateway(getContainer()); + } else { + choiceState=getModelFactory().createEventBasedXORGateway(getContainer()); + } + + //region.createNode(null, UMLPackage.eINSTANCE.getDecisionNode()); + //choiceState.getInPartitions().add(getActivityPartition()); + + m_choiceState = new JunctionActivity(choiceState, this, + getModelFactory(), getNotationFactory()); + + // Create junction state + Object junctionState=null; + + if (dataBased) { + junctionState=getModelFactory().createDataBasedXORGateway(getContainer()); + } else { + junctionState=getModelFactory().createEventBasedXORGateway(getContainer()); + } + + //region.createNode(null, UMLPackage.eINSTANCE.getMergeNode()); + //junctionState.getInPartitions().add(getActivityPartition()); + + m_junctionState = new JunctionActivity(junctionState, this, + getModelFactory(), getNotationFactory()); + } + + /** + * This method indicates that the BPMN state for the + * child nodes is complete. + * + */ + public void childrenComplete() { + + if (m_completed == false) { + int width=m_choiceState.getWidth()+m_junctionState.getWidth()+ + (2 * HORIZONTAL_GAP); + int height=0; + + // Move the junction state to the end of the list + if (getChildStates().remove(m_junctionState)) { + getChildStates().add(m_junctionState); + } + + // Join the child state vertex with transitions + int maxwidth=0; + + for (int i=1; i < getChildStates().size()-1; i++) { + BPMNActivity umls=(BPMNActivity)getChildStates().get(i); + + height += umls.getHeight(); + + if (i != 1) { + height += VERTICAL_GAP; + } + + if (umls.getWidth() > maxwidth) { + maxwidth = umls.getWidth(); + } + + /* + String expr=null; + + if (m_expressions.size() > 0) { + expr = (String)m_expressions.get(i-1); + + if (expr != null && expr.length() == 0) { + expr = null; + } + } + */ + + umls.transitionFrom(m_choiceState, null); + + // Check if state is a junction + Object endNode=umls.getEndNode(); + + /* + if (umls.getEndState().canDeleteEndNode() && + (getModelFactory().isJoin(endNode) || // instanceof org.eclipse.uml2.uml.MergeNode || + getModelFactory().isTerminal(endNode))) { // instanceof org.eclipse.uml2.uml.FlowFinalNode) { + + // Move the incoming transitions from the junction + // to the next state + java.util.List list=getModelFactory().getInboundControlLinks(endNode); + for (int j=list.size()-1; j >= 0; j--) { + Object transition=list.get(j); + + getModelFactory().setTarget(transition, m_junctionState.getStartNode()); + //transition.setTarget(m_junctionState.getStartNode()); + } + + // Remove the junction + //endNode.destroy(); + getModelFactory().delete(endNode); + } else { + */ + m_junctionState.transitionFrom(umls, null); + //} + } + + width += maxwidth; + + if (height < m_choiceState.getHeight()) { + height = m_choiceState.getHeight(); + } + + if (height < m_junctionState.getHeight()) { + height = m_junctionState.getHeight(); + } + + setWidth(width); + setHeight(height); + + adjustWidth(width); + + m_completed = true; + } + } + + public void calculatePosition(int x, int y) { + int cury=y; + int midx=x+(getWidth()/2); + int midy=y+(getHeight()/2); + + setX(x); + setY(y); + + for (int i=1; i < getChildStates().size()-1; i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.calculatePosition(midx-(act.getWidth()/2), cury); + //midy-(act.getHeight()/2)); + + cury += (act.getHeight()+VERTICAL_GAP); + } + + m_choiceState.calculatePosition(x, midy-(m_choiceState.getHeight()/2)); + m_junctionState.calculatePosition(x+getWidth()- + m_junctionState.getWidth(), + midy-(m_junctionState.getHeight()/2)); + } + + /** + * This method returns the start node for the activites + * represented by this BPMN activity implementation. + * + * @return The starting node + */ + public Object getStartNode() { + return(m_choiceState.getStartNode()); + } + + /** + * This method returns the end node for the activities + * represented by this BPMN activity implementation. + * + * @return The ending node + */ + public Object getEndNode() { + return(m_junctionState.getEndNode()); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + return(m_choiceState); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + return(m_junctionState); + } + + public void adjustWidth(int width) { + + int extrawidth=m_choiceState.getWidth()+m_junctionState.getWidth()+ + (2 * HORIZONTAL_GAP); + + setWidth(width); + + // Adjust child widths + for (int i=1; i < getChildStates().size()-1; i++) { + BPMNActivity umls=(BPMNActivity)getChildStates().get(i); + + umls.adjustWidth(width-extrawidth); + } + } + + public void draw(Object parent) { + + // Construct notation + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.draw(parent); + } + } + + private boolean m_completed=false; + private BPMNActivity m_choiceState=null; + private BPMNActivity m_junctionState=null; + //private java.util.Vector m_expressions=new java.util.Vector(); +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ConditionalActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ConditionalActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ConditionalActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,362 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +import org.jboss.savara.tools.bpmn.generation.BPMNGenerationException; +import org.pi4soa.service.behavior.Choice; +import org.pi4soa.service.behavior.Conditional; + +/** + * This class represents a conditional decision within a + * BPMN state machine. + * + */ +public class ConditionalActivity extends AbstractBPMNActivity { + + /** + * This constructor initializes the conditional state. + * + * @param conditional The conditional + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public ConditionalActivity(Conditional conditional, + BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) + throws BPMNGenerationException { + super(parent, model, notation); + + initialize(conditional); + } + + /** + * This method performs the initialization of the + * conditional state. + * + * @param elem The conditional + * @throws BPMNGenerationException Failed to initialize + */ + protected void initialize(Conditional elem) throws BPMNGenerationException { + m_choiceElement = (elem.getParent() instanceof Choice); + + // TODO: condition expression causes problem when used as + // name + m_conditionalDescription = elem.getName(); + + if (org.pi4soa.common.util.NamesUtil.isSet(elem.getExpression())) { + m_conditionalExpression = elem.getExpression(); + } + + if (isChoiceElement() == false) { + + // Get region + /* + Activity region=getTopLevelActivity(); + + // Create choice state + ActivityNode choiceState = region.createNode(null, + UMLPackage.eINSTANCE.getDecisionNode()); + choiceState.getInPartitions().add(getActivityPartition()); + */ + Object choiceState=getModelFactory().createDataBasedXORGateway(getContainer()); + + m_choiceState = new JunctionActivity(choiceState, this, + getModelFactory(), getNotationFactory()); + + // Create junction state + /* + ActivityNode junctionState = region.createNode(null, + UMLPackage.eINSTANCE.getMergeNode()); + junctionState.getInPartitions().add(getActivityPartition()); + */ + Object junctionState=getModelFactory().createDataBasedXORGateway(getContainer()); + + m_junctionState = new JunctionActivity(junctionState, this, + getModelFactory(), getNotationFactory()); + } + } + + /** + * This method determines whether the conditional is a + * choice element. + * + * @return Whether a choice element + */ + protected boolean isChoiceElement() { + return(m_choiceElement); + } + + /** + * This method indicates that the UML state for the + * child nodes is complete. + * + */ + public void childrenComplete() { + + if (m_completed == false) { + + if (isChoiceElement() == false) { + + // Move the junction state to the end of the list + if (getChildStates().remove(m_junctionState)) { + getChildStates().add(m_junctionState); + } + } + + // Join the child state vertex with transitions + transitionSequentialNodes(); + + if (isChoiceElement() == false) { + + // Place the condition on the outgoing transition + // from the choice state, before adding the alternate + // 'false' path + java.util.List list=getModelFactory().getOutboundControlLinks(m_choiceState.getEndNode()); + + if (list.size() > 0) { + Object outgoing=list.get(0); + + /* + org.eclipse.uml2.uml.OpaqueExpression expr= + (org.eclipse.uml2.uml.OpaqueExpression) + outgoing.createGuard("expression", null, + UMLPackage.eINSTANCE.getOpaqueExpression()); + */ + + if (m_conditionalExpression != null) { + //expr.getBodies().add(m_conditionalExpression); + getModelFactory().setLinkExpression(outgoing, + m_conditionalExpression); + } else { + //expr.getBodies().add("<non-observable>"); + getModelFactory().setLinkExpression(outgoing, + "<non-observable>"); + } + } + + // Have direct transition from choice to junction + // to represent the 'false' path + Object transition= + m_junctionState.transitionFrom(m_choiceState, + "false()"); + //transition.setName("false"); + + /* + org.eclipse.uml2.uml.OpaqueExpression expr= + (org.eclipse.uml2.uml.OpaqueExpression) + transition.createGuard("expression", null, + UMLPackage.eINSTANCE.getOpaqueExpression()); + + expr.getBodies().add("false()"); + */ + } + + if (isChoiceElement() == false) { + int width=0; + int height=0; + + // Calculate extra width + /* + width = m_junctionState.getWidth()+ + (HORIZONTAL_GAP*2)+ + m_choiceState.getWidth(); + */ + + height = m_choiceState.getHeight(); + + if (height < m_junctionState.getHeight()) { + height = m_junctionState.getHeight(); + } + + height += (VERTICAL_GAP*2); + + setWidth(getWidth()+width); + setHeight(getHeight()+height); + } + + m_completed = true; + } + } + + /** + * This method causes a transition to be established from + * the supplied BPMN state to the current state, applying + * any relevant information (such as event triggers + * or conditions) to the transition as appropriate. + * + * @param fromVertex The source vertex + * @return The transition + */ + public Object transitionFrom(BPMNActivity fromVertex, + String conditionalExpression) { + Object ret=null; + + if (isChoiceElement()) { + String expr=m_conditionalExpression; + + if (expr == null) { + expr = "<non-observable>"; + } + + ret = super.transitionFrom(fromVertex, expr); + } else { + ret = super.transitionFrom(fromVertex, conditionalExpression); + } + + if (ret != null && m_conditionalDescription != null) { + String name=m_conditionalDescription.replace(' ', '_'); + getModelFactory().setLabel(ret, name); + } + + return(ret); + } + + /** + * This method returns the start node for the activites + * represented by this BPMN activity implementation. + * + * @return The starting node + */ + public Object getStartNode() { + Object ret=null; + + if (isChoiceElement() == false) { + ret = m_choiceState.getStartNode(); + + } else if (getChildStates().size() > 0) { + BPMNActivity state=(BPMNActivity)getChildStates().get(0); + ret = state.getStartNode(); + } + + return(ret); + } + + /** + * This method returns the end node for the activities + * represented by this BPMN activity implementation. + * + * @return The ending node + */ + public Object getEndNode() { + Object ret=null; + int len=0; + + if (isChoiceElement() == false) { + ret = m_junctionState.getEndNode(); + + } else if ((len=getChildStates().size()) > 0) { + BPMNActivity state=(BPMNActivity)getChildStates().get(len-1); + ret = state.getEndNode(); + } + + return(ret); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + BPMNActivity ret=null; + + if (isChoiceElement() == false) { + ret = m_choiceState; + + } else if (getChildStates().size() > 0) { + BPMNActivity state=(BPMNActivity)getChildStates().get(0); + ret = state; + } + + return(ret); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + BPMNActivity ret=null; + int len=0; + + if (isChoiceElement() == false) { + ret = m_junctionState; + + } else if ((len=getChildStates().size()) > 0) { + BPMNActivity state=(BPMNActivity)getChildStates().get(len-1); + ret = state; + } + + return(ret); + } + + public void calculatePosition(int x, int y) { + if (isChoiceElement()) { + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + if (act instanceof SequenceActivity) { + act.calculatePosition(x, y); + } + } + + } else { + int junctionY=y+getHeight()-VERTICAL_GAP; + //int junctionY=y+(getHeight()/2); + + m_choiceState.calculatePosition(x, junctionY- + (m_choiceState.getHeight()/2)); + m_junctionState.calculatePosition(x+getWidth()- + m_junctionState.getWidth(), junctionY- + (m_junctionState.getHeight()/2)); + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + if (act instanceof SequenceActivity) { + act.calculatePosition(x+ + m_choiceState.getWidth()+ + HORIZONTAL_GAP, y); + } + } + } + } + + public void draw(Object parent) { + + // Construct notation + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.draw(parent); + } + } + + private boolean m_completed=false; + private boolean m_choiceElement=false; + + private BPMNActivity m_choiceState=null; + private BPMNActivity m_junctionState=null; + private String m_conditionalDescription=null; + private String m_conditionalExpression=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/JunctionActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/JunctionActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/JunctionActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,100 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +/** + * This class represents a junction within a + * BPMN process. + * + */ +public class JunctionActivity extends AbstractBPMNActivity { + + /** + * This constructor initializes the junction activity. + * + * @param node The junction node + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public JunctionActivity(Object node, + BPMNActivity parent, org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) { + super(parent, model, notation); + + m_node = node; + + } + + /** + * This method returns the start node for the activites + * represented by this UML activity implementation. + * + * @return The starting node + */ + public Object getStartNode() { + return(m_node); + } + + /** + * This method returns the end node for the activities + * represented by this UML activity implementation. + * + * @return The ending node + */ + public Object getEndNode() { + return(m_node); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + return(this); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + return(this); + } + + public int getWidth() { + return(30); + } + + public int getHeight() { + return(30); + } + + public void draw(Object parent) { + + if (getModelFactory().isDeleted(m_node) == false) { + getNotationFactory().createJunction(getModelFactory(), + m_node, parent, getX(), getY(), getWidth(), getHeight()); + } + } + + private Object m_node=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ParallelActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ParallelActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ParallelActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,252 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +import org.jboss.savara.tools.bpmn.generation.BPMNGenerationException; +import org.pi4soa.service.behavior.Parallel; + +/** + * This class represents a parallel grouping of states within a + * UML state machine. + * + */ +public class ParallelActivity extends AbstractBPMNActivity { + + /** + * This constructor initializes the parallel state. + * + * @param parallel The parallel + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public ParallelActivity(Parallel parallel, BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) + throws BPMNGenerationException { + super(parent, model, notation); + + initialize(parallel); + } + + /** + * This method performs the initialization of the + * parallel state. + * + * @param elem The parallel + * @throws BPMNGenerationException Failed to initialize + */ + protected void initialize(Parallel elem) throws BPMNGenerationException { + + // Get region + /* + Activity region=getTopLevelActivity(); + + // Create parallel state + ActivityNode parallelState = region.createNode(null, + UMLPackage.eINSTANCE.getForkNode()); + parallelState.getInPartitions().add(getActivityPartition()); + */ + Object parallelState=getModelFactory().createANDGateway(getContainer()); + + m_forkState = new JunctionActivity(parallelState, this, + getModelFactory(), getNotationFactory()); + + // Create join state + /* + ActivityNode joinState = region.createNode(null, + UMLPackage.eINSTANCE.getJoinNode()); + joinState.getInPartitions().add(getActivityPartition()); + */ + + Object joinState=getModelFactory().createANDGateway(getContainer()); + + m_joinState = new JunctionActivity(joinState, this, + getModelFactory(), getNotationFactory()); + } + + /** + * This method indicates that the UML state for the + * child nodes is complete. + * + */ + public void childrenComplete() { + + if (m_completed == false) { + int width=m_forkState.getWidth()+m_joinState.getWidth()+ + (2 * HORIZONTAL_GAP); + int height=0; + + // Move the junction state to the end of the list + if (getChildStates().remove(m_joinState)) { + getChildStates().add(m_joinState); + } + + // Join the child state vertex with transitions + int maxwidth=0; + + for (int i=1; i < getChildStates().size()-1; i++) { + BPMNActivity umls=(BPMNActivity)getChildStates().get(i); + + height += (umls.getHeight()+VERTICAL_GAP); + + if (umls.getWidth() > maxwidth) { + maxwidth = umls.getWidth(); + } + + umls.transitionFrom(m_forkState, null); + + // Check if state is a junction + Object endNode=umls.getEndNode(); + + /* Do not remove endpoint junctions from + * parallel elements, as this can cause issues + * with layout + if (getModelFactory().isJoin(endNode) || // instanceof org.eclipse.uml2.uml.MergeNode || + getModelFactory().isTerminal(endNode)) { // instanceof org.eclipse.uml2.uml.FlowFinalNode) { + + // Move the incoming transitions from the junction + // to the next state + java.util.List list=getModelFactory().getInboundControlLinks(endNode); + for (int j=list.size()-1; j >= 0; j--) { + Object transition=list.get(j); + + getModelFactory().setTarget(transition, + m_joinState.getStartNode()); + } + + // Remove the junction + getModelFactory().delete(endNode); + } else { + */ + m_joinState.transitionFrom(umls, null); + //} + } + + width += maxwidth; + + if (height >= HORIZONTAL_GAP) { + height -= HORIZONTAL_GAP; + } + + if (height < m_forkState.getHeight()) { + height = m_forkState.getHeight(); + } + + if (height < m_joinState.getHeight()) { + height = m_joinState.getHeight(); + } + + setWidth(width); + setHeight(height); + + adjustWidth(width); + + m_completed = true; + } + } + + /** + * This method returns the start node for the activites + * represented by this UML activity implementation. + * + * @return The starting node + */ + public Object getStartNode() { + return(m_forkState.getStartNode()); + } + + /** + * This method returns the end node for the activities + * represented by this UML activity implementation. + * + * @return The ending node + */ + public Object getEndNode() { + return(m_joinState.getEndNode()); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + return(m_forkState); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + return(m_joinState); + } + + public void adjustWidth(int width) { + int extrawidth=m_forkState.getWidth()+m_joinState.getWidth()+ + (2 * HORIZONTAL_GAP); + + setWidth(width); + + // Adjust child widths + for (int i=1; i < getChildStates().size()-1; i++) { + BPMNActivity umls=(BPMNActivity)getChildStates().get(i); + + umls.adjustWidth(width-extrawidth); + } + } + + public void calculatePosition(int x, int y) { + int cury=y; + int midx=x+(getWidth()/2); + int midy=y+(getHeight()/2); + + setX(x); + setY(y); + + for (int i=1; i < getChildStates().size()-1; i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.calculatePosition(midx-(act.getWidth()/2), cury); + //midy-(act.getHeight()/2)); + + cury += (act.getHeight()+VERTICAL_GAP); + } + + m_forkState.calculatePosition(x, midy); + m_joinState.calculatePosition(x+getWidth()- + m_joinState.getWidth(), midy); + } + + public void draw(Object parent) { + + // Construct notation + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.draw(parent); + } + } + + private boolean m_completed=false; + private BPMNActivity m_forkState=null; + private BPMNActivity m_joinState=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/PerformActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/PerformActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/PerformActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,92 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +/** + * This class represents the BPMN activity node for a Perform activity. + * + */ +public class PerformActivity extends SimpleActivity { + + /** + * This constructor initializes the receive state. + * + * @param act The behavioral activity + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public PerformActivity(org.pi4soa.service.behavior.ActivityType act, + BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) { + super(act, parent, model, notation); + } + + /** + * This method causes the receive activity to break any + * existing control links, including removing preceeding + * nodes that only have these links as their outgoing + * links. + * + */ + public void breakLinks() { + Object node=getStartNode(); + + java.util.List list=getModelFactory().getInboundControlLinks(node); + + for (int i=list.size()-1; i >= 0; i--) { + Object edge=list.get(i); + + tidyUpEdge(edge); + } + } + + /** + * This method tidies up an activity edge, recursively being + * called if its source node only has a single incoming + * activity edge. + * + * @param edge The activity edge + */ + protected void tidyUpEdge(Object edge) { + + // Check if source node has only a single incoming link + // and if so, then remove the node + Object sourceNode=getModelFactory().getSource(edge); + + getModelFactory().delete(edge); + + // If has less than 2 incoming links and no + // outgoing link, then tidyup node and links recursively + if (getModelFactory().getInboundControlLinks(sourceNode).size() <= 1 && + getModelFactory().getOutboundControlLinks(sourceNode).size() == 0 && + (getModelFactory().isDecision(sourceNode) || // was decision node + getModelFactory().isJoin(sourceNode))) { // was merge node + if (getModelFactory().getInboundControlLinks(sourceNode).size() == 1) { + Object actedge=getModelFactory(). + getInboundControlLinks(sourceNode).get(0); + + tidyUpEdge(actedge); + } + + getModelFactory().delete(sourceNode); + } + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ReceiveActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ReceiveActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/ReceiveActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,104 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +/** + * This class represents the UML activity node for a Receive activity. + * + */ +public class ReceiveActivity extends SimpleActivity { + + /** + * This constructor initializes the receive state. + * + * @param act The behavioral activity + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public ReceiveActivity(org.pi4soa.service.behavior.Receive act, + BPMNActivity parent, org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) { + super(act, parent, model, notation); + + m_receive = act; + } + + /** + * This method returns the behavioral receive activity. + * + * @return The receive activity + */ + public org.pi4soa.service.behavior.Receive getReceive() { + return(m_receive); + } + + /** + * This method causes the receive activity to break any + * existing control links, including removing preceeding + * nodes that only have these links as their outgoing + * links. + * + */ + public void breakLinks() { + Object node=getStartNode(); + + java.util.List list=getModelFactory().getInboundControlLinks(node); + + for (int i=list.size()-1; i >= 0; i--) { + Object edge=list.get(i); + + tidyUpEdge(edge); + } + } + + /** + * This method tidies up an activity edge, recursively being + * called if its source node only has a single incoming + * activity edge. + * + * @param edge The activity edge + */ + protected void tidyUpEdge(Object edge) { + + // Check if source node has only a single incoming link + // and if so, then remove the node + Object sourceNode=getModelFactory().getSource(edge); + + getModelFactory().delete(edge); + + // If has less than 2 incoming links and no + // outgoing link, then tidyup node and links recursively + if (getModelFactory().getInboundControlLinks(sourceNode).size() <= 1 && + getModelFactory().getOutboundControlLinks(sourceNode).size() == 0 && + (getModelFactory().isDecision(sourceNode) || // was decision node + getModelFactory().isJoin(sourceNode))) { // was merge node + if (getModelFactory().getInboundControlLinks(sourceNode).size() == 1) { + Object actedge=getModelFactory(). + getInboundControlLinks(sourceNode).get(0); + + tidyUpEdge(actedge); + } + + getModelFactory().delete(sourceNode); + } + } + + private org.pi4soa.service.behavior.Receive m_receive=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/SequenceActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/SequenceActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/SequenceActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,186 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +//import org.pi4soa.service.behavior.Sequence; + +/** + * This class represents a sequence of states within a + * UML state machine. + * + */ +public class SequenceActivity extends AbstractBPMNActivity { + + /** + * This constructor initializes the sequence state. + * + * @param sequence The sequence + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public SequenceActivity(org.pi4soa.service.behavior.ActivityType sequence, + BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) { + super(parent, model, notation); + + //addChildState(new SimpleState(null, this)); + //addChildState(new SimpleState(null, this)); + } + + /** + * This method indicates that the UML state for the + * child nodes is complete. + * + */ + public void childrenComplete() { + + if (m_completed == false) { + + // Join the child state vertex with transitions + /* + for (int i=1; i < getChildStates().size(); i++) { + UMLState v1=(UMLState)getChildStates().get(i-1); + UMLState v2=(UMLState)getChildStates().get(i); + + v2.transitionFrom(v1); + } + */ + transitionSequentialNodes(); + + m_completed = true; + } + } + + public void calculatePosition(int x, int y) { + int curx=x; + int midy=y+(getHeight()/2); + + setX(x); + setY(y); + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.calculatePosition(curx, midy-(act.getHeight()/2)); + + curx += (act.getWidth()+HORIZONTAL_GAP); + } + } + + /** + * This method returns the start node for the activites + * represented by this UML activity implementation. + * + * @return The starting node + */ + public Object getStartNode() { + Object ret=null; + + if (getChildStates().size() > 0) { + BPMNActivity state=(BPMNActivity)getChildStates().get(0); + ret = state.getStartNode(); + } + + return(ret); + } + + /** + * This method returns the end node for the activities + * represented by this UML activity implementation. + * + * @return The ending node + */ + public Object getEndNode() { + Object ret=null; + int len=0; + + if ((len=getChildStates().size()) > 0) { + BPMNActivity state=(BPMNActivity)getChildStates().get(len-1); + ret = state.getEndNode(); + } + + return(ret); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + BPMNActivity ret=null; + + if (getChildStates().size() > 0) { + BPMNActivity state=(BPMNActivity)getChildStates().get(0); + ret = state; + } + + return(ret); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + BPMNActivity ret=null; + int len=0; + + if ((len=getChildStates().size()) > 0) { + BPMNActivity state=(BPMNActivity)getChildStates().get(len-1); + ret = state.getEndState(); + } + + return(ret); + } + + public void adjustWidth(int width) { + float percentChange=((float)width)/((float)getWidth()); + + //setWidth(width); + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + int cur=act.getWidth(); + int newWidth=(int)((float)cur * percentChange); + + act.adjustWidth(newWidth); + + int change=act.getWidth()-cur; + + setWidth(getWidth()+change); + } + } + + public void draw(Object parent) { + + // Construct notation + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.draw(parent); + } + } + + private boolean m_completed=false; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/SimpleActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/SimpleActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/SimpleActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,144 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +/** + * This class represents a simple task within a + * BPMN process. + * + */ +public class SimpleActivity extends AbstractBPMNActivity { + + /** + * This constructor initializes the simple activity. + * + * @param act The behavioral activity + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public SimpleActivity(org.pi4soa.service.behavior.ActivityType act, + BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) { + super(parent, model, notation); + + // Create a state + /* + Activity region=getTopLevelActivity(); + + if (region != null) { + m_node = (ActivityNode) + region.createNode(null, UMLPackage.eINSTANCE.getCallBehaviorAction()); + m_node.getInPartitions().add(getActivityPartition()); + + if (label != null) { + m_node.setName(label); + } + } + */ + m_node = model.createSimpleTask(getContainer(), act); + + } + + /** + * Internal constructor which can be used to wrap a vertex. + * + * @param vertex The vertex + * @param parent The parent state + */ + /* + protected SimpleActivity(org.eclipse.uml2.uml.ActivityNode node, BPMNActivity parent) { + super(parent); + + m_node = node; + } + */ + + /** + * This method sets the association between this state and + * the sub-state machine that it represents. + * + * @param subMachine The sub state machine + */ + /* + public void setSubStateMachine(ActivityModel subMachine) { + + ((State)m_node).setSubmachine(subMachine.getStateMachine()); + } + */ + + /** + * This method returns the start node for the activites + * represented by this UML activity implementation. + * + * @return The starting node + */ + public Object getStartNode() { + return(m_node); + } + + /** + * This method returns the end node for the activities + * represented by this UML activity implementation. + * + * @return The ending node + */ + public Object getEndNode() { + return(m_node); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + return(this); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + return(this); + } + + public int getWidth() { + return(m_width); + } + + public int getHeight() { + return(60); + } + + public void adjustWidth(int width) { + m_width = width; + } + + public void draw(Object parent) { + getNotationFactory().createTask(getModelFactory(), + m_node, parent, getX(), getY(), getWidth(), getHeight()); + } + + private Object m_node=null; + private int m_width=110; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/WhenActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/WhenActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/WhenActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,387 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +import org.jboss.savara.tools.bpmn.generation.BPMNGenerationException; +import org.pi4soa.service.behavior.When; + +/** + * This class represents a when activity within a + * UML state machine. + * + */ +public class WhenActivity extends AbstractBPMNActivity { + + /** + * This constructor initializes the when state. + * + * @param when The when + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public WhenActivity(When when, BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) + throws BPMNGenerationException { + super(parent, model, notation); + + initialize(when); + } + + /** + * This method performs the initialization of the + * when's state. + * + * @param elem The when + * @throws BPMNGenerationException Failed to initialize + */ + protected void initialize(When elem) throws BPMNGenerationException { + + if (org.pi4soa.common.util.NamesUtil.isSet(elem.getExpression())) { + m_conditionalExpression = elem.getExpression(); + } + + if (org.pi4soa.common.util.NamesUtil.isSet(elem.getReEvaluateExpression())) { + m_repeatExpression = elem.getReEvaluateExpression(); + } + + // Get region + /* + Activity region=getTopLevelActivity(); + + ActivityNode initialState = region.createNode(null, + UMLPackage.eINSTANCE.getCallBehaviorAction()); + initialState.setName(UMLGenerationUtil.processName("When "+elem.getName())); + initialState.getInPartitions().add(getActivityPartition()); + m_initialState = new SimpleActivity(initialState, this); + */ + + m_initialState = new SimpleActivity(elem, this, getModelFactory(), + getNotationFactory()); + + // Only create end choice if there is a possibility of repeating + if (m_repeatExpression != null) { + /* + ActivityNode endChoiceState = region.createNode(null, + UMLPackage.eINSTANCE.getDecisionNode()); + endChoiceState.getInPartitions().add(getActivityPartition()); + + m_endChoiceState = new SimpleActivity(endChoiceState, this); + */ + + Object endChoiceState=getModelFactory().createDataBasedXORGateway(getContainer()); + + m_endChoiceState = new JunctionActivity(endChoiceState, this, + getModelFactory(), getNotationFactory()); + + // Create junction state + Object junctionState=getModelFactory().createFinalNode(getContainer()); + + m_junctionState = new JunctionActivity(junctionState, this, + getModelFactory(), getNotationFactory()); + } + } + + /** + * This method indicates that the UML state for the + * child nodes is complete. + * + */ + public void childrenComplete() { + + if (m_completed == false) { + + // Move the end choice state to the end of the list + if (m_endChoiceState != null && + getChildStates().remove(m_endChoiceState)) { + getChildStates().add(m_endChoiceState); + } + + // Move the junction state to the end of the list + boolean junctionRemoved=false; + + if (m_junctionState != null) { + junctionRemoved = getChildStates().remove(m_junctionState); + } + + // If no repeat condition, then include junction before + // setting up sequential transitions + if (junctionRemoved && m_repeatExpression == null) { + getChildStates().add(m_junctionState); + } + + // Join the child state vertex with transitions + // Don't join the endChoice and junction states here + transitionSequentialNodes(); + + /* + java.util.List list=m_initialState.getEndNode().getOutgoings(); + + if (list.size() > 0) { + ActivityEdge transition=(ActivityEdge)list.get(0); + + org.eclipse.uml2.uml.OpaqueExpression expr= + (org.eclipse.uml2.uml.OpaqueExpression) + transition.createGuard("expression", null, + UMLPackage.eINSTANCE.getOpaqueExpression()); + + if (m_conditionalExpression != null) { + expr.getBodies().add(m_conditionalExpression); + } else { + expr.getBodies().add("<non-observable>"); + } + } + */ + java.util.List list=getModelFactory().getOutboundControlLinks(m_initialState.getEndNode()); + + if (list.size() > 0) { + Object outgoing=list.get(0); + + if (m_conditionalExpression != null) { + getModelFactory().setLinkExpression(outgoing, + m_conditionalExpression); + } else { + getModelFactory().setLinkExpression(outgoing, + "<non-observable>"); + } + } + + // Junction is re-added after setting up the sequential transitions, + // so that it is not sequentially transitioned - only transition + // to the junction state based on an appropriate condition + // evaluation + if (junctionRemoved && m_repeatExpression != null) { + getChildStates().add(m_junctionState); + } + + // Transition from end choice state to start vertex + // to represent the loop back + if (m_repeatExpression != null) { + /* + ActivityEdge loopback= + m_initialState.transitionFrom(m_endChoiceState); + + org.eclipse.uml2.uml.OpaqueExpression expr= + (org.eclipse.uml2.uml.OpaqueExpression) + loopback.createGuard("expression", null, + UMLPackage.eINSTANCE.getOpaqueExpression()); + + expr.getBodies().add(m_repeatExpression); + */ + m_initialState.transitionFrom(m_endChoiceState, + m_repeatExpression); + + // Transition from end choice state to junction, to + // represent the situation where the loopback does + // not occur + /* + ActivityEdge whenEnd= + m_junctionState.transitionFrom(m_endChoiceState); + + expr = (org.eclipse.uml2.uml.OpaqueExpression) + whenEnd.createGuard("expression", null, + UMLPackage.eINSTANCE.getOpaqueExpression()); + + expr.getBodies().add("false()"); + */ + m_junctionState.transitionFrom(m_endChoiceState, + "false()"); + } + + int width=0; + int height=0; + + // Calculate extra width + if (m_junctionState != null) { + width = m_junctionState.getWidth()+HORIZONTAL_GAP; + + height = m_initialState.getHeight(); + + if (m_junctionState != null && + height < m_junctionState.getHeight()) { + height = m_junctionState.getHeight(); + } + + height += (VERTICAL_GAP*2); + + if (m_endChoiceState != null) { + height += m_endChoiceState.getHeight()+VERTICAL_GAP; + } + + setWidth(getWidth()+width); + setHeight(getHeight()+height); + } + + m_completed = true; + } + } + + public void calculatePosition(int x, int y) { + + if (m_junctionState == null) { + int curx=x; + int midy=y+(getHeight()/2); + + setX(x); + setY(y); + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.calculatePosition(curx, midy-(act.getHeight()/2)); + + curx += (act.getWidth()+HORIZONTAL_GAP); + } + } else { + /* + if (isChoiceElement()) { + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + if (act instanceof SequenceActivity) { + act.calculatePosition(x, y); + } + } + + } else { + */ + int junctionY=y+getHeight()-VERTICAL_GAP; + //int junctionY=y+(getHeight()/2); + int extraY=0; + + m_initialState.calculatePosition(x, junctionY- + (m_initialState.getHeight()/2)); + + if (m_junctionState != null) { + m_junctionState.calculatePosition(x+getWidth()- + m_junctionState.getWidth(), junctionY- + (m_junctionState.getHeight()/2)); + } + + if (m_endChoiceState != null) { + m_endChoiceState.calculatePosition(x+getWidth()- +// m_junctionState.getWidth(), y); + m_junctionState.getWidth()- + HORIZONTAL_GAP, junctionY- + (m_junctionState.getHeight()/2)); + //extraY = m_endChoiceState.getHeight()+VERTICAL_GAP; + } + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + if (act instanceof SequenceActivity) { + act.calculatePosition(x+ + m_initialState.getWidth()+ + HORIZONTAL_GAP, y+extraY); + } + } + } + } + + public void draw(Object parent) { + + // Construct notation + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.draw(parent); + } + } + /** + * This method returns the start node for the activites + * represented by this UML activity implementation. + * + * @return The starting node + */ + public Object getStartNode() { + Object ret=null; + BPMNActivity state=getStartState(); + + if (state != null) { + ret = state.getStartNode(); + } + + return(ret); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + BPMNActivity ret=null; + + if (getChildStates().size() > 0) { + ret = (BPMNActivity)getChildStates().get(0); + } + + return(ret); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + BPMNActivity ret=null; + + if (m_junctionState != null) { + ret = m_junctionState; + } else if (getChildStates().size() > 0) { + BPMNActivity act=(BPMNActivity) + getChildStates().get(getChildStates().size()-1); + ret = act; + } + + return(ret); + } + + /** + * This method returns the end node for the activities + * represented by this UML activity implementation. + * + * @return The ending node + */ + public Object getEndNode() { + Object ret=null; + + if (m_junctionState != null) { + ret = m_junctionState.getEndNode(); + } else if (getChildStates().size() > 0) { + BPMNActivity act=(BPMNActivity) + getChildStates().get(getChildStates().size()-1); + ret = act.getEndNode(); + } + + return(ret); + } + + private boolean m_completed=false; + + private BPMNActivity m_initialState=null; + private BPMNActivity m_endChoiceState=null; + private BPMNActivity m_junctionState=null; + private String m_conditionalExpression=null; + private String m_repeatExpression=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/WhileActivity.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/WhileActivity.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/components/WhileActivity.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,472 @@ +/* + * Copyright 2005-7 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * Jan 25, 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.components; + +import org.jboss.savara.tools.bpmn.generation.BPMNGenerationException; +import org.pi4soa.service.behavior.Choice; +import org.pi4soa.service.behavior.While; + +/** + * This class represents a while repetition within a + * UML state machine. + * + */ +public class WhileActivity extends AbstractBPMNActivity { + + /** + * This constructor initializes the while state. + * + * @param while The while + * @param parent The parent BPMN state + * @param model The BPMN model + */ + public WhileActivity(While whileElem, BPMNActivity parent, + org.jboss.savara.tools.bpmn.generation.BPMNModelFactory model, + org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory notation) + throws BPMNGenerationException { + super(parent, model, notation); + + initialize(whileElem); + } + + /** + * This method performs the initialization of the + * whiles state. + * + * @param elem The while + * @throws BPMNGenerationException Failed to initialize + */ + protected void initialize(While elem) throws BPMNGenerationException { + m_choiceElement = (elem.getParent() instanceof Choice); + + m_conditionalDescription = elem.getName(); + + if (org.pi4soa.common.util.NamesUtil.isSet(elem.getExpression())) { + m_conditionalExpression = elem.getExpression(); + } + + if (org.pi4soa.common.util.NamesUtil.isSet(elem.getReEvaluateExpression()) && + elem.getReEvaluateExpression().equals("true()") == false) { + m_repeatExpression = elem.getReEvaluateExpression(); + + if (isChoiceElement() && m_conditionalExpression != null) { + m_repeatExpression += " and "+m_conditionalExpression; + } + } else if (isChoiceElement() && m_conditionalExpression != null) { + m_repeatExpression = m_conditionalExpression; + } + + // Get region + //Activity region=getTopLevelActivity(); + + if (isChoiceElement() == false) { + + // Create choice state + /* + ActivityNode choiceState = region.createNode(null, + UMLPackage.eINSTANCE.getDecisionNode()); + choiceState.getInPartitions().add(getActivityPartition()); + + m_initialChoiceState = new SimpleActivity(choiceState, this); + */ + Object choiceState=getModelFactory().createDataBasedXORGateway(getContainer()); + + m_initialChoiceState = new JunctionActivity(choiceState, this, + getModelFactory(), getNotationFactory()); + } + + if (m_repeatExpression != null) { + /* + ActivityNode endChoiceState = region.createNode(null, + UMLPackage.eINSTANCE.getDecisionNode()); + endChoiceState.getInPartitions().add(getActivityPartition()); + + m_endChoiceState = new SimpleActivity(endChoiceState, this); + */ + Object endChoiceState=getModelFactory().createDataBasedXORGateway(getContainer()); + + m_endChoiceState = new JunctionActivity(endChoiceState, this, + getModelFactory(), getNotationFactory()); + } + + // Create junction state + /* + ActivityNode junctionState = region.createNode(null, + UMLPackage.eINSTANCE.getMergeNode()); + junctionState.getInPartitions().add(getActivityPartition()); + + m_junctionState = new SimpleActivity(junctionState, this); + */ + Object junctionState=getModelFactory().createDataBasedXORGateway(getContainer()); + + m_junctionState = new JunctionActivity(junctionState, this, + getModelFactory(), getNotationFactory()); + } + + /** + * This method determines whether the conditional is a + * choice element. + * + * @return Whether a choice element + */ + protected boolean isChoiceElement() { + return(m_choiceElement); + } + + /** + * This method indicates that the UML state for the + * child nodes is complete. + * + */ + public void childrenComplete() { + + if (m_completed == false) { + + // Move the end choice state to the end of the list + if (m_endChoiceState != null && + getChildStates().remove(m_endChoiceState)) { + getChildStates().add(m_endChoiceState); + } + + // Move the junction state to the end of the list + boolean junctionRemoved=getChildStates().remove(m_junctionState); + + // Join the child state vertex with transitions + // Don't join the endChoice and junction states here + transitionSequentialNodes(); + + // Label the expression on the choice outgoing link + /* + java.util.List list= + m_initialChoiceState.getEndNode().getOutgoings(); + if (list != null && list.size() > 0) { + ActivityEdge t=(ActivityEdge)list.get(0); + + if (t != null && m_conditionalDescription != null) { + String name=m_conditionalDescription.replace(' ', '_'); + t.setName(name); + + org.eclipse.uml2.uml.OpaqueExpression expr= + (org.eclipse.uml2.uml.OpaqueExpression) + t.createGuard("expression", null, + UMLPackage.eINSTANCE.getOpaqueExpression()); + + if (m_conditionalExpression != null) { + expr.getBodies().add(m_conditionalExpression); + } else { + expr.getBodies().add("<non-observable>"); + } + } + } + */ + + if (m_initialChoiceState != null) { + java.util.List list=getModelFactory().getOutboundControlLinks(m_initialChoiceState.getEndNode()); + + if (list.size() > 0) { + Object outgoing=list.get(0); + + if (m_conditionalExpression != null) { + getModelFactory().setLinkExpression(outgoing, + m_conditionalExpression); + } else { + getModelFactory().setLinkExpression(outgoing, + "<non-observable>"); + } + } + } + + // Junction is re-added after setting up the sequential transitions, + // so that it is not sequentially transitioned - only transition + // to the junction state based on an appropriate condition + // evaluation + BPMNActivity lastState=(BPMNActivity)getChildStates(). + get(getChildStates().size()-1); + + if (junctionRemoved) { + getChildStates().add(m_junctionState); + } + + if (isChoiceElement() == false) { + + // Have direct transition from choice to junction + // to represent the 'false' path + /* + ActivityEdge transition= + m_junctionState.transitionFrom(m_initialChoiceState); + //transition.setName("false"); + + org.eclipse.uml2.uml.OpaqueExpression expr= + (org.eclipse.uml2.uml.OpaqueExpression) + transition.createGuard("expression", null, + UMLPackage.eINSTANCE.getOpaqueExpression()); + + expr.getBodies().add("false()"); + */ + m_junctionState.transitionFrom(m_initialChoiceState, + "false()"); + } + + if (m_repeatExpression != null) { + // Transition from end choice state to start vertex + // to represent the loop back + /* + ActivityEdge loopback= + getStartState().transitionFrom(m_endChoiceState); + + if (loopback != null && m_repeatExpression != null) { + org.eclipse.uml2.uml.OpaqueExpression expr= + (org.eclipse.uml2.uml.OpaqueExpression) + loopback.createGuard("expression", null, + UMLPackage.eINSTANCE.getOpaqueExpression()); + + expr.getBodies().add(m_repeatExpression); + } + */ + + getStartState().transitionFrom(m_endChoiceState, + m_repeatExpression != null? + m_repeatExpression:"<non-observable>"); + + // Transition from end choice state to junction, to + // represent the situation where the loopback does + // not occur + /* + ActivityEdge whileEnd= + m_junctionState.transitionFrom(m_endChoiceState); + + org.eclipse.uml2.uml.OpaqueExpression expr= + (org.eclipse.uml2.uml.OpaqueExpression) + whileEnd.createGuard("expression", null, + UMLPackage.eINSTANCE.getOpaqueExpression()); + + expr.getBodies().add("false()"); + */ + m_junctionState.transitionFrom(m_endChoiceState, + "false()"); + } else { + // Establish transition from last state to initial choice + //m_initialChoiceState.transitionFrom(lastState, null); + getStartState().transitionFrom(lastState, null); + + if (isChoiceElement()) { + m_junctionState.transitionFrom(lastState, + "false()"); + } + } + + if (isChoiceElement() == false) { + int width=0; + int height=0; + + // Calculate extra width + width = m_initialChoiceState.getWidth()+HORIZONTAL_GAP+ + m_junctionState.getWidth()+HORIZONTAL_GAP; + + height = m_initialChoiceState.getHeight(); + + if (height < m_junctionState.getHeight()) { + height = m_junctionState.getHeight(); + } + + height += (VERTICAL_GAP*2); + + if (m_endChoiceState != null) { + height += m_endChoiceState.getHeight()+VERTICAL_GAP; + } + + setWidth(getWidth()+width); + setHeight(getHeight()+height); + } else { + + int width=0; + int height=0; + + // Calculate extra width + width = m_junctionState.getWidth()+HORIZONTAL_GAP; + + setWidth(getWidth()+width); + } + + m_completed = true; + } + } + + public void calculatePosition(int x, int y) { + int junctionY=y+getHeight()-VERTICAL_GAP; + + if (isChoiceElement()) { + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + if (act instanceof SequenceActivity) { + act.calculatePosition(x, y); + } + } + + m_junctionState.calculatePosition(x+getWidth()- + m_junctionState.getWidth(), junctionY- + (m_junctionState.getHeight()/2)); + + if (m_endChoiceState != null) { + m_endChoiceState.calculatePosition(x+getWidth()- + m_junctionState.getWidth()-HORIZONTAL_GAP- + m_endChoiceState.getWidth(), + junctionY-m_endChoiceState.getHeight()- + (VERTICAL_GAP/2)); + //extraY = m_endChoiceState.getHeight()+VERTICAL_GAP; + } + + } else { + //int junctionY=y+(getHeight()/2); + int extraY=0; + + m_initialChoiceState.calculatePosition(x, junctionY- + (m_initialChoiceState.getHeight()/2)); + m_junctionState.calculatePosition(x+getWidth()- + m_junctionState.getWidth(), junctionY- + (m_junctionState.getHeight()/2)); + + if (m_endChoiceState != null) { + m_endChoiceState.calculatePosition(x+getWidth()- + m_junctionState.getWidth()-HORIZONTAL_GAP- + m_endChoiceState.getWidth(), + junctionY-m_endChoiceState.getHeight()- + (VERTICAL_GAP/2)); + //extraY = m_endChoiceState.getHeight()+VERTICAL_GAP; + } + + SequenceActivity seq=null; + + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + if (act instanceof SequenceActivity) { + seq = (SequenceActivity)act; + + //act.calculatePosition(x+ + // m_initialChoiceState.getWidth()+ + // HORIZONTAL_GAP, y+extraY); + int gap=(VERTICAL_GAP/4); + + if (m_endChoiceState != null) { + gap = VERTICAL_GAP; + } + + act.calculatePosition(x+ + m_initialChoiceState.getWidth()+ + HORIZONTAL_GAP, junctionY- + act.getHeight()-gap); + } + } + + // If a normal expression, then move the end + // node of the last child, to help with layout + if (m_endChoiceState == null && seq.getChildStates().size() > 0) { + BPMNActivity lastState=(BPMNActivity)seq.getEndState(); + + lastState.calculatePosition(x+getWidth()- + lastState.getWidth()-HORIZONTAL_GAP- + m_junctionState.getWidth(), + junctionY-lastState.getHeight()- + (VERTICAL_GAP/2)); + } + } + } + + public void draw(Object parent) { + + // Construct notation + for (int i=0; i < getChildStates().size(); i++) { + BPMNActivity act=(BPMNActivity)getChildStates().get(i); + + act.draw(parent); + } + } + + /** + * This method returns the start node for the activites + * represented by this UML activity implementation. + * + * @return The starting node + */ + public Object getStartNode() { + Object ret=null; + BPMNActivity state=getStartState(); + + if (state != null) { + ret = state.getStartNode(); + } + + return(ret); + } + + /** + * This method returns the start state. + * + * @return The start state + */ + public BPMNActivity getStartState() { + BPMNActivity ret=null; + + if (isChoiceElement() == false) { + ret = m_initialChoiceState; + + } else if (getChildStates().size() > 0) { + ret = (BPMNActivity)getChildStates().get(0); + } + + return(ret); + } + + /** + * This method returns the end state. + * + * @return The end state + */ + public BPMNActivity getEndState() { + return(m_junctionState); + } + + /** + * This method returns the end node for the activities + * represented by this UML activity implementation. + * + * @return The ending node + */ + public Object getEndNode() { + return(m_junctionState.getEndNode()); + } + + public boolean canDeleteEndNode() { + return(false); + } + + private boolean m_completed=false; + private boolean m_choiceElement=false; + + private BPMNActivity m_initialChoiceState=null; + private BPMNActivity m_endChoiceState=null; + private BPMNActivity m_junctionState=null; + private String m_conditionalDescription=null; + private String m_conditionalExpression=null; + private String m_repeatExpression=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/gmf/GMFBPMNNotationFactoryImpl.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/gmf/GMFBPMNNotationFactoryImpl.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/gmf/GMFBPMNNotationFactoryImpl.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,341 @@ +/* + * Copyright 2005-6 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 30 Jan 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.gmf; + +import org.eclipse.gmf.runtime.notation.*; +import org.jboss.savara.tools.bpmn.generation.BPMNGenerationException; +import org.jboss.savara.tools.bpmn.generation.BPMNModelFactory; +import org.jboss.savara.tools.bpmn.generation.BPMNNotationFactory; + +public class GMFBPMNNotationFactoryImpl implements BPMNNotationFactory { + + public String getFileExtension() { + return("bpmn_diagram"); + } + + public void saveNotation(String modelFileName, Object diagramModel, + String notationFileName, Object diagramNotation) + throws BPMNGenerationException { + try { + int pos=notationFileName.lastIndexOf(java.io.File.separator); + + ((Diagram)diagramNotation).setName(notationFileName.substring(pos+1)); + + org.eclipse.emf.ecore.resource.ResourceSet resourceSet = + new org.eclipse.emf.ecore.resource.impl.ResourceSetImpl(); + +// Register XML resource factory + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("bpmn_diagram", + new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl()); + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("bpmn", + new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl()); + + resourceSet.getPackageRegistry().put(NotationPackage.eINSTANCE.getNsURI(), NotationPackage.eINSTANCE); + resourceSet.getPackageRegistry().put(org.eclipse.stp.bpmn.BpmnPackage.eINSTANCE.getNsURI(), org.eclipse.stp.bpmn.BpmnPackage.eINSTANCE); + + org.eclipse.emf.ecore.resource.Resource modelResource = + resourceSet.createResource(org.eclipse.emf.common.util.URI.createFileURI(modelFileName)); + + if (modelResource instanceof org.eclipse.emf.ecore.xmi.XMLResource) { + setXMIId((org.eclipse.emf.ecore.xmi.XMLResource)modelResource, + (org.eclipse.stp.bpmn.BpmnDiagram)diagramModel); + } + + modelResource.getContents().add((org.eclipse.emf.ecore.EObject)diagramModel); + + org.eclipse.emf.ecore.resource.Resource notationResource = + resourceSet.createResource(org.eclipse.emf.common.util.URI.createFileURI(notationFileName)); + + if (notationResource instanceof org.eclipse.emf.ecore.xmi.XMLResource) { + setXMIId((org.eclipse.emf.ecore.xmi.XMLResource)notationResource, + (org.eclipse.emf.ecore.EObject)diagramNotation); + } + + notationResource.getContents().add((org.eclipse.emf.ecore.EObject)diagramNotation); + + /* + org.eclipse.emf.ecore.resource.Resource resource = + ((Diagram)diagramNotation).eResource(); + resource.setURI(org.eclipse.emf.common.util.URI.createFileURI(fileName)); + */ + + org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl xmi = + new org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl(); + java.util.Map options=xmi.getDefaultSaveOptions(); + + options.put(org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl.OPTION_SAVE_TYPE_INFORMATION, Boolean.TRUE); + //options.put(org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl.OPTION_RECORD_ANY_TYPE_NAMESPACE_DECLARATIONS, Boolean.TRUE); + notationResource.save(options); + modelResource.save(options); + + +/* + // Output the UML2 model to the supplied stream + final org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl xmi = + new org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl(); + xmi.setURI(org.eclipse.emf.common.util.URI.createFileURI(fileName)); + + xmi.getResourceSet(); + + org.eclipse.emf.ecore.resource.impl.ResourceSetImpl set= + new org.eclipse.emf.ecore.resource.impl.ResourceSetImpl(); + + org.eclipse.stp.bpmn.BpmnPackage.eINSTANCE.getActivity(); + + System.out.println("Registry for '"+org.eclipse.stp.bpmn.BpmnPackage.eNS_URI + +": "+xmi.getResourceSet().getPackageRegistry().getEPackage(org.eclipse.stp.bpmn.BpmnPackage.eNS_URI)); + + xmi.getContents().add(diagramNotation); + + xmi.doSave(ostream, xmi.getDefaultLoadOptions()); +*/ + //ostream.close(); + + } catch(Exception e) { + throw new BPMNGenerationException("Failed to convert to XMI", e); + } + } + + public Object createDiagram(BPMNModelFactory factory, Object diagramModel, + int x, int y, int width, int height) { + Diagram ret=NotationFactory.eINSTANCE.createDiagram(); + + ret.setType("Bpmn"); + ret.setMeasurementUnit(MeasurementUnit.PIXEL_LITERAL); + ret.setElement((org.eclipse.emf.ecore.EObject)diagramModel); + + ret.getStyles().add(NotationFactory.eINSTANCE.createPageStyle()); + ret.getStyles().add(NotationFactory.eINSTANCE.createGuideStyle()); + ret.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle()); + + /* + try { + org.eclipse.emf.ecore.resource.ResourceSet resourceSet = + new org.eclipse.emf.ecore.resource.impl.ResourceSetImpl(); + +// Register XML resource factory +resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("bpmn_diagram", + new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl()); + +resourceSet.getPackageRegistry().put(NotationPackage.eINSTANCE.getNsURI(), NotationPackage.eINSTANCE); +resourceSet.getPackageRegistry().put(org.eclipse.stp.bpmn.BpmnPackage.eINSTANCE.getNsURI(), org.eclipse.stp.bpmn.BpmnPackage.eINSTANCE); + +org.eclipse.emf.ecore.resource.Resource resource = + resourceSet.createResource(org.eclipse.emf.common.util.URI.createFileURI("test.xmi")); +// add the root object to the resource +resource.getContents().add(ret); + } catch(Exception e) { + e.printStackTrace(); + } + */ + + return(ret); + } + + public Object createPool(BPMNModelFactory factory, Object poolModel, + Object diagramNotation, int x, int y, int width, int height) { + Node ret=NotationFactory.eINSTANCE.createNode(); + + ret.setElement((org.eclipse.emf.ecore.EObject)poolModel); + ret.setType("1001"); + + Bounds bounds=NotationFactory.eINSTANCE.createBounds(); + bounds.setHeight(height); + bounds.setWidth(width+100); + bounds.setX(x); + bounds.setY(y); + + ret.setLayoutConstraint(bounds); + + FontStyle font=NotationFactory.eINSTANCE.createFontStyle(); + font.setFontName("Ariel"); + ret.getStyles().add(font); + ret.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle()); + + FillStyle fill=NotationFactory.eINSTANCE.createFillStyle(); + fill.setFillColor(16771304); + ret.getStyles().add(fill); + + LineStyle line=NotationFactory.eINSTANCE.createLineStyle(); + line.setLineColor(11119017); + ret.getStyles().add(line); + + Node nameNode=NotationFactory.eINSTANCE.createNode(); + nameNode.setType("4008"); + ret.insertChild(nameNode); + + Node lineNode=NotationFactory.eINSTANCE.createNode(); + lineNode.setType("5001"); + ret.getStyles().add(NotationFactory.eINSTANCE.createDrawerStyle()); + ret.getStyles().add(NotationFactory.eINSTANCE.createSortingStyle()); + ret.getStyles().add(NotationFactory.eINSTANCE.createFilteringStyle()); + ret.insertChild(lineNode); + + ((Diagram)diagramNotation).insertChild(ret); + + return(lineNode); + } + + public Object createTask(BPMNModelFactory factory, + Object taskModel, Object parentNotation, + int x, int y, int width, int height) { + Node ret=NotationFactory.eINSTANCE.createNode(); + + ret.setElement((org.eclipse.emf.ecore.EObject)taskModel); + ret.setType("2001"); + + Bounds bounds=NotationFactory.eINSTANCE.createBounds(); + bounds.setHeight(height); + bounds.setWidth(width); + bounds.setX(x); + bounds.setY(y); + + ret.setLayoutConstraint(bounds); + + FontStyle font=NotationFactory.eINSTANCE.createFontStyle(); + font.setFontName("Ariel"); + ret.getStyles().add(font); + ret.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle()); + + FillStyle fill=NotationFactory.eINSTANCE.createFillStyle(); + fill.setFillColor(16771304); + ret.getStyles().add(fill); + + LineStyle line=NotationFactory.eINSTANCE.createLineStyle(); + line.setLineColor(11119017); + ret.getStyles().add(line); + + Node nameNode=NotationFactory.eINSTANCE.createNode(); + nameNode.setType("4001"); + ret.insertChild(nameNode); + + ((Node)parentNotation).insertChild(ret); + + m_taskViews.put(taskModel, ret); + + return(ret); + } + + + public Object createJunction(BPMNModelFactory factory, + Object junctionModel, Object parentNotation, + int x, int y, int width, int height) { + Node ret=NotationFactory.eINSTANCE.createNode(); + + ret.setElement((org.eclipse.emf.ecore.EObject)junctionModel); + ret.setType("2001"); + + Bounds bounds=NotationFactory.eINSTANCE.createBounds(); + bounds.setHeight(height); + bounds.setWidth(width); + bounds.setX(x); + bounds.setY(y); + + ret.setLayoutConstraint(bounds); + + FontStyle font=NotationFactory.eINSTANCE.createFontStyle(); + font.setFontName("Ariel"); + ret.getStyles().add(font); + ret.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle()); + + FillStyle fill=NotationFactory.eINSTANCE.createFillStyle(); + fill.setFillColor(16771304); + ret.getStyles().add(fill); + + LineStyle line=NotationFactory.eINSTANCE.createLineStyle(); + line.setLineColor(11119017); + ret.getStyles().add(line); + + Node nameNode=NotationFactory.eINSTANCE.createNode(); + nameNode.setType("4001"); + ret.insertChild(nameNode); + + ((Node)parentNotation).insertChild(ret); + + return(ret); + } + + public Object createMessageLink(BPMNModelFactory factory, + Object linkModel, Object diagramNotation) { + Edge ret=NotationFactory.eINSTANCE.createEdge(); + + Object source=factory.getSource(linkModel); + if (source != null) { + ret.setSource(getTaskView(source)); + } + + Object target=factory.getTarget(linkModel); + if (target != null) { + ret.setTarget(getTaskView(target)); + } + + ret.setElement((org.eclipse.emf.ecore.EObject)linkModel); + ret.setType("3002"); + + Node nameNode=NotationFactory.eINSTANCE.createNode(); + nameNode.setType("4007"); + ret.insertChild(nameNode); + + Location layout=NotationFactory.eINSTANCE.createLocation(); + layout.setY(40); + nameNode.setLayoutConstraint(layout); + + ret.getStyles().add(NotationFactory.eINSTANCE.createRoutingStyle()); + + FontStyle font=NotationFactory.eINSTANCE.createFontStyle(); + font.setFontName("Ariel"); + ret.getStyles().add(font); + ret.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle()); + + RelativeBendpoints bendpoints=NotationFactory.eINSTANCE.createRelativeBendpoints(); + //bendpoints.setPoints(arg0); + ret.setBendpoints(bendpoints); + + ((Diagram)diagramNotation).insertEdge(ret); + + return(ret); + } + + protected View getTaskView(Object modelObject) { + View ret=(View)m_taskViews.get(modelObject); + + return(ret); + } + + protected void setXMIId(org.eclipse.emf.ecore.xmi.XMLResource res, + org.eclipse.emf.ecore.EObject eobj) { + + if (eobj instanceof org.eclipse.stp.bpmn.Identifiable) { + res.setID((org.eclipse.stp.bpmn.Identifiable)eobj, + ((org.eclipse.stp.bpmn.Identifiable)eobj).getID()); + } else if (eobj instanceof org.eclipse.gmf.runtime.notation.View) { + res.setID((org.eclipse.gmf.runtime.notation.View)eobj, + "_"+System.currentTimeMillis()+"_"+((org.eclipse.gmf.runtime.notation.View)eobj).hashCode()); + } + + java.util.List children=eobj.eContents(); + + for (int i=0; i < children.size(); i++) { + setXMIId(res, (org.eclipse.emf.ecore.EObject)children.get(i)); + } + } + + private java.util.Hashtable m_taskViews=new java.util.Hashtable(); +} Added: trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/stp/STPBPMNModelFactoryImpl.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/stp/STPBPMNModelFactoryImpl.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/src/java/org/jboss/savara/tools/bpmn/generation/stp/STPBPMNModelFactoryImpl.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,462 @@ +/* + * Copyright 2005-6 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 26 Jan 2007 : Initial version created by gary + */ +package org.jboss.savara.tools.bpmn.generation.stp; + +import org.eclipse.stp.bpmn.*; +import org.jboss.savara.tools.bpmn.generation.BPMNGenerationException; + +public class STPBPMNModelFactoryImpl implements org.jboss.savara.tools.bpmn.generation.BPMNModelFactory { + + public String getFileExtension() { + return("bpmn"); + } + + public void saveModel(String fileName, Object diagram) + throws BPMNGenerationException { + + /* + try { + org.eclipse.stp.bpmn.BpmnPackage.eINSTANCE.getActivity(); + + java.io.FileOutputStream ostream= + new java.io.FileOutputStream(fileName); + + // Output the UML2 model to the supplied stream + final org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl xmi = + new org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl(); + xmi.setURI(org.eclipse.emf.common.util.URI.createFileURI(fileName)); + xmi.getContents().add(diagram); + + xmi.doSave(ostream, xmi.getDefaultLoadOptions()); + + ostream.close(); + + } catch(Exception e) { + throw new BPMNGenerationException("Failed to convert to XMI", e); + } + */ + } + + public Object createDiagram() { + BpmnDiagram ret=BpmnFactory.eINSTANCE.createBpmnDiagram(); + return(ret); + } + + public Object createPool(Object diagram, String name) { + Pool ret = BpmnFactory.eINSTANCE.createPool(); + ret.setName(name); + + if (diagram instanceof BpmnDiagram) { + ((BpmnDiagram)diagram).getPools().add(ret); + } + + return(ret); + } + + public Object createInitialNode(Object container) { + org.eclipse.stp.bpmn.Activity ret= + org.eclipse.stp.bpmn.BpmnFactory.eINSTANCE.createActivity(); + + ret.setActivityType(ActivityType.EVENT_START_EMPTY_LITERAL); + + if (container instanceof Graph) { + ((Graph)container).getVertices().add(ret); + } + + return(ret); + } + + public Object createSimpleTask(Object container, + org.pi4soa.service.behavior.ActivityType activity) { + org.eclipse.stp.bpmn.Activity ret= + org.eclipse.stp.bpmn.BpmnFactory.eINSTANCE.createActivity(); + + ret.setActivityType(ActivityType.TASK_LITERAL); + + String label=activity.getName(); + + Class[] intf=activity.getClass().getInterfaces(); + for (int i=0; i < intf.length; i++) { + if (intf[i].getName().startsWith("org.pi4soa.service.behavior")) { + int index=intf[i].getName().lastIndexOf('.'); + label = intf[i].getName().substring(index+1); + + if (activity instanceof org.pi4soa.service.behavior.Perform) { + label += " "+((org.pi4soa.service.behavior.Perform) + activity).getBehaviorDescription().getName(); + } else if (activity.getName() != null) { + label += " "+activity.getName(); + } + } + } + + ret.setName(label); + + if (container instanceof Graph) { + ((Graph)container).getVertices().add(ret); + } + + return(ret); + } + + public Object createControlLink(Object container, + Object fromNode, Object toNode, + String conditionalExpression) { + org.eclipse.stp.bpmn.SequenceEdge ret= + org.eclipse.stp.bpmn.BpmnFactory.eINSTANCE.createSequenceEdge(); + + if (fromNode instanceof Vertex) { + ret.setSource((Vertex)fromNode); + } + + if (toNode instanceof Vertex) { + ret.setTarget((Vertex)toNode); + } + + if (conditionalExpression != null) { + ret.setName(conditionalExpression); + } + + if (container instanceof Graph) { + ((Graph)container).getSequenceEdges().add(ret); + } + + return(ret); + } + + public Object createMessageLink(Object container, + Object fromNode, Object toNode, + org.pi4soa.service.behavior.Receive receive) { + MessagingEdge ret=BpmnFactory.eINSTANCE.createMessagingEdge(); + + if (fromNode instanceof Activity) { + ret.setSource((Activity)fromNode); + } + + if (toNode instanceof Activity) { + ret.setTarget((Activity)toNode); + } + + String name=receive.getOperationName(); + String mesgType=null; + + if (receive.getMessageDefinition() != null && + receive.getMessageDefinition().getInformationType() != null) { + mesgType = receive.getMessageDefinition().getInformationType().getType(); + + if (mesgType == null) { + mesgType = receive.getMessageDefinition().getInformationType().getElement(); + } + } + + if (mesgType != null) { + mesgType = org.pi4soa.common.xml.XMLUtils.getLocalname(mesgType); + } + + if (name == null) { + name = mesgType; + } else if (mesgType != null) { + name += "("+mesgType+")"; + } else { + name += "()"; + } + + if (name != null) { + ret.setName(name); + } + + if (container instanceof BpmnDiagram) { + ((BpmnDiagram)container).getMessages().add(ret); + } else if (container instanceof Pool) { + ((Pool)container).getBpmnDiagram().getMessages().add(ret); + } + + return(ret); + } + + public Object setLinkExpression(Object link, String expression) { + + if (expression != null && + link instanceof org.eclipse.stp.bpmn.SequenceEdge) { + org.eclipse.stp.bpmn.SequenceEdge edge= + (org.eclipse.stp.bpmn.SequenceEdge)link; + + edge.setName(expression); + } + + return(link); + } + + public Object createDataBasedXORGateway(Object container) { + org.eclipse.stp.bpmn.Activity ret= + org.eclipse.stp.bpmn.BpmnFactory.eINSTANCE.createActivity(); + + ret.setActivityType(ActivityType.GATEWAY_DATA_BASED_EXCLUSIVE_LITERAL); + + if (container instanceof Graph) { + ((Graph)container).getVertices().add(ret); + } + + return(ret); + } + + public Object createEventBasedXORGateway(Object container) { + org.eclipse.stp.bpmn.Activity ret= + org.eclipse.stp.bpmn.BpmnFactory.eINSTANCE.createActivity(); + + ret.setActivityType(ActivityType.GATEWAY_EVENT_BASED_EXCLUSIVE_LITERAL); + + if (container instanceof Graph) { + ((Graph)container).getVertices().add(ret); + } + + return(ret); + } + + public Object createANDGateway(Object container) { + org.eclipse.stp.bpmn.Activity ret= + org.eclipse.stp.bpmn.BpmnFactory.eINSTANCE.createActivity(); + + ret.setActivityType(ActivityType.GATEWAY_PARALLEL_LITERAL); + + if (container instanceof Graph) { + ((Graph)container).getVertices().add(ret); + } + + return(ret); + } + + public Object createFinalNode(Object container) { + org.eclipse.stp.bpmn.Activity ret= + org.eclipse.stp.bpmn.BpmnFactory.eINSTANCE.createActivity(); + + ret.setActivityType(ActivityType.EVENT_END_EMPTY_LITERAL); + + if (container instanceof Graph) { + ((Graph)container).getVertices().add(ret); + } + + return(ret); + } + + public boolean isDecision(Object node) { + boolean ret=false; + + if (node instanceof org.eclipse.stp.bpmn.Activity && + (((org.eclipse.stp.bpmn.Activity)node).getActivityType() + == ActivityType.GATEWAY_DATA_BASED_EXCLUSIVE_LITERAL || + ((org.eclipse.stp.bpmn.Activity)node).getActivityType() + == ActivityType.GATEWAY_EVENT_BASED_EXCLUSIVE_LITERAL)) { + ret = true; + } + + return(ret); + } + + /** + * This method determines if the supplied node is a join. This + * is true, if the node is a data or event based gateway, + * and as incoming edges. This is based on the fact that only + * a join gateway, at the point this method is invoked, would + * have incoming links, otherwise any other gateway would be + * assumed to be the initial gateway in a conditional grouping + * construct. + * + * @param node + * @return Whether the node is a join + */ + public boolean isJoin(Object node) { + boolean ret=false; + + if (node instanceof org.eclipse.stp.bpmn.Activity && + (((org.eclipse.stp.bpmn.Activity)node).getActivityType() + == ActivityType.GATEWAY_DATA_BASED_EXCLUSIVE_LITERAL || + ((org.eclipse.stp.bpmn.Activity)node).getActivityType() + == ActivityType.GATEWAY_EVENT_BASED_EXCLUSIVE_LITERAL) && + ((org.eclipse.stp.bpmn.Activity)node).getIncomingEdges().size() > 0) { + ret = true; + } + + return(ret); + } + + public boolean isTerminal(Object node) { + boolean ret=false; + + if (node instanceof org.eclipse.stp.bpmn.Activity && + ((org.eclipse.stp.bpmn.Activity)node).getActivityType() + == ActivityType.EVENT_END_EMPTY_LITERAL) { + ret = true; + } + + return(ret); + } + + public void setLabel(Object entity, String label) { + if (entity instanceof Activity) { + ((Activity)entity).setName(label); + } + } + + public Object getSource(Object link) { + Object ret=null; + + if (link instanceof SequenceEdge) { + ret = ((SequenceEdge)link).getSource(); + } else if (link instanceof MessagingEdge) { + ret = ((MessagingEdge)link).getSource(); + } + + return(ret); + } + + public void setSource(Object link, Object node) { + if (link instanceof SequenceEdge && node instanceof Vertex) { + ((SequenceEdge)link).setSource((Vertex)node); + } else if (link instanceof MessagingEdge && + node instanceof Activity) { + ((MessagingEdge)link).setSource((Activity)node); + } + } + + public Object getTarget(Object link) { + Object ret=null; + + if (link instanceof SequenceEdge) { + ret = ((SequenceEdge)link).getTarget(); + } else if (link instanceof MessagingEdge) { + ret = ((MessagingEdge)link).getTarget(); + } + + return(ret); + } + + public void setTarget(Object link, Object node) { + if (link instanceof SequenceEdge && node instanceof Vertex) { + ((SequenceEdge)link).setTarget((Vertex)node); + } else if (link instanceof MessagingEdge && + node instanceof Activity) { + ((MessagingEdge)link).setTarget((Activity)node); + } + } + + public java.util.List getInboundControlLinks(Object node) { + java.util.List ret=null; + + if (node instanceof Vertex) { + ret = ((Vertex)node).getIncomingEdges(); + } + + return(ret); + } + + public java.util.List getOutboundControlLinks(Object node) { + java.util.List ret=null; + + if (node instanceof Vertex) { + ret = ((Vertex)node).getOutgoingEdges(); + } + + return(ret); + } + + public java.util.List getInboundMessageLinks(Object node) { + java.util.List ret=null; + + if (node instanceof Activity) { + ret = ((Activity)node).getIncomingMessages(); + } + + return(ret); + } + + public java.util.List getOutboundMessageLinks(Object node) { + java.util.List ret=null; + + if (node instanceof Activity) { + ret = ((Activity)node).getOutgoingMessages(); + } + + return(ret); + } + + public void delete(Object entity) { +//System.out.println("DELETE: "+entity); + + if (entity instanceof Vertex) { + Vertex node=(Vertex)entity; + + if (node.getGraph() != null) { + node.getGraph().getVertices().remove(node); + } + + for (int i=node.getIncomingEdges().size()-1; i >= 0; i--) { + SequenceEdge edge=(SequenceEdge)node.getIncomingEdges().get(i); + delete(edge); + } + + for (int i=node.getOutgoingEdges().size()-1; i >= 0; i--) { + SequenceEdge edge=(SequenceEdge)node.getOutgoingEdges().get(i); + delete(edge); + } + } else if (entity instanceof SequenceEdge) { + SequenceEdge edge=(SequenceEdge)entity; + + edge.setSource(null); + edge.setTarget(null); + + if (edge.getGraph() != null) { + edge.getGraph().getSequenceEdges().remove(edge); + } + } else if (entity instanceof Pool) { + Pool pool=(Pool)entity; + + if (pool.getBpmnDiagram() != null) { + pool.getBpmnDiagram().getPools().remove(pool); + } + } + } + + public boolean isDeleted(Object entity) { + boolean ret=false; + + if (entity instanceof Vertex) { + Vertex node=(Vertex)entity; + + if (node.getGraph() == null) { + ret = true; + } + } else if (entity instanceof SequenceEdge) { + SequenceEdge edge=(SequenceEdge)entity; + + if (edge.getGraph() == null) { + ret = true; + } + } else if (entity instanceof Pool) { + Pool pool=(Pool)entity; + + if (pool.getBpmnDiagram() != null) { + ret = true; + } + } + + return(ret); + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/.classpath =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/.classpath (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/.classpath 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/java"/> + <classpathentry exported="true" kind="lib" path="lib/log4j.jar"/> + <classpathentry exported="true" kind="lib" path="lib/trove.jar"/> + <classpathentry kind="lib" path="lib/jboss-serialization.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="lib" path="lib/jboss-client.jar"/> + <classpathentry kind="lib" path="lib/jboss-javaee.jar"/> + <classpathentry kind="lib" path="lib/jnp-client.jar"/> + <classpathentry kind="lib" path="lib/jboss-logging-spi.jar"/> + <classpathentry kind="lib" path="lib/jboss-messaging-client.jar"/> + <classpathentry kind="lib" path="lib/jboss-aop-client.jar"/> + <classpathentry kind="lib" path="lib/jboss-mdr.jar"/> + <classpathentry kind="output" path="classes"/> +</classpath> Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/.project =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/.project (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/.project 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.savara.tools.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> Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/LICENSE.txt =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/LICENSE.txt (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/LICENSE.txt 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,41 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: JBoss SAVARA Tools Monitor Plug-in +Bundle-SymbolicName: org.jboss.savara.tools.monitor;singleton:=true +Bundle-Version: 3.0.0.qualifier +Bundle-Activator: org.jboss.savara.tools.monitor.eclipse.Activator +Bundle-Vendor: www.jboss.org +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.pi4soa.service, + org.pi4soa.cdl, + org.eclipse.core.resources, + org.eclipse.debug.core, + org.eclipse.jdt.launching, + org.eclipse.core.resources, + org.eclipse.ui.ide, + org.eclipse.jface, + org.eclipse.jdt.debug.ui, + org.eclipse.ui.console, + org.eclipse.debug.ui, + org.eclipse.ui, + org.eclipse.jdt.core, + org.eclipse.emf.ecore, + org.pi4soa.common +Eclipse-LazyStart: true +Bundle-ClassPath: ., + lib/concurrent.jar, + lib/javassist.jar, + lib/jboss-aop-client.jar, + lib/jboss-client.jar, + lib/jboss-common-core.jar, + lib/jboss-javaee.jar, + lib/jboss-logging-spi.jar, + lib/jboss-mdr.jar, + lib/jboss-messaging-client.jar, + lib/jboss-remoting.jar, + lib/jnp-client.jar, + lib/log4j.jar, + lib/trove.jar, + lib/jboss-serialization.jar +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/build.properties =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/build.properties (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/build.properties 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,29 @@ +source.. = src/java/ +output.. = classes/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + LICENSE.txt,\ + lib/,\ + lib/concurrent.jar,\ + lib/javassist.jar,\ + lib/jboss-aop-client.jar,\ + lib/jboss-client.jar,\ + lib/jboss-common-core.jar,\ + lib/jboss-javaee.jar,\ + lib/jboss-logging-spi.jar,\ + lib/jboss-mdr.jar,\ + lib/jboss-messaging-client.jar,\ + lib/jboss-remoting.jar,\ + lib/jnp-client.jar,\ + lib/log4j.jar,\ + lib/trove.jar,\ + lib/jboss-serialization.jar +src.includes = .classpath,\ + .project,\ + LICENSE.txt,\ + META-INF/,\ + build.properties,\ + plugin.xml,\ + src/,\ + lib/ Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/concurrent.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/concurrent.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/javassist.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/javassist.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-aop-client.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-aop-client.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-client.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-client.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-common-core.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-common-core.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-javaee.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-javaee.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-logging-spi.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-logging-spi.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-mdr.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-mdr.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-messaging-client.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-messaging-client.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-remoting.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-remoting.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-serialization.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jboss-serialization.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jnp-client.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/jnp-client.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/log4j.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/log4j.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/trove.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/lib/trove.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/plugin.xml 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.2"?> +<plugin> + <extension point="org.eclipse.debug.core.launchConfigurationTypes"> + <launchConfigurationType + id="org.jboss.savara.tools.monitor.eclipse.MonitorLauncher" + delegate="org.jboss.savara.tools.monitor.eclipse.MonitorLauncher" + modes="run" + name="Monitor"> + <fileExtension extension="cdm" default="true"/> + </launchConfigurationType> + </extension> + + <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups"> + <launchConfigurationTabGroup + type="org.jboss.savara.tools.monitor.eclipse.MonitorLauncher" + class="org.jboss.savara.tools.monitor.eclipse.MonitorTabGroup" + id="org.eclipse.jdt.debug.ui.launchConfigurationTabGroup.monitor"> + </launchConfigurationTabGroup> + </extension> + + <extension point="org.eclipse.ui.popupMenus"> + <objectContribution + id="org.jboss.savara.tools.service.generation.contribution2" + objectClass="org.eclipse.core.resources.IFile" + nameFilter="*.cdm"> + <menu + id="org.jboss.savara.tools.menu" + label="Savara" + path="additions"> + <separator name="group1"/> + </menu> + <action + label="Monitor" + class="org.jboss.savara.tools.monitor.eclipse.MonitorAction" + menubarPath="org.jboss.savara.tools.menu/group1" + enablesFor="1" + id="org.jboss.savara.tools.monitor.MonitorAction"> + </action> + </objectContribution> + </extension> + +</plugin> Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/CorrelationManagerListener.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/CorrelationManagerListener.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/CorrelationManagerListener.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,106 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor; + +import org.pi4soa.service.correlator.CorrelationSession; + +/** + * This interface represents a listener interested in changes + * that occur within the correlation manager. + * + */ +public interface CorrelationManagerListener { + + /** + * This method indicates that a correlation session has + * started. + * + * @param session The correlation session + */ + public void correlationSessionStarted(CorrelationSession session); + + /** + * This method indicates that a correlation session has + * finished. + * + * @param session The correlation session + */ + public void correlationSessionFinished(CorrelationSession session); + + /** + * A new exchange event has been added to a correlation session. + * + * @param exchangeEvent The exchange event. + */ + public void exchangeEventAdded(ExchangeEvent exchangeEvent); + + + /** + * An exchange event has been updated. + * + * @param exchangeEvent The exchange event. + */ + public void exchangeEventUpdated(ExchangeEvent exchangeEvent); + + /** + * An unexpected event has occured + * + * @param exchangeEvent. The exchange event. + * @param serviceName The service reporting the error + */ + public void unexpectedExchangeEventAdded(ExchangeEvent exchangeEvent, + String serviceName); + + /** + * An error occurred related to the specified correlation + * session. + * + * @param session The correlation session + * @param mesg The error message + * @param exception The optional exception trace + * @param serviceName The service reporting the error + */ + public void error(CorrelationSession session, String mesg, + String exception, String serviceName); + + /** + * A warning occurred related to the specified correlation + * session. + * + * @param session The correlation session + * @param mesg The warning message + * @param exception The optional exception trace + * @param serviceName The service reporting the warning + */ + public void warning(CorrelationSession session, String mesg, + String exception, String serviceName); + + /** + * An information event occurred related to the specified correlation + * session. + * + * @param session The correlation session + * @param mesg The information message + * @param serviceName The service reporting the information + */ + public void information(CorrelationSession session, + String mesg, String serviceName); + +} \ No newline at end of file Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ExchangeEvent.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ExchangeEvent.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ExchangeEvent.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,268 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor; + +import java.io.Serializable; +import java.util.logging.Logger; +import java.util.logging.Level; + +import org.pi4soa.cdl.ExchangeDetails; +import org.pi4soa.service.Message; +import org.pi4soa.service.Channel; +import org.pi4soa.service.correlator.CorrelationSession; + +/** + * This class represents the 'exchange' correlation event. + * + */ +public class ExchangeEvent implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -1984285030410307153L; + + Message m_message = null; + + /** + * This class represents the 'exchange' correlation event. + * + * @param exchange The exchange details + * @param channel The channel + * @param session The session + * @param serviceDescriptionName The service description name + */ + public ExchangeEvent(ExchangeDetails exchange, + Channel channel, CorrelationSession session, + String serviceDescriptionName, Message message) { + m_exchange = exchange; + m_channel = channel; + m_session = session; + m_serviceDescriptionName = serviceDescriptionName; + this.m_message = message; + } + + /** + * This method returns the exchange details. + * + * @return The exchange details + */ + public ExchangeDetails getExchange() { + return(m_exchange); + } + + /** + * This method returns the channel. + * + * @return The channel + */ + public Channel getChannel() { + return(m_channel); + } + + /** + * This method returns the correlation session. + * + * @return The correlation session + */ + public CorrelationSession getCorrelationSession() { + return(m_session); + } + + /** + * This method returns the service description name. + * + * @return The service description name + */ + public String getServiceDescriptionName() { + return(m_serviceDescriptionName); + } + + /** + * This method returns the message. + * + * @return The service description name + */ + public Message getMessage() { + return m_message; + } + + /** + * This method returns whether the exchange has been + * initiated and completed. + * + * @return The 'complete' status of the exchange event + */ + public boolean isExchangeComplete() { + return(m_initiated && m_completed); + } + + /** + * This method determines whether the event has been + * initiated. + * + * @return Whether event has been initiated + */ + public boolean getInitiated(){ + return m_initiated; + } + + /** + * This method determines whether the event has been + * completed. + * + * @return Whether event has been completed + */ + public boolean getCompleted(){ + return m_completed; + } + + /** + * This method indicates that the exchange associated with + * the event has initiated. + * + */ + public void initiated() { + m_initiated = true; + checkIfExchangeCorrelated(); + } + + /** + * This method indicates that the exchange associated with + * the event has completed. + * + */ + public void completed() { + m_completed = true; + checkIfExchangeCorrelated(); + } + + + protected void checkIfExchangeCorrelated() { + if (isExchangeComplete()) { + // logger.fine("EXCHANGE CORRELATED: "+this); + } + } + + public int hashCode() { + return(m_message.getOperationName().hashCode()); + } + + public boolean equals(Object obj) { + boolean ret=false; + if (obj instanceof ExchangeEvent) { + ExchangeEvent other=(ExchangeEvent)obj; + if (m_exchange == null || other.getExchange() == null) { + // Compare on message basis + if (m_message.isRPCStyle() && + other.getMessage().isRPCStyle()) { + if (m_message.getOperationName().equals( + other.getMessage().getOperationName()) && + m_message.isRequest() == other.getMessage().isRequest() && + m_message.getServiceType().equals( + other.getMessage().getServiceType())) { + ret = true; + } + } else if (m_message.isRPCStyle() == false && + other.getMessage().isRPCStyle() == false) { + if (m_message.getType().equals( + other.getMessage().getType())) { + ret = true; + } + } + } else if (other.getExchange() == m_exchange && + other.getChannel().getName().equals(m_channel.getName()) && + other.getCorrelationSession() == m_session) { + ret = true; + } + + if (ret) { + + // Check identities + if (other.getMessage().getMessageIdentities().size() + == getMessage().getMessageIdentities().size()) { + + for (int i=0; ret && + i < getMessage().getMessageIdentities().size(); i++) { + ret = false; + + org.pi4soa.service.Identity id= + getMessage().getMessageIdentities().get(i); + + if (logger.isLoggable(Level.FINEST)) { + logger.finest("Checking message identity ("+i+ + "): "+id); + } + + for (int j=0; ret == false && + j < other.getMessage().getMessageIdentities().size(); j++) { + + if (id.equals(other.getMessage().getMessageIdentities().get(j))) { + ret = true; + } + + if (logger.isLoggable(Level.FINEST)) { + logger.finest("Against message identity ("+j+ + "): "+other.getMessage().getMessageIdentities().get(j)+ + " = "+ret); + } + } + } + } else { + if (logger.isLoggable(Level.FINEST)) { + logger.finest("Message identity list length mismatch"); + } + + ret = false; + } + } + } + return(ret); + } + + public String toString() { + StringBuffer ret=new StringBuffer(); + ret.append("ExchangeEvent["); + if (m_exchange != null) { + + // if (NamesUtil.isSet(m_exchange.getDescription())) { + + + if (m_exchange.getDescription() != null && "".equals(m_exchange.getDescription()) == false) { + + ret.append(m_exchange.getDescription()); + } else { + ret.append(m_exchange.getName()); + } + ret.append(", "); + } + ret.append(m_message.toString()+"]"); + return(ret.toString()); + } + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor"); + + private ExchangeDetails m_exchange=null; + private Channel m_channel=null; + private CorrelationSession m_session; + private String m_serviceDescriptionName=null; + private boolean m_initiated=false; + private boolean m_completed=false; +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/TxnMonitor.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/TxnMonitor.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/TxnMonitor.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,593 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor; + +import java.util.logging.Logger; + +import org.pi4soa.cdl.ExchangeDetails; +import org.pi4soa.service.Channel; +import org.pi4soa.service.Message; +import org.pi4soa.service.ServiceException; +import org.pi4soa.service.correlator.CorrelationSession; +import org.pi4soa.service.correlator.ServiceCorrelator; +import org.pi4soa.service.correlator.ServiceCorrelatorFactory; +import org.pi4soa.service.correlator.ServiceCorrelatorListener; +import org.pi4soa.service.tracker.ServiceTrackerClient; +import org.pi4soa.service.tracker.jms.JMSServiceTrackerClient; + +/** + * The TxnMonitor class is a generic transaction monitor class that + * takes in a CDL description and monitors the progress of transactions, + * which are long lived interactions, against the CDL description. + * A TxnMonitor MAY be used as a generic monitor for any CDL description. + * + */ +public class TxnMonitor { + + public TxnMonitor(String fname) + { + m_cdlFile = fname; + } + + public void initialize() throws ServiceException + { + + m_correlator=ServiceCorrelatorFactory.getServiceCorrelator(); + m_correlator.addServiceCorrelatorListener(new CorrelatorListener()); + + // Obtain service tracker client + m_trackerClient = new JMSServiceTrackerClient(); + + m_trackerClient.addServiceTrackerListener(m_correlator); + + //System.err.println(""); + //System.err.println("Staring to monitor events against " + m_cdlFile + " .... "); + //System.err.println(""); + try { + monitor(m_cdlFile); + } catch(java.io.IOException ioe) { + throw new ServiceException("Failed to initialize monitor for '"+ + m_cdlFile+"'", ioe); + } + } + + /** + * This method returns the singleton for the TxnMonitor. + * + * @return The singleton + * @exception ServiceException Failed to obtain monitor + */ + public static TxnMonitor getInstance(String fname) throws ServiceException { + // TODO: See if there is a better way to make an instance + // available to a view + if (m_instance == null) { + m_instance = new TxnMonitor(fname); + m_instance.initialize(); + } + + return(m_instance); + } + + /** + * This method loads the choreography description associated + * with the supplied filename, and then monitors it, before + * returning it to the caller. + * + * @param filename The choreography description filename + * @return The choreography description being monitored + * @throws java.io.IOException Failed to load + * @throws ServiceException Failed to monitor + */ + public org.pi4soa.cdl.Package monitor(String filename) + throws java.io.IOException, ServiceException { + org.pi4soa.cdl.Package ret= + org.pi4soa.cdl.CDLManager.load(filename); + + monitor(ret); + + return(ret); + } + + /** + * This method initializes the correlator with the choreography + * description to be monitored. + * + * @param cdl The choreography description + * @exception ServiceException Failed to monitor choreography + * description + */ + public void monitor(org.pi4soa.cdl.Package cdl) + throws ServiceException { + m_correlator.register(cdl); + } + + /** + * This method disassociates the correlator from the choreography + * description being monitored. + * + * @param cdl The choreography description + * @exception ServiceException Failed to stop monitor choreography + * description + */ + public void unmonitor(org.pi4soa.cdl.Package cdl) + throws ServiceException { + m_correlator.unregister(cdl); + } + + /** + * @param args - the first argument in args is the location of the + * CDM file that will be used to drive the monitoring. + */ + public static void main(String[] args) + { + // TODO Auto-generated method stub + String s = "Constructing a monitor for " + args[0]; + logger.fine(s); + + try { + TxnMonitor mon = TxnMonitor.getInstance(args[0]); + } catch(Exception e) { + e.printStackTrace(); + } + } + + /** + * This method will return an existing list, associated with the + * supplied session, or if not found, will create one - unless + * the session's event list has previously been removed and + * therefore a null will be returned (i.e. events to be + * ignored). + * + * @param session The session + * @return The list, or null if session to be ignored + */ + protected java.util.List createEventList(CorrelationSession session) { + java.util.List ret=null; + + logger.fine("createEventList for session - " + session); + + synchronized(m_eventLists) { + ret = (java.util.List)m_eventLists.get(session); + + if (ret == null) { + ret = new java.util.Vector(); + + logger.fine("Creating event list for session: "+session); + + m_eventLists.put(session, ret); + } + } + + logger.fine("createEventList returning - " + ret); + + return(ret); + } + + /** + * This method will remove the event list associated with + * the supplied session, and add the session to the list + * of sessions to be ignored from now on. + * + * @param session The session + */ + protected void removeEventList(CorrelationSession session) { + + synchronized(m_eventLists) { + + logger.fine("Remove correlation session: "+session); + + m_eventLists.remove(session); + } + } + + protected void fireSessionStarted(CorrelationSession session) { + System.err.println(">>>> fireSessionStarted"); + for (int i=0; i < m_listeners.size(); i++) { + CorrelationManagerListener l= + (CorrelationManagerListener)m_listeners.get(i); + + l.correlationSessionStarted(session); + } + System.err.println(">>>> finished fireSessionStarted"); + } + + protected void fireSessionFinished(CorrelationSession session) { + System.err.println(">>>> fireSessionFinished"); + for (int i=0; i < m_listeners.size(); i++) { + CorrelationManagerListener l= + (CorrelationManagerListener)m_listeners.get(i); + + l.correlationSessionFinished(session); + } + logger.fine(">>>> finished fireSessionFinished"); + } + + protected void fireUpdatedSession(CorrelationSession session) { + logger.fine(">>>> fireSessionUpdated"); + for (int i=0; i < m_listeners.size(); i++) { + CorrelationManagerListener l= + (CorrelationManagerListener)m_listeners.get(i); + + // l.correlationSessionUpdated(session); + } + logger.fine(">>>> finished fireSessionUpdated"); + } + + + protected void fireAddedExchangeEvent(ExchangeEvent exchangeEvent) { + for (int i=0; i < m_listeners.size(); i++) { + CorrelationManagerListener l= + (CorrelationManagerListener)m_listeners.get(i); + + l.exchangeEventAdded(exchangeEvent); + } + } + + protected void fireUpdatedExchangeEvent(ExchangeEvent exchangeEvent) { + for (int i=0; i < m_listeners.size(); i++) { + CorrelationManagerListener l= + (CorrelationManagerListener)m_listeners.get(i); + + l.exchangeEventUpdated(exchangeEvent); + } + } + + protected void fireAddedUnexpectedExchangeEvent(ExchangeEvent exchangeEvent, + String serviceName) { + logger.fine(">>>> fireAddedUnexpectedExchangeEvent"); + for (int i=0; i < m_listeners.size(); i++) { + CorrelationManagerListener l= + (CorrelationManagerListener)m_listeners.get(i); + + l.unexpectedExchangeEventAdded(exchangeEvent, serviceName); + } + logger.fine("<<<< fireAddedUnexpectedExchangeEvent"); + } + + protected void fireErrorEvent(CorrelationSession session, + String mesg, String exception, String serviceName) { + logger.fine(">>>> fireErrorEvent"); + for (int i=0; i < m_listeners.size(); i++) { + CorrelationManagerListener l= + (CorrelationManagerListener)m_listeners.get(i); + + l.error(session, mesg, exception, serviceName); + } + logger.fine("<<<< fireErrorEvent"); + } + + protected void fireWarningEvent(CorrelationSession session, + String mesg, String exception, String serviceName) { + logger.fine(">>>> fireWarningEvent"); + for (int i=0; i < m_listeners.size(); i++) { + CorrelationManagerListener l= + (CorrelationManagerListener)m_listeners.get(i); + + l.warning(session, mesg, exception, serviceName); + } + logger.fine("<<<< fireWarningEvent"); + } + + protected void fireInformationEvent(CorrelationSession session, + String mesg, String serviceName) { + logger.fine(">>>> fireInformationEvent"); + for (int i=0; i < m_listeners.size(); i++) { + CorrelationManagerListener l= + (CorrelationManagerListener)m_listeners.get(i); + + l.information(session, mesg, serviceName); + } + logger.fine("<<<< fireInformationEvent"); + } + + public void addCorrelationManagerListener(CorrelationManagerListener l) { + logger.fine(">>>> addCorrelationManagerListener"); + m_listeners.add(l); + } + + public void removeCorrelationManagerListener(CorrelationManagerListener l) { + logger.fine(">>>> removeCorrelationManagerListener"); + m_listeners.remove(l); + } + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor"); + + private static TxnMonitor m_instance=null; + private ServiceCorrelator m_correlator=null; + private ServiceTrackerClient m_trackerClient=null; + private java.util.Hashtable m_eventLists=new java.util.Hashtable(); + private java.util.Vector m_listeners=new java.util.Vector(); + private String m_cdlFile = null; + + + public class CorrelatorListener implements ServiceCorrelatorListener { + + /** + * This method indicates that the supplied choreography + * description has been registered with the service + * correlator. + * + * @param cdlpack The choreography description + */ + public void choreographyDescriptionRegistered(org.pi4soa.cdl.Package cdlpack) { + logger.fine(">>>> choreographyDescriptionRegistered"); + } + + /** + * This method indicates that the supplied choreography + * description has been unregistered from the service + * correlator. + * + * @param cdlpack The choreography description + */ + public void choreographyDescriptionUnregistered(org.pi4soa.cdl.Package cdlpack) { + logger.fine(">>>> choreographyDescriptionUnregistered"); + } + + /** + * This method indicates that a new correlated session has + * been started. + * + * @param session The session + */ + public void sessionStarted(CorrelationSession session) { + logger.fine(">>>> sessionStarted"); + fireSessionStarted(session); + } + + /** + * This method indicates that a correlated session has + * been finished. + * + * @param session The session + */ + public void sessionFinished(CorrelationSession session) { + logger.fine(">>>> sessionFinished"); + fireSessionFinished(session); + } + + /** + * This method is invoked to indicate that a choreography + * exchange has been initiated by one participant. + * + * @param exchange The exchange details + * @param channel The channel associated with the exchange + * @param session The session + * @param serviceDescriptionName The name of the service + * description that caused this exchange to + * be initiated + */ + public synchronized void exchangeInitiated(ExchangeDetails exchange, + Channel channel, Message message, CorrelationSession session, + String serviceDescriptionName) { + + logger.fine(">>>> exchangeInitiated"); + + java.util.List list = createEventList(session); + + if(list != null){ + ExchangeEvent event = new ExchangeEvent(exchange, channel, session, serviceDescriptionName, message); + int index = 0; + boolean f_updated=false; + + if ((index=list.indexOf(event)) == -1) { + logger.fine("Add new event '"+event+ "' to correlation session "+session); + list.add(event); + } + else{ + logger.fine("Retrieve existing event for index "+index); + ExchangeEvent existingEvent= + (ExchangeEvent)list.get(index); + + if (existingEvent.getInitiated() == false) { + event = existingEvent; + + // Remove event from list + list.remove(index); + + if (list.size() == 0) { + // Remove list + removeEventList(session); + } + + f_updated = true; + } else { + logger.fine("Add new event '"+event+ "' to correlation session "+session); + list.add(event); + } + } + + event.initiated(); + logger.fine("EXCHANGE INITIATED: "); + logger.fine(" CHANNEL DETAILS: " + channel + " (" + channel.getName() + ") session " + session); + logger.fine(" EXCHANGE DETAILS: " + exchange); + + if(f_updated == false){ + fireAddedExchangeEvent(event); + } + else{ + fireUpdatedExchangeEvent(event); + } + // fireUpdatedSession(session); + } + } + + /** + * This method is invoked to indicate that a choreography + * exchange has been completed by the target participant. + * + * @param exchange The exchange details + * @param channel The channel associated with the exchange + * @param session The session + * @param serviceDescriptionName The name of the service + * description that caused this exchange to + * be completed + */ + public synchronized void exchangeCompleted(ExchangeDetails exchange, + Channel channel, Message message, CorrelationSession session, + String serviceDescriptionName) { + + logger.fine(">>>> exchangeCompleted"); + + java.util.List list=createEventList(session); + + if (list != null) { + ExchangeEvent event=new ExchangeEvent(exchange, channel, session, serviceDescriptionName, message); + + int index = 0; + + if ((index=list.indexOf(event)) == -1) { + logger.fine("Add new event '"+event+ "' to correlation session "+session); + list.add(event); + } + else{ + logger.fine("Retrieve existing event for index "+index); + ExchangeEvent existingEvent= + (ExchangeEvent)list.get(index); + + if (existingEvent.getCompleted() == false) { + event = existingEvent; + + // Remove event from list + list.remove(index); + + if (list.size() == 0) { + // Remove list + removeEventList(session); + } + } else { + logger.fine("Add new event '"+event+ "' to correlation session "+session); + list.add(event); + } + } + + event.completed(); + logger.fine("EXCHANGE COMPLETED: "); + // logger.fine(" CHANNEL DETAILS: " + channel); + logger.fine(" CHANNEL DETAILS: " + channel + " (" + channel.getName() + ") session " + session); + logger.fine(" EXCHANGE DETAILS: " + exchange); + + if(index == -1){ + fireAddedExchangeEvent(event); + } + else{ + fireUpdatedExchangeEvent(event); + } + // fireUpdatedSession(session); + logger.fine("<<<< exchangeCompleted"); + } + } + + /** + * This method is invoked to indicate that a message + * was unexpected at a participant. + * + * @param message The message + * @param session The session + * @param serviceDescriptionName The name of the service + * description that caused this unexpected + * message error + */ + public synchronized void unexpectedMessage(Message message, + CorrelationSession session, String serviceDescriptionName) { + + logger.fine(">>>> unexpectedMessage"); + logger.fine("MESSAGE: " + message + " SESSION: " + session + " SERVICE: " + serviceDescriptionName); + logger.fine("MESSAGE: " + message); + logger.fine("Identities: " + message.getChannelIdentity()); + //java.util.List list = createEventList(session); + + //if(list != null){ + ExchangeDetails exchange = null; + Channel channel = null; + + logger.fine(">>>> creating unexpected event"); + + ExchangeEvent event = new ExchangeEvent(exchange, channel, session, serviceDescriptionName, message); + + logger.fine(">>>> created unexpected event"); + + logger.fine("Add unexpected new event '"+event+ "' to correlation session "+session); + //list.add(event); + + logger.fine(">>>> UNEXPECTED EVENT for session: " + session); + + fireAddedUnexpectedExchangeEvent(event, serviceDescriptionName); + + + logger.fine(">>>> HANDLED UNEXPECTED EVENT for session: " + session); + //} + logger.fine("<<<< unexpectedMessage"); + } + + /** + * An error occurred related to the specified correlation + * session. + * + * @param mesg The error message + * @param exception The optional exception details + * @param session The correlation session + * @param serviceDescriptionName The service name + */ + public void error(String mesg, String exception, + CorrelationSession session, String serviceDescriptionName) { + logger.fine(">>>> error"); + + fireErrorEvent(session, mesg, exception, serviceDescriptionName); + + logger.fine("<<<< error"); + } + + /** + * A warning occurred related to the specified correlation + * session. + * + * @param mesg The warning message + * @param exception The optional exception details + * @param session The correlation session + * @param serviceDescriptionName The service name + */ + public void warning(String mesg, String exception, + CorrelationSession session, String serviceDescriptionName) { + logger.fine(">>>> warning"); + + fireWarningEvent(session, mesg, exception, serviceDescriptionName); + + logger.fine("<<<< warning"); + } + + /** + * An information event occurred related to the specified correlation + * session. + * + * @param mesg The information message + * @param session The correlation session + * @param serviceDescriptionName The service name + */ + public void information(String mesg, CorrelationSession session, + String serviceDescriptionName) { + logger.fine(">>>> information"); + + fireInformationEvent(session, mesg, serviceDescriptionName); + + logger.fine("<<<< information"); + } + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/Activator.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/Activator.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/Activator.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,74 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by gary + */ +package org.jboss.savara.tools.monitor.eclipse; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; +import org.pi4soa.common.eclipse.BundleUtil; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.savara.tools.monitor"; + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + + static { + BundleUtil.registerClasspathEntries(PLUGIN_ID, false); + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorAction.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorAction.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorAction.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,173 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 17 Jan, 2008 : Initial version created by gary + */ +package org.jboss.savara.tools.monitor.eclipse; + +import java.util.logging.Logger; + +import org.eclipse.core.resources.IResource; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.MessageBox; +import org.eclipse.ui.IObjectActionDelegate; +import org.eclipse.ui.IWorkbenchPart; +import org.pi4soa.common.resource.eclipse.ResourceUtil; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchConfigurationType; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.debug.core.Launch; +import org.eclipse.debug.core.DebugPlugin; + +/** + * This class invokes the monitor action on the selected + * choreography file. + * + */ +public class MonitorAction implements IObjectActionDelegate { + + /** + * This method implements the action's run method. + * + * @param action The action + */ + public void run(IAction action) { + + if (m_selection instanceof StructuredSelection) { + StructuredSelection sel=(StructuredSelection)m_selection; + + IResource res=(IResource)sel.getFirstElement(); + + // Make sure there are no markers associated + // with the resource + if (ResourceUtil.hasErrors(res) == false) { + + launch(res.getProject().getName(), + res.getProjectRelativePath().toString()); + + } else { + error(ERRORS_NO_TEST); + } + } + } + + /** + * This method invokes the launch action. + * + * @param project The project + * @param relativePath The relative path within the project + */ + protected void launch(String project, String relativePath) { + + MonitorLauncher launcher=new MonitorLauncher(); + + try { + ILaunchManager manager = + DebugPlugin.getDefault().getLaunchManager(); + + ILaunchConfigurationType type = + manager.getLaunchConfigurationType( + MonitorLaunchConfigurationConstants.LAUNCH_CONFIG_TYPE); + ILaunchConfiguration[] configurations = + manager.getLaunchConfigurations(type); + + for (int i = 0; i < configurations.length; i++) { + ILaunchConfiguration configuration = configurations[i]; + if (configuration.getName().equals(CHOREOGRAPHY_MONITOR)) { + configuration.delete(); + break; + } + } + + ILaunchConfigurationWorkingCopy workingCopy = + type.newInstance(null, CHOREOGRAPHY_MONITOR); + + workingCopy.setAttribute(MonitorLaunchConfigurationConstants.ATTR_PROJECT_NAME, + project); + workingCopy.setAttribute(MonitorLaunchConfigurationConstants.ATTR_CHOREOGRAPHY_DESCRIPTION, + relativePath); + + ILaunchConfiguration configuration=workingCopy.doSave(); + + + Launch launch=new Launch(configuration, LAUNCH_MODE, null); + + launcher.launch(configuration, LAUNCH_MODE, launch, null); + + } catch(Exception e) { + logger.severe("Failed to launch monitor: "+e); + + e.printStackTrace(); + } + } + + /** + * This method is used to report an error. + * + * @param mesg The error message + */ + public void error(String mesg) { + + logger.severe("Error occurred: "+mesg); + + MessageBox mbox=new MessageBox(m_targetPart.getSite().getShell(), + SWT.ICON_ERROR|SWT.OK); + + if (mesg == null) { + mesg = "Null pointer exception has occurred"; + } + + mbox.setMessage(mesg); + mbox.open(); + } + + /** + * This method indicates that the selection has changed. + * + * @param action The action + * @param selection The selection + */ + public void selectionChanged(IAction action, + ISelection selection) { + m_selection = selection; + } + + /** + * This method sets the currently active workbench part. + * + * @param action The action + * @param targetPart The active workbench part + */ + public void setActivePart(IAction action, + IWorkbenchPart targetPart) { + m_targetPart = targetPart; + } + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor.eclipse"); + + private ISelection m_selection=null; + private IWorkbenchPart m_targetPart=null; + + private static final String ERRORS_NO_TEST = "Choreography Description has errors, so cannot run monitor"; + + private static final String LAUNCH_MODE = "run"; + private static final String CHOREOGRAPHY_MONITOR = "Choreography Monitor"; +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLaunchConfigurationConstants.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLaunchConfigurationConstants.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLaunchConfigurationConstants.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,34 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 17 Jan, 2008 : Initial version created by gary + */ +package org.jboss.savara.tools.monitor.eclipse; + +/** + * This interface defines the constants for the monitor + * launch configuration. + */ +public interface MonitorLaunchConfigurationConstants { + + public static final String ATTR_PROJECT_NAME="project"; + + public static final String ATTR_CHOREOGRAPHY_DESCRIPTION="choreography"; + + public static final String LAUNCH_CONFIG_TYPE= + "org.jboss.savara.tools.monitor.eclipse.MonitorLauncher"; +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorLauncher.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,442 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 17 Jan, 2008 : Initial version created by gary + */ +package org.jboss.savara.tools.monitor.eclipse; + +import java.io.File; +import java.text.MessageFormat; +import java.util.Map; +import java.util.Vector; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.eclipse.debug.core.DebugPlugin; +import org.eclipse.debug.core.ILaunch; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.IStreamListener; +import org.eclipse.debug.core.model.IStreamMonitor; +import org.eclipse.debug.core.model.IProcess; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate; +import org.eclipse.jdt.launching.ExecutionArguments; +import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.IVMRunner; +import org.eclipse.jdt.launching.VMRunnerConfiguration; +import org.eclipse.osgi.util.ManifestElement; +import org.osgi.framework.Bundle; +import org.osgi.framework.Constants; +import org.pi4soa.common.eclipse.BundleUtil; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.Path; + +/** + * This class is responsible for launching a monitor against + * a choreography description. + */ +public class MonitorLauncher + extends AbstractJavaLaunchConfigurationDelegate { + + /** + * This is the default constructor. + * + */ + public MonitorLauncher() { + } + + /** + * This method launches the monitor. + * + * @param configuration The launch configuration + * @param mode The mode (run or debug) + * @param launch The launch object + * @param monitor The optional progress monitor + */ + public void launch(ILaunchConfiguration configuration, + String mode, ILaunch launch, IProgressMonitor monitor) + throws CoreException { + if (monitor == null) { + monitor = new NullProgressMonitor(); + } + + monitor.beginTask(MessageFormat.format("{0}...", new String[]{configuration.getName()}), 3); //$NON-NLS-1$ + // check for cancellation + if (monitor.isCanceled()) { + return; + } + + monitor.subTask("Verifying launch configuration...."); + + String mainTypeName = org.jboss.savara.tools.monitor.ui.Monitor.class.getName(); + + IVMInstall vm = verifyVMInstall(configuration); + + IVMRunner runner = vm.getVMRunner(mode); + if (runner == null) { + abort("VM runner does not exist", + null, IJavaLaunchConfigurationConstants.ERR_VM_RUNNER_DOES_NOT_EXIST); //$NON-NLS-1$ + } + + File workingDir = verifyWorkingDirectory(configuration); + String workingDirName = null; + if (workingDir != null) { + workingDirName = workingDir.getAbsolutePath(); + } + + // Environment variables + String[] envp= DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration); + + // Program & VM args + String filename=configuration.getAttribute( + MonitorLaunchConfigurationConstants.ATTR_PROJECT_NAME, "")+ + "/"+configuration.getAttribute( + MonitorLaunchConfigurationConstants.ATTR_CHOREOGRAPHY_DESCRIPTION, ""); + + String pgmArgs="\""+getPathForResource(filename); + + logger.fine("Launching monitor with args: "+pgmArgs); + + String vmArgs = getVMArguments(configuration); + ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs); + + // VM-specific attributes + Map vmAttributesMap = getVMSpecificAttributesMap(configuration); + + // Classpath + String[] classpath = getClasspath(configuration); + + // Create VM config + VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainTypeName, classpath); + runConfig.setProgramArguments(execArgs.getProgramArgumentsArray()); + runConfig.setEnvironment(envp); + runConfig.setVMArguments(execArgs.getVMArgumentsArray()); + runConfig.setWorkingDirectory(workingDirName); + runConfig.setVMSpecificAttributesMap(vmAttributesMap); + + // Bootpath + runConfig.setBootClassPath(getBootpath(configuration)); + + // check for cancellation + if (monitor.isCanceled()) { + return; + } + + // stop in main + prepareStopInMain(configuration); + + // done the verification phase + monitor.worked(1); + + // Launch the configuration - 1 unit of work + runner.run(runConfig, launch, monitor); + + IProcess[] processes=launch.getProcesses(); + if (processes.length > 0) { + processes[0].getStreamsProxy().getOutputStreamMonitor(). + addListener(new IStreamListener() { + public void streamAppended(String str, IStreamMonitor mon) { + handleResults(str, false); + } + }); + processes[0].getStreamsProxy().getErrorStreamMonitor(). + addListener(new IStreamListener() { + public void streamAppended(String str, IStreamMonitor mon) { + handleResults(str, true); + } + }); + } + + // check for cancellation + if (monitor.isCanceled()) { + return; + } + + monitor.done(); + } + + /** + * This method handles the results produced by the launched + * monitor. + * + * @param results The results + * @param errorStream Whether the results are from the error + * stream + */ + protected void handleResults(String results, boolean errorStream) { + //System.out.println(results); + } + + /** + * This method returns the full path to the resource. + * + * @param relativePath The is the resource path beginning at + * the project + * @return The full path + */ + protected String getPathForResource(String relativePath) { + String ret=null; + + IFile file=ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(relativePath)); + if (file != null && file.exists()) { + ret = file.getLocation().toString(); + } + + return(ret); + } + + /** + * This method derives the classpath required to run the + * Monitor. + * + * @param configuration The launch configuation + * @return The list of classpath entries + */ + /* + public String[] getClasspath(ILaunchConfiguration configuration) { + String[] ret=null; + Vector classpathEntries=new Vector(); + + // Add classpath entry for current Java project + try { + String projname=configuration.getAttribute( + MonitorLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); + + IProject project= + ResourcesPlugin.getWorkspace().getRoot().getProject(projname); + + IJavaProject jproject=JavaCore.create(project); + + // Add output location + IPath outputLocation=jproject.getOutputLocation(); + + IFolder folder= + ResourcesPlugin.getWorkspace().getRoot().getFolder(outputLocation); + + String path=folder.getLocation().toString(); + + classpathEntries.add(path); + + // Add other libraries to the classpath + IClasspathEntry[] curclspath=jproject.getRawClasspath(); + for (int i=0; curclspath != null && + i < curclspath.length; i++) { + + if (curclspath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) { + IFile file= + ResourcesPlugin.getWorkspace(). + getRoot().getFile(curclspath[i].getPath()); + + if (file.exists()) { + // Library is within the workspace + classpathEntries.add(file.getLocation().toString()); + } else { + // Assume library is external to workspace + classpathEntries.add(curclspath[i].getPath().toString()); + } + + } else if (curclspath[i].getEntryKind() == + IClasspathEntry.CPE_CONTAINER) { + // Container's not currently handled - but + // problem need to retrieve from project and + // iterate over container entries + } + } + + } catch(Exception e) { + // TODO: report error + } + + String[] cpes=BundleUtil.getClasspathEntries(); + + for (int i=0; i < cpes.length; i++) { + classpathEntries.add(cpes[i]); + } + + ret = new String[classpathEntries.size()]; + classpathEntries.copyInto(ret); + + return(ret); + } + */ + + public String[] getClasspath(ILaunchConfiguration configuration) { + String[] ret=null; + java.util.Vector<String> classpathEntries=new java.util.Vector<String>(); + + // Add classpath entry for current Java project + try { + String projname=configuration.getAttribute( + MonitorLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); + + IProject project= + ResourcesPlugin.getWorkspace().getRoot().getProject(projname); + + IJavaProject jproject=JavaCore.create(project); + + // Add output location + IPath outputLocation=jproject.getOutputLocation(); + + IFolder folder= + ResourcesPlugin.getWorkspace().getRoot().getFolder(outputLocation); + + String path=folder.getLocation().toString(); + + classpathEntries.add(path); + + // Add other libraries to the classpath + IClasspathEntry[] curclspath=jproject.getRawClasspath(); + for (int i=0; curclspath != null && + i < curclspath.length; i++) { + + if (curclspath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) { + IFile file= + ResourcesPlugin.getWorkspace(). + getRoot().getFile(curclspath[i].getPath()); + + if (file.exists()) { + // Library is within the workspace + classpathEntries.add(file.getLocation().toString()); + } else { + // Assume library is external to workspace + classpathEntries.add(curclspath[i].getPath().toString()); + } + + } else if (curclspath[i].getEntryKind() == + IClasspathEntry.CPE_CONTAINER) { + // Container's not currently handled - but + // problem need to retrieve from project and + // iterate over container entries + } + } + + } catch(Exception e) { + // TODO: report error + } + + buildClassPath("org.jboss.savara.tools.monitor", classpathEntries); + buildClassPath("org.pi4soa.service", classpathEntries); + buildClassPath("org.pi4soa.common", classpathEntries); + buildClassPath("org.pi4soa.cdl", classpathEntries); + buildClassPath("org.eclipse.emf.ecore", classpathEntries); + buildClassPath("org.eclipse.emf.ecore.xmi", classpathEntries); + buildClassPath("org.eclipse.emf.common", classpathEntries); + buildClassPath("org.apache.xalan", classpathEntries); + buildClassPath("org.apache.xml.serializer", classpathEntries); + + ret = new String[classpathEntries.size()]; + classpathEntries.copyInto(ret); + + if (logger.isLoggable(Level.FINEST)) { + logger.finest("Scenario Simulation Classpath:"); + for (int i=0; i < ret.length; i++) { + logger.finest(" ["+i+"] "+ret[i]); + } + } + + return(ret); + } + + protected void buildClassPath(String bundleId, java.util.List<String> entries) { + Bundle bundle= Platform.getBundle(bundleId); + if (bundle != null) { + java.net.URL installLocation= bundle.getEntry("/"); + java.net.URL local= null; + try { + local= Platform.asLocalURL(installLocation); + } catch (java.io.IOException e) { + e.printStackTrace(); + } + + String baseLocation = local.getFile(); + + try { + String requires = (String)bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH); + ManifestElement[] elements = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, requires); + + for (int i=0; elements != null && i < elements.length; i++) { + + String path=baseLocation+elements[i].getValue(); + + // Check if path is for a Jar and that the + // file exists - if not see if a classes + // directory exists + if (path.endsWith(".jar")) { + + if ((new File(path)).exists() == false) { + if ((new File(baseLocation+"classes")).exists()) { + path = baseLocation+"classes"; + } + } + } + + if (entries.contains(path) == false) { + if (logger.isLoggable(Level.FINE)) { + logger.fine("Adding classpath entry '"+ + path+"'"); + } + entries.add(path); + + if (elements[i].getValue().equals(".")) { + if ((new File(baseLocation+"classes")).exists()) { + path = baseLocation+"classes"; + + entries.add(path); + } + } + } + } + + if (elements == null) { + if (logger.isLoggable(Level.FINE)) { + logger.fine("Adding classpath entry '"+ + baseLocation+"'"); + } + entries.add(baseLocation); + } + + /* + requires = (String)bundle.getHeaders().get(Constants.REQUIRE_BUNDLE); + elements = ManifestElement.parseHeader(Constants.REQUIRE_BUNDLE, requires); + + for (int i=0; recursive && + elements != null && i < elements.length; i++) { + buildClasspathEntries(elements[i].getValue(), + entries, false); + } + */ + + } catch(Exception e) { + logger.severe("Failed to construct classpath: "+e); + e.printStackTrace(); + } + } + } + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor.eclipse"); +} \ No newline at end of file Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorMainTab.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorMainTab.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorMainTab.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,516 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 17 Jan, 2008 : Initial version created by gary + */ +package org.jboss.savara.tools.monitor.eclipse; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; +import org.eclipse.debug.ui.ILaunchConfigurationTab; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.dialogs.ElementListSelectionDialog; + +/** + * This class represents the first main tab within the tab group + * associated with the monitor launch configuration. + */ +public class MonitorMainTab extends AbstractLaunchConfigurationTab { + + /** + * @see ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite) + */ + public void createControl(Composite parent) { + Composite comp = new Composite(parent, SWT.NONE); + setControl(comp); + + GridLayout topLayout = new GridLayout(); + topLayout.numColumns= 3; + comp.setLayout(topLayout); + + Label label = new Label(comp, SWT.NONE); + GridData gd = new GridData(); + gd.horizontalSpan = 3; + label.setLayoutData(gd); + + createChoreographySection(comp); + + label = new Label(comp, SWT.NONE); + gd = new GridData(); + gd.horizontalSpan = 3; + label.setLayoutData(gd); + + Dialog.applyDialogFont(comp); + validatePage(); + } + + /** + * This method creates the GUI components for the + * monitor tab. + * + * @param comp The composite + */ + protected void createChoreographySection(Composite comp) { + GridData gd = new GridData(); + gd.horizontalSpan = 3; + + m_projectLabel = new Label(comp, SWT.NONE); + m_projectLabel.setText("Project"); + gd= new GridData(); + gd.horizontalIndent = 25; + m_projectLabel.setLayoutData(gd); + + m_project= new Text(comp, SWT.SINGLE | SWT.BORDER); + m_project.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + m_project.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent evt) { + validatePage(); + updateLaunchConfigurationDialog(); + m_choreographySearch.setEnabled(m_project.getText().length() > 0); + } + }); + + m_projectButton = new Button(comp, SWT.PUSH); + m_projectButton.setText("Browse"); + m_projectButton.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent evt) { + handleProjectButtonSelected(); + } + }); + setButtonGridData(m_projectButton); + + m_choreographyLabel = new Label(comp, SWT.NONE); + gd = new GridData(); + gd.horizontalIndent = 25; + m_choreographyLabel.setLayoutData(gd); + m_choreographyLabel.setText("Choreography"); + + m_choreography = new Text(comp, SWT.SINGLE | SWT.BORDER); + m_choreography.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + m_choreography.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent evt) { + validatePage(); + updateLaunchConfigurationDialog(); + } + }); + + m_choreographySearch = new Button(comp, SWT.PUSH); + m_choreographySearch.setEnabled(m_project.getText().length() > 0); + m_choreographySearch.setText("Search"); + m_choreographySearch.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent evt) { + handleSearchButtonSelected(); + } + }); + setButtonGridData(m_choreographySearch); + } + + protected static Image createImage(String path) { + return null; + } + + + /** + * @see ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration) + */ + public void initializeFrom(ILaunchConfiguration config) { + String projectName= ""; + String choreography= ""; + + try { + projectName = config.getAttribute(MonitorLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$ + } catch (CoreException ce) { + } + m_project.setText(projectName); + + try { + choreography = config.getAttribute(MonitorLaunchConfigurationConstants.ATTR_CHOREOGRAPHY_DESCRIPTION, ""); //$NON-NLS-1$ + } catch (CoreException ce) { + } + m_choreography.setText(choreography); + } + + /** + * @see ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy) + */ + public void performApply(ILaunchConfigurationWorkingCopy config) { + } + + /** + * @see ILaunchConfigurationTab#dispose() + */ + public void dispose() { + super.dispose(); + } + + /** + * @see AbstractLaunchConfigurationTab#getImage() + */ + public Image getImage() { + return(null); + } + + /** + * This method sets the grid data for the button. + * + * @param button The button + */ + protected void setButtonGridData(Button button) { + GridData gridData= new GridData(); + button.setLayoutData(gridData); + //SWTUtil.setButtonDimensionHint(button); + } + + /** + * Show a dialog that lists all choreography files within the + * selected project + */ + protected void handleSearchButtonSelected() { + + IProject project = getProject(); + + ILabelProvider labelProvider=new LabelProvider() { + public String getText(Object obj) { + String ret="<unknown>"; + if (obj instanceof IResource) { + String filename=((IResource)obj).getName(); + if (filename.endsWith(org.pi4soa.cdl.CDLDefinitions.CDL_FILE_EXTENSION)) { + filename = filename.substring(0, filename.length()- + org.pi4soa.cdl.CDLDefinitions.CDL_FILE_EXTENSION.length()-1); + } + ret = filename+" ["+ + ((IResource)obj).getParent(). + getProjectRelativePath()+"]"; + } + return(ret); + } + }; + + IResource[] choreos=null; + + if (project.exists() == false) { + choreos = new IResource[0]; + } else { + choreos = getChoreographies(project); + } + + ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider); + dialog.setTitle("Choreographies"); + dialog.setMessage("Select the relevant choreography"); + dialog.setElements(choreos); + + if (dialog.open() == Window.OK) { + IResource file=(IResource)dialog.getFirstResult(); + m_choreography.setText(file.getProjectRelativePath().toString()); + } + } + + /** + * This method returns the list of choreography resource files within + * the supplied project. + * + * @param project The project + * @return The list of choreography resource files + */ + protected IResource[] getChoreographies(IProject project) { + IResource[] ret=null; + final java.util.Vector list=new java.util.Vector(); + + try { + project.accept(new org.eclipse.core.resources.IResourceVisitor() { + public boolean visit(IResource res) { + + if (res.getFileExtension() != null && + res.getFileExtension().equals( + org.pi4soa.cdl.CDLDefinitions.CDL_FILE_EXTENSION)) { + list.add(res); + } + + return(true); + } + }); + + ret = new IResource[list.size()]; + list.copyInto(ret); + + } catch(Exception e) { + e.printStackTrace(); + } + + return(ret); + } + + /** + * Show a dialog that lets the user select a project. This in turn provides + * context for the main type, allowing the user to key a main type name, or + * constraining the search for main types to the specified project. + */ + protected void handleProjectButtonSelected() { + IProject project = chooseProject(); + if (project == null) { + return; + } + + String projectName = project.getName(); + m_project.setText(projectName); + } + + /** + * Realize a Java Project selection dialog and return the first selected project, + * or null if there was none. + */ + protected IProject chooseProject() { + IProject[] projects; + try { + projects= getWorkspaceRoot().getProjects(); + } catch (Exception e) { + projects= new IProject[0]; + } + + ILabelProvider labelProvider=new LabelProvider() { + public String getText(Object obj) { + String ret="<unknown>"; + if (obj instanceof IResource) { + ret = ((IResource)obj).getName(); + } + return(ret); + } + }; + + ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider); + dialog.setTitle("Projects"); + dialog.setMessage("Select the relevant project"); + dialog.setElements(projects); + + IProject project = getProject(); + if (project != null) { + dialog.setInitialSelections(new Object[] { project }); + } + if (dialog.open() == Window.OK) { + return (IProject) dialog.getFirstResult(); + } + return null; + } + + /** + * Return the IProject corresponding to the project name in the project name + * text field, or null if the text does not match a project name. + */ + protected IProject getProject() { + String projectName = m_project.getText().trim(); + if (projectName.length() < 1) { + return null; + } + return(getWorkspaceRoot().getProject(projectName)); + } + + /** + * Convenience method to get the workspace root. + */ + private IWorkspaceRoot getWorkspaceRoot() { + return ResourcesPlugin.getWorkspace().getRoot(); + } + + /** + * @see ILaunchConfigurationTab#isValid(ILaunchConfiguration) + */ + public boolean isValid(ILaunchConfiguration config) { + return getErrorMessage() == null; + } + + /** + * This method validates the page. + * + */ + private void validatePage() { + setErrorMessage(null); + setMessage(null); + + String projectName = m_project.getText().trim(); + if (projectName.length() == 0) { + setErrorMessage("Project name not specified"); + return; + } + + IProject project = getWorkspaceRoot().getProject(projectName); + if (!project.exists()) { + setErrorMessage("Project '"+projectName+"' does not exist"); + return; + } + + try { + String choreographyName = m_choreography.getText().trim(); + if (choreographyName.length() == 0) { + setErrorMessage("Choreography has not been defined"); + return; + } + IResource resource = project.findMember(choreographyName); + if (resource == null) { + setErrorMessage("Could not find choreography '"+choreographyName+"'"); + } else { + + // TODO: Check is valid choreography model + } + } catch (Exception e) { + } + } + + /** + * @see ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy) + */ + public void setDefaults(ILaunchConfigurationWorkingCopy config) { + + IResource resource = getContext(); + if (resource != null) { + initializeProject(resource, config); + } else { + config.setAttribute(MonitorLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); + config.setAttribute(MonitorLaunchConfigurationConstants.ATTR_CHOREOGRAPHY_DESCRIPTION, ""); + } + initializeTestAttributes(resource, config); + } + + /** + * This method identifies the context associated with the + * monitor. + * + * @return The context resource + */ + protected IResource getContext() { + IResource ret=null; + IWorkbenchPage page = + org.eclipse.ui.PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); + + if (page != null) { + ISelection selection = page.getSelection(); + if (selection instanceof IStructuredSelection) { + IStructuredSelection ss = (IStructuredSelection)selection; + if (!ss.isEmpty()) { + Object obj = ss.getFirstElement(); + if (obj instanceof IResource) { + ret = (IResource)obj; + } + } + } + + if (ret == null) { + IEditorPart part = page.getActiveEditor(); + if (part != null) { + IEditorInput input = part.getEditorInput(); + ret =(IResource)input.getAdapter(IResource.class); + } + } + } + + return(ret); + } + + /** + * This method initializes the project details. + * + * @param resource The resource + * @param config The configuration + */ + protected void initializeProject(IResource resource, ILaunchConfigurationWorkingCopy config) { + IProject project = resource.getProject(); + String name = null; + if (project != null && project.exists()) { + name = project.getName(); + } + config.setAttribute(MonitorLaunchConfigurationConstants.ATTR_PROJECT_NAME, name); + } + + /** + * This method initializes the choreography details. + * + * @param resource The selected resource + * @param config The configuration + */ + private void initializeTestAttributes(IResource resource, ILaunchConfigurationWorkingCopy config) { + if (resource != null && (resource.getType() == IResource.FOLDER || + (resource.getType() == IResource.FILE && + resource.getFileExtension().equals( + org.pi4soa.cdl.CDLDefinitions.CDL_FILE_EXTENSION)))) { + + config.setAttribute(MonitorLaunchConfigurationConstants.ATTR_CHOREOGRAPHY_DESCRIPTION, + resource.getProjectRelativePath().toString()); + + initializeName(config, resource.getName()); + } + } + + /** + * This method initializes the launch configuration name. + * + * @param config The configuration + * @param name The name + */ + private void initializeName(ILaunchConfigurationWorkingCopy config, String name) { + if (name == null) { + name= ""; + } + if (name.length() > 0) { + + int index = name.lastIndexOf('.'); + if (index > 0) { + name = name.substring(0, index); + } + name= getLaunchConfigurationDialog().generateName(name); + config.rename(name); + } + } + + /** + * @see ILaunchConfigurationTab#getName() + */ + public String getName() { + return("Monitor"); + } + + private Label m_projectLabel=null; + private Text m_project=null; + private Button m_projectButton=null; + private Label m_choreographyLabel=null; + private Text m_choreography=null; + private Button m_choreographySearch=null; +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorTabGroup.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorTabGroup.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/eclipse/MonitorTabGroup.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,56 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 17 Jan, 2008 : Initial version created by gary + */ +package org.jboss.savara.tools.monitor.eclipse; + +import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup; +import org.eclipse.debug.ui.CommonTab; +import org.eclipse.debug.ui.ILaunchConfigurationDialog; +import org.eclipse.debug.ui.ILaunchConfigurationTab; +import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab; + +/** + * This class represents the UI tab group for the Scenario Test + * launcher. + */ +public class MonitorTabGroup extends + AbstractLaunchConfigurationTabGroup { + + /** + * The default constructor for the scenario type tab group. + */ + public MonitorTabGroup() { + } + + /** + * This method creates the tabs for the scenario test launch + * configuration. + * + * @param dialog The launch configuration dialog + * @param mode The mode + */ + public void createTabs(ILaunchConfigurationDialog dialog, String mode) { + ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { + new MonitorMainTab(), + new JavaJRETab(), + new CommonTab() + }; + setTabs(tabs); + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ChannelJPanel.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ChannelJPanel.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ChannelJPanel.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,556 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.util.Comparator; +import java.util.Iterator; +import java.util.logging.Logger; + +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTree; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeCellRenderer; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreePath; +import javax.swing.tree.TreeSelectionModel; + +import org.pi4soa.service.Identity; +import org.pi4soa.service.correlator.CorrelationSession; + + +/** + * The left hand pane contains a tree whose root is the + * choreography, and whose leaves are channels and transactions. + * + * Selecting a channel filters the exchange events list (or should + * do). + */ +public class ChannelJPanel extends JPanel{ + + public final static String UNEXPECTED_MESSAGES_NAME = "Unexpected Messages"; + public final static String ERROR_NAME="Errors"; + public final static String WARNING_NAME="Warnings"; + public final static String INFORMATION_NAME="Information"; + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor.ui"); + + JTree tree = null; + TreeSelectionListener listener = null; + JScrollPane treeView = null; + + ImageIcon channelLeafIcon = null; + ImageIcon channelOpenIcon = null; + ImageIcon channelClosedIcon = null; + ImageIcon channelEmptyIcon = null; + ImageIcon errorsLeafIcon = null; + ImageIcon unexpectedLeafIcon = null; + ImageIcon warningsLeafIcon = null; + ImageIcon issuesOpenIcon = null; + ImageIcon issuesClosedIcon = null; + ImageIcon issuesEmptyIcon = null; + ImageIcon txnLeafIcon = null; + ImageIcon txnOpenIcon = null; + ImageIcon txnClosedIcon = null; + ImageIcon txnEmptyIcon = null; + + // Vector exchangeEvents = null; + ExchangeEventsData exchangeEventsData = null; + + DefaultTreeModel treeModel = null; + DefaultMutableTreeNode rootNode = null; + + DefaultMutableTreeNode channelRoot = null; + DefaultMutableTreeNode issuesRoot = null; + DefaultMutableTreeNode errorsRoot = null; + DefaultMutableTreeNode warningsRoot = null; + DefaultMutableTreeNode unexpectedMessagesRoot = null; + DefaultMutableTreeNode sessionRoot = null; + + String sessionRootName = "Sessions"; + String channelRootName = "Channels"; + String unexpectedMessagesRootName = UNEXPECTED_MESSAGES_NAME; + String errorsRootName = ERROR_NAME; + String warningsRootName = WARNING_NAME; + String issuesRootName = "Issues"; + + + + /** + * Creates a new ChannelJPanel. + * + * @param listener The listener for tree selection changes. + */ + public ChannelJPanel(TreeSelectionListener listener){ + + this.listener = listener; + this.setBackground(Color.white); + this.setLayout(new BorderLayout()); + } + + public ChannelJPanel(ExchangeEventsData eed, TreeSelectionListener listener){ + this.listener = listener; + this.setBackground(Color.white); + this.setLayout(new BorderLayout()); + exchangeEventsData = eed; + } + + //////////////////////////////////////////// + + static public String getUnexpectedMessagesName() + { + return UNEXPECTED_MESSAGES_NAME; + } + + static public String getErrorName() { + return(ERROR_NAME); + } + + static public String getWarningName() { + return(WARNING_NAME); + } + + static public String getInformationName() { + return(INFORMATION_NAME); + } + + public void addedSession(CorrelationSession s) + { + logger.fine("ADD SESSION TO PANEL " + s); + logger.fine("rootNote child count is: " + rootNode.getChildCount()); + String name = ChannelJPanel.getSessionIdentity(s); + if (name == null) + { + name = "Session :" + s.toString().substring(s.getClass().getName().length()); + } + logger.info("ADDING SESSION FOR TXN: " + name); + + addObject(sessionRoot,new ProxyTreeNode(name, s),true); + } + + static public String getSessionIdentity(CorrelationSession s) + { + String identityString = null; + java.util.List<Identity> messageIdentityArray = s.getIdentities(); + if (messageIdentityArray != null) + logger.info("sessionIdentArray length is: " + messageIdentityArray.size()); + else + logger.info("messageIdentityArray was null"); + if(messageIdentityArray == null || messageIdentityArray.size() == 0) + { + return identityString; + } else { + Identity firstMessageIdentity = messageIdentityArray.get(0); + // messageIdentityString = firstMessageIdentity.toText(); + String tokens[] = firstMessageIdentity.getTokens(); + // value + Object values_obj[] = firstMessageIdentity.getValues(); + + String[] values = new String[values_obj.length]; + + for (int values_index=0; values_index < values_obj.length; values_index++) + { + values[values_index] = values_obj[values_index].toString(); + if (values_obj[values_index] instanceof String) + { + values[values_index] = (String)values_obj[values_index]; + } + else if (values_obj[values_index] instanceof java.util.List) + { + java.util.List list = (java.util.List)values_obj[values_index]; + values[values_index] = "{"; + for (int i=0; (i < list.size()); i++ ) + { + values[values_index] += (String)list.get(i); + } + values[values_index] += "}"; + } else { + logger.severe("Problem creating an identity string, values is of unknown type."); + } + + } + + if(tokens == null || values == null) + { + if(tokens == null) + { + logger.fine("identity.getTokens() returned null"); + // messageIdentityString = "null tokens"; + } + + if(values == null) + { + logger.fine("identity.getValues() returned null"); + // messageIdentityString = "null values"; + } + + identityString = firstMessageIdentity.toString(); + } else { + if(tokens != null && values != null && tokens.length == values.length) + { + identityString = ""; + for(int i = 0; i < tokens.length - 1; i++) + { + identityString += values[i] + " (" + tokens[i] + "), "; + } + identityString += values[tokens.length - 1] + " (" + tokens[tokens.length - 1]+")"; + } else { + identityString = "tokens/values mismatch"; + } + } + } + + return identityString; + } + + /** + * Adds the channel nodes to the tree, sorted in name order. + */ + public void createAndAddTree(org.pi4soa.cdl.Package choreography){ + if(tree != null){ + // remove the current tree ... + this.remove(treeView); + treeView = null; + tree = null; + } + + rootNode = new DefaultMutableTreeNode(choreography.getName()); + if (treeModel == null){ + treeModel = new DefaultTreeModel(rootNode); + treeModel.addTreeModelListener(new MonitorTreeModelListener()); + } + + createChannelNodes(treeModel, choreography); + + tree = new JTree(treeModel); // instead of rootNode instead of treeModel + ChannelTreeCellRenderer renderer = new ChannelTreeCellRenderer(); + + if(txnLeafIcon == null) txnLeafIcon = MonitorMainPanel.createImageIcon("icons/txnleaf.png"); + if(txnOpenIcon == null) txnOpenIcon = MonitorMainPanel.createImageIcon("icons/txnopen.png"); + if(txnClosedIcon == null) txnClosedIcon = MonitorMainPanel.createImageIcon("icons/txnclosed.png"); + if(txnEmptyIcon == null) txnEmptyIcon = MonitorMainPanel.createImageIcon("icons/txnempty.png"); + if(channelLeafIcon == null) channelLeafIcon = MonitorMainPanel.createImageIcon("icons/channelleaf.png"); + if(channelOpenIcon == null) channelOpenIcon = MonitorMainPanel.createImageIcon("icons/channelopen.png"); + if(channelClosedIcon == null) channelClosedIcon = MonitorMainPanel.createImageIcon("icons/channelclosed.png"); + if(channelEmptyIcon == null) channelEmptyIcon = MonitorMainPanel.createImageIcon("icons/channelempty.png"); + if(errorsLeafIcon == null) errorsLeafIcon = MonitorMainPanel.createImageIcon("icons/errorsleaf.png"); + if(warningsLeafIcon == null) warningsLeafIcon = MonitorMainPanel.createImageIcon("icons/warningsleaf.png"); + if(unexpectedLeafIcon == null) unexpectedLeafIcon = MonitorMainPanel.createImageIcon("icons/unexpectedleaf.png"); + if(issuesOpenIcon == null) issuesOpenIcon = MonitorMainPanel.createImageIcon("icons/issuesopen.png"); + if(issuesClosedIcon == null) issuesClosedIcon = MonitorMainPanel.createImageIcon("icons/issuesclosed.png"); + if(issuesEmptyIcon == null) issuesEmptyIcon = MonitorMainPanel.createImageIcon("icons/issuesempty.png"); + + tree.setCellRenderer(renderer); + + tree.setRootVisible(false); + + tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); + + // Listen for when the selection changes. + tree.addTreeSelectionListener(listener); + + treeView = new JScrollPane(this.tree); + this.add(treeView, BorderLayout.CENTER); + + // hack. + this.revalidate(); + } + + /** + * Adds the channel nodes to the tree, sorted in name order. + */ + private void createChannelNodes(DefaultTreeModel t, org.pi4soa.cdl.Package choreography){ + + issuesRoot = addObject(null, issuesRootName); + unexpectedMessagesRoot = addObject(issuesRoot,unexpectedMessagesRootName); // was nullChannel + errorsRoot = addObject(issuesRoot,errorsRootName); // was nullChannel + warningsRoot = addObject(issuesRoot,warningsRootName); // was nullChannel + + sessionRoot = addObject(null,sessionRootName); // was sessionRoot + + logger.fine("createChannelNodes(new)"); + + channelRoot = addObject(null,channelRootName); // was channelRoot + + org.pi4soa.cdl.TypeDefinitions typeDefinitions = choreography.getTypeDefinitions(); + org.eclipse.emf.common.util.EList channelTypes = typeDefinitions.getChannelTypes(); + + // we would like to sort the list of channels first + + org.eclipse.emf.common.util.ECollections.sort(channelTypes, new Comparator() { + public int compare(Object o1, Object o2) { + return ((org.pi4soa.cdl.ChannelType) o1).getName().compareTo( + ((org.pi4soa.cdl.ChannelType) o2).getName() + ); + } + }); + + Iterator listIterator = channelTypes.iterator(); + while(listIterator.hasNext()){ + org.pi4soa.cdl.ChannelType channelType = (org.pi4soa.cdl.ChannelType) listIterator.next(); + ProxyTreeNode node = new ProxyTreeNode(channelType.getName(), + channelType); + logger.fine("Adding channel type to tree: " + channelType.getName()); + addObject(channelRoot,node); + } + } + + + /** Add child to the currently selected node. */ + public DefaultMutableTreeNode addObject(Object child) { + logger.fine("addObject " + child.toString() + " to child"); + DefaultMutableTreeNode parentNode = null; + TreePath parentPath = tree.getSelectionPath(); + + if (parentPath == null) { + parentNode = rootNode; + } else { + parentNode = (DefaultMutableTreeNode) + (parentPath.getLastPathComponent()); + } + + return addObject(parentNode, child, true); + } + + public DefaultMutableTreeNode addObject(DefaultMutableTreeNode parent, + Object child) { + logger.fine("addObject " + child.toString() + " to parent"); + return addObject(parent, child, false); + } + + public DefaultMutableTreeNode addObject(DefaultMutableTreeNode parent, + Object child, + boolean shouldBeVisible) { + logger.fine("addObject " + child.toString() + " to parent with visibility " + shouldBeVisible); + DefaultMutableTreeNode childNode = + new DefaultMutableTreeNode(child); + + if (parent == null) { + parent = rootNode; + } + + treeModel.insertNodeInto(childNode, parent, + parent.getChildCount()); + + //Make sure the user can see the lovely new node. + if (shouldBeVisible) { + tree.scrollPathToVisible(new TreePath(childNode.getPath())); + } + return childNode; + } + + + /** + * Adds the channel nodes to the tree, sorted in name order. + */ + public void setChannelSelectionOn(boolean channelSelection){ + if(channelSelection == true){ + tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); + } + else{ + + } + } + + + /** + * + */ + public JTree getTree(){ + return tree; + } + + + /** + * + */ + public void redraw(){ + tree.setSelectionPaths(tree.getSelectionPaths()); + tree.revalidate(); + tree.repaint(); + } + + public class ProxyTreeNode { + + public ProxyTreeNode(String label, Object obj) { + m_label = label; + m_object = obj; + } + + public String getLabel() { + return(m_label); + } + + public Object getObject() { + return(m_object); + } + + public String toString() { + return(m_label); + } + + private String m_label=null; + private Object m_object=null; + } + + public class ChannelTreeCellRenderer extends DefaultTreeCellRenderer{ + + private Color originalTextNonSelectionColor = null; + private Color originalTextSelectionColor = null; + + /** + * + */ + public Component getTreeCellRendererComponent(JTree tree, + Object value, + boolean selected, + boolean expanded, + boolean leaf, + int row, + boolean hasFocus){ + + logger.fine("getTreeCellRendererComponent(" + value.toString() + ")"); + + if(originalTextNonSelectionColor == null) originalTextNonSelectionColor = this.getTextNonSelectionColor(); + if(originalTextSelectionColor == null) originalTextSelectionColor = this.getTextSelectionColor(); + + boolean nodeHasErrors = false; + boolean nodeHasWarnings = false; + boolean nodeHasUnexpectedMessage = false; + + if(leaf == true){ + if(exchangeEventsData.getHasErrorsForChannel(value.toString()) == true || + exchangeEventsData.getHasErrorsForSession(value.toString())) { + nodeHasErrors = true; + } + else if(exchangeEventsData.getHasWarningsForChannel(value.toString()) == true || + exchangeEventsData.getHasWarningsForSession(value.toString())) { + nodeHasWarnings = true; + } + else if (exchangeEventsData.getHasUnexpectedExchangeEventsForChannel(value.toString()) == true || + exchangeEventsData.getHasUnexpectedExchangeEventsForSession(value.toString())) { + nodeHasUnexpectedMessage = true; + } + } + else{ + //nodeHasErrors = exchangeEventsData.getHasErrors(); + //nodeHasWarnings = exchangeEventsData.getHasWarnings(); + //nodeHasUnexpectedMessage = exchangeEventsData.getHasUnexpectedMessages(); + } + + // + // Sets the left panel colors + // + if(nodeHasErrors == true){ + logger.fine("hasErrors - dark red"); + this.setTextNonSelectionColor(Color.red.darker()); + this.setTextSelectionColor(Color.red.darker()); + } + else if(nodeHasWarnings == true){ + logger.fine("hasWarnings - orange"); + this.setTextNonSelectionColor(Color.orange); + this.setTextSelectionColor(Color.orange); + } + else if (nodeHasUnexpectedMessage == true) { + logger.fine("hasUnexpectedMessages - red"); + this.setTextNonSelectionColor(Color.red); + this.setTextSelectionColor(Color.red); + } + else{ + logger.fine("hasOkay"); + this.setTextNonSelectionColor(originalTextNonSelectionColor); + this.setTextSelectionColor(originalTextSelectionColor); + } + + if (value instanceof DefaultMutableTreeNode) { + m_lastValue = ((DefaultMutableTreeNode)value).getUserObject(); + } else { + m_lastValue = value; + } + + return super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus); + } + + public Icon getOpenIcon() { + Icon ret=super.getOpenIcon(); + + if (m_lastValue.toString().equals(sessionRootName)) { + ret = txnOpenIcon; + } else if (m_lastValue.toString().equals(channelRootName)) { + ret = channelOpenIcon; + } else if (m_lastValue.toString().equals(issuesRootName)) { + ret = issuesOpenIcon; + } + + logger.info("Returning open icon for "+m_lastValue); + return(ret); + } + + public Icon getClosedIcon() { + Icon ret=super.getClosedIcon(); + + if (m_lastValue.toString().equals(sessionRootName)) { + ret = txnClosedIcon; + } else if (m_lastValue.toString().equals(channelRootName)) { + ret = channelClosedIcon; + } else if (m_lastValue.toString().equals(issuesRootName)) { + ret = issuesClosedIcon; + } + + logger.info("Returning closed icon for "+m_lastValue); + return(ret); + } + + public Icon getLeafIcon() { + Icon ret=super.getLeafIcon(); + + if (m_lastValue instanceof ProxyTreeNode) { + if (((ProxyTreeNode)m_lastValue).getObject() instanceof CorrelationSession) { + ret = txnLeafIcon; + } else if (((ProxyTreeNode)m_lastValue).getObject() + instanceof org.pi4soa.cdl.ChannelType) { + ret = channelLeafIcon; + } + } else if (m_lastValue.toString().equals(sessionRootName)) { + ret = txnEmptyIcon; + } else if (m_lastValue.toString().equals(channelRootName)) { + ret = channelEmptyIcon; + } else if (m_lastValue.toString().equals(unexpectedMessagesRootName)) { + ret = unexpectedLeafIcon; + } else if (m_lastValue.toString().equals(errorsRootName)) { + ret = errorsLeafIcon; + } else if (m_lastValue.toString().equals(warningsRootName)) { + ret = warningsLeafIcon; + } + logger.info("Returning leaf icon for "+m_lastValue+" of type "+m_lastValue.getClass()); + return(ret); + } + + private Object m_lastValue=null; + } + +} + Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ExchangeEventWrapper.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ExchangeEventWrapper.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ExchangeEventWrapper.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,797 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + +import org.jboss.savara.tools.monitor.ExchangeEvent; + +import org.pi4soa.cdl.Interaction; +import org.pi4soa.cdl.RoleType; +import org.pi4soa.cdl.Variable; + +import org.pi4soa.service.Message; +import org.pi4soa.service.Identity; + +import org.pi4soa.service.correlator.CorrelationSession; + +import java.io.Serializable; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.ObjectInputStream; +import java.util.logging.Logger; + + + +/** + * + */ +public class ExchangeEventWrapper implements Serializable{ + + Integer index = null; + + String realSessionName = null; + String sessionName = null; + String description = null; + String toRoleTypeName = null; + String fromRoleTypeName = null; + String serviceName=null; + String sendVariableString = null; + String sendVariableTypeString = null; + String messageTypeString = ""; + String messageTypeNoNamespaceString = ""; + String operationString = null; + String messageValueString = null; + String exceptionValueString = null; + String messageIdentityString = null; + String channelType = null; + String correlationSessionString = null; + + // don't serialize this one ... + transient private ExchangeEvent exchangeEvent = null; + + String status = null; + boolean hasFrozenStatus = false; + + boolean hasSetErrorsAndWarnings = false; + boolean isError = false; + boolean isWarning = false; + + boolean isErrorMessage=false; + boolean isWarningMessage=false; + boolean isInformationMessage=false; + + boolean isFault = false; + boolean hasSetIsFault = false; + + boolean isRequest; + + boolean isUnexpected = false; + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor.ui"); + + public ExchangeEventWrapper(CorrelationSession session, + Integer index, String mesgValue, String exception){ + this.index = index; + + correlationSessionString = (session == null? + "<unknown>":session.toString()); + + setMessageValue(mesgValue); + + if (messageValueString == null) { + messageValueString = ""; + } + + exceptionValueString = exception; + + messageIdentityString = ""; + operationString = ""; + description = ""; + sendVariableString=""; + + setRealSessionName(session); + setSessionName(session); + } + + /** + * + */ + public ExchangeEventWrapper(ExchangeEvent event, Integer index){ + this.index = index; + this.exchangeEvent = event; + + correlationSessionString = (event.getCorrelationSession() == null? + "<unknown>":event.getCorrelationSession().toString()); + + Message message = exchangeEvent.getMessage(); + if(message != null){ + + if (exchangeEvent.getExchange() != null) { + isRequest = (exchangeEvent.getExchange().getAction() + == org.pi4soa.cdl.ExchangeActionType.REQUEST); + } else { + isRequest = message.isRequest(); + } + + messageTypeString = message.getType(); + + messageTypeNoNamespaceString = + org.pi4soa.common.xml.NameSpaceUtil.getLocalPart(message.getType()); + + } + else{ + logger.fine(">>>> Null message"); + isRequest = true; + } + + setRealSessionName(event.getCorrelationSession()); + setSessionName(event.getCorrelationSession()); + setDescription(event); + setFromRoleTypeName(event); + setToRoleTypeName(event); + setSendVariableName(event); + setSendVariableTypeName(event); + setOperationString(event); + setMessageValue(event); + setMessageIdentity(event); + setChannelType(event); + } + + /** + * + */ + public Integer getIndex(){ return index; } + + + /** + * + */ + public String getRealSessionName() { return realSessionName; } + public String getSessionName() { return sessionName; } + + /** + * + */ + public void setRealSessionName(CorrelationSession s){ + + if (s == null) { + realSessionName = "Session:unknown"; + } else { + realSessionName = "Session:" + s.toString().substring(s.getClass().getName().length()); + } + + logger.fine("Set real session name in wrapper: " + realSessionName); + } + + public void setSessionName(CorrelationSession s){ + + if (s == null) { + sessionName = "unknown"; + } else { + sessionName = ChannelJPanel.getSessionIdentity(s); + } + + logger.fine("Set session name alias in wrapper: " + sessionName); + } + /** + * + */ + public String getDescription(){ return description; } + + /** + * + */ + protected void setDescription(ExchangeEvent exchangeEvent){ + if(exchangeEvent == null || exchangeEvent.getExchange() == null){ + description = "null exchange"; + } + else{ + description = exchangeEvent.getExchange().getDescription(); + if(description != null){ + String newDescription = description.replaceAll("\\s+", " "); + description = newDescription; + } + else{ + description = ""; + } + } + } + + + /** + * + */ + public String getStatus(){ + String returnValue = null; + if(hasFrozenStatus == true){ + returnValue = status; + } else { + if (exchangeEvent == null) { + returnValue = ""; + } else if (exchangeEvent.getChannel() == null) { + returnValue = "Unexpected"; + } else if(exchangeEvent.isExchangeComplete()) { + returnValue = "Completed"; + } else{ + returnValue = "Initiated"; + } + } + + return returnValue; + } + + + /** + * + */ + public void freezeStatus(){ + status = getStatus(); + hasFrozenStatus = true; + } + + + /** + * + */ + public boolean equals(Object object){ + boolean result = false; + + if (object != null && object instanceof ExchangeEventWrapper) { + ExchangeEventWrapper other = (ExchangeEventWrapper) object; + if(other.exchangeEvent != null && this.exchangeEvent != null){ + if(other.exchangeEvent.equals(this.exchangeEvent)){ + result = true; + } + } + else{ + result = other.getDescription().equals(this.getDescription()) && + other.getFromRoleTypeName().equals(this.getFromRoleTypeName()) && + other.getToRoleTypeName().equals(this.getToRoleTypeName()) && + other.getSendVariableName().equals(this.getSendVariableName()) && + other.getOperationString().equals(this.getOperationString()) && + other.getMessageValue().equals(this.getMessageValue()) && + other.getMessageIdentity().equals(this.getMessageIdentity()) && + other.getChannelType().equals(this.getChannelType()); + } + + } + + return result; + } + + + + /** + * + */ + public String getFromRoleTypeName(){ + if (exchangeEvent == null || exchangeEvent.getChannel() == null) + { + return(""); // "Unknown From Role"; + } + if(isRequest){ + return fromRoleTypeName; + } + else{ + return toRoleTypeName; + } + } + + + /** + * + */ + protected void setFromRoleTypeName(ExchangeEvent exchangeEvent){ + if(exchangeEvent.getExchange() == null){ + fromRoleTypeName = ""; //"Unknown From Role"; + } + else{ + Interaction interaction = exchangeEvent.getExchange().getInteraction(); + if(interaction != null){ + RoleType fromRoleType = interaction.getFromRoleType(); + if(fromRoleType != null){ + fromRoleTypeName = fromRoleType.getName() != null ? fromRoleType.getName() : ""; + } + else{ + fromRoleTypeName = ""; //"null fromRoleType"; + } + } + else{ + fromRoleTypeName = ""; //"null interaction"; + } + } + } + + protected void setServiceName(String name) { + serviceName = name; + } + + public String getServiceName() { return serviceName; } + + /** + * + */ + public String getToRoleTypeName(){ + if (exchangeEvent == null || exchangeEvent.getChannel() == null) + { + return(""); // "Unknown To Role"; + } + if(isRequest){ + return toRoleTypeName; + } + else{ + return fromRoleTypeName; + } + } + + + /** + * + */ + protected void setToRoleTypeName(ExchangeEvent exchangeEvent){ + if(exchangeEvent == null || exchangeEvent.getExchange() == null){ + toRoleTypeName = ""; //"Unknown To Role"; + } + else{ + Interaction interaction = exchangeEvent.getExchange().getInteraction(); + if(interaction != null){ + RoleType toRoleType = interaction.getToRoleType(); + if(toRoleType != null){ + toRoleTypeName = toRoleType.getName() != null ? toRoleType.getName() : ""; + } + else{ + toRoleTypeName = ""; //"null toRoleType"; + } + } + else{ + toRoleTypeName = ""; //"null interaction"; + } + } + } + + + /** + * + */ + public String getSendVariableName(){ return sendVariableString; } + public String getSendVariableTypeName() { return sendVariableTypeString; } + + /** + * + */ + protected void setSendVariableTypeName(ExchangeEvent exchangeEvent) + { + if(exchangeEvent.getExchange() == null){ + if (exchangeEvent.getMessage().getType() != null) { + String tmp = exchangeEvent.getMessage().getType(); + sendVariableTypeString = tmp.substring(tmp.indexOf("}")+1); + // Need to abberivate after the last "{" + } else { + sendVariableTypeString = "Unknown type"; + } + } + else{ + Variable sendVariable = exchangeEvent.getExchange().getSendVariable(); + if(sendVariable != null){ + //sendVariableString = sendVariable.getName() != null ? sendVariable.getName() : "Type: " + sendVariable.getType().getName(); + sendVariableTypeString = sendVariable.getType().getName(); + } + } + } + /** + * + */ + protected void setSendVariableName(ExchangeEvent exchangeEvent){ + if(exchangeEvent.getExchange() == null){ + if (exchangeEvent.getMessage().getType() != null) { + String tmp = exchangeEvent.getMessage().getType(); + sendVariableString = "None : " + tmp.substring(tmp.indexOf("}")+1); + // Need to abberivate after the last "{" + } else + sendVariableString = "null exchange"; + } + else{ + Variable sendVariable = exchangeEvent.getExchange().getSendVariable(); + if(sendVariable != null){ + //sendVariableString = sendVariable.getName() != null ? sendVariable.getName() : "Type: " + sendVariable.getType().getName(); + sendVariableString = sendVariable.getName() != null ? sendVariable.getName() : " : " + sendVariable.getType().getName(); + } + else{ + sendVariableString = "None : " + exchangeEvent.getExchange().getType().getName(); + //sendVariableString = "null sendVariable"; + } + } + } + + + /** + * + */ + public String getOperationString(){ return operationString; } + + + + /** + * + */ + protected void setOperationString(ExchangeEvent exchangeEvent){ + if(exchangeEvent.getExchange() == null){ + operationString = ""; //"Unknown Operation"; + } + Message message = exchangeEvent.getMessage(); + if(message == null){ + operationString = ""; //"null message"; + } + else{ + operationString = message.getOperationName(); + if(operationString == null){ + operationString = ""; //"null operation"; + } + } + } + + public String getMessageSummary() { + String ret=""; + + if (exchangeEvent != null) { + String op=getOperationString(); + if (op != null && op.trim().length() > 0) { + ret += op+"("; + } + + ret += getMessageTypeNoNamespace(); + if (op != null && op.trim().length() > 0) { + ret += ")"; + } + } else { + ret = getMessageValue(); + } + + if (ret != null && ret.length() > 0 && + ret.charAt(0) == '<') { + ret = getChannelType()+" ..."; + } + + return(ret); + } + + /** + * + */ + public String getMessageValue(){ return messageValueString; } + + public String getExceptionValue() { return exceptionValueString; } + + /** + * + */ + protected void setMessageValue(ExchangeEvent exchangeEvent){ + logger.fine("**** Setting message value"); + messageValueString = ""; + Message message = exchangeEvent.getMessage(); + if(message == null){ + logger.fine("**** null message"); + messageValueString = "null message"; + } + else{ + Serializable messageValue = message.getValue(); + if(messageValue == null){ + messageValueString = "null message value"; + logger.fine("**** null message value"); + } + else{ + setMessageValue(messageValue.toString()); + } + } + } + + protected void setMessageValue(String originalMessageValueString) { + logger.fine("**** original message = " + originalMessageValueString); + + logger.fine("**** prettifying"); + + messageValueString = XmlPrettyPrinter.prettify(originalMessageValueString); + + logger.fine("**** prettified"); + + logger.fine(messageValueString); + + if(messageValueString == null) { + + logger.fine("**** prettified string was null"); + + // messageValueString = originalMessageValueString; + // messageValueString = "prettyprinting failed"; + messageValueString = originalMessageValueString.replaceAll("[ \\t]+", " "); + + logger.fine("**** reprettified"); + logger.fine(messageValueString); + } + } + + + /** + * + */ + public String getMessageIdentity(){ return messageIdentityString; } + + public String getMessageType() { return messageTypeString; } + + public String getMessageTypeNoNamespace() { return messageTypeNoNamespaceString; } + + /** + * + */ + protected void setMessageIdentity(ExchangeEvent exchangeEvent){ + Message message = exchangeEvent.getMessage(); + if(message == null){ + messageIdentityString = "null message"; + } + else{ + java.util.List<Identity> messageIdentityArray=message.getMessageIdentities(); + if(messageIdentityArray == null || messageIdentityArray.size() == 0){ + messageIdentityString = "no identities"; + } + else{ + Identity firstMessageIdentity = messageIdentityArray.get(0); + // messageIdentityString = firstMessageIdentity.toText(); + String tokens[] = firstMessageIdentity.getTokens(); + // valu + Object values_obj[] = firstMessageIdentity.getValues(); + + String[] values = new String[values_obj.length]; + + for (int values_index=0; values_index < values_obj.length; values_index++) + { + values[values_index] = values_obj[values_index].toString(); + } + + if(tokens == null || values == null){ + if(tokens == null){ + logger.fine("identity.getTokens() returned null"); + // messageIdentityString = "null tokens"; + } + + if(values == null){ + logger.fine("identity.getValues() returned null"); + // messageIdentityString = "null values"; + } + + messageIdentityString = firstMessageIdentity.toString(); + } + else{ + if(tokens != null && values != null && tokens.length == values.length){ + messageIdentityString = ""; + for(int i = 0; i < tokens.length - 1; i++){ + messageIdentityString += values[i] + " (" + tokens[i] + "), "; + } + messageIdentityString += values[tokens.length - 1] + " (" + tokens[tokens.length - 1]+")"; + } + else{ + messageIdentityString = "tokens/values mismatch"; + } + } + } + } + } + + public void setMessageIdentity(String ident) + { + messageIdentityString = ident; + } + + + /** + * + */ + public boolean isFault(){ + if(hasSetIsFault == false){ + if(exchangeEvent != null && exchangeEvent.getExchange() != null){ + isFault = exchangeEvent.getExchange().isFault(); + } + //else{ + // isFault = true; + //} + hasSetIsFault = true; + } + return isFault; + } + + + /** + * + */ + private void setErrorsAndWarnings(){ + if(hasSetErrorsAndWarnings == false){ + if(getToRoleTypeName().toLowerCase().matches("exception")){ + if(getOperationString().toLowerCase().matches("fatal")){ + isError = true; + } + else{ + isWarning = true; + } + } + else if(getFromRoleTypeName().toLowerCase().matches("exception")){ + if(isFault()){ + isError = true; + } + } + else{ + if(exchangeEvent != null && exchangeEvent.getExchange() == null){ + isUnexpected = true; + } + else if(isFault()){ + isWarning = true; + } + + // if the session was terminated early. color me red. + } + hasSetErrorsAndWarnings = true; + } + } + + public void setErrorMessage(boolean b) { + isErrorMessage = b; + + if (b) { + channelType = ChannelJPanel.getErrorName(); + } + } + + public boolean isErrorMessage() { + return(isErrorMessage); + } + + public void setWarningMessage(boolean b) { + isWarningMessage = b; + + if (b) { + channelType = ChannelJPanel.getWarningName(); + } + } + + public boolean isWarningMessage() { + return(isWarningMessage); + } + + public void setInformationMessage(boolean b) { + isInformationMessage = b; + + if (b) { + channelType = ChannelJPanel.getInformationName(); + } + } + + public boolean isInformationMessage() { + return(isInformationMessage); + } + + /** + * + */ + public boolean isError(){ + if(hasSetErrorsAndWarnings == false){ + setErrorsAndWarnings(); + } + return(isError || isErrorMessage()); + } + + public boolean isUnexpected(){ + return isUnexpected; + } + + public void setUnexpected(boolean b){ + isUnexpected = b; + } + + /** + * + */ + public boolean isWarning(){ + if(hasSetErrorsAndWarnings == false){ + setErrorsAndWarnings(); + } + return(isWarning || isWarningMessage()); + } + + + /** + * + */ + public String getChannelType(){ return channelType; } + + protected void setChannelType(String ctype) { + channelType = ctype; + } + + /** + * + */ + public String getCorrelationSession(){ return correlationSessionString; } + + /** + * + */ + public String toString() + { + String s = "EXCHANGE EVENT WRAPPER: " + + "<sessionName = " + sessionName + ">" + + "<realSessionName = " + realSessionName + ">" + + "<serviceName = " + serviceName + ">" + + "<description = " + description + ">" + + "<toRoleTypeName = " + toRoleTypeName + ">" + + "<fromRoleTypeName = " + fromRoleTypeName + ">" + + "<sendVariableString = " + sendVariableString + ">" + + "<operationString = " + operationString + ">" + + "<messageValueString = " + messageValueString + ">" + + "<messageIdentityString = " + messageIdentityString + ">" + + "<channelType = " + channelType + ">" + + "<correlationSessionString = " + correlationSessionString + ">" + + "<status = " + status + ">" + + "<hasFrozenStatus = " + hasFrozenStatus + ">" + + "<hasSetErrorsAndWarnings = " + hasSetErrorsAndWarnings + ">" + + "<isError = " + isError + ">" + + "<isWarning = " + isWarning + ">" + + "<isFault = " + isFault + ">" + + "<hasSetIsFault = " + hasSetIsFault + ">" + + "<isRequest = " + isRequest + ">" + + "<isUnexpected = " + isUnexpected + ">"; + + return s; + } + /** + * + */ + + protected void setChannelType(ExchangeEvent exchangeEvent){ + if(exchangeEvent.getChannel() == null){ + channelType = ChannelJPanel.getUnexpectedMessagesName(); + } + else{ + channelType = exchangeEvent.getExchange().getInteraction().getChannelVariable().getType().getName(); // Not getType + logger.fine("Channel type name: " + channelType); + logger.fine("Channel service type name: " + exchangeEvent.getChannel().getServiceType()); + logger.fine("Channel instance name: " + exchangeEvent.getChannel().getName()); + logger.fine("OR Channel instance name: " + exchangeEvent.getExchange().getInteraction().getChannelVariable().getType().getName()); + } + } + + // Serialization support + + + /** + * + */ + private void writeObject(ObjectOutputStream out) throws IOException{ + // to make sure that this has been set. + boolean myIsError = this.isError(); + boolean myIsFault = this.isFault(); + freezeStatus(); + out.defaultWriteObject(); + } + + + /** + * + */ + private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException{ + in.defaultReadObject(); + } + +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ExchangeEventsData.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ExchangeEventsData.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/ExchangeEventsData.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,449 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + +import java.util.Vector; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.logging.Logger; + +import java.io.FileOutputStream; +import java.io.ObjectOutputStream; + +import java.io.FileInputStream; +import java.io.ObjectInputStream; + + +import org.jboss.savara.tools.monitor.ExchangeEvent; +import org.pi4soa.service.correlator.CorrelationSession; + +/** + * + */ +public class ExchangeEventsData{ + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor.ui"); + + Vector exchangeEvents = null; + + Vector warningAndErrorExchangeEvents = null; + + Vector errorExchangeEvents = null; + + Vector warningExchangeEvents = null; + + Vector unexpectedExchangeEvents = null; + + Hashtable exchangeEventsByChannelTable = null; + + Hashtable exchangeEventsBySessionTable = null; + + Hashtable sessionHasErrorsTable = null; + Hashtable sessionHasWarningsTable = null; + Hashtable sessionHasUnexpectedMessagesTable = null; + Hashtable channelHasErrorsTable = null; + Hashtable channelHasWarningsTable = null; + Hashtable channelHasUnexpectedMessagesTable = null; + + Hashtable exchangeEventToWrapperMap = null; + + boolean hasErrors = false; + + boolean hasWarnings = false; + + boolean hasUnexpectedMessages = false; + + /** + * + */ + public ExchangeEventsData(){ + exchangeEvents = new Vector(); + warningAndErrorExchangeEvents = new Vector(); + errorExchangeEvents = new Vector(); + warningExchangeEvents = new Vector(); + unexpectedExchangeEvents = new Vector(); + exchangeEventsByChannelTable = new Hashtable(); + exchangeEventsBySessionTable = new Hashtable(); + exchangeEventToWrapperMap = new Hashtable(); + channelHasErrorsTable = new Hashtable(); + channelHasUnexpectedMessagesTable = new Hashtable(); + channelHasWarningsTable = new Hashtable(); + sessionHasErrorsTable = new Hashtable(); + sessionHasUnexpectedMessagesTable = new Hashtable(); + sessionHasWarningsTable = new Hashtable(); + } + + + + /** + * + */ + public void clear(){ + exchangeEvents.clear(); + exchangeEventsByChannelTable.clear(); + exchangeEventsBySessionTable.clear(); + exchangeEventToWrapperMap.clear(); + warningAndErrorExchangeEvents.clear(); + errorExchangeEvents.clear(); + warningExchangeEvents.clear(); + unexpectedExchangeEvents.clear(); + channelHasErrorsTable.clear(); + channelHasWarningsTable.clear(); + channelHasUnexpectedMessagesTable.clear(); + sessionHasErrorsTable.clear(); + sessionHasWarningsTable.clear(); + sessionHasUnexpectedMessagesTable.clear(); + hasErrors = false; + hasWarnings = false; + } + + + /** + * + */ + public boolean exportEvents(String path){ + try{ + FileOutputStream fileOutputStream = new FileOutputStream(path); + ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream); + objectOutputStream.writeObject(exchangeEvents); + objectOutputStream.close(); + } + catch(Exception e){ + logger.severe("Exception: " + e); + return false; + } + + return true; + } + + + + /** + * + */ + public boolean importEvents(String path){ + clear(); + + Vector v = null; + + try{ + FileInputStream fileInputStream = new FileInputStream(path); + ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream); + v = (Vector) objectInputStream.readObject(); + objectInputStream.close(); + } + catch(Exception e){ + logger.severe("Exception: " + e); + return false; + } + + Iterator iterator = v.iterator(); + int i = 0; + while(iterator.hasNext()){ + ExchangeEventWrapper wrapper = (ExchangeEventWrapper) iterator.next(); + + logger.fine("Getting wrapper message value"); + + String wrapperMessageValue = wrapper.getMessageValue(); + + logger.fine("Imported event wrapper message value = " + wrapperMessageValue); + + Integer key = new Integer(i); + i++; + exchangeEventToWrapperMap.put(key, wrapper); + addExchangeEvent(wrapper); + } + + return true; + } + + + + + /** + * + */ + public ExchangeEventWrapper createExchangeEventWrapper(ExchangeEvent exchangeEvent){ + ExchangeEventWrapper wrapper=null; + + logger.fine(">>>> creating new wrapper"); + wrapper = new ExchangeEventWrapper(exchangeEvent, new Integer(exchangeEvents.size())); + logger.fine(">>>> created new wrapper"); + + java.util.List list=(java.util.List) + exchangeEventToWrapperMap.get(exchangeEvent); + + if (list == null) { + list = new java.util.Vector(); + exchangeEventToWrapperMap.put(exchangeEvent, list); + logger.fine("Added new list for map entry: "+exchangeEvent); + } + + list.add(wrapper); + + return wrapper; + } + + public ExchangeEventWrapper matchExchangeEventWrapper(ExchangeEvent exchangeEvent){ + logger.info("getExchangeEventWrapper for " + exchangeEvent); + logger.fine(">>>> looking for pre-existing wrapper for " + exchangeEvent); + + java.util.List list= + (java.util.List)exchangeEventToWrapperMap.get(exchangeEvent); + + ExchangeEventWrapper wrapper=null; + + if (list != null && list.size() > 0) { + wrapper = (ExchangeEventWrapper)list.remove(0); + + if (list.size() == 0) { + exchangeEventToWrapperMap.remove(exchangeEvent); + + logger.fine("Cleaned up map entry for: "+exchangeEvent); + } + } + + if(wrapper == null){ + logger.severe(">>>> Failed to find existing wrapper: "+exchangeEvent); + } + else{ + logger.fine(">>>> found old wrapper"); + + // Remove from map + exchangeEventToWrapperMap.remove(exchangeEvent); + } + + return wrapper; + } + + public ExchangeEventWrapper errorExchangeEventWrapper(ExchangeEvent exchangeEvent){ + ExchangeEventWrapper wrapper=null; + + logger.fine(">>>> creating new error wrapper"); + wrapper = new ExchangeEventWrapper(exchangeEvent, new Integer(exchangeEvents.size())); + logger.fine(">>>> created new error wrapper"); + + return wrapper; + } + + public ExchangeEventWrapper simpleWrapper(CorrelationSession session, + String text, String exception) { + ExchangeEventWrapper wrapper=null; + + logger.fine(">>>> creating new empty wrapper"); + wrapper = new ExchangeEventWrapper(session, + new Integer(exchangeEvents.size()), text, exception); + logger.fine(">>>> created new empty wrapper"); + + return wrapper; + } + + /** + * + */ + public void addExchangeEvent(ExchangeEventWrapper wrapper){ + + String channelType = wrapper.getChannelType(); + String sessionName = wrapper.getSessionName(); + + Vector exchangeEventsByChannel = (Vector) exchangeEventsByChannelTable.get(channelType); + Vector exchangeEventsBySession = (Vector) exchangeEventsBySessionTable.get(sessionName); + + + if(exchangeEventsByChannel == null){ + exchangeEventsByChannel = new Vector(); + } + logger.info("addExchangeEvent for CHANNEL TYPE: " + channelType); + exchangeEventsByChannel.add(wrapper); + + if (exchangeEventsBySession == null){ + exchangeEventsBySession = new Vector(); + } + logger.info("addExchangeEvent for SESSION: " + sessionName); + exchangeEventsBySession.add(wrapper); + + // is this necessary if we already had an entry? + exchangeEventsByChannelTable.put(channelType, exchangeEventsByChannel); + exchangeEventsBySessionTable.put(sessionName, exchangeEventsBySession); + + exchangeEvents.add(wrapper); + + logger.fine(">>>> added to exchange events list. size = " + exchangeEvents.size()); + + // OLD fault handling. + // if(wrapper.isFault() == true){ + // channelHasErrorsTable.put(channelType, new Boolean(true)); + // hasErrors = true; + // } + + // NEW fault handling. +logger.warning("Checking if error...."); + if(wrapper.isWarning() == true || wrapper.isError() == true || wrapper.isUnexpected() == true){ + // channelHasErrorsTable.put(channelType, new Boolean(true)); + // hasErrors = true; + + warningAndErrorExchangeEvents.add(wrapper); + + if (wrapper.isError() == true) { + errorExchangeEvents.add(wrapper); +logger.warning("RECORD ERROR channel="+channelType); + channelHasErrorsTable.put(channelType, new Boolean(true)); + sessionHasErrorsTable.put(sessionName, new Boolean(true)); + hasErrors = true; + } else if(wrapper.isWarning() == true){ + warningExchangeEvents.add(wrapper); + channelHasWarningsTable.put(channelType, new Boolean(true)); + sessionHasWarningsTable.put(sessionName, new Boolean(true)); +logger.warning("RECORD WARNING channel="+channelType); + hasWarnings = true; + } else if (wrapper.isUnexpected() == true) { + unexpectedExchangeEvents.add(wrapper); + channelHasUnexpectedMessagesTable.put(channelType, new Boolean(true)); + sessionHasUnexpectedMessagesTable.put(sessionName, new Boolean(true)); + hasUnexpectedMessages = true; + logger.info("ADDED UNEXPECTED WRAPPER TO ExchangeEventData for channelType " + channelType); + } +logger.warning("Checked"); + } + } + + + /** + * + */ + public ExchangeEventWrapper getWrapper(int i){ return (ExchangeEventWrapper) exchangeEvents.elementAt(i); } + + + + /** + * + */ + public Vector getExchangeEventsForChannel(String channel){ + return (Vector) exchangeEventsByChannelTable.get(channel); + } + + public Vector getExchangeEventsForSession(String session) { + return (Vector)exchangeEventsBySessionTable.get(session); + } + + + /** + * + */ + public Vector getExchangeEvents(){ return exchangeEvents; } + + /** + * + */ + public Vector getWarningAndErrorExchangeEvents(){ return warningAndErrorExchangeEvents; } + + /** + * + */ + public Vector getErrorExchangeEvents(){ return errorExchangeEvents; } + + /** + * + */ + public Vector getWarningExchangeEvents(){ return warningExchangeEvents; } + + /** + * + */ + public Vector getUnexpectedExchangeEvents() { return unexpectedExchangeEvents; } + + /** + * + */ + public boolean getHasUnexpectedExchangeEventsForChannel(String channel){ + if(hasUnexpectedMessages == true){ + Boolean hasUnexpectedMessagesForChannel = (Boolean) channelHasUnexpectedMessagesTable.get(channel); + if (hasUnexpectedMessagesForChannel != null) return true; + } + return false; + } + + public boolean getHasUnexpectedExchangeEventsForSession(String session){ + if(hasUnexpectedMessages == true){ + Boolean hasUnexpectedMessagesForSession = (Boolean) sessionHasUnexpectedMessagesTable.get(session); + if (hasUnexpectedMessagesForSession != null) return true; + } + return false; + } + + /** + * + */ + public boolean getHasErrorsForChannel(String channel){ + if(hasErrors == true){ + Boolean hasErrorsForChannel = (Boolean) channelHasErrorsTable.get(channel); + if (hasErrorsForChannel != null) return true; + } + return false; + } + + public boolean getHasErrorsForSession(String session){ + if(hasErrors == true){ + Boolean hasErrorsForSession = (Boolean) sessionHasErrorsTable.get(session); + if (hasErrorsForSession != null) return true; + } + return false; + } + + /** + * + */ + public boolean getHasWarningsForChannel(String channel){ + if(hasWarnings == true){ + Boolean hasWarningsForChannel = (Boolean) channelHasWarningsTable.get(channel); + if (hasWarningsForChannel != null) { + return true; + } + } + return false; + } + + public boolean getHasWarningsForSession(String session){ + if(hasWarnings == true){ + Boolean hasWarningsForSession = (Boolean) sessionHasWarningsTable.get(session); + if (hasWarningsForSession != null) { + return true; + } + } + return false; + } + + + /** + * + */ + public boolean getHasUnexpectedMessages(){ return hasUnexpectedMessages; } + /** + * + */ + public boolean getHasErrors(){ return hasErrors; } + + + /** + * + */ + public boolean getHasWarnings(){ return hasWarnings; } + +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/Monitor.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/Monitor.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/Monitor.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,503 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + +import javax.swing.*; + +import java.awt.BorderLayout; + +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.jboss.savara.tools.monitor.CorrelationManagerListener; +import org.jboss.savara.tools.monitor.ExchangeEvent; +import org.jboss.savara.tools.monitor.TxnMonitor; +import org.pi4soa.service.correlator.CorrelationSession; + +/** + * Monitor user interface class. + */ +public class Monitor extends JApplet implements CorrelationManagerListener /* , TreeSelectionListener */{ + + private static final long serialVersionUID = -4323114698930604980L; + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor.ui"); + + static final int NEW_FRAME_WIDTH = 800; + static final int NEW_FRAME_HEIGHT = 600; + + MonitorMainPanel smPanel = null; + + String choreographyPath = null; + + org.pi4soa.cdl.Package choreography = null; + + TxnMonitor txnMonitor = null; + + ExchangeEventsData exchangeEventsData = null; + + boolean isMonitoring = false; + boolean choreographyProvided = false; + + /** + * Initialisation. + */ + public Monitor(boolean choreoProvided) { + + exchangeEventsData = new ExchangeEventsData(); + + smPanel = new MonitorMainPanel(exchangeEventsData, choreoProvided); + + this.getContentPane().setLayout(new BorderLayout()); + this.getContentPane().add(smPanel, BorderLayout.CENTER); + + smPanel.setApplet(this); + } + + + /** + * Initialisation. + */ + public void init() { + // hack to get around system event queue check - which doesn't work, of course + this.getRootPane().putClientProperty("defeatSystemEventQueueCheck", Boolean.TRUE); + } + + + /** + * Returns info about the acceptable parameters + */ + public String[][] getParameterInfo() + { + String pinfo[][] = { + // actual parameters might include + // ip address, directories, colors + // etc. + + // properties should be used for + // most stuff + + {"parameter1", "String", "A String."}, + {"parameter2", "String", "Another String."}, + {"parameter3", "integer", "An integer."}, + }; + + return pinfo; + } + + /** + * + */ + public static void main(String args[]){ + Monitor monitor = new Monitor(args.length > 0); + JFrame jFrame = new JFrame("Choreography Monitor"); + jFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + jFrame.getContentPane().setLayout(new BorderLayout()); + jFrame.getContentPane().add(monitor, BorderLayout.CENTER); + monitor.init(); + + jFrame.setIconImage(MonitorMainPanel.createImageIcon("icons/monitor.png").getImage()); + + jFrame.setSize(NEW_FRAME_WIDTH, NEW_FRAME_HEIGHT); + + java.awt.Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize(); + java.awt.Dimension frameSize = jFrame.getSize(); + if (frameSize.height > screenSize.height) { + frameSize.height = screenSize.height; + } + if (frameSize.width > screenSize.width) { + frameSize.width = screenSize.width; + } + jFrame.setLocation( (screenSize.width - frameSize.width) / 2, + (screenSize.height - frameSize.height) / 2); + jFrame.setVisible(true); + + if(args.length > 0){ + if(monitor.loadChoreography(args[0])){ + monitor.startMonitoring(); + } else { + System.exit(1); + } + } + } + + ////////////////////////// + + + /** + * + */ + public boolean isMonitoring(){ return isMonitoring; } + + public boolean isChoreographyLoaded() { return choreography!=null; } + + /** + * + */ + public void setIsMonitoring(boolean isMonitoring){ this.isMonitoring = isMonitoring; } + + public void close() { + this.destroy(); + System.exit(0); + } + + /** + * + */ + public boolean loadChoreography(String choreographyPath){ + + logger.info("Loading " + choreographyPath); + smPanel.setStatus("Loading " + choreographyPath); + + // try and read the new one ... + org.pi4soa.cdl.Package newChoreography = null; + + try{ + newChoreography = org.pi4soa.cdl.CDLManager.load(choreographyPath); + } + catch(IOException e){ + logger.severe("Exception: " + e); + smPanel.setStatus("Failed to load " + choreographyPath); + + JOptionPane.showMessageDialog(null, + "Failed to load "+choreographyPath, + "Error", JOptionPane.ERROR_MESSAGE); + + return false; + } + + // ok, we were successful ... + if(this.choreographyPath != null){ + if(this.isMonitoring() == true){ + // stop monitoring + } + + exchangeEventsData.clear(); + } + + this.choreographyPath = choreographyPath; + this.choreography = newChoreography; + + // tell the panel we loaded a new choreography ... + smPanel.loadedChoreography(choreography); + + return true; + } + + + /** + * + */ + public boolean startMonitoring(){ + + logger.info("Starting monitoring"); + + if(this.isMonitoring() == true){ + logger.info("Already monitoring"); + return false; + } + + if(this.choreography == null){ + logger.info("No choreography to monitor"); + return false; + } + + smPanel.setStatus("Trying to monitor " + choreography.getName()); + logger.info("Trying to monitor " + choreography.getName()); + + try{ + this.txnMonitor = TxnMonitor.getInstance(choreographyPath); + this.txnMonitor.addCorrelationManagerListener(this); + } + catch(Exception e){ + // hack + logger.log(Level.SEVERE, "Exception while trying to monitor choreography " + e, e); + + JOptionPane.showMessageDialog(null, + "Failed to initialize monitor: "+e.getLocalizedMessage(), + "Error", JOptionPane.ERROR_MESSAGE); + } + + logger.fine("Past txnMonitor calls"); + + this.setIsMonitoring(true); + + // tell the panel + smPanel.startedMonitoring(); + + return true; + } + + + /** + * + */ + public boolean stopMonitoring(){ + if(this.isMonitoring() == false){ + logger.info("Not monitoring"); + return false; + } + + this.txnMonitor.removeCorrelationManagerListener(this); + + try{ + this.txnMonitor.unmonitor(this.choreography); + } + catch(Exception e){ + logger.severe("Exception: " + e); + return false; + } + + this.setIsMonitoring(false); + + // tell the panel + smPanel.stoppedMonitoring(); + + return true; + } + + + /** + * + */ + public boolean importEvents(String path){ + boolean result = exchangeEventsData.importEvents(path); + smPanel.importedEvents(); + return result; + } + + + /** + * + */ + public boolean exportEvents(String path){ + return exchangeEventsData.exportEvents(path); + // + // try{ + // FileOutputStream fileOutputStream = new FileOutputStream(path); + // ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream); + // objectOutputStream.writeObject(exchangeEvents); + // objectOutputStream.close(); + // } + // catch(Exception e){ + // System.err.println("Exception: " + e); + // return false; + // } + // + // return true; + } + + + // CorrelationManagerListener interface + + /** + * This method indicates that a correlation session has + * started. + * + * @param session The correlation session + */ + public void correlationSessionStarted(CorrelationSession session){ + logger.info(">>>> CORRELATION SESSION STARTED: " + session ); + + // TO DO: Need to add something to the sessionPanel at this point. + ChannelJPanel cp = smPanel.getChannelPanel(); + cp.addedSession(session); + } + + + /** + * This method indicates that a correlation session has + * finished. + * + * @param session The correlation session + */ + public void correlationSessionFinished(CorrelationSession session){ + logger.info(">>>> CORRELATION SESSION FINSIHED: " + session); + smPanel.getChannelPanel().addedSession(session); + // TO DO: Need to change colour for the same session item in the session Panel + } + + + /** + * A new exchange event has been added to a correlation session. + * + * @param exchangeEvent The exchange event. + */ + public void exchangeEventAdded(ExchangeEvent exchangeEvent){ + logger.fine(">>>> ADDING EXCHANGE EVENT" + exchangeEvent); + // System.err.println(">>>> Adding exchange event"); + // System.err.println(">>>> Getting correlation session"); + CorrelationSession session = exchangeEvent.getCorrelationSession(); + logger.fine("Identity for new exchange is: " + ChannelJPanel.getSessionIdentity(exchangeEvent.getCorrelationSession())); + // System.err.println(">>>> Getting wrapper"); + ExchangeEventWrapper wrapper = exchangeEventsData.createExchangeEventWrapper(exchangeEvent); + // System.err.println(">>>> Adding to data"); + exchangeEventsData.addExchangeEvent(wrapper); + // System.err.println(">>>> updating smPanel"); + smPanel.addedExchangeEvent(wrapper); + logger.fine(">>>> ADDED EXCHANGE EVENT FOR SESSION: " + session); + } + + + /** + * An exchange event has been updated. + * + * @param exchangeEvent The exchange event. + */ + public void exchangeEventUpdated(ExchangeEvent exchangeEvent){ + ExchangeEventWrapper wrapper = exchangeEventsData.matchExchangeEventWrapper(exchangeEvent); + logger.fine("Identity for updated exchange is: " + ChannelJPanel.getSessionIdentity(exchangeEvent.getCorrelationSession())); + smPanel.updatedExchangeEvent(wrapper); + } + + /** + * An unexpcted exchange event has occured + * + * @param exchangeEvent. The exchange event. + * @param serviceName The service reporting the error + */ + public void unexpectedExchangeEventAdded(ExchangeEvent exchangeEvent, + String serviceName) + { + logger.info(">>>> unexpectedExchangeEventAdded"); + + //CorrelationSession session = exchangeEvent.getCorrelationSession(); + String ident = null; + + if (exchangeEvent.getCorrelationSession() != null) { + ident = ChannelJPanel.getSessionIdentity(exchangeEvent.getCorrelationSession()); + } + + logger.info("Identity for unexpected is: " + ident); + ExchangeEventWrapper wrapper = exchangeEventsData.errorExchangeEventWrapper(exchangeEvent); + wrapper.setUnexpected(true); + wrapper.setMessageIdentity(ident); + wrapper.setServiceName(serviceName); + exchangeEventsData.addExchangeEvent(wrapper); + smPanel.addedUnexpectedExchangeEvent(wrapper); + + logger.fine("<<<< unexpectedExchangeEventAdded"); + } + + /** + * An error occurred related to the specified correlation + * session. + * + * @param session The correlation session + * @param mesg The error message + * @param exception The optional exception + * @param serviceName The service reporting the error + */ + public void error(CorrelationSession session, String mesg, + String exception, String serviceName) { + logger.info(">>>> error"); + + //CorrelationSession session = exchangeEvent.getCorrelationSession(); + String ident = null; + + if (session != null) { + ident = ChannelJPanel.getSessionIdentity(session); + } + + logger.info("Identity for unexpected is: " + ident); + ExchangeEventWrapper wrapper = + exchangeEventsData.simpleWrapper(session, mesg, + exception); + wrapper.setErrorMessage(true); + wrapper.setMessageIdentity(ident); + wrapper.setChannelType(ChannelJPanel.getErrorName()); + wrapper.setServiceName(serviceName); + exchangeEventsData.addExchangeEvent(wrapper); + smPanel.addedErrorEvent(wrapper); + + logger.fine("<<<< error"); + } + + /** + * A warning occurred related to the specified correlation + * session. + * + * @param session The correlation session + * @param mesg The warning message + * @param exception The optional exception + * @param serviceName The service reporting the warning + */ + public void warning(CorrelationSession session, String mesg, + String exception, String serviceName) { + logger.info(">>>> warning"); + + //CorrelationSession session = exchangeEvent.getCorrelationSession(); + String ident = null; + + if (session != null) { + ident = ChannelJPanel.getSessionIdentity(session); + } + + logger.info("Identity for unexpected is: " + ident); + ExchangeEventWrapper wrapper = + exchangeEventsData.simpleWrapper(session, mesg, + exception); + wrapper.setWarningMessage(true); + wrapper.setMessageIdentity(ident); + wrapper.setChannelType(ChannelJPanel.getWarningName()); + wrapper.setServiceName(serviceName); + exchangeEventsData.addExchangeEvent(wrapper); + smPanel.addedErrorEvent(wrapper); + + logger.fine("<<<< warning"); + } + + /** + * An information event occurred related to the specified correlation + * session. + * + * @param session The correlation session + * @param mesg The information message + * @param serviceName The service reporting the information + */ + public void information(CorrelationSession session, String mesg, + String serviceName) { + logger.info(">>>> information"); + + //CorrelationSession session = exchangeEvent.getCorrelationSession(); + String ident = null; + + if (session != null) { + ident = ChannelJPanel.getSessionIdentity(session); + } + + logger.info("Identity for unexpected is: " + ident); + ExchangeEventWrapper wrapper = + exchangeEventsData.simpleWrapper(session, mesg, null); + wrapper.setInformationMessage(true); + wrapper.setMessageIdentity(ident); + wrapper.setChannelType(ChannelJPanel.getInformationName()); + wrapper.setServiceName(serviceName); + exchangeEventsData.addExchangeEvent(wrapper); + smPanel.addedErrorEvent(wrapper); + + logger.fine("<<<< information"); + } + + +} // End of Applet + +// EOF Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorExchangeEvent.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorExchangeEvent.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorExchangeEvent.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,134 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + + +import java.util.Date; + +import org.pi4soa.cdl.ExchangeDetails; +import org.pi4soa.service.Channel; +import org.pi4soa.cdl.ExchangeActionType; + +/** + * Convenience class for representing an exchange, and providing + * convenient access to data for display. + */ +public class MonitorExchangeEvent { + + Date initiatedDate = null; + Date completedDate = null; + + Channel channel = null; + ExchangeDetails exchangeDetails = null; + + /** + * + */ + public MonitorExchangeEvent(Channel channel, ExchangeDetails exchangeDetails){ + this.channel = channel; + this.exchangeDetails = exchangeDetails; + } + + /** + * + */ + public String getChannelName(){ + return channel.getName(); + } + + /** + * + */ + public String getAction(){ + if(exchangeDetails.getAction() == ExchangeActionType.REQUEST) return "Request"; + else return "Response"; + } + + + /** + * + */ + public String getName(){ + return exchangeDetails.getName(); + } + + + /** + * + */ + public String getDescription(){ + return exchangeDetails.getDescription(); + } + + + /** + * + */ + public Date getInitiatedDate(){ + return initiatedDate; + } + + + /** + * + */ + public Date getCompletedDate(){ + return completedDate; + } + + + /** + * + */ + public String getStatus(){ + if(completedDate != null) return "Completed"; + else return "Initiated"; + } + + + /** + * + */ + public int hashCode(){ + return exchangeDetails.hashCode(); + } + + + /** + * + */ + public boolean equals(Object object){ + boolean result = false; + + if(object instanceof MonitorExchangeEvent){ + MonitorExchangeEvent other = (MonitorExchangeEvent) object; + + if(other.exchangeDetails == this.exchangeDetails && + other.getChannelName().equals(this.getChannelName())){ + /* other.getCorrelationSession() == m_session) { */ + result = true; + } + } + + return result; + } + + +} // End of class Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorFileFilter.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorFileFilter.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorFileFilter.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,253 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + +import java.io.File; +import java.util.Hashtable; +import java.util.Enumeration; +import javax.swing.filechooser.*; + +/** + * A convenience implementation of FileFilter that filters out + * all files except for those type extensions that it knows about. + * + * Extensions are of the type ".foo", which is typically found on + * Windows and Unix boxes, but not on Macinthosh. Case is ignored. + * + * Example - create a new filter that filerts out all files + * but gif and jpg image files: + * + * JFileChooser chooser = new JFileChooser(); + * ExampleFileFilter filter = new ExampleFileFilter( + * new String{"gif", "jpg"}, "JPEG & GIF Images") + * chooser.addChoosableFileFilter(filter); + * chooser.showOpenDialog(this); + * + * @version 1.9 04/23/99 + * @author Jeff Dinkins + */ +public class MonitorFileFilter extends FileFilter { + + //private static String TYPE_UNKNOWN = "Type Unknown"; + //private static String HIDDEN_FILE = "Hidden File"; + + private Hashtable filters = null; + private String description = null; + private String fullDescription = null; + private boolean useExtensionsInDescription = true; + + /** + * Creates a file filter. If no filters are added, then all + * files are accepted. + * + * @see #addExtension + */ + public MonitorFileFilter() { + this.filters = new Hashtable(); + } + + /** + * Creates a file filter that accepts files with the given extension. + * Example: new ExampleFileFilter("jpg"); + * + * @see #addExtension + */ + public MonitorFileFilter(String extension) { + this(extension,null); + } + + /** + * Creates a file filter that accepts the given file type. + * Example: new ExampleFileFilter("jpg", "JPEG Image Images"); + * + * Note that the "." before the extension is not needed. If + * provided, it will be ignored. + * + * @see #addExtension + */ + public MonitorFileFilter(String extension, String description) { + this(); + if(extension!=null) addExtension(extension); + if(description!=null) setDescription(description); + } + + /** + * Creates a file filter from the given string array. + * Example: new ExampleFileFilter(String {"gif", "jpg"}); + * + * Note that the "." before the extension is not needed adn + * will be ignored. + * + * @see #addExtension + */ + public MonitorFileFilter(String[] filters) { + this(filters, null); + } + + /** + * Creates a file filter from the given string array and description. + * Example: new ExampleFileFilter(String {"gif", "jpg"}, "Gif and JPG Images"); + * + * Note that the "." before the extension is not needed and will be ignored. + * + * @see #addExtension + */ + public MonitorFileFilter(String[] filters, String description) { + this(); + for (int i = 0; i < filters.length; i++) { + // add filters one by one + addExtension(filters[i]); + } + if(description!=null) setDescription(description); + } + + /** + * Return true if this file should be shown in the directory pane, + * false if it shouldn't. + * + * Files that begin with "." are ignored. + * + * @see #getExtension + * @see FileFilter#accepts + */ + public boolean accept(File f) { + if(f != null) { + if(f.isDirectory()) { + return true; + } + String extension = getExtension(f); + if(extension != null && filters.get(getExtension(f)) != null) { + return true; + }; + } + return false; + } + + /** + * Return the extension portion of the file's name . + * + * @see #getExtension + * @see FileFilter#accept + */ + public String getExtension(File f) { + if(f != null) { + String filename = f.getName(); + int i = filename.lastIndexOf('.'); + if(i>0 && i<filename.length()-1) { + return filename.substring(i+1).toLowerCase(); + }; + } + return null; + } + + /** + * Adds a filetype "dot" extension to filter against. + * + * For example: the following code will create a filter that filters + * out all files except those that end in ".jpg" and ".tif": + * + * ExampleFileFilter filter = new ExampleFileFilter(); + * filter.addExtension("jpg"); + * filter.addExtension("tif"); + * + * Note that the "." before the extension is not needed and will be ignored. + */ + public void addExtension(String extension) { + if(filters == null) { + filters = new Hashtable(5); + } + filters.put(extension.toLowerCase(), this); + fullDescription = null; + } + + + /** + * Returns the human readable description of this filter. For + * example: "JPEG and GIF Image Files (*.jpg, *.gif)" + * + * @see setDescription + * @see setExtensionListInDescription + * @see isExtensionListInDescription + * @see FileFilter#getDescription + */ + public String getDescription() { + if(fullDescription == null) { + if(description == null || isExtensionListInDescription()) { + fullDescription = description==null ? "(" : description + " ("; + // build the description from the extension list + Enumeration extensions = filters.keys(); + if(extensions != null) { + fullDescription += "." + (String) extensions.nextElement(); + while (extensions.hasMoreElements()) { + fullDescription += ", " + (String) extensions.nextElement(); + } + } + fullDescription += ")"; + } else { + fullDescription = description; + } + } + return fullDescription; + } + + /** + * Sets the human readable description of this filter. For + * example: filter.setDescription("Gif and JPG Images"); + * + * @see setDescription + * @see setExtensionListInDescription + * @see isExtensionListInDescription + */ + public void setDescription(String description) { + this.description = description; + fullDescription = null; + } + + /** + * Determines whether the extension list (.jpg, .gif, etc) should + * show up in the human readable description. + * + * Only relevent if a description was provided in the constructor + * or using setDescription(); + * + * @see getDescription + * @see setDescription + * @see isExtensionListInDescription + */ + public void setExtensionListInDescription(boolean b) { + useExtensionsInDescription = b; + fullDescription = null; + } + + /** + * Returns whether the extension list (.jpg, .gif, etc) should + * show up in the human readable description. + * + * Only relevent if a description was provided in the constructor + * or using setDescription(); + * + * @see getDescription + * @see setDescription + * @see setExtensionListInDescription + */ + public boolean isExtensionListInDescription() { + return useExtensionsInDescription; + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorMainPanel.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorMainPanel.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorMainPanel.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,1038 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + +import java.awt.Component; + +import java.util.Vector; +import java.util.Date; +import java.util.Iterator; +import java.util.Comparator; +import java.util.Hashtable; +import java.util.logging.Logger; + +import javax.swing.JTree; +import javax.swing.JTable; +import javax.swing.JScrollPane; +import javax.swing.JLabel; +import javax.swing.JSplitPane; +import javax.swing.JPanel; +import javax.swing.ImageIcon; +import javax.swing.JTextArea; +import javax.swing.JEditorPane; + +import javax.swing.ListSelectionModel; +import javax.swing.SpringLayout; +import javax.swing.JCheckBox; +//import javax.swing.JPopupMenu; +import javax.swing.JComboBox; + +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.ListSelectionEvent; + +import javax.swing.event.ListSelectionListener; + +import javax.swing.tree.TreeSelectionModel; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeCellRenderer; + +import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableCellRenderer; + +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Dimension; +import java.awt.Color; + +import java.awt.event.ItemListener; +import java.awt.event.ItemEvent; + +import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; + +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import java.io.StringWriter; +import java.io.StringReader; + +//import org.pi4soa.cdl.ExchangeDetails; +import org.jboss.savara.tools.monitor.ExchangeEvent; +import org.jboss.savara.tools.monitor.ui.table.TableSorter; +import org.pi4soa.service.correlator.CorrelationSession; +import org.pi4soa.cdl.ExchangeActionType; + + +/** + * This is the main user interface for the swing monitor. + * + * It comprises a three-panel display, listing Channels, Exchange + * Events, and Exchange Event Details. + * + * @author Martin Redington + */ +public class MonitorMainPanel extends JPanel{ + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor.ui"); + + // Vector exchangeEvents = null; + ExchangeEventsData exchangeEventsData = null; + + MonitorMenuBar menuBar =null; + + ControlPanel controlPanel = null; + + ChannelJPanel channelPanel = null; + StatusPanel statusPanel = null; + + ExchangeEventsTableModel exchangeEventsTableModel = null; + TableSorter sorter = null; + + String choreographyName = null; + + ExchangeJPanel exchangePanel = null; + + public static final Comparator INTEGER_COMPARATOR = new Comparator() { + public int compare(Object o1, Object o2) { + return ((Integer) o1).intValue() - ((Integer) o2).intValue(); + } + }; + + /** + * Constructor. + */ + public MonitorMainPanel(ExchangeEventsData exchangeEventsData, + boolean choreoProvided){ + + this.menuBar = new MonitorMenuBar(choreoProvided); + + this.exchangeEventsData = exchangeEventsData; + + this.setLayout(new BorderLayout()); + this.add(menuBar, BorderLayout.PAGE_START); + + JPanel layoutPanel = new JPanel(); + layoutPanel.setLayout(new BorderLayout()); + + controlPanel = new ControlPanel(); + layoutPanel.add(controlPanel, BorderLayout.PAGE_START); + + MessageJPanel exchangeDetailPanel = null; + + if(true){ + exchangeDetailPanel = new MessageJPanel(true); + } + + exchangeDetailPanel.setPreferredSize(new Dimension(600, 100)); + exchangeDetailPanel.setMinimumSize(new Dimension(400, 100)); + + exchangePanel = new ExchangeJPanel(exchangeDetailPanel); + exchangePanel.setPreferredSize(new Dimension(600, 350)); + exchangePanel.setMinimumSize(new Dimension(400, 200)); + + channelPanel = new ChannelJPanel(this.exchangeEventsData,exchangeEventsTableModel); + channelPanel.setPreferredSize(new Dimension(200, 580)); + channelPanel.setMinimumSize(new Dimension(180, 400)); + + statusPanel = new StatusPanel(); + + + JSplitPane otherPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, exchangePanel, exchangeDetailPanel); + JSplitPane mainPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, channelPanel, otherPanel); + layoutPanel.add(mainPanel, BorderLayout.CENTER); + layoutPanel.add(statusPanel, BorderLayout.SOUTH); + + this.add(layoutPanel, BorderLayout.CENTER); + } + + //////////////////////////////////////////////////////////// + + /** Returns the Channel Panel **/ + public ChannelJPanel getChannelPanel() + { + return channelPanel; + } + + /** Returns an ImageIcon, or null if the path was invalid. */ + protected static ImageIcon createImageIcon(String path) { + java.net.URL imgURL = MonitorMainPanel.class.getResource(path); + if (imgURL != null) { + return new ImageIcon(imgURL); + } else { + System.err.println("Couldn't find file: " + path); + return null; + } + } + + //////////////////////////////////////////////////////////// + + /** + * + */ + public void loadedChoreography(org.pi4soa.cdl.Package choreography){ + channelPanel.createAndAddTree(choreography); + exchangeEventsTableModel.fireTableDataChanged(); + menuBar.loadedChoreography(); + choreographyName = choreography.getName(); + setStatus("Loaded " + choreographyName); + } + + //////////////////////////////////////////////////////////// + + /** + * + */ + public void startedMonitoring(){ + menuBar.startedMonitoring(); + setStatus("Monitoring " + choreographyName); + } + + //////////////////////////////////////////////////////////// + + /** + * + */ + public void stoppedMonitoring(){ + menuBar.stoppedMonitoring(); + setStatus("Stopped monitoring " + choreographyName); + } + + //////////////////////////////////////////////////////////// + + /** + * + */ + public void importedEvents(){ + exchangeEventsTableModel.cancelFiltering(); + exchangeEventsTableModel.fireTableDataChanged(); + } + + //////////////////////////////////////////////////////////// + + /** + * Can't remember what this is for. + */ + public void setApplet(Monitor applet) { + // ui.setApplet(applet); + menuBar.setMonitor(applet); + } + + + + //////////////////////////////////////////// + + /** + * Called by the SwingMonitor when a new exchange event occurs. + * + * The event will already have been added to the vector or + * exchange events. + */ + public void addedExchangeEvent(ExchangeEventWrapper wrapper){ + logger.fine(">>>> addedExchangeEvent"); + + String selectedChannelName = (String) exchangeEventsTableModel.getSelectedChannelName(); + logger.fine("channel is: " + selectedChannelName); + + // we are trying to fix the flickering updates here ... + if(selectedChannelName == null || wrapper.getChannelType().equals(selectedChannelName)){ + logger.fine("fix flickering ..."); + int index = -1; + if((index = exchangeEventsTableModel.indexOfExchangeEventWrapperInFilteredList(wrapper)) != -1){ + logger.fine("inner ..."); + // This might not work when we hack the table ... + // exchangeEventsTableModel.fireTableRowsInserted(index, index); + int newIndex = exchangeEventsTableModel.getRowCount() - 1 - index; + exchangeEventsTableModel.fireTableRowsInserted(newIndex, newIndex); + } + } + + updateTreeIfEventIsFault(wrapper); + logger.fine("<<<< addedExchangeEvent"); + } + + //////////////////////////////////////////// + + /** + * Called by the SwingMonitor when a new exchange event occurs. + * + * The event will already have been added to the vector or + * exchange events. + */ + public void addedUnexpectedExchangeEvent(ExchangeEventWrapper wrapper){ + logger.fine(">>>> addedUnexpectedExchangeEvent"); + String selectedChannelName = ChannelJPanel.getUnexpectedMessagesName(); + logger.fine("channel is: " + selectedChannelName); + // we are trying to fix the flickering updates here ... + if(selectedChannelName == null || wrapper.getChannelType().equals(selectedChannelName)){ + logger.fine("fix flickering ..."); + int index = -1; + if((index = exchangeEventsTableModel.indexOfExchangeEventWrapperInFilteredList(wrapper)) != -1){ + // This might not work when we hack the table ... + // exchangeEventsTableModel.fireTableRowsInserted(index, index); + logger.fine("inner ..."); + int newIndex = exchangeEventsTableModel.getRowCount() - 1 - index; + exchangeEventsTableModel.fireTableRowsInserted(newIndex, newIndex); + } else { + exchangeEventsTableModel.fireTableDataChanged(); + } + } + exchangeEventsTableModel.fireTableDataChanged(); + updateTreeIfEventIsFault(wrapper); + + logger.fine("<<<< addedUnexpectedExchangeEvent"); + } + + public void addedErrorEvent(ExchangeEventWrapper wrapper){ + logger.fine(">>>> addedErrorEvent"); + String selectedChannelName = ChannelJPanel.getErrorName(); + logger.fine("channel is: " + selectedChannelName); + // we are trying to fix the flickering updates here ... + if(selectedChannelName == null || wrapper.getChannelType().equals(selectedChannelName)){ + logger.fine("fix flickering ..."); + int index = -1; + if((index = exchangeEventsTableModel.indexOfExchangeEventWrapperInFilteredList(wrapper)) != -1){ + // This might not work when we hack the table ... + // exchangeEventsTableModel.fireTableRowsInserted(index, index); + logger.fine("inner ..."); + int newIndex = exchangeEventsTableModel.getRowCount() - 1 - index; + exchangeEventsTableModel.fireTableRowsInserted(newIndex, newIndex); + } else { + exchangeEventsTableModel.fireTableDataChanged(); + } + } + exchangeEventsTableModel.fireTableDataChanged(); + updateTreeIfEventIsFault(wrapper); + + logger.fine("<<<< addedErrorEvent"); + } + + public void addedWarningEvent(ExchangeEventWrapper wrapper){ + logger.fine(">>>> addedErrorEvent"); + String selectedChannelName = ChannelJPanel.getWarningName(); + logger.fine("channel is: " + selectedChannelName); + // we are trying to fix the flickering updates here ... + if(selectedChannelName == null || wrapper.getChannelType().equals(selectedChannelName)){ + logger.fine("fix flickering ..."); + int index = -1; + if((index = exchangeEventsTableModel.indexOfExchangeEventWrapperInFilteredList(wrapper)) != -1){ + // This might not work when we hack the table ... + // exchangeEventsTableModel.fireTableRowsInserted(index, index); + logger.fine("inner ..."); + int newIndex = exchangeEventsTableModel.getRowCount() - 1 - index; + exchangeEventsTableModel.fireTableRowsInserted(newIndex, newIndex); + } else { + exchangeEventsTableModel.fireTableDataChanged(); + } + } + exchangeEventsTableModel.fireTableDataChanged(); + updateTreeIfEventIsFault(wrapper); + + logger.fine("<<<< addedErrorEvent"); + } + + public void addedInformationEvent(ExchangeEventWrapper wrapper){ + logger.fine(">>>> addedErrorEvent"); + String selectedChannelName = ChannelJPanel.getInformationName(); + logger.fine("channel is: " + selectedChannelName); + // we are trying to fix the flickering updates here ... + if(selectedChannelName == null || wrapper.getChannelType().equals(selectedChannelName)){ + logger.fine("fix flickering ..."); + int index = -1; + if((index = exchangeEventsTableModel.indexOfExchangeEventWrapperInFilteredList(wrapper)) != -1){ + // This might not work when we hack the table ... + // exchangeEventsTableModel.fireTableRowsInserted(index, index); + logger.fine("inner ..."); + int newIndex = exchangeEventsTableModel.getRowCount() - 1 - index; + exchangeEventsTableModel.fireTableRowsInserted(newIndex, newIndex); + } else { + exchangeEventsTableModel.fireTableDataChanged(); + } + } + exchangeEventsTableModel.fireTableDataChanged(); + updateTreeIfEventIsFault(wrapper); + + logger.fine("<<<< addedErrorEvent"); + } + + //////////////////////////////////////////// + + /** + * Called by the SwingMonitor when an existing exchange event is updated. + * + */ + public void updatedExchangeEvent(ExchangeEventWrapper wrapper){ + + String selectedChannelName = (String) exchangeEventsTableModel.getSelectedChannelName(); + + // we are trying to fix the flickering updates here ... + if(selectedChannelName == null || wrapper.getChannelType().equals(selectedChannelName)){ + int index = -1; + if((index = exchangeEventsTableModel.indexOfExchangeEventWrapperInFilteredList(wrapper)) != -1){ + int newIndex = exchangeEventsTableModel.getRowCount() - 1 - index; + exchangeEventsTableModel.fireTableRowsUpdated(newIndex, newIndex); + } + } + + updateTreeIfEventIsFault(wrapper); + } + + //////////////////////////////////////////// + + /** + * + */ + void updateTreeIfEventIsFault(ExchangeEventWrapper wrapper){ + if(wrapper.isFault()){ + channelPanel.revalidate(); + channelPanel.redraw(); + } + } + + //////////////////////////////////////////// + + /** + * + */ + public void setStatus(String status){ + statusPanel.setStatus(status); + } + + ////////////////// Inner classes + + + + //////////////////////////////////////////// + + /** + * + */ + + //////////////////////////////////////////// + + /** + * The upper pane contains a table listing the exchange events. + */ + public class ExchangeJPanel extends JPanel{ + + /** + * + */ + public ExchangeJPanel(ListSelectionListener listSelectionListener){ + + exchangeEventsTableModel = new ExchangeEventsTableModel(); + + final ExchangeEventRenderer exchangeEventRenderer = new ExchangeEventRenderer(true); + + JTable table = new JTable() { + public TableCellRenderer getCellRenderer(int row, int column) { + return exchangeEventRenderer; + } + }; + table.setModel(exchangeEventsTableModel); + + table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + table.setColumnSelectionAllowed(false); + table.getTableHeader().setReorderingAllowed(false); + + table.getColumnModel().getColumn(0).setPreferredWidth(40); + table.getColumnModel().getColumn(3).setPreferredWidth(200); + table.getColumnModel().getColumn(4).setPreferredWidth(40); + + ListSelectionModel rowSM = table.getSelectionModel(); + rowSM.addListSelectionListener(listSelectionListener); + + JScrollPane scrollpane = new JScrollPane(table); + this.setLayout(new BorderLayout()); + this.add(scrollpane, BorderLayout.CENTER); + } + } + + //////////////////////////////////////////// + + /** + * + */ + public class ExchangeEventRenderer extends JLabel implements TableCellRenderer{ + + public ExchangeEventRenderer(boolean isBordered) { + // this.isBordered = isBordered; + setOpaque(true); //MUST do this for background to show up. + } + + public Component getTableCellRendererComponent(JTable table, Object object, + boolean isSelected, boolean hasFocus, + int row, int column) { + Integer index = exchangeEventsTableModel.getEventIndexForRow(row); + + ExchangeEventWrapper wrapper = exchangeEventsData.getWrapper(index.intValue()); + + logger.fine("RENDERING EXCHANGE:"); + logger.fine("EXCHANGE IS: " + wrapper); + + if(isSelected){ + setForeground(table.getSelectionForeground()); + setBackground(table.getSelectionBackground()); + } + else{ + setForeground(table.getForeground()); + setBackground(table.getBackground()); + } + + if (object != null) { + setText(object.toString()); + } else { + setText(""); + } + + // + // Sets the individual exchange color + // + if(wrapper.isError()){ + logger.info("isError - setting color dark red"); + setForeground(Color.red.darker()); + } + else if (wrapper.isUnexpected()){ + logger.info("isUnexpected - setting color red"); + setForeground(Color.red); + } + else if(wrapper.isWarning()){ + logger.info("isWarning - setting color orange"); + setForeground(Color.orange); + } + else if(wrapper.isInformationMessage() && column == 3){ + logger.info("isInformationMessage - setting color blue"); + setForeground(Color.blue); + } + if (wrapper.isUnexpected()) + setToolTipText("This message, '" + wrapper.getSendVariableTypeName()+ "' is invalid for this choreography."); + else + setToolTipText(wrapper.getDescription()); //Discussed in the following section + + return this; + } + } + + //////////////////////////////////////////// + + /** + * + */ + public class ExchangeEventsTableModel extends AbstractTableModel implements TreeSelectionListener{ + + String selectedChannelName = null; + + Vector filteredExchangeEvents = null; + + Vector emptyVector = new Vector(); + + boolean filterByChannel = true; + + //////////////////////////////////////////// + + /** + * + */ + public ExchangeEventsTableModel(){ + this.filteredExchangeEvents = exchangeEventsData.getExchangeEvents(); + } + + //////////////////////////////////////////// + + public int getColumnCount() { + return 5; + } + + //////////////////////////////////////////// + + public int getRowCount() { + return filteredExchangeEvents.size(); + } + + //////////////////////////////////////////// + + public String getColumnName(int col) { + return getColumnNameSTP(col); + } + + //////////////////////////////////////////// + + public String getColumnNameSTP(int col) { + if(col == 0){ return "Session Id"; } + else if(col == 1){ return "From"; } + else if(col == 2){ return "To"; } + else if(col == 3){ return "Msg"; } + else return "Status"; + // else return "Priority"; + } + + //////////////////////////////////////////// + + /** + * + */ + public Object getValueAt(int row, int col) { + return getValueAtSTP(row, col); + } + + //////////////////////////////////////////// + + /** + * + */ + public Class getColumnClass(int col) { + return Object.class; + } + + //////////////////////////////////////////// + + /** + * + */ + protected ExchangeEventWrapper getWrapperForRow(int row) { + return (ExchangeEventWrapper) filteredExchangeEvents.elementAt(filteredExchangeEvents.size() - (row + 1)); + } + + //////////////////////////////////////////// + + + /** + * + */ + public Integer getEventIndexForRow(int row) { + ExchangeEventWrapper wrapper = getWrapperForRow(row); + return wrapper.getIndex(); + } + + //////////////////////////////////////////// + + /** + * + */ + public Object getValueAtSTP(int row, int col) { + ExchangeEventWrapper wrapper = getWrapperForRow(row); + // ExchangeEvent exchangeEvent = wrapper.getExchangeEvent(); + + Object result = null; + + switch(col){ + case 0: + result = wrapper.getMessageIdentity(); + break; + case 1: + result=""; + + if (wrapper.getFromRoleTypeName() != null && + wrapper.getFromRoleTypeName().trim().length() > 0) { + result = wrapper.getFromRoleTypeName(); + } else if (wrapper.getServiceName() != null) { + result = org.pi4soa.common.xml.NameSpaceUtil.getLocalPart( + wrapper.getServiceName()); + } + break; + case 2: + result=""; + + if (wrapper.getToRoleTypeName() != null) { + result = wrapper.getToRoleTypeName(); + } + break; + case 3: + result = wrapper.getMessageSummary(); + break; + case 4: + result = wrapper.getStatus(); + break; + default: + break; + } + + return result; + } + + //////////////////////////////////////////// + + + /** + * + */ + public void cancelFiltering(){ + JTree tree = channelPanel.getTree(); + + Vector exchangeEvents = exchangeEventsData.getExchangeEvents(); + if(this.filteredExchangeEvents != exchangeEvents){ + this.filteredExchangeEvents = exchangeEvents; + } + selectedChannelName = null; + fireTableDataChanged(); + tree.clearSelection(); + } + + //////////////////////////////////////////// + + /** + * + */ + public void setFilterByChannel(boolean filterByChannel){ + this.filterByChannel = filterByChannel; + JTree tree = channelPanel.getTree(); + + if(filterByChannel == true){ + valueChangedForTree(tree); + } + else{ + Vector exchangeEvents = exchangeEventsData.getExchangeEvents(); + if(this.filteredExchangeEvents != exchangeEvents){ + this.filteredExchangeEvents = exchangeEvents; + } + selectedChannelName = null; + fireTableDataChanged(); + + tree.clearSelection(); + } + } + + //////////////////////////////////////////////////////////// + + /** + * + */ + public void setFilterByEventType(int index, ControlPanel controlPanel){ + + Vector oldFilteredExchangeEvents = filteredExchangeEvents; + Vector newFilteredExchangeEvents = null; + + switch(index){ + case 0: + newFilteredExchangeEvents = exchangeEventsData.getExchangeEvents(); + break; + case 1: + newFilteredExchangeEvents = exchangeEventsData.getWarningAndErrorExchangeEvents(); + break; + case 2: + newFilteredExchangeEvents = exchangeEventsData.getErrorExchangeEvents(); + break; + case 3: + newFilteredExchangeEvents = exchangeEventsData.getWarningExchangeEvents(); + break; + default: + // this ain't gonna happen + return; + //break; + } + /* + if(oldFilteredExchangeEvents != newFilteredExchangeEvents){ + // we should also reset the enablement of the channel filtering ... + if(index == 0){ + controlPanel.setFilterEventsByChannelIsEnabled(true); + } + else{ + controlPanel.setFilterEventsByChannelIsEnabled(false); + } + + this.filteredExchangeEvents = newFilteredExchangeEvents; + fireTableDataChanged(); + } + */ + } + + //////////////////////////////////////////////////////////// + + /** + * When the channel panel selection changes, we (should) filter + * the exchange event list. + * + * Right now, we simply print the selection name to stderr. + */ + public void valueChanged(TreeSelectionEvent e) { + + logger.fine("valueChanged"); + if(filterByChannel == false){ + return; + } + + JTree tree = (JTree) e.getSource(); + + valueChangedForTree(tree); + } + + + /** + * + */ + public void valueChangedForTree(JTree tree) { + logger.fine("valueChangedForTree"); + DefaultMutableTreeNode node = (DefaultMutableTreeNode) tree.getLastSelectedPathComponent(); + + if(node == null) { + selectedChannelName = null; + return; + } + + Vector oldFilteredExchangeEvents = filteredExchangeEvents; + + if (node.isLeaf()) { + logger.fine("Selected is: " + node.getUserObject().toString()); + selectedChannelName = (String) node.getUserObject().toString(); + logger.fine("SelectedChannelName is " + selectedChannelName); + Vector newVector = exchangeEventsData.getExchangeEventsForChannel(selectedChannelName); + + // avoid npe's + if(newVector == null) { + newVector = exchangeEventsData.getExchangeEventsForSession(selectedChannelName); + if (newVector == null) { + this.filteredExchangeEvents = emptyVector; + logger.fine("emptyVector"); + } else { + this.filteredExchangeEvents = newVector; + logger.fine("newVector (" + newVector.size() + ")"); + } + } else { + this.filteredExchangeEvents = newVector; + logger.fine("newVector (" + newVector.size() + ")"); + } + + + + } else { + this.filteredExchangeEvents = exchangeEventsData.getExchangeEvents(); + selectedChannelName = null; + } + + if(oldFilteredExchangeEvents != filteredExchangeEvents) { + fireTableDataChanged(); + } + } + + //////////////////////////////////////////////////////////// + + /** + * + */ + public String getSelectedChannelName(){ + return selectedChannelName; + } + + //////////////////////////////////////////////////////////// + + /** + * + */ + public int indexOfExchangeEventWrapperInFilteredList(Object o){ + return filteredExchangeEvents.indexOf(o); + } + } + + //////////////////////////////////////////// + + public class StatusPanel extends JPanel{ + JLabel statusJLabel = new JLabel(); + + public StatusPanel(){ + this.setLayout(new BorderLayout()); + this.add(statusJLabel, BorderLayout.LINE_START); + setStatus("No choreography loaded"); + } + + public void setStatus(String status){ + statusJLabel.setText(status); + } + } + + //////////////////////////////////////////// + + /** + * + */ + public class ControlPanel extends JPanel implements ItemListener, ActionListener{ + //JCheckBox filterEventsByChannelJCheckBox = new JCheckBox("Filter by channel", true); + + Object sessionItems[] = { "All sessions" }; + //JComboBox sessionPopupMenu = new JComboBox(sessionItems); + + // add the sessions to the jpopup menu ... + // JComboBox sessionPopupMenu = new JComboBox(sessionItems); + + //Object showItems[] = { "All Events", "Errors and Warnings", "Errors", "Warnings" }; + //JComboBox showPopupMenu = new JComboBox(showItems); + + // JComboBox showPopupMenu = new JComboBox("Show: "); + + + + /** + * + */ + public ControlPanel(){ + this.setLayout(new BorderLayout()); + //this.add(filterEventsByChannelJCheckBox, BorderLayout.WEST); + + //filterEventsByChannelJCheckBox.addItemListener(this); + + // this.add(sessionPopupMenu, BorderLayout.CENTER); + //JPanel layoutPanel = new JPanel(); + // layoutPanel.setLayout(new FlowLayout()); + + //layoutPanel.add(new JLabel("Show: ")); + //layoutPanel.add(showPopupMenu); + //showPopupMenu.addActionListener(this); + + //this.add(layoutPanel, BorderLayout.EAST); + } + + + /** + * + * + public void itemStateChanged(ItemEvent e) { + Object source = e.getItemSelectable(); + if(source == filterEventsByChannelJCheckBox){ + boolean filterByChannel = filterEventsByChannelJCheckBox.isSelected(); + exchangeEventsTableModel.setFilterByChannel(filterByChannel); + } + } + */ + public void itemStateChanged(ItemEvent e) {} + + + /** + * + * + public void actionPerformed(ActionEvent e) { + Object source = e.getSource(); + if(source == showPopupMenu){ + int index = showPopupMenu.getSelectedIndex(); + exchangeEventsTableModel.setFilterByEventType(index, this); + } + } + */ + public void actionPerformed(ActionEvent e) {} + + + + /** + * + * + public void setFilterEventsByChannelIsEnabled(boolean setFilterEventsByChannelIsEnabled){ + if(setFilterEventsByChannelIsEnabled == false){ + filterEventsByChannelJCheckBox.setSelected(false); + } + filterEventsByChannelJCheckBox.setEnabled(setFilterEventsByChannelIsEnabled); + } + */ + public void setFilterEventsByChannelIsEnabled(boolean setFilterEventsByChannelIsEnabled){} + + } + + //////////////////////////////////////////// + + /** + * + */ + // public class MessageJPanel extends ExchangeDetailJPanel implements ListSelectionListener{ + public class MessageJPanel extends JPanel implements ListSelectionListener{ + + JTextArea msgTextArea = null; + + /** + * + */ + public MessageJPanel(boolean dummy){ + msgTextArea = new JTextArea(); + msgTextArea.setEditable(false); + JScrollPane scrollpane = new JScrollPane(msgTextArea); + this.setLayout(new BorderLayout()); + this.add(scrollpane, BorderLayout.CENTER); + } + + + public void valueChanged(ListSelectionEvent e) { + + logger.fine(">>>> valueChanged - new message selected"); + + //Ignore extra messages. + if (e.getValueIsAdjusting()) { + logger.fine(">>>> just adjusting - returning early"); + return; + } + + ListSelectionModel lsm = (ListSelectionModel)e.getSource(); + + if (lsm.isSelectionEmpty()){ + logger.fine(">>>> no rows selected"); + // no rows are selected + } + else{ + // selectedRow is selected + // harhar. grab the first value ... + int selectedRowIndex = lsm.getMinSelectionIndex(); + + logger.fine(">>>> selectedIndex = " + selectedRowIndex); + + Integer index = (Integer) exchangeEventsTableModel.getEventIndexForRow(selectedRowIndex); + + // ExchangeEventWrapper wrapper = (ExchangeEventWrapper) exchangeEvents.elementAt(index.intValue()); + ExchangeEventWrapper wrapper = exchangeEventsData.getWrapper(index.intValue()); + + + // avoid NPE's + if(wrapper != null){ + this.updateDetails(wrapper); + } + else{ + logger.fine(">>>> null exception wrapper"); + } + } + } + + + /** + * + */ + public void updateDetails(ExchangeEventWrapper exchangeEventWrapper){ + String text = exchangeEventWrapper.getMessageValue(); + logger.info("MESSAGE PAYLOAD: " + text); + + try { + org.w3c.dom.Node node=org.pi4soa.common.xml.XMLUtils.getNode(text); + + text = org.pi4soa.common.xml.XMLUtils.getText(node, true); + + } catch (Exception e) { + //text = "Unable to display message\r\n\r\n"+e; + } + + if (exchangeEventWrapper.getExceptionValue() != null) { + text += "\r\n\r\nException Trace:\r\n"+ + exchangeEventWrapper.getExceptionValue(); + } + + msgTextArea.setText(text); + msgTextArea.setBackground(Color.lightGray); + msgTextArea.setCaretPosition(0); + } + } + +} + + +// EOF Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorMenuBar.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorMenuBar.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorMenuBar.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,318 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + +import javax.swing.*; +import java.awt.event.*; +import java.io.*; + +/** + * + */ +public class MonitorMenuBar extends JMenuBar { + + MonitorMenuBar menuBar = this; + + static final int NEW_FRAME_WIDTH = 415; + static final int NEW_FRAME_HEIGHT = 330; + + JMenu fileMenu = new JMenu("File"); + JMenu editMenu = new JMenu("Edit"); + JMenu monitorMenu = new JMenu("Monitor"); + JMenu helpMenu = new JMenu("Help"); + + JMenuItem openItem = new JMenuItem("Open Choreography..."); + JMenuItem importItem = new JMenuItem("Import Events..."); + JMenuItem exportItem = new JMenuItem("Export Events..."); + JMenuItem exitItem = new JMenuItem("Exit"); + + JMenuItem undoItem = new JMenuItem("Undo"); + JMenuItem cutItem = new JMenuItem("Cut"); + JMenuItem copyItem = new JMenuItem("Copy"); + JMenuItem pasteItem = new JMenuItem("Paste"); + JMenuItem selectAllItem = new JMenuItem("Select All"); + JMenuItem clearItem = new JMenuItem("Clear"); + JMenuItem preferencesItem = new JMenuItem("Preferences..."); + + JMenuItem startMonitoringItem = new JMenuItem("Start Monitoring"); + JMenuItem stopMonitoringItem = new JMenuItem("Stop Monitoring"); + + JMenuItem helpItem = new JMenuItem("About Choreography Monitor"); + + Monitor monitor; + + /** + * + */ + public MonitorMenuBar(boolean choreoProvided){ + setUpFileMenu(choreoProvided); + setUpEditMenu(choreoProvided); + setUpMonitorMenu(choreoProvided); + setUpHelpMenu(choreoProvided); + } + + + /** + * + */ + private void setUpFileMenu(boolean choreoProvided){ + openItem.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O, java.awt.Event.META_MASK)); + exitItem.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_X, java.awt.Event.META_MASK)); + + openItem.setEnabled(true); + importItem.setEnabled(true); + exportItem.setEnabled(false); + exitItem.setEnabled(true); + + openItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + JFileChooser chooser = new JFileChooser(); + chooser.setDialogTitle("Open Choreography"); + + // Note: source for ExampleFileFilter can be found in FileChooserDemo, + // under the demo/jfc directory in the Java 2 SDK, Standard Edition. + MonitorFileFilter filter = new MonitorFileFilter(); + filter.addExtension("cdm"); + filter.setDescription("CDM Files"); + chooser.setFileFilter(filter); + int returnVal = chooser.showOpenDialog(menuBar); + if(returnVal == JFileChooser.APPROVE_OPTION) { + File directory = chooser.getCurrentDirectory(); + String fileName = chooser.getSelectedFile().getName(); + File path = new File(directory, fileName); + monitor.loadChoreography(path.getPath()); + + // now that we've opened, start monitoring should be enabled. + } + } + }); + + + importItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + JFileChooser chooser = new JFileChooser(); + chooser.setDialogTitle("Import Events"); + + // Note: source for ExampleFileFilter can be found in FileChooserDemo, + // under the demo/jfc directory in the Java 2 SDK, Standard Edition. + MonitorFileFilter filter = new MonitorFileFilter(); + filter.addExtension("data"); + filter.setDescription("Exchange Events"); + chooser.setFileFilter(filter); + int returnVal = chooser.showOpenDialog(menuBar); + if(returnVal == JFileChooser.APPROVE_OPTION) { + File directory = chooser.getCurrentDirectory(); + String fileName = chooser.getSelectedFile().getName(); + File path = new File(directory, fileName); + monitor.importEvents(path.getPath()); + } + } + }); + + + exportItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + JFileChooser chooser = new JFileChooser(); + chooser.setDialogTitle("Export Events"); + + // Note: source for ExampleFileFilter can be found in FileChooserDemo, + // under the demo/jfc directory in the Java 2 SDK, Standard Edition. + // ExampleFileFilter filter = new ExampleFileFilter(); + // filter.addExtension("data"); + // filter.setDescription("Exchange Events"); + // chooser.setFileFilter(filter); + int returnVal = chooser.showSaveDialog(menuBar); + if(returnVal == JFileChooser.APPROVE_OPTION) { + File directory = chooser.getCurrentDirectory(); + String fileName = chooser.getSelectedFile().getName(); + File path = new File(directory, fileName); + monitor.exportEvents(path.getPath()); + } + } + }); + + exitItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + monitor.close(); + } + }); + + if (!choreoProvided) { + fileMenu.add(openItem); + fileMenu.add(new JSeparator()); + } + + // Disable import/export in this version + // If re-enabled, need to sort out message summary + // persistence, as it uses the exchange event which + // is transient + //fileMenu.add(importItem); + //fileMenu.add(exportItem); + //fileMenu.add(new JSeparator()); + + fileMenu.add(exitItem); + + this.add(fileMenu); + } + + + /** + * + */ + private void setUpEditMenu(boolean choreoProvided){ + + undoItem.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_Z, java.awt.Event.META_MASK)); + cutItem.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_X, java.awt.Event.META_MASK)); + copyItem.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_C, java.awt.Event.META_MASK)); + pasteItem.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_V, java.awt.Event.META_MASK)); + selectAllItem.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_A, java.awt.Event.META_MASK)); + preferencesItem.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_P /* was VK_SEMICOLON */, + java.awt.Event.META_MASK)); + + undoItem.setEnabled(false); + cutItem.setEnabled(false); + copyItem.setEnabled(false); + pasteItem.setEnabled(false); + selectAllItem.setEnabled(false); + clearItem.setEnabled(false); + + // preferences menu implementation + preferencesItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + // preferences.setVisible(true); + } + }); + + editMenu.add(undoItem); + editMenu.add(new JSeparator()); + editMenu.add(cutItem); + editMenu.add(copyItem); + editMenu.add(pasteItem); + editMenu.add(selectAllItem); + editMenu.add(clearItem); + editMenu.add(new JSeparator()); + editMenu.add(preferencesItem); + + /* + this.add(editMenu); + */ + } + + + /** + * + */ + private void setUpMonitorMenu(boolean choreoProvided){ + startMonitoringItem.setEnabled(false); + stopMonitoringItem.setEnabled(false); + + startMonitoringItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + monitor.startMonitoring(); + } + }); + + stopMonitoringItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + monitor.stopMonitoring(); + } + }); + + monitorMenu.add(startMonitoringItem); + monitorMenu.add(stopMonitoringItem); + + if (!choreoProvided) { + this.add(monitorMenu); + } + } + + + /** + * + */ + private void setUpHelpMenu(boolean choreoProvided){ + helpItem.setAccelerator(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_F1, 0)); + helpMenu.add(helpItem); + helpItem.setEnabled(true); + + helpItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + JOptionPane.showMessageDialog(null, + "pi4soa Choreography Monitor\r\n\r\n" + + "Version 1\r\n\r\n" + + "(c) Pi4 Technologies Ltd, 2005-8", + "About ...", JOptionPane.INFORMATION_MESSAGE); + } + }); + + this.add(helpMenu); + } + + + /** + * + */ + public void setMonitor(Monitor monitor) { + this.monitor = monitor; + } + + + /** + * + */ + public void loadedChoreography(){ + startMonitoringItem.setEnabled(true); + } + + + /** + * + */ + public void startedMonitoring(){ + openItem.setEnabled(false); + importItem.setEnabled(false); + exportItem.setEnabled(true); + startMonitoringItem.setEnabled(false); + stopMonitoringItem.setEnabled(true); + } + + + /** + * + */ + public void stoppedMonitoring(){ + openItem.setEnabled(true); + importItem.setEnabled(true); + exportItem.setEnabled(true); + startMonitoringItem.setEnabled(true); + stopMonitoringItem.setEnabled(false); + } + + /** + * + */ + public void importedEvents(){ + exportItem.setEnabled(true); + } + +} // End of class + + +// EOF Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorTreeModelListener.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorTreeModelListener.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/MonitorTreeModelListener.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,76 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + +import java.util.logging.Logger; + +import javax.swing.event.TreeModelEvent; +import javax.swing.event.TreeModelListener; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeCellRenderer; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeSelectionModel; + +import org.pi4soa.service.correlator.CorrelationSession; + + +/** + * The left hand pane contains a tree whose root is the + * choreography, and whose leaves are channels. + * + * Selecting a channel filters the exchange events list (or should + * do). + */ +class MonitorTreeModelListener implements TreeModelListener { + + private static Logger logger = Logger.getLogger("org.jboss.savara.tools.monitor.ui"); + + public void treeNodesChanged(TreeModelEvent e) { + DefaultMutableTreeNode node; + node = (DefaultMutableTreeNode) + (e.getTreePath().getLastPathComponent()); + + /* + * If the event lists children, then the changed + * node is the child of the node we've already + * gotten. Otherwise, the changed node and the + * specified node are the same. + */ + try { + int index = e.getChildIndices()[0]; + node = (DefaultMutableTreeNode) + (node.getChildAt(index)); + } catch (NullPointerException exc) {} + + logger.fine(">>> CHANGED NODE"); + logger.fine("The user has finished editing the node."); + logger.fine("New value: " + node.getUserObject()); + } + public void treeNodesInserted(TreeModelEvent e) { + logger.fine(">>> INSERTED NODE"); + } + public void treeNodesRemoved(TreeModelEvent e) { + logger.fine(">>> REMOVED NODE"); + } + public void treeStructureChanged(TreeModelEvent e) { + logger.fine(">>> TREE STRUCTURE CHANGED"); + } +} \ No newline at end of file Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/SpringUtilities.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/SpringUtilities.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/SpringUtilities.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,213 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + +import javax.swing.*; +import javax.swing.SpringLayout; +import java.awt.*; + +/** + * A 1.4 file that provides utility methods for + * creating form- or grid-style layouts with SpringLayout. + * These utilities are used by several programs, such as + * SpringBox and SpringCompactGrid. + */ +public class SpringUtilities { + /** + * A debugging utility that prints to stdout the component's + * minimum, preferred, and maximum sizes. + */ + public static void printSizes(Component c) { + System.out.println("minimumSize = " + c.getMinimumSize()); + System.out.println("preferredSize = " + c.getPreferredSize()); + System.out.println("maximumSize = " + c.getMaximumSize()); + } + + /** + * Aligns the first <code>rows</code> * <code>cols</code> + * components of <code>parent</code> in + * a grid. Each component is as big as the maximum + * preferred width and height of the components. + * The parent is made just big enough to fit them all. + * + * @param rows number of rows + * @param cols number of columns + * @param initialX x location to start the grid at + * @param initialY y location to start the grid at + * @param xPad x padding between cells + * @param yPad y padding between cells + */ + public static void makeGrid(Container parent, + int rows, int cols, + int initialX, int initialY, + int xPad, int yPad) { + SpringLayout layout; + try { + layout = (SpringLayout)parent.getLayout(); + } catch (ClassCastException exc) { + System.err.println("The first argument to makeGrid must use SpringLayout."); + return; + } + + Spring xPadSpring = Spring.constant(xPad); + Spring yPadSpring = Spring.constant(yPad); + Spring initialXSpring = Spring.constant(initialX); + Spring initialYSpring = Spring.constant(initialY); + int max = rows * cols; + + //Calculate Springs that are the max of the width/height so that all + //cells have the same size. + Spring maxWidthSpring = layout.getConstraints(parent.getComponent(0)). + getWidth(); + Spring maxHeightSpring = layout.getConstraints(parent.getComponent(0)). + getWidth(); + for (int i = 1; i < max; i++) { + SpringLayout.Constraints cons = layout.getConstraints( + parent.getComponent(i)); + + maxWidthSpring = Spring.max(maxWidthSpring, cons.getWidth()); + maxHeightSpring = Spring.max(maxHeightSpring, cons.getHeight()); + } + + //Apply the new width/height Spring. This forces all the + //components to have the same size. + for (int i = 0; i < max; i++) { + SpringLayout.Constraints cons = layout.getConstraints( + parent.getComponent(i)); + + cons.setWidth(maxWidthSpring); + cons.setHeight(maxHeightSpring); + } + + //Then adjust the x/y constraints of all the cells so that they + //are aligned in a grid. + SpringLayout.Constraints lastCons = null; + SpringLayout.Constraints lastRowCons = null; + for (int i = 0; i < max; i++) { + SpringLayout.Constraints cons = layout.getConstraints( + parent.getComponent(i)); + if (i % cols == 0) { //start of new row + lastRowCons = lastCons; + cons.setX(initialXSpring); + } else { //x position depends on previous component + cons.setX(Spring.sum(lastCons.getConstraint(SpringLayout.EAST), + xPadSpring)); + } + + if (i / cols == 0) { //first row + cons.setY(initialYSpring); + } else { //y position depends on previous row + cons.setY(Spring.sum(lastRowCons.getConstraint(SpringLayout.SOUTH), + yPadSpring)); + } + lastCons = cons; + } + + //Set the parent's size. + SpringLayout.Constraints pCons = layout.getConstraints(parent); + pCons.setConstraint(SpringLayout.SOUTH, + Spring.sum( + Spring.constant(yPad), + lastCons.getConstraint(SpringLayout.SOUTH))); + pCons.setConstraint(SpringLayout.EAST, + Spring.sum( + Spring.constant(xPad), + lastCons.getConstraint(SpringLayout.EAST))); + } + + /* Used by makeCompactGrid. */ + private static SpringLayout.Constraints getConstraintsForCell( + int row, int col, + Container parent, + int cols) { + SpringLayout layout = (SpringLayout) parent.getLayout(); + Component c = parent.getComponent(row * cols + col); + return layout.getConstraints(c); + } + + /** + * Aligns the first <code>rows</code> * <code>cols</code> + * components of <code>parent</code> in + * a grid. Each component in a column is as wide as the maximum + * preferred width of the components in that column; + * height is similarly determined for each row. + * The parent is made just big enough to fit them all. + * + * @param rows number of rows + * @param cols number of columns + * @param initialX x location to start the grid at + * @param initialY y location to start the grid at + * @param xPad x padding between cells + * @param yPad y padding between cells + */ + public static void makeCompactGrid(Container parent, + int rows, int cols, + int initialX, int initialY, + int xPad, int yPad) { + SpringLayout layout; + try { + layout = (SpringLayout)parent.getLayout(); + } catch (ClassCastException exc) { + System.err.println("The first argument to makeCompactGrid must use SpringLayout."); + return; + } + + //Align all cells in each column and make them the same width. + Spring x = Spring.constant(initialX); + for (int c = 0; c < cols; c++) { + Spring width = Spring.constant(0); + for (int r = 0; r < rows; r++) { + width = Spring.max(width, + getConstraintsForCell(r, c, parent, cols). + getWidth()); + } + for (int r = 0; r < rows; r++) { + SpringLayout.Constraints constraints = + getConstraintsForCell(r, c, parent, cols); + constraints.setX(x); + constraints.setWidth(width); + } + x = Spring.sum(x, Spring.sum(width, Spring.constant(xPad))); + } + + //Align all cells in each row and make them the same height. + Spring y = Spring.constant(initialY); + for (int r = 0; r < rows; r++) { + Spring height = Spring.constant(0); + for (int c = 0; c < cols; c++) { + height = Spring.max(height, + getConstraintsForCell(r, c, parent, cols). + getHeight()); + } + for (int c = 0; c < cols; c++) { + SpringLayout.Constraints constraints = + getConstraintsForCell(r, c, parent, cols); + constraints.setY(y); + constraints.setHeight(height); + } + y = Spring.sum(y, Spring.sum(height, Spring.constant(yPad))); + } + + //Set the parent's size. + SpringLayout.Constraints pCons = layout.getConstraints(parent); + pCons.setConstraint(SpringLayout.SOUTH, y); + pCons.setConstraint(SpringLayout.EAST, x); + } +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/XmlPrettyPrinter.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/XmlPrettyPrinter.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/XmlPrettyPrinter.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,105 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui; + + +import org.w3c.dom.Document; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.ParserConfigurationException; + +//import org.apache.xml.serialize.OutputFormat; +//import org.apache.xml.serialize.XMLSerializer; + +import java.io.IOException; +import java.io.StringBufferInputStream; +import java.io.ByteArrayOutputStream; + +import org.xml.sax.SAXException; + +/** + * + */ +public class XmlPrettyPrinter{ + + /** + * + */ + public static String prettify(String input){ + + // Find the implementation + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = null; + + try{ + builder = factory.newDocumentBuilder(); + } + catch(ParserConfigurationException pce){ + System.err.println("Exception: " + pce); + return null; + } + + StringBufferInputStream stringBufferInputStream = new StringBufferInputStream(input); + + Document doc = null; + + try{ + doc = builder.parse(stringBufferInputStream); + } + catch(SAXException se){ + System.err.println("Exception: " + se); + return null; + } + catch(IOException ioe){ + System.err.println("Exception: " + ioe); + return null; + } + + String text=null; + + try { + text = org.pi4soa.common.xml.XMLUtils.getText(doc, true); + } catch(Exception e) { + System.err.println("Exception: " + e); + } + + return(text); + + /* + OutputFormat format = new OutputFormat(doc); + format.setLineWidth(65); + format.setIndenting(true); + format.setIndent(2); + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + XMLSerializer serializer = new XMLSerializer(byteArrayOutputStream, format); + + try{ + serializer.serialize(doc); + } + catch(IOException ioe){ + System.err.println("Exception: " + ioe); + return null; + } + + return byteArrayOutputStream.toString(); + */ + } + +} Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelclosed.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelclosed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelempty.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelempty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelleaf.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelleaf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelopen.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/channelopen.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/errorsleaf.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/errorsleaf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/issuesclosed.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/issuesclosed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/issuesempty.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/issuesempty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/issuesopen.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/issuesopen.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/monitor.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/monitor.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnclosed.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnclosed.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnempty.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnempty.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnleaf.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnleaf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnopen.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/txnopen.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/unexpectedleaf.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/unexpectedleaf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/warningsleaf.png =================================================================== (Binary files differ) Property changes on: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/icons/warningsleaf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/table/TableSorter.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/table/TableSorter.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/src/java/org/jboss/savara/tools/monitor/ui/table/TableSorter.java 2010-08-16 10:29:56 UTC (rev 350) @@ -0,0 +1,450 @@ +/* + * Copyright 2005-8 Pi4 Technologies Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * + * Change History: + * 16 Jan, 2008 : Initial version created by martin + */ +package org.jboss.savara.tools.monitor.ui.table; + +import java.awt.*; +import java.awt.event.*; +import java.util.*; +import java.util.List; + +import javax.swing.*; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; +import javax.swing.table.*; + +public class TableSorter extends AbstractTableModel { + protected TableModel tableModel; + + public static final int DESCENDING = -1; + public static final int NOT_SORTED = 0; + public static final int ASCENDING = 1; + + private static Directive EMPTY_DIRECTIVE = new Directive(-1, NOT_SORTED); + + public static final Comparator COMPARABLE_COMAPRATOR = new Comparator() { + public int compare(Object o1, Object o2) { + return ((Comparable) o1).compareTo(o2); + } + }; + public static final Comparator LEXICAL_COMPARATOR = new Comparator() { + public int compare(Object o1, Object o2) { + return o1.toString().compareTo(o2.toString()); + } + }; + + private Row[] viewToModel; + private int[] modelToView; + + private JTableHeader tableHeader; + private MouseListener mouseListener; + private TableModelListener tableModelListener; + private Map columnComparators = new HashMap(); + private List sortingColumns = new ArrayList(); + + public TableSorter() { + this.mouseListener = new MouseHandler(); + this.tableModelListener = new TableModelHandler(); + } + + public TableSorter(TableModel tableModel) { + this(); + setTableModel(tableModel); + } + + public TableSorter(TableModel tableModel, JTableHeader tableHeader) { + this(); + setTableHeader(tableHeader); + setTableModel(tableModel); + } + + private void clearSortingState() { + viewToModel = null; + modelToView = null; + } + + public TableModel getTableModel() { + return tableModel; + } + + public void setTableModel(TableModel tableModel) { + if (this.tableModel != null) { + this.tableModel.removeTableModelListener(tableModelListener); + } + + this.tableModel = tableModel; + if (this.tableModel != null) { + this.tableModel.addTableModelListener(tableModelListener); + } + + clearSortingState(); + fireTableStructureChanged(); + } + + public JTableHeader getTableHeader() { + return tableHeader; + } + + public void setTableHeader(JTableHeader tableHeader) { + if (this.tableHeader != null) { + this.tableHeader.removeMouseListener(mouseListener); + TableCellRenderer defaultRenderer = this.tableHeader.getDefaultRenderer(); + if (defaultRenderer instanceof SortableHeaderRenderer) { + this.tableHeader.setDefaultRenderer(((SortableHeaderRenderer) defaultRenderer).tableCellRenderer); + } + } + this.tableHeader = tableHeader; + if (this.tableHeader != null) { + this.tableHeader.addMouseListener(mouseListener); + this.tableHeader.setDefaultRenderer( + new SortableHeaderRenderer(this.tableHeader.getDefaultRenderer())); + } + } + + public boolean isSorting() { + return sortingColumns.size() != 0; + } + + private Directive getDirective(int column) { + for (int i = 0; i < sortingColumns.size(); i++) { + Directive directive = (Directive)sortingColumns.get(i); + if (directive.column == column) { + return directive; + } + } + return EMPTY_DIRECTIVE; + } + + public int getSortingStatus(int column) { + return getDirective(column).direction; + } + + private void sortingStatusChanged() { + clearSortingState(); + fireTableDataChanged(); + if (tableHeader != null) { + tableHeader.repaint(); + } + } + + public void setSortingStatus(int column, int status) { + Directive directive = getDirective(column); + if (directive != EMPTY_DIRECTIVE) { + sortingColumns.remove(directive); + } + if (status != NOT_SORTED) { + sortingColumns.add(new Directive(column, status)); + } + sortingStatusChanged(); + } + + protected Icon getHeaderRendererIcon(int column, int size) { + Directive directive = getDirective(column); + if (directive == EMPTY_DIRECTIVE) { + return null; + } + return new Arrow(directive.direction == DESCENDING, size, sortingColumns.indexOf(directive)); + } + + private void cancelSorting() { + sortingColumns.clear(); + sortingStatusChanged(); + } + + public void setColumnComparator(Class type, Comparator comparator) { + if (comparator == null) { + columnComparators.remove(type); + } else { + columnComparators.put(type, comparator); + } + } + + protected Comparator getComparator(int column) { + Class columnType = tableModel.getColumnClass(column); + Comparator comparator = (Comparator) columnComparators.get(columnType); + if (comparator != null) { + return comparator; + } + if (Comparable.class.isAssignableFrom(columnType)) { + return COMPARABLE_COMAPRATOR; + } + return LEXICAL_COMPARATOR; + } + + private Row[] getViewToModel() { + if (viewToModel == null) { + int tableModelRowCount = tableModel.getRowCount(); + viewToModel = new Row[tableModelRowCount]; + for (int row = 0; row < tableModelRowCount; row++) { + viewToModel[row] = new Row(row); + } + + if (isSorting()) { + Arrays.sort(viewToModel); + } + } + return viewToModel; + } + + public int modelIndex(int viewIndex) { + return getViewToModel()[viewIndex].modelIndex; + } + + private int[] getModelToView() { + if (modelToView == null) { + int n = getViewToModel().length; + modelToView = new int[n]; + for (int i = 0; i < n; i++) { + modelToView[modelIndex(i)] = i; + } + } + return modelToView; + } + + // TableModel interface methods + + public int getRowCount() { + return (tableModel == null) ? 0 : tableModel.getRowCount(); + } + + public int getColumnCount() { + return (tableModel == null) ? 0 : tableModel.getColumnCount(); + } + + public String getColumnName(int column) { + return tableModel.getColumnName(column); + } + + public Class getColumnClass(int column) { + return tableModel.getColumnClass(column); + } + + public boolean isCellEditable(int row, int column) { + return tableModel.isCellEditable(modelIndex(row), column); + } + + public Object getValueAt(int row, int column) { + return tableModel.getValueAt(modelIndex(row), column); + } + + public void setValueAt(Object aValue, int row, int column) { + tableModel.setValueAt(aValue, modelIndex(row), column); + } + + // Helper classes + + private class Row implements Comparable { + private int modelIndex; + + public Row(int index) { + this.modelIndex = index; + } + + public int compareTo(Object o) { + int row1 = modelIndex; + int row2 = ((Row) o).modelIndex; + + for (Iterator it = sortingColumns.iterator(); it.hasNext();) { + Directive directive = (Directive) it.next(); + int column = directive.column; + Object o1 = tableModel.getValueAt(row1, column); + Object o2 = tableModel.getValueAt(row2, column); + + int comparison = 0; + // Define null less than everything, except null. + if (o1 == null && o2 == null) { + comparison = 0; + } else if (o1 == null) { + comparison = -1; + } else if (o2 == null) { + comparison = 1; + } else { + comparison = getComparator(column).compare(o1, o2); + } + if (comparison != 0) { + return directive.direction == DESCENDING ? -comparison : comparison; + } + } + return 0; + } + } + + private class TableModelHandler implements TableModelListener { + public void tableChanged(TableModelEvent e) { + // If we're not sorting by anything, just pass the event along. + if (!isSorting()) { + clearSortingState(); + fireTableChanged(e); + return; + } + + // If the table structure has changed, cancel the sorting; the + // sorting columns may have been either moved or deleted from + // the model. + if (e.getFirstRow() == TableModelEvent.HEADER_ROW) { + cancelSorting(); + fireTableChanged(e); + return; + } + + // We can map a cell event through to the view without widening + // when the following conditions apply: + // + // a) all the changes are on one row (e.getFirstRow() == e.getLastRow()) and, + // b) all the changes are in one column (column != TableModelEvent.ALL_COLUMNS) and, + // c) we are not sorting on that column (getSortingStatus(column) == NOT_SORTED) and, + // d) a reverse lookup will not trigger a sort (modelToView != null) + // + // Note: INSERT and DELETE events fail this test as they have column == ALL_COLUMNS. + // + // The last check, for (modelToView != null) is to see if modelToView + // is already allocated. If we don't do this check; sorting can become + // a performance bottleneck for applications where cells + // change rapidly in different parts of the table. If cells + // change alternately in the sorting column and then outside of + // it this class can end up re-sorting on alternate cell updates - + // which can be a performance problem for large tables. The last + // clause avoids this problem. + int column = e.getColumn(); + if (e.getFirstRow() == e.getLastRow() + && column != TableModelEvent.ALL_COLUMNS + && getSortingStatus(column) == NOT_SORTED + && modelToView != null) { + int viewIndex = getModelToView()[e.getFirstRow()]; + fireTableChanged(new TableModelEvent(TableSorter.this, + viewIndex, viewIndex, + column, e.getType())); + return; + } + + // Something has happened to the data that may have invalidated the row order. + clearSortingState(); + fireTableDataChanged(); + return; + } + } + + private class MouseHandler extends MouseAdapter { + public void mouseClicked(MouseEvent e) { + JTableHeader h = (JTableHeader) e.getSource(); + TableColumnModel columnModel = h.getColumnModel(); + int viewColumn = columnModel.getColumnIndexAtX(e.getX()); + int column = columnModel.getColumn(viewColumn).getModelIndex(); + if (column != -1) { + int status = getSortingStatus(column); + if (!e.isControlDown()) { + cancelSorting(); + } + // Cycle the sorting states through {NOT_SORTED, ASCENDING, DESCENDING} or + // {NOT_SORTED, DESCENDING, ASCENDING} depending on whether shift is pressed. + status = status + (e.isShiftDown() ? -1 : 1); + status = (status + 4) % 3 - 1; // signed mod, returning {-1, 0, 1} + setSortingStatus(column, status); + } + } + } + + private static class Arrow implements Icon { + private boolean descending; + private int size; + private int priority; + + public Arrow(boolean descending, int size, int priority) { + this.descending = descending; + this.size = size; + this.priority = priority; + } + + public void paintIcon(Component c, Graphics g, int x, int y) { + Color color = c == null ? Color.GRAY : c.getBackground(); + // In a compound sort, make each succesive triangle 20% + // smaller than the previous one. + int dx = (int)(size/2*Math.pow(0.8, priority)); + int dy = descending ? dx : -dx; + // Align icon (roughly) with font baseline. + y = y + 5*size/6 + (descending ? -dy : 0); + int shift = descending ? 1 : -1; + g.translate(x, y); + + // Right diagonal. + g.setColor(color.darker()); + g.drawLine(dx / 2, dy, 0, 0); + g.drawLine(dx / 2, dy + shift, 0, shift); + + // Left diagonal. + g.setColor(color.brighter()); + g.drawLine(dx / 2, dy, dx, 0); + g.drawLine(dx / 2, dy + shift, dx, shift); + + // Horizontal line. + if (descending) { + g.setColor(color.darker().darker()); + } else { + g.setColor(color.brighter().brighter()); + } + g.drawLine(dx, 0, 0, 0); + + g.setColor(color); + g.translate(-x, -y); + } + + public int getIconWidth() { + return size; + } + + public int getIconHeight() { + return size; + } + } + + private class SortableHeaderRenderer implements TableCellRenderer { + private TableCellRenderer tableCellRenderer; + + public SortableHeaderRenderer(TableCellRenderer tableCellRenderer) { + this.tableCellRenderer = tableCellRenderer; + } + + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + Component c = tableCellRenderer.getTableCellRendererComponent(table, + value, isSelected, hasFocus, row, column); + if (c instanceof JLabel) { + JLabel l = (JLabel) c; + l.setHorizontalTextPosition(JLabel.LEFT); + int modelColumn = table.convertColumnIndexToModel(column); + l.setIcon(getHeaderRendererIcon(modelColumn, l.getFont().getSize())); + } + return c; + } + } + + private static class Directive { + private int column; + private int direction; + + public Directive(int column, int direction) { + this.column = column; + this.direction = direction; + } + } +}

15 years, 8 months

1
0
0 / 0

savara SVN: r349 - trunk/tools/plugins.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-08-16 05:24:44 -0400 (Mon, 16 Aug 2010) New Revision: 349 Removed: trunk/tools/plugins/org.pi4soa.monitor/ Log:

15 years, 8 months

1
0
0 / 0

savara SVN: r348 - trunk/tools/plugins.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-08-16 05:24:19 -0400 (Mon, 16 Aug 2010) New Revision: 348 Removed: trunk/tools/plugins/org.pi4soa.bpmn/ Log: Refactored pi4soa BPMN and monitor plugins to be consistently named as Savara tools.

15 years, 8 months

1
0
0 / 0

savara SVN: r347 - branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl and 8 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2010-08-13 08:58:07 -0400 (Fri, 13 Aug 2010) New Revision: 347 Added: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/XMLUtils.java trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/XMLUtils.java Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java trunk/pom.xml trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java trunk/validators/jbossesb/pom.xml Log: SAVARA-118 - generate xsd imports, instead of wsdl imports, for referenced schema files. Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java =================================================================== --- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-08-06 08:42:06 UTC (rev 346) +++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-08-13 12:58:07 UTC (rev 347) @@ -321,6 +321,7 @@ } String filename=getWSDLFileName(role, localcm.getModelName().getName(), num); + byte[] b=null; if (i > 0) { javax.wsdl.Import imp=defns.get(0).createImport(); @@ -330,19 +331,39 @@ imp.setLocationURI(filename); defns.get(0).addImport(imp); + + java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); + + writer.writeWSDL(defn, baos); + + b = baos.toByteArray(); + + baos.close(); + } else { + org.w3c.dom.Document doc=writer.getDocument(defn); + importSchemas(cdmResource, contract, bpelFolderPath, - defn, defns.get(0)); + doc); + + // Create bytearray from DOM + java.io.ByteArrayOutputStream xmlstr= + new java.io.ByteArrayOutputStream(); + + DOMSource source=new DOMSource(); + source.setNode(doc); + + StreamResult result=new StreamResult(xmlstr); + + Transformer trans= + TransformerFactory.newInstance().newTransformer(); + trans.transform(source, result); + + xmlstr.close(); + + b = XMLUtils.format(new String(xmlstr.toByteArray())).getBytes(); } - java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); - - writer.writeWSDL(defn, baos); - - byte[] b=baos.toByteArray(); - - baos.close(); - IPath wsdlPath=bpelFolderPath.append(filename); IFile wsdlFile=proj.getProject().getWorkspace().getRoot().getFile(wsdlPath); @@ -362,42 +383,61 @@ } protected void importSchemas(IFile cdmResource, Contract contract, - IPath bpelFolderPath, javax.wsdl.Definition defn, - javax.wsdl.Definition firstDefn) throws Exception { + IPath bpelFolderPath, org.w3c.dom.Document doc) throws Exception { - // Generate imports for specified message schema - for (Namespace ns : contract.getNamespaces()) { + // NOTE: Unfortunate workaround due to issue with WSDLWriter not + // generating output for extensible elements created to represent + // the xsd:schema/xsd:import elements. So instead had to obtain + // the DOM document and insert the relevant elements. + + if (contract.getNamespaces().size() > 0) { + org.w3c.dom.Element defnElem=doc.getDocumentElement(); - if (ns.getSchemaLocation() != null && - ns.getSchemaLocation().trim().length() > 0) { + // Added types node + org.w3c.dom.Element types=doc.createElementNS("http://schemas.xmlsoap.org/wsdl/", + "types"); + + org.w3c.dom.Element schema=doc.createElementNS("http://www.w3.org/2001/XMLSchema", + "schema"); + + types.appendChild(schema); + + // Generate imports for specified message schema + for (Namespace ns : contract.getNamespaces()) { - java.util.StringTokenizer st=new java.util.StringTokenizer(ns.getSchemaLocation()); - - while (st.hasMoreTokens()) { - String location=st.nextToken(); - IFile file=cdmResource.getParent().getFile(new Path(location)); + if (ns.getSchemaLocation() != null && + ns.getSchemaLocation().trim().length() > 0) { + + java.util.StringTokenizer st=new java.util.StringTokenizer(ns.getSchemaLocation()); - javax.wsdl.Import imp=firstDefn.createImport(); + while (st.hasMoreTokens()) { + String location=st.nextToken(); + IFile file=cdmResource.getParent().getFile(new Path(location)); - imp.setDefinition(defn); - imp.setNamespaceURI(ns.getURI()); - - if (file.exists()) { - imp.setLocationURI(file.getProjectRelativePath().toPortableString()); + org.w3c.dom.Element imp=doc.createElementNS("http://www.w3.org/2001/XMLSchema", + "import"); - // Copy schema file into generated BPEL project - IPath artifactPath=bpelFolderPath.append(file.getProjectRelativePath()); + imp.setAttribute("namespace", ns.getURI()); - IFile artifactFile=cdmResource.getProject().getWorkspace().getRoot().getFile(artifactPath); + if (file.exists()) { + imp.setAttribute("schemaLocation", file.getProjectRelativePath().toPortableString()); - copySchema(file, artifactFile, bpelFolderPath); - } else { - imp.setLocationURI(location); + // Copy schema file into generated BPEL project + IPath artifactPath=bpelFolderPath.append(file.getProjectRelativePath()); + + IFile artifactFile=cdmResource.getProject().getWorkspace().getRoot().getFile(artifactPath); + + copySchema(file, artifactFile, bpelFolderPath); + } else { + imp.setAttribute("schemaLocation", location); + } + + schema.appendChild(imp); } - - firstDefn.addImport(imp); } } + + defnElem.insertBefore(types, defnElem.getFirstChild()); } } Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java =================================================================== --- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-08-06 08:42:06 UTC (rev 346) +++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-08-13 12:58:07 UTC (rev 347) @@ -32,7 +32,13 @@ import org.eclipse.ui.IWorkbenchPart; import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; import org.jboss.savara.tools.wsdl.generator.soap.*; +import org.jboss.savara.tools.wsdl.util.XMLUtils; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.scribble.contract.model.Contract; import org.scribble.contract.model.Interface; import org.scribble.contract.model.Namespace; @@ -161,6 +167,8 @@ // Check if definition has a port type if (defn.getPortTypes().size() > 0 || defn.getMessages().size() > 0 || (f_hasMEP && defn.getServices().size() > 0)) { + byte[] b=null; // Bytes to write out + String num=""; if (i > 0) { num += i; @@ -175,47 +183,87 @@ imp.setNamespaceURI(defn.getTargetNamespace()); imp.setLocationURI(filename); - defns.get(0).addImport(imp); + defns.get(0).addImport(imp); + + java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); + + writer.writeWSDL(defn, baos); + + b=baos.toByteArray(); + + baos.close(); + } else { - - // Generate imports for specified message schema - for (Namespace ns : contract.getNamespaces()) { + + // NOTE: Unfortunate workaround due to issue with WSDLWriter not + // generating output for extensible elements created to represent + // the xsd:schema/xsd:import elements. So instead had to obtain + // the DOM document and insert the relevant elements. + + org.w3c.dom.Document doc=writer.getDocument(defn); + + if (contract.getNamespaces().size() > 0) { + org.w3c.dom.Element defnElem=doc.getDocumentElement(); - if (ns.getSchemaLocation() != null && - ns.getSchemaLocation().trim().length() > 0) { - - java.util.StringTokenizer st=new java.util.StringTokenizer(ns.getSchemaLocation()); + // Added types node + org.w3c.dom.Element types=doc.createElementNS("http://schemas.xmlsoap.org/wsdl/", + "types"); + + org.w3c.dom.Element schema=doc.createElementNS("http://www.w3.org/2001/XMLSchema", + "schema"); + + types.appendChild(schema); + + // Generate imports for specified message schema + for (Namespace ns : contract.getNamespaces()) { - while (st.hasMoreTokens()) { - String location=st.nextToken(); - IFile file=cdmResource.getParent().getFile(new Path(location)); - - javax.wsdl.Import imp=defns.get(0).createImport(); + if (ns.getSchemaLocation() != null && + ns.getSchemaLocation().trim().length() > 0) { + + java.util.StringTokenizer st=new java.util.StringTokenizer(ns.getSchemaLocation()); - imp.setDefinition(defn); - imp.setNamespaceURI(ns.getURI()); + while (st.hasMoreTokens()) { + String location=st.nextToken(); + IFile file=cdmResource.getParent().getFile(new Path(location)); - if (file.exists()) { - IPath relative=file.getFullPath().makeRelativeTo(wsdlFolderPath); - imp.setLocationURI(relative.toPortableString()); - } else { - imp.setLocationURI(location); + org.w3c.dom.Element imp=doc.createElementNS("http://www.w3.org/2001/XMLSchema", + "import"); + + imp.setAttribute("namespace", ns.getURI()); + + if (file.exists()) { + IPath relative=file.getFullPath().makeRelativeTo(wsdlFolderPath); + imp.setAttribute("schemaLocation", relative.toPortableString()); + } else { + imp.setAttribute("schemaLocation", location); + } + + schema.appendChild(imp); } - - defns.get(0).addImport(imp); } } + + defnElem.insertBefore(types, defnElem.getFirstChild()); } + + // Create bytearray from DOM + java.io.ByteArrayOutputStream xmlstr= + new java.io.ByteArrayOutputStream(); + + DOMSource source=new DOMSource(); + source.setNode(doc); + + StreamResult result=new StreamResult(xmlstr); + + Transformer trans= + TransformerFactory.newInstance().newTransformer(); + trans.transform(source, result); + + xmlstr.close(); + + b = XMLUtils.format(new String(xmlstr.toByteArray())).getBytes(); } - java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); - - writer.writeWSDL(defn, baos); - - byte[] b=baos.toByteArray(); - - baos.close(); - IPath wsdlPath=wsdlFolderPath.append(filename); IFile wsdlFile=cdmResource.getProject().getWorkspace().getRoot().getFile(wsdlPath); Added: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/XMLUtils.java =================================================================== --- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/XMLUtils.java (rev 0) +++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/XMLUtils.java 2010-08-13 12:58:07 UTC (rev 347) @@ -0,0 +1,300 @@ +/* + * 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.jboss.savara.tools.wsdl.util; + +import java.io.ByteArrayOutputStream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.scribble.model.ModelObject; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +/** + * This class defines a set of XML related utility functions. + */ +public final class XMLUtils { + + private static final String NS_LABEL = "ns"; + + /** + * This class converts a DOM representation node to text. + * @param node + * @return + * @throws Exception + */ + public static final String toText(Node node) throws Exception { + String ret = null; + try { + // Transform the DOM represent to text + ByteArrayOutputStream xmlstr= new ByteArrayOutputStream(); + DOMSource source=new DOMSource(node); + //source.setNode(node); + + StreamResult result=new StreamResult(xmlstr); + Transformer trans= TransformerFactory.newInstance().newTransformer(); + trans.transform(source, result); + + xmlstr.close(); + + ret = new String(xmlstr.toByteArray()); + + if ((node instanceof Document) == false) { + // Strip off any <?xml> header + int index=ret.indexOf("<?xml"); + if (index != -1) { + index = ret.indexOf("<", 1); + if (index != -1) { + ret = ret.substring(index); + } else { + index = ret.indexOf("?>"); + if (index != -1) { + index += 2; + + // Remove any trailing whitespaces after XML header + while (index < ret.length() && + Character.isWhitespace(ret.charAt(index))) { + index++; + } + + ret = ret.substring(index); + } + } + } + } + + } catch(Exception e) { + throw new Exception("Failed to transform DOM representation into text", e); + } + if (ret != null) { + return format(ret); + } + return ret; + } + + + /** + * Format the xml to well print. + * + * @param xmltext + * @return + */ + public static final String format(String xmltext) { + String ret=xmltext; + int pos=0; + int prevpos=0; + StringBuffer buf=new StringBuffer(); + int level=0; + + while ((pos=ret.indexOf('<', prevpos)) != -1) { + + if (prevpos < pos && + ret.substring(prevpos, pos).trim().length() > 0 && + ret.charAt(prevpos-1) != '?') { + + if (ret.charAt(prevpos) == '\r' && + ret.charAt(prevpos+1) == '\n') { + prevpos += 2; + } + for (int i=0; i < level; i++) { + buf.append(" "); + } + + buf.append(ret.substring(prevpos, pos).trim()); + buf.append("\r\n"); + } + + int endpos=ret.indexOf('>', pos); + + if (endpos > 0) { + boolean noreturn=false; + + if (pos > 0 && ret.charAt(pos+1) == '/') { + level--; + } + + for (int i=0; i < level; i++) { + buf.append(" "); + } + buf.append(ret.substring(pos, endpos+1)); + + if (ret.charAt(endpos-1)== '?') { + //noreturn = true; + + } else if (ret.charAt(endpos-1) == '/') { + // Ignore + } else if (pos > 0 && ret.charAt(pos+1) == '/') { + // Ignore + + } else if (pos > 0 && ret.charAt(pos+1) == '!') { + // Ignore + + } else { + level++; + } + + if (noreturn == false) { + buf.append("\r\n"); + } + + pos = endpos+1; + } + + prevpos = pos; + } + + if (prevpos != -1 && + ret.substring(prevpos).trim().length() > 0) { + buf.append(ret.substring(prevpos)); + } + + ret = buf.toString(); + + return(ret); + } + + public static Node getNode(String text) throws Exception { + Node ret=null; + + // Transform the text representation to DOM + DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance(); + fact.setNamespaceAware(true); + + java.io.InputStream xmlstr= + new java.io.ByteArrayInputStream(text.getBytes()); + + DocumentBuilder builder=fact.newDocumentBuilder(); + org.w3c.dom.Document doc=builder.parse(xmlstr); + + ret = doc.getDocumentElement(); + + return(ret); + } + + /** + * This method returns the localname part of the supplied + * qualified name. + * + * @param qname The qualified name + * @return The localname part + */ + public static String getLocalname(String qname) { + String ret=qname; + int pos=0; + + if (qname != null && ((pos=qname.indexOf(':')) != -1)) { + ret = qname.substring(pos+1); + } + + return(ret); + } + + /** + * This method returns the prefix associated with the supplied namespace. + * + * @param namespace The namespace + * @param nsMap The existing namespace prefix mappings + * @return The prefix + */ + public static String getPrefix(String namespace, java.util.Map<String,String> nsMap) { + String prefix=null; + + prefix = nsMap.get(namespace); + + if (prefix == null) { + prefix = NS_LABEL+(nsMap.size()+1); + nsMap.put(namespace, prefix); + } + + return(prefix); + } + + /** + * This method calculates the start and end position of a supplied DOM element, within + * the supplied text contents, and sets the values on the supplied ModelObject. + * + * @param obj The ModelObject to be initialized + * @param contents The text contents + * @param elem The DOM element to be located in the text + */ + public static void setStartAndEndPosition(ModelObject obj, String contents, org.w3c.dom.Element elem) { + + if (contents != null) { + org.w3c.dom.NodeList nl=elem.getOwnerDocument().getElementsByTagName(elem.getNodeName()); + int elempos=-1; + + for (int i=0; elempos == -1 && i < nl.getLength(); i++) { + if (nl.item(i) == elem) { + elempos = i; + } + } + + if (elempos != -1) { + int startpos=-1; + + for (int i=0; i <= elempos; i++) { + int val1=contents.indexOf("<"+elem.getNodeName()+">", startpos+1); + int val2=contents.indexOf("<"+elem.getNodeName()+" ", startpos+1); + + if (val1 == -1 && val2 != -1) { + startpos = val2; + } else if (val1 != -1 && val2 == -1) { + startpos = val1; + } else if (val1 == -1 && val2 == -1) { + // TODO: Error condition + break; + } else if (val1 > val2) { + startpos = val2; + } else { + startpos = val1; + } + } + + if (startpos != -1) { + obj.getSource().setStartPosition(startpos); + + // Check if single node + int p1=contents.indexOf('>', startpos); + + if (p1 != -1 && contents.charAt(p1-1) == '/') { + obj.getSource().setEndPosition(p1); + } else { + + org.w3c.dom.NodeList enl=elem.getElementsByTagName(elem.getNodeName()); + + int endpos=startpos; + String nodetxt="</"+elem.getNodeName()+">"; + + for (int i=0; endpos != -1 && i <= enl.getLength(); i++) { + endpos = contents.indexOf(nodetxt, endpos+1); + } + + if (endpos != -1) { + obj.getSource().setEndPosition(endpos+nodetxt.length()-1); + } + } + } + } + } + } +} Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-06 08:42:06 UTC (rev 346) +++ trunk/pom.xml 2010-08-13 12:58:07 UTC (rev 347) @@ -160,6 +160,17 @@ <updatePolicy>never</updatePolicy> </snapshots> </repository> + <repository> + <id>pi4soa</id> + <url>http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/jbosstools...</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> </repositories> <distributionManagement> Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-08-06 08:42:06 UTC (rev 346) +++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-08-13 12:58:07 UTC (rev 347) @@ -323,6 +323,7 @@ } String filename=getWSDLFileName(role, localcm.getModelName().getName(), num); + byte[] b=null; if (i > 0) { javax.wsdl.Import imp=defns.get(0).createImport(); @@ -332,19 +333,39 @@ imp.setLocationURI(filename); defns.get(0).addImport(imp); + + java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); + + writer.writeWSDL(defn, baos); + + b = baos.toByteArray(); + + baos.close(); + } else { + org.w3c.dom.Document doc=writer.getDocument(defn); + importSchemas(cdmResource, contract, bpelFolderPath, - defn, defns.get(0)); + doc); + + // Create bytearray from DOM + java.io.ByteArrayOutputStream xmlstr= + new java.io.ByteArrayOutputStream(); + + DOMSource source=new DOMSource(); + source.setNode(doc); + + StreamResult result=new StreamResult(xmlstr); + + Transformer trans= + TransformerFactory.newInstance().newTransformer(); + trans.transform(source, result); + + xmlstr.close(); + + b = XMLUtils.format(new String(xmlstr.toByteArray())).getBytes(); } - java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); - - writer.writeWSDL(defn, baos); - - byte[] b=baos.toByteArray(); - - baos.close(); - IPath wsdlPath=bpelFolderPath.append(filename); IFile wsdlFile=proj.getProject().getWorkspace().getRoot().getFile(wsdlPath); @@ -364,42 +385,61 @@ } protected void importSchemas(IFile cdmResource, Contract contract, - IPath bpelFolderPath, javax.wsdl.Definition defn, - javax.wsdl.Definition firstDefn) throws Exception { + IPath bpelFolderPath, org.w3c.dom.Document doc) throws Exception { - // Generate imports for specified message schema - for (Namespace ns : contract.getNamespaces()) { + // NOTE: Unfortunate workaround due to issue with WSDLWriter not + // generating output for extensible elements created to represent + // the xsd:schema/xsd:import elements. So instead had to obtain + // the DOM document and insert the relevant elements. + + if (contract.getNamespaces().size() > 0) { + org.w3c.dom.Element defnElem=doc.getDocumentElement(); - if (ns.getSchemaLocation() != null && - ns.getSchemaLocation().trim().length() > 0) { + // Added types node + org.w3c.dom.Element types=doc.createElementNS("http://schemas.xmlsoap.org/wsdl/", + "types"); + + org.w3c.dom.Element schema=doc.createElementNS("http://www.w3.org/2001/XMLSchema", + "schema"); + + types.appendChild(schema); + + // Generate imports for specified message schema + for (Namespace ns : contract.getNamespaces()) { - java.util.StringTokenizer st=new java.util.StringTokenizer(ns.getSchemaLocation()); - - while (st.hasMoreTokens()) { - String location=st.nextToken(); - IFile file=cdmResource.getParent().getFile(new Path(location)); + if (ns.getSchemaLocation() != null && + ns.getSchemaLocation().trim().length() > 0) { + + java.util.StringTokenizer st=new java.util.StringTokenizer(ns.getSchemaLocation()); - javax.wsdl.Import imp=firstDefn.createImport(); + while (st.hasMoreTokens()) { + String location=st.nextToken(); + IFile file=cdmResource.getParent().getFile(new Path(location)); - imp.setDefinition(defn); - imp.setNamespaceURI(ns.getURI()); - - if (file.exists()) { - imp.setLocationURI(file.getProjectRelativePath().toPortableString()); + org.w3c.dom.Element imp=doc.createElementNS("http://www.w3.org/2001/XMLSchema", + "import"); - // Copy schema file into generated BPEL project - IPath artifactPath=bpelFolderPath.append(file.getProjectRelativePath()); + imp.setAttribute("namespace", ns.getURI()); - IFile artifactFile=cdmResource.getProject().getWorkspace().getRoot().getFile(artifactPath); + if (file.exists()) { + imp.setAttribute("schemaLocation", file.getProjectRelativePath().toPortableString()); - copySchema(file, artifactFile, bpelFolderPath); - } else { - imp.setLocationURI(location); + // Copy schema file into generated BPEL project + IPath artifactPath=bpelFolderPath.append(file.getProjectRelativePath()); + + IFile artifactFile=cdmResource.getProject().getWorkspace().getRoot().getFile(artifactPath); + + copySchema(file, artifactFile, bpelFolderPath); + } else { + imp.setAttribute("schemaLocation", location); + } + + schema.appendChild(imp); } - - firstDefn.addImport(imp); } } + + defnElem.insertBefore(types, defnElem.getFirstChild()); } } Modified: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-08-06 08:42:06 UTC (rev 346) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-08-13 12:58:07 UTC (rev 347) @@ -32,7 +32,13 @@ import org.eclipse.ui.IWorkbenchPart; import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; import org.jboss.savara.tools.wsdl.generator.soap.*; +import org.jboss.savara.tools.wsdl.util.XMLUtils; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.jboss.savara.contract.model.Contract; import org.jboss.savara.contract.model.Interface; import org.jboss.savara.contract.model.Namespace; @@ -163,6 +169,8 @@ // Check if definition has a port type if (defn.getPortTypes().size() > 0 || defn.getMessages().size() > 0 || (f_hasMEP && defn.getServices().size() > 0)) { + byte[] b=null; // Bytes to write out + String num=""; if (i > 0) { num += i; @@ -177,47 +185,87 @@ imp.setNamespaceURI(defn.getTargetNamespace()); imp.setLocationURI(filename); - defns.get(0).addImport(imp); + defns.get(0).addImport(imp); + + java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); + + writer.writeWSDL(defn, baos); + + b=baos.toByteArray(); + + baos.close(); + } else { - - // Generate imports for specified message schema - for (Namespace ns : contract.getNamespaces()) { + + // NOTE: Unfortunate workaround due to issue with WSDLWriter not + // generating output for extensible elements created to represent + // the xsd:schema/xsd:import elements. So instead had to obtain + // the DOM document and insert the relevant elements. + + org.w3c.dom.Document doc=writer.getDocument(defn); + + if (contract.getNamespaces().size() > 0) { + org.w3c.dom.Element defnElem=doc.getDocumentElement(); - if (ns.getSchemaLocation() != null && - ns.getSchemaLocation().trim().length() > 0) { - - java.util.StringTokenizer st=new java.util.StringTokenizer(ns.getSchemaLocation()); + // Added types node + org.w3c.dom.Element types=doc.createElementNS("http://schemas.xmlsoap.org/wsdl/", + "types"); + + org.w3c.dom.Element schema=doc.createElementNS("http://www.w3.org/2001/XMLSchema", + "schema"); + + types.appendChild(schema); + + // Generate imports for specified message schema + for (Namespace ns : contract.getNamespaces()) { - while (st.hasMoreTokens()) { - String location=st.nextToken(); - IFile file=cdmResource.getParent().getFile(new Path(location)); - - javax.wsdl.Import imp=defns.get(0).createImport(); + if (ns.getSchemaLocation() != null && + ns.getSchemaLocation().trim().length() > 0) { + + java.util.StringTokenizer st=new java.util.StringTokenizer(ns.getSchemaLocation()); - imp.setDefinition(defn); - imp.setNamespaceURI(ns.getURI()); + while (st.hasMoreTokens()) { + String location=st.nextToken(); + IFile file=cdmResource.getParent().getFile(new Path(location)); - if (file.exists()) { - IPath relative=file.getFullPath().makeRelativeTo(wsdlFolderPath); - imp.setLocationURI(relative.toPortableString()); - } else { - imp.setLocationURI(location); + org.w3c.dom.Element imp=doc.createElementNS("http://www.w3.org/2001/XMLSchema", + "import"); + + imp.setAttribute("namespace", ns.getURI()); + + if (file.exists()) { + IPath relative=file.getFullPath().makeRelativeTo(wsdlFolderPath); + imp.setAttribute("schemaLocation", relative.toPortableString()); + } else { + imp.setAttribute("schemaLocation", location); + } + + schema.appendChild(imp); } - - defns.get(0).addImport(imp); } } + + defnElem.insertBefore(types, defnElem.getFirstChild()); } + + // Create bytearray from DOM + java.io.ByteArrayOutputStream xmlstr= + new java.io.ByteArrayOutputStream(); + + DOMSource source=new DOMSource(); + source.setNode(doc); + + StreamResult result=new StreamResult(xmlstr); + + Transformer trans= + TransformerFactory.newInstance().newTransformer(); + trans.transform(source, result); + + xmlstr.close(); + + b = XMLUtils.format(new String(xmlstr.toByteArray())).getBytes(); } - java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); - - writer.writeWSDL(defn, baos); - - byte[] b=baos.toByteArray(); - - baos.close(); - IPath wsdlPath=wsdlFolderPath.append(filename); IFile wsdlFile=cdmResource.getProject().getWorkspace().getRoot().getFile(wsdlPath); Added: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/XMLUtils.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/XMLUtils.java (rev 0) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/XMLUtils.java 2010-08-13 12:58:07 UTC (rev 347) @@ -0,0 +1,300 @@ +/* + * 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.jboss.savara.tools.wsdl.util; + +import java.io.ByteArrayOutputStream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.scribble.model.ModelObject; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + +/** + * This class defines a set of XML related utility functions. + */ +public final class XMLUtils { + + private static final String NS_LABEL = "ns"; + + /** + * This class converts a DOM representation node to text. + * @param node + * @return + * @throws Exception + */ + public static final String toText(Node node) throws Exception { + String ret = null; + try { + // Transform the DOM represent to text + ByteArrayOutputStream xmlstr= new ByteArrayOutputStream(); + DOMSource source=new DOMSource(node); + //source.setNode(node); + + StreamResult result=new StreamResult(xmlstr); + Transformer trans= TransformerFactory.newInstance().newTransformer(); + trans.transform(source, result); + + xmlstr.close(); + + ret = new String(xmlstr.toByteArray()); + + if ((node instanceof Document) == false) { + // Strip off any <?xml> header + int index=ret.indexOf("<?xml"); + if (index != -1) { + index = ret.indexOf("<", 1); + if (index != -1) { + ret = ret.substring(index); + } else { + index = ret.indexOf("?>"); + if (index != -1) { + index += 2; + + // Remove any trailing whitespaces after XML header + while (index < ret.length() && + Character.isWhitespace(ret.charAt(index))) { + index++; + } + + ret = ret.substring(index); + } + } + } + } + + } catch(Exception e) { + throw new Exception("Failed to transform DOM representation into text", e); + } + if (ret != null) { + return format(ret); + } + return ret; + } + + + /** + * Format the xml to well print. + * + * @param xmltext + * @return + */ + public static final String format(String xmltext) { + String ret=xmltext; + int pos=0; + int prevpos=0; + StringBuffer buf=new StringBuffer(); + int level=0; + + while ((pos=ret.indexOf('<', prevpos)) != -1) { + + if (prevpos < pos && + ret.substring(prevpos, pos).trim().length() > 0 && + ret.charAt(prevpos-1) != '?') { + + if (ret.charAt(prevpos) == '\r' && + ret.charAt(prevpos+1) == '\n') { + prevpos += 2; + } + for (int i=0; i < level; i++) { + buf.append(" "); + } + + buf.append(ret.substring(prevpos, pos).trim()); + buf.append("\r\n"); + } + + int endpos=ret.indexOf('>', pos); + + if (endpos > 0) { + boolean noreturn=false; + + if (pos > 0 && ret.charAt(pos+1) == '/') { + level--; + } + + for (int i=0; i < level; i++) { + buf.append(" "); + } + buf.append(ret.substring(pos, endpos+1)); + + if (ret.charAt(endpos-1)== '?') { + //noreturn = true; + + } else if (ret.charAt(endpos-1) == '/') { + // Ignore + } else if (pos > 0 && ret.charAt(pos+1) == '/') { + // Ignore + + } else if (pos > 0 && ret.charAt(pos+1) == '!') { + // Ignore + + } else { + level++; + } + + if (noreturn == false) { + buf.append("\r\n"); + } + + pos = endpos+1; + } + + prevpos = pos; + } + + if (prevpos != -1 && + ret.substring(prevpos).trim().length() > 0) { + buf.append(ret.substring(prevpos)); + } + + ret = buf.toString(); + + return(ret); + } + + public static Node getNode(String text) throws Exception { + Node ret=null; + + // Transform the text representation to DOM + DocumentBuilderFactory fact=DocumentBuilderFactory.newInstance(); + fact.setNamespaceAware(true); + + java.io.InputStream xmlstr= + new java.io.ByteArrayInputStream(text.getBytes()); + + DocumentBuilder builder=fact.newDocumentBuilder(); + org.w3c.dom.Document doc=builder.parse(xmlstr); + + ret = doc.getDocumentElement(); + + return(ret); + } + + /** + * This method returns the localname part of the supplied + * qualified name. + * + * @param qname The qualified name + * @return The localname part + */ + public static String getLocalname(String qname) { + String ret=qname; + int pos=0; + + if (qname != null && ((pos=qname.indexOf(':')) != -1)) { + ret = qname.substring(pos+1); + } + + return(ret); + } + + /** + * This method returns the prefix associated with the supplied namespace. + * + * @param namespace The namespace + * @param nsMap The existing namespace prefix mappings + * @return The prefix + */ + public static String getPrefix(String namespace, java.util.Map<String,String> nsMap) { + String prefix=null; + + prefix = nsMap.get(namespace); + + if (prefix == null) { + prefix = NS_LABEL+(nsMap.size()+1); + nsMap.put(namespace, prefix); + } + + return(prefix); + } + + /** + * This method calculates the start and end position of a supplied DOM element, within + * the supplied text contents, and sets the values on the supplied ModelObject. + * + * @param obj The ModelObject to be initialized + * @param contents The text contents + * @param elem The DOM element to be located in the text + */ + public static void setStartAndEndPosition(ModelObject obj, String contents, org.w3c.dom.Element elem) { + + if (contents != null) { + org.w3c.dom.NodeList nl=elem.getOwnerDocument().getElementsByTagName(elem.getNodeName()); + int elempos=-1; + + for (int i=0; elempos == -1 && i < nl.getLength(); i++) { + if (nl.item(i) == elem) { + elempos = i; + } + } + + if (elempos != -1) { + int startpos=-1; + + for (int i=0; i <= elempos; i++) { + int val1=contents.indexOf("<"+elem.getNodeName()+">", startpos+1); + int val2=contents.indexOf("<"+elem.getNodeName()+" ", startpos+1); + + if (val1 == -1 && val2 != -1) { + startpos = val2; + } else if (val1 != -1 && val2 == -1) { + startpos = val1; + } else if (val1 == -1 && val2 == -1) { + // TODO: Error condition + break; + } else if (val1 > val2) { + startpos = val2; + } else { + startpos = val1; + } + } + + if (startpos != -1) { + obj.getSource().setStartPosition(startpos); + + // Check if single node + int p1=contents.indexOf('>', startpos); + + if (p1 != -1 && contents.charAt(p1-1) == '/') { + obj.getSource().setEndPosition(p1); + } else { + + org.w3c.dom.NodeList enl=elem.getElementsByTagName(elem.getNodeName()); + + int endpos=startpos; + String nodetxt="</"+elem.getNodeName()+">"; + + for (int i=0; endpos != -1 && i <= enl.getLength(); i++) { + endpos = contents.indexOf(nodetxt, endpos+1); + } + + if (endpos != -1) { + obj.getSource().setEndPosition(endpos+nodetxt.length()-1); + } + } + } + } + } + } +} Modified: trunk/validators/jbossesb/pom.xml =================================================================== --- trunk/validators/jbossesb/pom.xml 2010-08-06 08:42:06 UTC (rev 346) +++ trunk/validators/jbossesb/pom.xml 2010-08-13 12:58:07 UTC (rev 347) @@ -31,24 +31,26 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.savara.dependencies.pi4soa</groupId> - <artifactId>pi4soa-common</artifactId> - <version>3.1.0.M1</version> + <groupId>org.jboss.tools</groupId> + <artifactId>org.pi4soa.common</artifactId> + <version>3.1.0</version>  </dependency> <dependency> - <groupId>org.jboss.savara.dependencies.pi4soa</groupId> - <artifactId>pi4soa-cdl</artifactId> - <version>3.1.0.M1</version> + <groupId>org.jboss.tools</groupId> + <artifactId>org.pi4soa.cdl</artifactId> + <version>3.1.0</version> + <type>eclipse-plugin</type>  </dependency> <dependency> - <groupId>org.jboss.savara.dependencies.pi4soa</groupId> - <artifactId>pi4soa-service</artifactId> - <version>3.1.0.M1</version> + <groupId>org.jboss.tools</groupId> + <artifactId>org.pi4soa.service</artifactId> + <version>3.1.0.v20100727-0348-H31-M1</version> + <type>eclipse-plugin</type>  </dependency> - + <dependency> <groupId>org.jboss.savara.dependencies.eclipse</groupId> <artifactId>emf-common</artifactId>

15 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

savara-commits August 2010