svn commit: r1426780 - in /rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src: main/java/org/apache/rave/extension/ main/java/org/apache/rave/extension/portal/ main/java/org/apache/rave/extension/portal/service/ main/...

Sat, 29 Dec 2012 08:33:16 -0800 

Author: jasha
Date: Sat Dec 29 16:32:51 2012
New Revision: 1426780

URL: http://svn.apache.org/viewvc?rev=1426780&view=rev
Log:
Move custom service to different package which is not scanned automatically

Added:
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/extension/
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/extension/portal/
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/extension/portal/service/
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/extension/portal/service/impl/
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/extension/portal/service/impl/CustomUserService.java
      - copied, changed from r1426774, 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/extension/
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/extension/portal/
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/extension/portal/service/
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/extension/portal/service/impl/
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/extension/portal/service/impl/CustomUserServiceTest.java
      - copied, changed from r1426774, 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
Removed:
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
Modified:
    
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml

Copied: 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/extension/portal/service/impl/CustomUserService.java
 (from r1426774, 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java)
URL: 
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/extension/portal/service/impl/CustomUserService.java?p2=rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/extension/portal/service/impl/CustomUserService.java&p1=rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java&r1=1426774&r2=1426780&rev=1426780&view=diff
==============================================================================
--- 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
 (original)
+++ 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/extension/portal/service/impl/CustomUserService.java
 Sat Dec 29 16:32:51 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.rave.portal.service.impl;
+package org.apache.rave.extension.portal.service.impl;
 
 import org.apache.rave.portal.model.User;
 import org.apache.rave.portal.repository.CategoryRepository;
@@ -26,6 +26,7 @@ import org.apache.rave.portal.repository
 import org.apache.rave.portal.repository.PersonRepository;
 import org.apache.rave.portal.repository.UserRepository;
 import org.apache.rave.portal.repository.WidgetRepository;
+import org.apache.rave.portal.service.impl.DefaultUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

Modified: 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
URL: 
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1426780&r1=1426779&r2=1426780&view=diff
==============================================================================
--- 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
 (original)
+++ 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
 Sat Dec 29 16:32:51 2012
@@ -75,4 +75,7 @@
         <property name="permissionEvaluator" ref="ravePermissionEvaluator" />
     </bean>
 
+    <!-- Need to define customUserService because its package is not scanned 
automatically -->
+    <bean id="customUserService" 
class="org.apache.rave.extension.portal.service.impl.CustomUserService"/>
+
 </beans>

Copied: 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/extension/portal/service/impl/CustomUserServiceTest.java
 (from r1426774, 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java)
URL: 
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/extension/portal/service/impl/CustomUserServiceTest.java?p2=rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/extension/portal/service/impl/CustomUserServiceTest.java&p1=rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java&r1=1426774&r2=1426780&rev=1426780&view=diff
==============================================================================
--- 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
 (original)
+++ 
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/extension/portal/service/impl/CustomUserServiceTest.java
 Sat Dec 29 16:32:51 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.rave.portal.service.impl;
+package org.apache.rave.extension.portal.service.impl;
 
 import org.apache.rave.portal.model.User;
 import org.apache.rave.portal.model.impl.UserImpl;

Reply via email to