Merge dluebke's branch and main branch

8 views
Skip to first unread message

Daniel Lübke

unread,
Mar 25, 2013, 1:43:31 PM3/25/13
to bpel...@googlegroups.com
Hi all,

I have now merged my changes back with the 1.6.2-SNAPSHOT branch. You can find them in my repo [1]
  • Many small improvements in the core framework (tidy up work)
  • Removal of the coverage measurement facilities (this might be too early but they had many strange dependencies so they really hindered code clean-up)
  • Addition of first coverage code. This is not working yet.
  • Small improvements in the Eclipse Tools:
    • Run profiles can now reference test cases
    • You can run a test case from within the test suite editor

If there are no objections I will merge this into the main repo by end of this week.

Regards,

Daniel

[1] https://github.com/dluebke/BPELUnit

Antonio García Domínguez

unread,
Mar 26, 2013, 7:33:41 AM3/26/13
to bpel...@googlegroups.com
Hi Daniel,

I've successfully merged your master branch with mine with no issues and I'm running the test cases now. It looks good to me, except for two little things:

- Why is the util module now a regular jar, instead of an OSGi bundle? Did you run into any issues with it? I'm checking if it won't affect us for the Tycho builds now.

- The CHANGES.markdown file doesn't seem to reflect any of your changes. Could you add a brief summary of your changes there?

By the way, Alejandro Acosta (the student who is working on the template-related UI for the Eclipse .bpts editor) is still adding more features. After he's done with the <setUp> blocks, I'll urge him to clean up his commits and push them, so we can have a look at them and hopefully pull them in.

Regards,
Antonio



--
Sie haben diese Nachricht erhalten, weil Sie der Google Groups-Gruppe BPELUnit beigetreten sind.
Um Ihr Abonnement für diese Gruppe zu beenden und keine E-Mails mehr von dieser Gruppe zu erhalten, senden Sie eine Email an bpelunit+u...@googlegroups.com.
Weitere Optionen: https://groups.google.com/groups/opt_out
 
 

Antonio García Domínguez

unread,
Mar 26, 2013, 8:13:17 AM3/26/13
to bpel...@googlegroups.com
Hi Daniel,

By the way, we should really agree on a build environment for the plugins, as it's getting a bit confusing. Should we use maven-eclipse-plugin, or m2e? If we use m2e, we'll probably need to add the lifecycle mapping bits to our .pom files to avoid issues.

Regards,
Antonio

Daniel Lübke

unread,
Mar 26, 2013, 6:05:40 PM3/26/13
to bpel...@googlegroups.com


Am Dienstag, 26. März 2013 12:33:41 UTC+1 schrieb Antonio García Domínguez:
Hi Daniel,

I've successfully merged your master branch with mine with no issues and I'm running the test cases now. It looks good to me, except for two little things:

- Why is the util module now a regular jar, instead of an OSGi bundle? Did you run into any issues with it? I'm checking if it won't affect us for the Tycho builds now.

There are no shared objects between the different OSGi bundles as these are simply utility methods. So I thought it would be cleaner to have it as a standard JAR. However, I did this because I had many problems getting the Tycho build right and as part of it I did this. But we can change this back if needed or is wanted.
 

- The CHANGES.markdown file doesn't seem to reflect any of your changes. Could you add a brief summary of your changes there?

Sorry, I forgot this. Added the changes and pushed them to my repo.


By the way, Alejandro Acosta (the student who is working on the template-related UI for the Eclipse .bpts editor) is still adding more features. After he's done with the <setUp> blocks, I'll urge him to clean up his commits and push them, so we can have a look at them and hopefully pull them in.


That would be great. I'd like to have/implement support for the src-attribute in send activities. Therefore, I should start the implementation on top of this merge.
 
Regards,
Daniel

Daniel Lübke

unread,
Mar 26, 2013, 6:07:57 PM3/26/13
to bpel...@googlegroups.com
Hi,

yes, that we should do - together with a short info on how to set this up. I thought I'd try m2e because I had different project names than you have (net.bpelunit.* vs. *). But I am not really satisfied with m2e for Eclipse plug-ins so we should stay on the maven-eclipse-plugin but should make sure that we can check out all projects, go through a step-by-step guide and have a clean and defined workspace.

Regards,
Daniel

Antonio García Domínguez

unread,
Mar 29, 2013, 11:16:54 AM3/29/13
to bpel...@googlegroups.com
Hi Daniel,

I'm fixing a few classpath issues that appeared after the merge. It seems the m2e switch messed up quite a few of the .classpath and .project files, and that XMLBeans does not like having .xsd in several projects at the same time. I'm moving all the .xsd files into a single module, so we won't have ugly OSGi classloader issues later on.

Regards,
Antonio


--

Antonio García Domínguez

unread,
Mar 29, 2013, 1:54:08 PM3/29/13
to bpel...@googlegroups.com
Hi Daniel,

I've pushed a few commits to bluezio/master that get compilation working again for everything, after the merge. I've also updated the README.markdown and added a few helper scripts to automate the basic builds. Could you try it out?

You should follow these steps:

- fetch bluezio/master
- git checkout bluezio/mastere
- make sure you have a clean working directory with "git clean -xdf && git checkout ." (no untracked/ignored files and no local changes)
- run ./prepare-eclipse-projects.sh
- import all the BPELUnit projects into a new workspace

BTW, in the end I didn't have to create a separate project for all XSD files. I did have to fix a few clashes between net.bpelunit.framework and net.bpelunit.framework.coverage (exported too many packages and had a wrong plugin id). I've also removed all the cruft from M2E and discouraged its use in the README.markdown file, for the record.

Regards,
Antonio


Daniel Lübke

unread,
Apr 9, 2013, 9:40:47 AM4/9/13
to bpel...@googlegroups.com
Hi Antonio,

I tried out your changes and interestingly with an old Eclipse version I still got the wrong project names. But with the current version this does not happen so I can check out your branch, build and things are working. I added a .bat file that can be used on Windows systems.

Daniel

Antonio García Domínguez

unread,
Apr 9, 2013, 10:33:23 AM4/9/13
to bpel...@googlegroups.com
Hi Daniel,

That's great :-). Please push your changes to bpelunit/master when they're ready, so we can all continue working from the same commits.

Best regards,
Antonio




Daniel

--

Daniel Lübke

unread,
Apr 9, 2013, 10:38:30 AM4/9/13
to bpel...@googlegroups.com
Thanks for your effort!

Have you pushed your changes to bpelunit/master already?

Antonio García Domínguez

unread,
Apr 9, 2013, 12:14:49 PM4/9/13
to bpel...@googlegroups.com
Oops, forgot to do that! Done :-).

Daniel Lübke

unread,
Apr 9, 2013, 12:22:15 PM4/9/13
to bpel...@googlegroups.com
Windows .bat file is there. I also included mvn eclipse:eclipse in there. Additionally, the Maven build didn't work on Win32 without special JVM memory configuration which is included.
Reply all
Reply to author
Forward
0 new messages