james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1142752 - in /james/server/trunk: imapserver/src/main/resources/META-INF/spring/ lmtpserver/src/main/resources/META-INF/spring/ pop3server/src/main/resources/META-INF/spring/ smtpserver/src/main/resources/META-INF/spring/
Date Mon, 04 Jul 2011 18:07:54 GMT
Author: norman
Date: Mon Jul  4 18:07:54 2011
New Revision: 1142752

URL: http://svn.apache.org/viewvc?rev=1142752&view=rev
Log:
Remove the declaration of a class via the configuration admin. The bundle plugin get confused
with it. See JAMES-835

Modified:
    james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml
    james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml
    james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml
    james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml

Modified: james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml?rev=1142752&r1=1142751&r2=1142752&view=diff
==============================================================================
--- james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml
(original)
+++ james/server/trunk/imapserver/src/main/resources/META-INF/spring/imapserver-context.xml
Mon Jul  4 18:07:54 2011
@@ -17,23 +17,10 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
-       xmlns:ctx="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
-           http://www.springframework.org/schema/context 
-           http://www.springframework.org/schema/context/spring-context.xsd">
-         
-    <!-- Configuration Admin entries so the user can overwrite them if needed -->
-    <!-- This allows the user to switch also to the OIO based server -->
-    <osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
-      <prop key="imapserver.class">org.apache.james.imapserver.netty.IMAPServer</prop>
-    </osgix:cm-properties>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-   <!-- placeholder configurer -->
-   <ctx:property-placeholder properties-ref="cmProps" />
     <!-- 
       IMAP Server
      -->
-    <bean id="imapserver" class="${imapserver.class}"/>    
+    <bean id="imapserver" class="org.apache.james.imapserver.netty.IMAPServer"/>  
 
 </beans>

Modified: james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml?rev=1142752&r1=1142751&r2=1142752&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml
(original)
+++ james/server/trunk/lmtpserver/src/main/resources/META-INF/spring/lmtpserver-context.xml
Mon Jul  4 18:07:54 2011
@@ -13,25 +13,13 @@
         express or implied. See the License for the ! ! specific language
         governing permissions and limitations ! ! under the License. !
     -->
-
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
-       xmlns:ctx="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
-           http://www.springframework.org/schema/context 
-           http://www.springframework.org/schema/context/spring-context.xsd">
-         
-    <!-- Configuration Admin entries so the user can overwrite them if needed -->
-    <!-- This allows the user to switch also to the OIO based server -->
-    <osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
-      <prop key="lmtpserver.class">org.apache.james.lmtpserver.netty.LMTPServer</prop>
-    </osgix:cm-properties>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
     <!-- 
       LMTP Server
      -->
-    <bean id="lmtpserver" class="${lmtpserver.class}"/>
+    <bean id="lmtpserver" class="org.apache.james.lmtpserver.netty.LMTPServer"/>
     
 </beans>

Modified: james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml?rev=1142752&r1=1142751&r2=1142752&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml
(original)
+++ james/server/trunk/pop3server/src/main/resources/META-INF/spring/pop3server-context.xml
Mon Jul  4 18:07:54 2011
@@ -14,28 +14,13 @@
         governing permissions and limitations ! ! under the License. !
     -->
 
-
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
-       xmlns:ctx="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
-           http://www.springframework.org/schema/context 
-           http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <!-- Configuration Admin entries so the user can overwrite them if needed -->
-    <!-- This allows the user to switch also to the OIO based server -->
-    <osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
-      <prop key="pop3server.class">org.apache.james.pop3server.netty.POP3Server</prop>
-    </osgix:cm-properties>
-
-   <!-- placeholder configurer -->
-   <ctx:property-placeholder properties-ref="cmProps" />
-   
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+       
     <!-- 
       POP3 Server
      -->
-    <bean id="pop3server" class="${pop3server.class}"/>
+    <bean id="pop3server" class="org.apache.james.pop3server.netty.POP3Server"/>
     
 </beans>

Modified: james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml?rev=1142752&r1=1142751&r2=1142752&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml
(original)
+++ james/server/trunk/smtpserver/src/main/resources/META-INF/spring/smtpserver-context.xml
Mon Jul  4 18:07:54 2011
@@ -16,24 +16,11 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
-       xmlns:ctx="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
-           http://www.springframework.org/schema/context 
-           http://www.springframework.org/schema/context/spring-context.xsd">
-         
-    <!-- Configuration Admin entries so the user can overwrite them if needed -->
-    <!-- This allows the user to switch also to the OIO based server -->
-    <osgix:cm-properties id="cmProps" persistent-id="org.apache.james">
-      <prop key="smtpserver.class">org.apache.james.smtpserver.netty.SMTPServer</prop>
-    </osgix:cm-properties>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-   <!-- placeholder configurer -->
-   <ctx:property-placeholder properties-ref="cmProps" />
     <!-- 
       SMTP Server
      -->
-    <bean id="smtpserver" class="${smtpserver.class}"/>
+    <bean id="smtpserver" class="org.apache.james.smtpserver.netty.SMTPServer"/>
     
 </beans>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message