abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From calav...@apache.org
Subject svn commit: r736035 - in /abdera/java/trunk: pom.xml spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java spring/src/test/resources/org/apache/abdera/spring/beans.xml
Date Tue, 20 Jan 2009 16:40:42 GMT
Author: calavera
Date: Tue Jan 20 08:40:41 2009
New Revision: 736035

URL: http://svn.apache.org/viewvc?rev=736035&view=rev
Log:
release bundle downgrade to version 1.3 due to problems generating the notice file

fixes #212: Cannot add a WorkspaceManager instance to ProviderFactoryBean, thanks to Chris
K Wensel

Modified:
    abdera/java/trunk/pom.xml
    abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java
    abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml

Modified: abdera/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/pom.xml?rev=736035&r1=736034&r2=736035&view=diff
==============================================================================
--- abdera/java/trunk/pom.xml (original)
+++ abdera/java/trunk/pom.xml Tue Jan 20 08:40:41 2009
@@ -160,7 +160,7 @@
                   </goals>
                   <configuration>
                       <resourceBundles>
-                          <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                          <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
                       </resourceBundles>
                       <supplementalModels>
                           <supplementalModel>${topDir}/etc/notice-supplements.xml</supplementalModel>

Modified: abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java
URL: http://svn.apache.org/viewvc/abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java?rev=736035&r1=736034&r2=736035&view=diff
==============================================================================
--- abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java
(original)
+++ abdera/java/trunk/spring/src/main/java/org/apache/abdera/spring/ProviderFactoryBean.java
Tue Jan 20 08:40:41 2009
@@ -26,6 +26,7 @@
 import org.apache.abdera.protocol.server.Filter;
 import org.apache.abdera.protocol.server.Target;
 import org.apache.abdera.protocol.server.WorkspaceInfo;
+import org.apache.abdera.protocol.server.WorkspaceManager;
 import org.apache.abdera.protocol.server.impl.DefaultProvider;
 import org.springframework.beans.factory.FactoryBean;
 
@@ -33,6 +34,7 @@
 public class ProviderFactoryBean implements FactoryBean {
     private Class<? extends DefaultProvider> providerClass = DefaultProvider.class;
     private String base;
+    private WorkspaceManager workspaceManager;
     private Collection<WorkspaceInfo> workspaces;
     private Resolver<Target> targetResolver;
     private Resolver<Subject> subjectResolver;
@@ -49,6 +51,10 @@
             p = providerClass.newInstance();
         }
         
+        if( workspaceManager != null ) {
+            p.setWorkspaceManager( workspaceManager );
+        }
+
         if (workspaces != null && workspaces.size() > 0) {
             p.addWorkspaces(workspaces);
         }
@@ -90,6 +96,14 @@
         this.base = base;
     }
 
+    public WorkspaceManager getWorkspaceManager() {
+        return workspaceManager;
+    }
+
+    public void setWorkspaceManager( WorkspaceManager workspaceManager ) {
+      this.workspaceManager = workspaceManager;
+    }
+
     public Collection<WorkspaceInfo> getWorkspaces() {
         return workspaces;
     }

Modified: abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml
URL: http://svn.apache.org/viewvc/abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml?rev=736035&r1=736034&r2=736035&view=diff
==============================================================================
--- abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml (original)
+++ abdera/java/trunk/spring/src/test/resources/org/apache/abdera/spring/beans.xml Tue Jan
20 08:40:41 2009
@@ -7,6 +7,13 @@
     http://abdera.apache.org http://abdera.apache.org/schemas/abdera-spring.xsd">
 
   <!-- Abdera -->
+
+  <a:provider>
+    <a:workspaceManager>
+      <bean class="org.apache.abdera.protocol.server.provider.basic.BasicProvider"/>
+    </a:workspaceManager>
+  </a:provider>
+
   <a:provider>
     <a:workspace title="Foo Workspace">
       <!-- These are our collections -->



Mime
View raw message