9:04 a.m.
Folks,
thanks to the input from Stewart I could resolve the blocking osgi issue
that caused error logs at framework activation and failing test
deployments. [AS7-5365] Intermittent failure due to missing OSGi service
<https://issues.jboss.org/browse/AS7-5365>
I rebased the large set of functionality and bug fixes on top of that.
Could you please review and get back to me if there should be any issues.
[AS7-5405 <https://github.com/jbossas/jboss-as/pull/2992>] Initial
Enterprise OSGi JPA implementation
[AS7-5139 <https://github.com/jbossas/jboss-as/pull/2998>] Allow
@Resource injection for OSGi components
[AS7-5486 <https://github.com/jbossas/jboss-as/pull/3036>] Cannot access
resources from OSGi WebApp with *.jar extension
[AS7-5481 <https://github.com/jbossas/jboss-as/pull/3001>] No web
context created for OSGi WebApp with *.jar extension
[AS7-5453 <https://github.com/jbossas/jboss-as/pull/2999>] Server
restart fails with persistent WAB deployment
[AS7-5469 <https://github.com/jbossas/jboss-as/pull/2990>] Initial
capabilities may not resolve
[AS7-5066 <https://github.com/jbossas/jboss-as/pull/2987>] Allow REST
deployments as OSGi bundles
[AS7-5430 <https://github.com/jbossas/jboss-as/pull/2986>] Add support
for Bundle redeployment
[AS7-5364 <https://github.com/jbossas/jboss-as/pull/2981>] Allow
WebService deployments as OSGi bundles
cheers
--thomas
PS: For some PRs GitHub lists commits that are already in master, which
makes it difficult to see the real diff.
9:05 a.m.
On 09/18/2012 09:04 AM, Thomas Diesler wrote:
PS: For some PRs GitHub lists commits that are already in master,
which
makes it difficult to see the real diff.
It should not do this if you're properly rebased. Chances are if it's
showing already-merged commits then a merge cannot happen cleanly and a
rebase/cleanup is needed anyway.
--
- DML
2:15 p.m.
I know it should not, but if you look at the sha1 values in
https://github.com/jbossas/jboss-as/pull/2992/commits
you'll see that my commits are a fast forward on the current master.
I've seen this before and AFAIR it goes away when I rebase on the next
commit to master.
On 09/18/2012 04:05 PM, David M. Lloyd wrote:
On 09/18/2012 09:04 AM, Thomas Diesler wrote:
> PS: For some PRs GitHub lists commits that are already in master, which
> makes it difficult to see the real diff.
It should not do this if you're properly rebased. Chances are if it's
showing already-merged commits then a merge cannot happen cleanly and a
rebase/cleanup is needed anyway.
--
xxxxxxxxxxxxxxxxxxxxxxxxxxxx
Thomas Diesler
JBoss OSGi Lead
JBoss, a division of Red Hat
xxxxxxxxxxxxxxxxxxxxxxxxxxxx
2:34 p.m.
I rebased on the previous master commit - that fixed it too.
On 09/18/2012 09:15 PM, Thomas Diesler wrote:
I know it should not, but if you look at the sha1 values in
https://github.com/jbossas/jboss-as/pull/2992/commits
you'll see that my commits are a fast forward on the current master.
I've seen this before and AFAIR it goes away when I rebase on the next
commit to master.
On 09/18/2012 04:05 PM, David M. Lloyd wrote:
> On 09/18/2012 09:04 AM, Thomas Diesler wrote:
>> PS: For some PRs GitHub lists commits that are already in master, which
>> makes it difficult to see the real diff.
> It should not do this if you're properly rebased. Chances are if it's
> showing already-merged commits then a merge cannot happen cleanly and a
> rebase/cleanup is needed anyway.
>
>
--
xxxxxxxxxxxxxxxxxxxxxxxxxxxx
Thomas Diesler
JBoss OSGi Lead
JBoss, a division of Red Hat
xxxxxxxxxxxxxxxxxxxxxxxxxxxx
4479
days inactive
4479
days old
3 comments
2 participants
participants (2)
-
David M. Lloyd -
Thomas Diesler