You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomee.apache.org by David Blevins <da...@gmail.com> on 2012/03/09 09:14:05 UTC
Re: svn commit: r1297405 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Also appears to just be a formatting change.
-David
On Mar 6, 2012, at 4:20 AM, rmannibucau@apache.org wrote:
> Author: rmannibucau
> Date: Tue Mar 6 10:20:08 2012
> New Revision: 1297405
>
> URL: http://svn.apache.org/viewvc?rev=1297405&view=rev
> Log:
> trying to guess the module is a webapp without WEB-INF folder
>
> Modified:
> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
>
> Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
> URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1297405&r1=1297404&r2=1297405&view=diff
> ==============================================================================
> --- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
> +++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Tue Mar 6 10:20:08 2012
> @@ -1052,11 +1052,11 @@ public class TomcatWebAppBuilder impleme
> * @param standardContext tomcat context instance
> * @return a openejb application module
> */
> - private AppModule loadApplication(StandardContext standardContext) {
> - ServletContext servletContext = standardContext.getServletContext();
> + private AppModule loadApplication(final StandardContext standardContext) {
> + final ServletContext servletContext = standardContext.getServletContext();
>
> - TomcatDeploymentLoader tomcatDeploymentLoader = new TomcatDeploymentLoader(standardContext, getId(standardContext));
> - AppModule appModule = null;
> + final TomcatDeploymentLoader tomcatDeploymentLoader = new TomcatDeploymentLoader(standardContext, getId(standardContext));
> + final AppModule appModule;
> try {
> appModule = tomcatDeploymentLoader.load(new File(servletContext.getRealPath(".")).getParentFile());
> } catch (OpenEJBException e) {
>
>
>
Re: svn commit: r1297405 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Posted by Romain Manni-Bucau <rm...@gmail.com>.
think was the "up arrow" of my keyboard ;)
- Romain
2012/3/9 David Blevins <da...@gmail.com>
> No worries. I've done that myself. Recently, in fact. For me it was
> that was the text already in the Intellij dialog box for committing and I
> clicked the "ok" button too quick.
>
> -David
>
> On Mar 9, 2012, at 2:17 AM, Romain Manni-Bucau wrote:
>
> > ok for this one
> >
> > can't remember why this comment was used :s
> >
> > - Romain
> >
> >
> > 2012/3/9 David Blevins <da...@gmail.com>
> >
> >> Also appears to just be a formatting change.
> >>
> >> -David
> >>
> >> On Mar 6, 2012, at 4:20 AM, rmannibucau@apache.org wrote:
> >>
> >>> Author: rmannibucau
> >>> Date: Tue Mar 6 10:20:08 2012
> >>> New Revision: 1297405
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=1297405&view=rev
> >>> Log:
> >>> trying to guess the module is a webapp without WEB-INF folder
> >>>
> >>> Modified:
> >>>
> >>
> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
> >>>
> >>> Modified:
> >>
> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
> >>> URL:
> >>
> http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1297405&r1=1297404&r2=1297405&view=diff
> >>>
> >>
> ==============================================================================
> >>> ---
> >>
> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
> >> (original)
> >>> +++
> >>
> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
> >> Tue Mar 6 10:20:08 2012
> >>> @@ -1052,11 +1052,11 @@ public class TomcatWebAppBuilder impleme
> >>> * @param standardContext tomcat context instance
> >>> * @return a openejb application module
> >>> */
> >>> - private AppModule loadApplication(StandardContext
> standardContext) {
> >>> - ServletContext servletContext =
> >> standardContext.getServletContext();
> >>> + private AppModule loadApplication(final StandardContext
> >> standardContext) {
> >>> + final ServletContext servletContext =
> >> standardContext.getServletContext();
> >>>
> >>> - TomcatDeploymentLoader tomcatDeploymentLoader = new
> >> TomcatDeploymentLoader(standardContext, getId(standardContext));
> >>> - AppModule appModule = null;
> >>> + final TomcatDeploymentLoader tomcatDeploymentLoader = new
> >> TomcatDeploymentLoader(standardContext, getId(standardContext));
> >>> + final AppModule appModule;
> >>> try {
> >>> appModule = tomcatDeploymentLoader.load(new
> >> File(servletContext.getRealPath(".")).getParentFile());
> >>> } catch (OpenEJBException e) {
> >>>
> >>>
> >>>
> >>
> >>
>
>
Re: svn commit: r1297405 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Posted by David Blevins <da...@gmail.com>.
No worries. I've done that myself. Recently, in fact. For me it was that was the text already in the Intellij dialog box for committing and I clicked the "ok" button too quick.
-David
On Mar 9, 2012, at 2:17 AM, Romain Manni-Bucau wrote:
> ok for this one
>
> can't remember why this comment was used :s
>
> - Romain
>
>
> 2012/3/9 David Blevins <da...@gmail.com>
>
>> Also appears to just be a formatting change.
>>
>> -David
>>
>> On Mar 6, 2012, at 4:20 AM, rmannibucau@apache.org wrote:
>>
>>> Author: rmannibucau
>>> Date: Tue Mar 6 10:20:08 2012
>>> New Revision: 1297405
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1297405&view=rev
>>> Log:
>>> trying to guess the module is a webapp without WEB-INF folder
>>>
>>> Modified:
>>>
>> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
>>>
>>> Modified:
>> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
>>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1297405&r1=1297404&r2=1297405&view=diff
>>>
>> ==============================================================================
>>> ---
>> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
>> (original)
>>> +++
>> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
>> Tue Mar 6 10:20:08 2012
>>> @@ -1052,11 +1052,11 @@ public class TomcatWebAppBuilder impleme
>>> * @param standardContext tomcat context instance
>>> * @return a openejb application module
>>> */
>>> - private AppModule loadApplication(StandardContext standardContext) {
>>> - ServletContext servletContext =
>> standardContext.getServletContext();
>>> + private AppModule loadApplication(final StandardContext
>> standardContext) {
>>> + final ServletContext servletContext =
>> standardContext.getServletContext();
>>>
>>> - TomcatDeploymentLoader tomcatDeploymentLoader = new
>> TomcatDeploymentLoader(standardContext, getId(standardContext));
>>> - AppModule appModule = null;
>>> + final TomcatDeploymentLoader tomcatDeploymentLoader = new
>> TomcatDeploymentLoader(standardContext, getId(standardContext));
>>> + final AppModule appModule;
>>> try {
>>> appModule = tomcatDeploymentLoader.load(new
>> File(servletContext.getRealPath(".")).getParentFile());
>>> } catch (OpenEJBException e) {
>>>
>>>
>>>
>>
>>
Re: svn commit: r1297405 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Posted by Romain Manni-Bucau <rm...@gmail.com>.
ok for this one
can't remember why this comment was used :s
- Romain
2012/3/9 David Blevins <da...@gmail.com>
> Also appears to just be a formatting change.
>
> -David
>
> On Mar 6, 2012, at 4:20 AM, rmannibucau@apache.org wrote:
>
> > Author: rmannibucau
> > Date: Tue Mar 6 10:20:08 2012
> > New Revision: 1297405
> >
> > URL: http://svn.apache.org/viewvc?rev=1297405&view=rev
> > Log:
> > trying to guess the module is a webapp without WEB-INF folder
> >
> > Modified:
> >
> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
> >
> > Modified:
> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
> > URL:
> http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1297405&r1=1297404&r2=1297405&view=diff
> >
> ==============================================================================
> > ---
> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
> (original)
> > +++
> openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
> Tue Mar 6 10:20:08 2012
> > @@ -1052,11 +1052,11 @@ public class TomcatWebAppBuilder impleme
> > * @param standardContext tomcat context instance
> > * @return a openejb application module
> > */
> > - private AppModule loadApplication(StandardContext standardContext) {
> > - ServletContext servletContext =
> standardContext.getServletContext();
> > + private AppModule loadApplication(final StandardContext
> standardContext) {
> > + final ServletContext servletContext =
> standardContext.getServletContext();
> >
> > - TomcatDeploymentLoader tomcatDeploymentLoader = new
> TomcatDeploymentLoader(standardContext, getId(standardContext));
> > - AppModule appModule = null;
> > + final TomcatDeploymentLoader tomcatDeploymentLoader = new
> TomcatDeploymentLoader(standardContext, getId(standardContext));
> > + final AppModule appModule;
> > try {
> > appModule = tomcatDeploymentLoader.load(new
> File(servletContext.getRealPath(".")).getParentFile());
> > } catch (OpenEJBException e) {
> >
> >
> >
>
>