Changeset 1321

Timestamp:

05/16/11 15:26:25 (13 years ago)

Author:

twagoo

Message:

Fixed Jersey/Spring? with config

Location:

ComponentRegistry/trunk/ComponentRegistry/src/main

Files:

• java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (3 diffs)
• webresources/WEB-INF/applicationContext.xml (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -42 +42 @@
 import clarin.cmdi.componentregistry.model.ProfileDescription;
 import clarin.cmdi.componentregistry.model.RegisterResponse;
+import com.sun.jersey.api.spring.Autowire;
 
 import com.sun.jersey.multipart.FormDataParam;
@@ -47 +48 @@
 
 @Path("/registry")
+@Autowire
 public class ComponentRegistryRestService {
 
@@ -511 +513 @@
         }
     }
+
+    /**
+     * @param componentRegistryFactory the componentRegistryFactory to set
+     */
+    public void setComponentRegistryFactory(ComponentRegistryFactory componentRegistryFactory) {
+        this.componentRegistryFactory = componentRegistryFactory;
+    }
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/webresources/WEB-INF/applicationContext.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+        xmlns:context="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/context
+                           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+    <context:annotation-config />
 
     <import resource="spring-config/component-registry.xml"/>
-    <import resource="spring-config/filesystem-impl.xml"/>
+<!--    <import resource="spring-config/filesystem-impl.xml"/>-->
+    <import resource="spring-config/database-impl.xml"/>
 
 </beans>