svn commit: r1820269 - in /turbine/core/trunk: pom.xml src/java/org/apache/turbine/services/BaseServiceBroker.java

[gk]

Author: gk
Date: Fri Jan  5 08:33:52 2018
New Revision: 1820269

URL: http://svn.apache.org/viewvc?rev=1820269&view=rev
Log:
- revert annotated services, cft. mail thread 
https://lists.apache.org/thread.html/ce77f6516e7a7e28425bac6bd3dcf72e37d9b046751890e455ad8b84@%3Cdev.turbine.apache.org%3E
- non wildcard exclusions eclipse build

Modified:
    turbine/core/trunk/pom.xml
    
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java

Modified: turbine/core/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1820269&r1=1820268&r2=1820269&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Fri Jan  5 08:33:52 2018
@@ -977,8 +977,22 @@
       <artifactId>jabsorb</artifactId>
       <version>1.3.2</version>
       <optional>true</optional>
-      <!-- exclude old versions: 
org.slf4j:slf4j-jdk14,slf4j-api,(renamed)cl104-over-slf4j,org.mortbay.jetty:jsp-2.1,
 commons-httpclient:commons-httpclient -->
+      <!-- reqires maven version >= 3,  exclude old versions: 
org.slf4j:slf4j-jdk14,slf4j-api,(renamed)cl104-over-slf4j,org.mortbay.jetty:jsp-2.1,
 commons-httpclient:commons-httpclient,
+         mvn eclipse:eclipse still no wildcard exclude (mvn version 3.3.9)
+      -->
       <exclusions>
+       <exclusion>
+          <artifactId>jsp-2.1</artifactId>
+          <groupId>org.mortbay.jetty</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jcl104-over-slf4j</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>slf4j-jdk14</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
         <exclusion>
           <artifactId>*</artifactId>
           <groupId>*</groupId>

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java?rev=1820269&r1=1820268&r2=1820269&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java 
(original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java 
Fri Jan  5 08:33:52 2018
@@ -33,8 +33,6 @@ import org.apache.commons.configuration.
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.turbine.annotation.AnnotationProcessor;
-import org.apache.turbine.util.TurbineException;
 
 /**
  * A generic implementation of a <code>ServiceBroker</code> which
@@ -375,16 +373,6 @@ public abstract class BaseServiceBroker
 
         if (!instance.getInit())
         {
-            
-            try
-            {
-             // convenience annotation in Turbine services 
-                AnnotationProcessor.process(instance);
-            }
-            catch ( TurbineException e )
-            {
-                throw new InstantiationException( e.getMessage(), e );
-            }
             // this call might result in an indirect recursion
             instance.init();
         }