You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/04/22 07:07:28 UTC

svn commit: r1328792 - /openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java

Author: dblevins
Date: Sun Apr 22 05:07:28 2012
New Revision: 1328792

URL: http://svn.apache.org/viewvc?rev=1328792&view=rev
Log:
remove dependence on trunk-only feature

Modified:
    openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java

Modified: openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java?rev=1328792&r1=1328791&r2=1328792&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java (original)
+++ openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java Sun Apr 22 05:07:28 2012
@@ -22,11 +22,9 @@ import org.apache.catalina.LifecycleEven
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.core.StandardServer;
 import org.apache.openejb.loader.IO;
-import org.apache.openejb.loader.ProvisioningUtil;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.tomee.loader.TomcatHelper;
 
-import java.io.IOException;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -102,13 +100,6 @@ public class ServerListener implements L
                 // no-op
             }
 
-            // manage additional libraries
-            try {
-                ProvisioningUtil.addAdditionalLibraries();
-            } catch (IOException e) {
-                // ignored
-            }
-
             TomcatLoader loader = new TomcatLoader();
             loader.init(properties);
 



Re: svn commit: r1328792 - /openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java

Posted by Romain Manni-Bucau <rm...@gmail.com>.
Was a refactoring of provisioningutil.
Le 22 avr. 2012 11:00, "David Blevins" <da...@gmail.com> a écrit :

> It didn't compile saying that method didn't exist.
>
>
> http://ci.apache.org/builders/openejb-4-empty-repo/builds/34/steps/compile/logs/stdio
>
> As trunk was ok with it and the branch not, I assumed it was something new
> added to trunk since the branch was created two weeks ago and shouldn't
> have been in the branch version.
>
>
> -David
>
> On Apr 22, 2012, at 1:38 AM, Romain Manni-Bucau wrote:
>
> > ?
> >
> > Why did you remove it?
> >
> > It should be in the release
> >
> > - Romain
> > Le 22 avr. 2012 07:07, <db...@apache.org> a écrit :
> >
> >> Author: dblevins
> >> Date: Sun Apr 22 05:07:28 2012
> >> New Revision: 1328792
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1328792&view=rev
> >> Log:
> >> remove dependence on trunk-only feature
> >>
> >> Modified:
> >>
> >>
> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
> >>
> >> Modified:
> >>
> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java?rev=1328792&r1=1328791&r2=1328792&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
> >> (original)
> >> +++
> >>
> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
> >> Sun Apr 22 05:07:28 2012
> >> @@ -22,11 +22,9 @@ import org.apache.catalina.LifecycleEven
> >> import org.apache.catalina.LifecycleListener;
> >> import org.apache.catalina.core.StandardServer;
> >> import org.apache.openejb.loader.IO;
> >> -import org.apache.openejb.loader.ProvisioningUtil;
> >> import org.apache.openejb.loader.SystemInstance;
> >> import org.apache.tomee.loader.TomcatHelper;
> >>
> >> -import java.io.IOException;
> >> import java.util.Properties;
> >> import java.util.logging.Level;
> >> import java.util.logging.Logger;
> >> @@ -102,13 +100,6 @@ public class ServerListener implements L
> >>                // no-op
> >>            }
> >>
> >> -            // manage additional libraries
> >> -            try {
> >> -                ProvisioningUtil.addAdditionalLibraries();
> >> -            } catch (IOException e) {
> >> -                // ignored
> >> -            }
> >> -
> >>            TomcatLoader loader = new TomcatLoader();
> >>            loader.init(properties);
> >>
> >>
> >>
> >>
>
>

Re: svn commit: r1328792 - /openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java

Posted by David Blevins <da...@gmail.com>.
It didn't compile saying that method didn't exist.

 http://ci.apache.org/builders/openejb-4-empty-repo/builds/34/steps/compile/logs/stdio

As trunk was ok with it and the branch not, I assumed it was something new added to trunk since the branch was created two weeks ago and shouldn't have been in the branch version.


-David

On Apr 22, 2012, at 1:38 AM, Romain Manni-Bucau wrote:

> ?
> 
> Why did you remove it?
> 
> It should be in the release
> 
> - Romain
> Le 22 avr. 2012 07:07, <db...@apache.org> a écrit :
> 
>> Author: dblevins
>> Date: Sun Apr 22 05:07:28 2012
>> New Revision: 1328792
>> 
>> URL: http://svn.apache.org/viewvc?rev=1328792&view=rev
>> Log:
>> remove dependence on trunk-only feature
>> 
>> Modified:
>> 
>> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
>> 
>> Modified:
>> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java?rev=1328792&r1=1328791&r2=1328792&view=diff
>> 
>> ==============================================================================
>> ---
>> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
>> (original)
>> +++
>> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
>> Sun Apr 22 05:07:28 2012
>> @@ -22,11 +22,9 @@ import org.apache.catalina.LifecycleEven
>> import org.apache.catalina.LifecycleListener;
>> import org.apache.catalina.core.StandardServer;
>> import org.apache.openejb.loader.IO;
>> -import org.apache.openejb.loader.ProvisioningUtil;
>> import org.apache.openejb.loader.SystemInstance;
>> import org.apache.tomee.loader.TomcatHelper;
>> 
>> -import java.io.IOException;
>> import java.util.Properties;
>> import java.util.logging.Level;
>> import java.util.logging.Logger;
>> @@ -102,13 +100,6 @@ public class ServerListener implements L
>>                // no-op
>>            }
>> 
>> -            // manage additional libraries
>> -            try {
>> -                ProvisioningUtil.addAdditionalLibraries();
>> -            } catch (IOException e) {
>> -                // ignored
>> -            }
>> -
>>            TomcatLoader loader = new TomcatLoader();
>>            loader.init(properties);
>> 
>> 
>> 
>> 


Re: svn commit: r1328792 - /openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java

Posted by Romain Manni-Bucau <rm...@gmail.com>.
?

Why did you remove it?

It should be in the release

- Romain
Le 22 avr. 2012 07:07, <db...@apache.org> a écrit :

> Author: dblevins
> Date: Sun Apr 22 05:07:28 2012
> New Revision: 1328792
>
> URL: http://svn.apache.org/viewvc?rev=1328792&view=rev
> Log:
> remove dependence on trunk-only feature
>
> Modified:
>
>  openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
>
> Modified:
> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
> URL:
> http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java?rev=1328792&r1=1328791&r2=1328792&view=diff
>
> ==============================================================================
> ---
> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
> (original)
> +++
> openejb/branches/openejb-4.0.0/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
> Sun Apr 22 05:07:28 2012
> @@ -22,11 +22,9 @@ import org.apache.catalina.LifecycleEven
>  import org.apache.catalina.LifecycleListener;
>  import org.apache.catalina.core.StandardServer;
>  import org.apache.openejb.loader.IO;
> -import org.apache.openejb.loader.ProvisioningUtil;
>  import org.apache.openejb.loader.SystemInstance;
>  import org.apache.tomee.loader.TomcatHelper;
>
> -import java.io.IOException;
>  import java.util.Properties;
>  import java.util.logging.Level;
>  import java.util.logging.Logger;
> @@ -102,13 +100,6 @@ public class ServerListener implements L
>                 // no-op
>             }
>
> -            // manage additional libraries
> -            try {
> -                ProvisioningUtil.addAdditionalLibraries();
> -            } catch (IOException e) {
> -                // ignored
> -            }
> -
>             TomcatLoader loader = new TomcatLoader();
>             loader.init(properties);
>
>
>
>