Author: berndf
Date: Mon Jul 16 07:13:51 2007
New Revision: 556634
URL: http://svn.apache.org/viewvc?view=rev&rev=556634
Log:
dropping ServiceManagerBridge which is replaced by DefauktServiceManagerFactory
remove src/trunk (step 1): rescue trunk-only code over to src/main
remove spring-config.xml containing manually converted beans from
james-assembly.xml. this is now done autmatically
Added:
james/server/sandbox/spring-integration/src/main/config/james-assembly.xml
- copied, changed from r556616,
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
james/server/sandbox/spring-integration/src/main/config/mailboxManagerSqlResources.xml
- copied unchanged from r556013,
james/server/sandbox/spring-integration/src/trunk/config/mailboxManagerSqlResources.xml
james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
Removed:
james/server/sandbox/spring-integration/src/main/config/spring-config.xml
james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/adaptor/ServiceManagerBridge.java
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/james-assembly.xml
Modified:
james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/processor/ServiceProcessor.java
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java
Copied:
james/server/sandbox/spring-integration/src/main/config/james-assembly.xml
(from r556616,
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml)
URL:
http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/src/main/config/james-assembly.xml?view=diff&rev=556634&p1=james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml&r1=556616&p2=james/server/sandbox/spring-integration/src/main/config/james-assembly.xml&r2=556634
==============================================================================
---
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/testing-james-assembly.xml
(original)
+++ james/server/sandbox/spring-integration/src/main/config/james-assembly.xml
Mon Jul 16 07:13:51 2007
@@ -19,13 +19,6 @@
under the License.
-->
-<!--
-
-THIS IS A TEST james-assembly.xml for UNIT TESTING.
-It might become outdated. Check for production quality configs outside the
test sources.
-
--->
-
<assembly>
<!-- The list of blocks being run in this Phoenix server. -->
Added:
james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java?view=auto&rev=556634
==============================================================================
---
james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
(added)
+++
james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/adaptor/FileSystemBridge.java
Mon Jul 16 07:13:51 2007
@@ -0,0 +1,44 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.container.spring.adaptor;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+
+import org.apache.james.services.FileSystem;
+
+public class FileSystemBridge implements FileSystem {
+
+ public File getBasedir() throws FileNotFoundException {
+ return new File(".");
+ }
+
+ public File getFile(String fileURL) throws FileNotFoundException {
+ if (fileURL.startsWith("file://")) {
+ if (fileURL.startsWith("file://conf/")) {
+ return new File("./src/trunk/config/"+fileURL.substring(12));
+ } else {
+ return new File("./"+fileURL.substring(7));
+ }
+ } else {
+ throw new UnsupportedOperationException("getFile: "+fileURL);
+ }
+ }
+
+}
Modified:
james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/processor/ServiceProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/processor/ServiceProcessor.java?view=diff&rev=556634&r1=556633&r2=556634
==============================================================================
---
james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/processor/ServiceProcessor.java
(original)
+++
james/server/sandbox/spring-integration/src/main/java/org/apache/james/container/spring/processor/ServiceProcessor.java
Mon Jul 16 07:13:51 2007
@@ -1,8 +1,26 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
package org.apache.james.container.spring.processor;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.container.spring.adaptor.ServiceManagerBridge;
+import org.apache.james.container.spring.adaptor.ServiceManagerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.core.Ordered;
@@ -12,7 +30,7 @@
*/
public class ServiceProcessor extends AbstractProcessor implements
BeanPostProcessor, Ordered {
- private ServiceManagerBridge serviceManagerBridge;
+ private ServiceManagerFactory serviceManagerBridge;
public int getOrder() {
return 2;
@@ -30,7 +48,7 @@
return bean;
}
- public void setServiceManagerBridge(ServiceManagerBridge
serviceManagerBridge) {
+ public void setServiceManagerBridge(ServiceManagerFactory
serviceManagerBridge) {
this.serviceManagerBridge=serviceManagerBridge;
}
}
Modified:
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java?view=diff&rev=556634&r1=556633&r2=556634
==============================================================================
---
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java
(original)
+++
james/server/sandbox/spring-integration/src/main/test/org/apache/james/container/spring/beanfactory/AvalonApplicationContextTestCase.java
Mon Jul 16 07:13:51 2007
@@ -32,5 +32,6 @@
Resource applicationResource = new
ClassPathResource("org/apache/james/container/spring/beanfactory/testing-james-assembly.xml");
AvalonApplicationContext context = new
AvalonApplicationContext(containerResource, applicationResource);
James james = (James)context.getBean("James");
+ assertNotNull("properly initialized", james);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
