You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/03/06 11:25:45 UTC
svn commit: r1297406 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Author: rmannibucau
Date: Tue Mar 6 10:25:45 2012
New Revision: 1297406
URL: http://svn.apache.org/viewvc?rev=1297406&view=rev
Log:
using webmodule as fallback if no module type was found
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1297406&r1=1297405&r2=1297406&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Tue Mar 6 10:25:45 2012
@@ -1531,6 +1531,12 @@ public class DeploymentLoader implements
return PersistenceModule.class;
}
+ // fallback -> webapp as in tomcat
+ final File pathFile = new File(path);
+ if (pathFile.exists() && pathFile.isDirectory()) {
+ return WebModule.class;
+ }
+
throw new UnknownModuleTypeException("Unknown module type: url=" + path); // baseUrl can be null
}
Re: svn commit: r1297406 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Posted by Romain Manni-Bucau <rm...@gmail.com>.
no test but how could it work? we should skip everything can be a pain.
like this it is easy and fine.
However i'm happy it you find sthg better.
- Romain
2012/3/9 David Blevins <da...@gmail.com>
>
> On Mar 9, 2012, at 1:47 AM, Romain Manni-Bucau wrote:
>
> > don't sure it is a bug,
> >
> > but was from a mail on the mailing list, tomcat deploys everything as a
> > webapp, not us (take an empty dir with a single index.html file). Was
> just
> > to keep the spirit "tomcat"
>
> For Tomcat specifically, we might want to simply catch the
> UnknownModuleTypeException and have it default to WebModule.
>
> Do we have anything in our own tests that can reproduce the reported issue?
>
>
> -David
>
> > 2012/3/9 David Blevins <da...@gmail.com>
> >
> >> Is there a bug associated with this?
> >>
> >> On Mar 6, 2012, at 4:25 AM, rmannibucau@apache.org wrote:
> >>
> >>> Author: rmannibucau
> >>> Date: Tue Mar 6 10:25:45 2012
> >>> New Revision: 1297406
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=1297406&view=rev
> >>> Log:
> >>> using webmodule as fallback if no module type was found
> >>>
> >>> Modified:
> >>>
> >>
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
> >>>
> >>> Modified:
> >>
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
> >>> URL:
> >>
> http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1297406&r1=1297405&r2=1297406&view=diff
> >>>
> >>
> ==============================================================================
> >>> ---
> >>
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
> >> (original)
> >>> +++
> >>
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
> >> Tue Mar 6 10:25:45 2012
> >>> @@ -1531,6 +1531,12 @@ public class DeploymentLoader implements
> >>> return PersistenceModule.class;
> >>> }
> >>>
> >>> + // fallback -> webapp as in tomcat
> >>> + final File pathFile = new File(path);
> >>> + if (pathFile.exists() && pathFile.isDirectory()) {
> >>> + return WebModule.class;
> >>> + }
> >>> +
> >>> throw new UnknownModuleTypeException("Unknown module type: url="
> >> + path); // baseUrl can be null
> >>> }
> >>>
> >>>
> >>>
> >>>
> >>
> >>
>
>
Re: svn commit: r1297406 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Posted by David Blevins <da...@gmail.com>.
On Mar 9, 2012, at 1:47 AM, Romain Manni-Bucau wrote:
> don't sure it is a bug,
>
> but was from a mail on the mailing list, tomcat deploys everything as a
> webapp, not us (take an empty dir with a single index.html file). Was just
> to keep the spirit "tomcat"
For Tomcat specifically, we might want to simply catch the UnknownModuleTypeException and have it default to WebModule.
Do we have anything in our own tests that can reproduce the reported issue?
-David
> 2012/3/9 David Blevins <da...@gmail.com>
>
>> Is there a bug associated with this?
>>
>> On Mar 6, 2012, at 4:25 AM, rmannibucau@apache.org wrote:
>>
>>> Author: rmannibucau
>>> Date: Tue Mar 6 10:25:45 2012
>>> New Revision: 1297406
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1297406&view=rev
>>> Log:
>>> using webmodule as fallback if no module type was found
>>>
>>> Modified:
>>>
>> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
>>>
>>> Modified:
>> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
>>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1297406&r1=1297405&r2=1297406&view=diff
>>>
>> ==============================================================================
>>> ---
>> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
>> (original)
>>> +++
>> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
>> Tue Mar 6 10:25:45 2012
>>> @@ -1531,6 +1531,12 @@ public class DeploymentLoader implements
>>> return PersistenceModule.class;
>>> }
>>>
>>> + // fallback -> webapp as in tomcat
>>> + final File pathFile = new File(path);
>>> + if (pathFile.exists() && pathFile.isDirectory()) {
>>> + return WebModule.class;
>>> + }
>>> +
>>> throw new UnknownModuleTypeException("Unknown module type: url="
>> + path); // baseUrl can be null
>>> }
>>>
>>>
>>>
>>>
>>
>>
Re: svn commit: r1297406 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Posted by Romain Manni-Bucau <rm...@gmail.com>.
don't sure it is a bug,
but was from a mail on the mailing list, tomcat deploys everything as a
webapp, not us (take an empty dir with a single index.html file). Was just
to keep the spirit "tomcat"
- Romain
2012/3/9 David Blevins <da...@gmail.com>
> Is there a bug associated with this?
>
> On Mar 6, 2012, at 4:25 AM, rmannibucau@apache.org wrote:
>
> > Author: rmannibucau
> > Date: Tue Mar 6 10:25:45 2012
> > New Revision: 1297406
> >
> > URL: http://svn.apache.org/viewvc?rev=1297406&view=rev
> > Log:
> > using webmodule as fallback if no module type was found
> >
> > Modified:
> >
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
> >
> > Modified:
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
> > URL:
> http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1297406&r1=1297405&r2=1297406&view=diff
> >
> ==============================================================================
> > ---
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
> (original)
> > +++
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
> Tue Mar 6 10:25:45 2012
> > @@ -1531,6 +1531,12 @@ public class DeploymentLoader implements
> > return PersistenceModule.class;
> > }
> >
> > + // fallback -> webapp as in tomcat
> > + final File pathFile = new File(path);
> > + if (pathFile.exists() && pathFile.isDirectory()) {
> > + return WebModule.class;
> > + }
> > +
> > throw new UnknownModuleTypeException("Unknown module type: url="
> + path); // baseUrl can be null
> > }
> >
> >
> >
> >
>
>
Re: svn commit: r1297406 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Posted by David Blevins <da...@gmail.com>.
Is there a bug associated with this?
On Mar 6, 2012, at 4:25 AM, rmannibucau@apache.org wrote:
> Author: rmannibucau
> Date: Tue Mar 6 10:25:45 2012
> New Revision: 1297406
>
> URL: http://svn.apache.org/viewvc?rev=1297406&view=rev
> Log:
> using webmodule as fallback if no module type was found
>
> Modified:
> openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
>
> Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
> URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1297406&r1=1297405&r2=1297406&view=diff
> ==============================================================================
> --- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
> +++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Tue Mar 6 10:25:45 2012
> @@ -1531,6 +1531,12 @@ public class DeploymentLoader implements
> return PersistenceModule.class;
> }
>
> + // fallback -> webapp as in tomcat
> + final File pathFile = new File(path);
> + if (pathFile.exists() && pathFile.isDirectory()) {
> + return WebModule.class;
> + }
> +
> throw new UnknownModuleTypeException("Unknown module type: url=" + path); // baseUrl can be null
> }
>
>
>
>