You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2011/11/30 13:56:21 UTC
svn commit: r1208410 - in /incubator/rave/trunk:
rave-components/rave-core/src/test/resources/
rave-portal-resources/src/main/resources/ rave-portal/src/test/resources/
rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service...
Author: jasha
Date: Wed Nov 30 12:56:19 2011
New Revision: 1208410
URL: http://svn.apache.org/viewvc?rev=1208410&view=rev
Log:
RAVE-373 inject wookie configuration through Spring
Modified:
incubator/rave/trunk/rave-components/rave-core/src/test/resources/portal.properties
incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties
incubator/rave/trunk/rave-portal/src/test/resources/portal.properties
incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml
Modified: incubator/rave/trunk/rave-components/rave-core/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/test/resources/portal.properties?rev=1208410&r1=1208409&r2=1208410&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/test/resources/portal.properties (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/test/resources/portal.properties Wed Nov 30 12:56:19 2011
@@ -35,3 +35,6 @@ portal.jpaVendorAdapter.showSql=true
portal.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
portal.openjpa.RuntimeUnenhancedClasses=supported
portal.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
+
+provider.wookie.wookieServerUrl=http://localhost:8080/wookie
+provider.wookie.wookieApiKey=TEST
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties?rev=1208410&r1=1208409&r2=1208410&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/resources/portal.properties Wed Nov 30 12:56:19 2011
@@ -49,3 +49,6 @@ portal.jpaVendorAdapter.showSql=true
portal.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
portal.openjpa.RuntimeUnenhancedClasses=unsupported
portal.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
+
+provider.wookie.wookieServerUrl=http://localhost:8080/wookie
+provider.wookie.wookieApiKey=TEST
\ No newline at end of file
Modified: incubator/rave/trunk/rave-portal/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/resources/portal.properties?rev=1208410&r1=1208409&r2=1208410&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/resources/portal.properties (original)
+++ incubator/rave/trunk/rave-portal/src/test/resources/portal.properties Wed Nov 30 12:56:19 2011
@@ -48,3 +48,6 @@ portal.jpaVendorAdapter.showSql=true
portal.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
portal.openjpa.RuntimeUnenhancedClasses=unsupported
portal.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
+
+provider.wookie.wookieServerUrl=http://localhost:8080/wookie
+provider.wookie.wookieApiKey=TEST
\ No newline at end of file
Modified: incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java?rev=1208410&r1=1208409&r2=1208410&view=diff
==============================================================================
--- incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java (original)
+++ incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java Wed Nov 30 12:56:19 2011
@@ -27,20 +27,19 @@ import org.apache.wookie.connector.frame
import org.apache.wookie.connector.framework.WookieConnectorService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
import java.io.IOException;
-@Service
public class WookieWidgetService implements WidgetProviderService {
private static Logger logger = LoggerFactory.getLogger(WookieWidgetService.class);
- // TODO RAVE-373: shouldn't hard code the server location or API key
- private static final String WOOKIE_SERVER_URL = "http://localhost:8080/wookie";
- private static final String WOOKIE_API_KEY = "TEST";
+ private final String wookieServerUrl; // = "http://localhost:8080/wookie";
+ private final String wookieApiKey; // = "TEST";
private static WookieConnectorService connectorService;
-
- public WookieWidgetService(){
+
+ public WookieWidgetService(String wookieServerUrl, String wookieApiKey){
+ this.wookieServerUrl = wookieServerUrl;
+ this.wookieApiKey = wookieApiKey;
}
/* (non-Javadoc)
@@ -65,7 +64,7 @@ public class WookieWidgetService impleme
private W3CWidget getWidgetForViewer(Widget widget, String sharedDataKey, User viewer){
try {
// TODO: parameters for WookieConnectorService should not be fixed in code.
- connectorService = getWookieConnectorService(WOOKIE_SERVER_URL, WOOKIE_API_KEY, sharedDataKey);
+ connectorService = getWookieConnectorService(wookieServerUrl, wookieApiKey, sharedDataKey);
org.apache.wookie.connector.framework.User user = new org.apache.wookie.connector.framework.User(String.valueOf(viewer.getUsername()), viewer.getUsername());
connectorService.setCurrentUser(user);
Modified: incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml?rev=1208410&r1=1208409&r2=1208410&view=diff
==============================================================================
--- incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml (original)
+++ incubator/rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml Wed Nov 30 12:56:19 2011
@@ -31,4 +31,9 @@
<!-- rave-w3c-provider base-package scan -->
<context:component-scan base-package="org.apache.rave.provider.w3c"/>
+ <bean id="wookieWidgetService" class="org.apache.rave.provider.w3c.service.impl.WookieWidgetService">
+ <constructor-arg name="wookieServerUrl" value="${provider.wookie.wookieServerUrl}"/>
+ <constructor-arg name="wookieApiKey" value="${provider.wookie.wookieApiKey}"/>
+ </bean>
+
</beans>
\ No newline at end of file