inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed test and RMI broken-ness. Switched from 'authenticationService' to

Browse Source 
'AuthenticationService' in a couple of places.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2007-01-04 06:57:52 +00:00
parent ed9e4ce9d3
commit bbfb3f7f22
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/authentication-services-context.xml
View File

@@ -324,7 +324,7 @@
<!-- The AuthenticationService exported as an RMI service. --> <!-- The AuthenticationService exported as an RMI service. -->
<bean id="rmiAuthenticationService" class="org.springframework.remoting.rmi.RmiServiceExporter"> <bean id="rmiAuthenticationService" class="org.springframework.remoting.rmi.RmiServiceExporter">
<property name="service"> <property name="service">
<ref bean="authenticationService"/> <ref bean="AuthenticationService"/>
</property> </property>
<property name="serviceInterface"> <property name="serviceInterface">
<value>org.alfresco.service.cmr.security.AuthenticationService</value> <value>org.alfresco.service.cmr.security.AuthenticationService</value>

9
source/java/org/alfresco/repo/avm/AVMServiceTest.java
View File

@@ -41,7 +41,6 @@ import org.alfresco.repo.avm.actions.SimpleAVMPromoteAction;
import org.alfresco.repo.avm.actions.SimpleAVMSubmitAction; import org.alfresco.repo.avm.actions.SimpleAVMSubmitAction;
import org.alfresco.repo.avm.util.BulkLoader; import org.alfresco.repo.avm.util.BulkLoader;
import org.alfresco.repo.domain.PropertyValue; import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.TransactionUtil; import org.alfresco.repo.transaction.TransactionUtil;
import org.alfresco.service.cmr.avm.AVMBadArgumentException; import org.alfresco.service.cmr.avm.AVMBadArgumentException;
@@ -3229,8 +3228,8 @@ public class AVMServiceTest extends AVMServiceTestBase
{ {
setupBasicTree(); setupBasicTree();
PermissionService perm = (PermissionService)fContext.getBean("PermissionService"); PermissionService perm = (PermissionService)fContext.getBean("PermissionService");
AuthenticationComponent ac = (AuthenticationComponent)fContext.getBean("authenticationComponent"); // AuthenticationService ac = (AuthenticationService)fContext.getBean("AuthenticationService");
ac.authenticate("admin", "admin".toCharArray()); // ac.authenticate("admin", "admin".toCharArray());
perm.setPermission(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c/foo"), perm.setPermission(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c/foo"),
PermissionService.ADMINISTRATOR_AUTHORITY, PermissionService.ADMINISTRATOR_AUTHORITY,
PermissionService.ALL_PERMISSIONS, PermissionService.ALL_PERMISSIONS,
@@ -3261,8 +3260,8 @@ public class AVMServiceTest extends AVMServiceTestBase
{ {
setupBasicTree(); setupBasicTree();
FileFolderService ffs = (FileFolderService)fContext.getBean("FileFolderService"); FileFolderService ffs = (FileFolderService)fContext.getBean("FileFolderService");
AuthenticationComponent ac = (AuthenticationComponent)fContext.getBean("authenticationComponent"); // AuthenticationComponent ac = (AuthenticationComponent)fContext.getBean("authenticationComponent");
ac.authenticate("admin", "admin".toCharArray()); // ac.authenticate("admin", "admin".toCharArray());
assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c/"), assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c/"),
"banana", WCMModel.TYPE_AVM_PLAIN_CONTENT) != null); "banana", WCMModel.TYPE_AVM_PLAIN_CONTENT) != null);
assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main://"), assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main://"),

2
source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
View File

@@ -76,7 +76,7 @@ public class AVMServiceTestBase extends TestCase
fService = (AVMService)fContext.getBean("AVMService"); fService = (AVMService)fContext.getBean("AVMService");
fReaper = (OrphanReaper)fContext.getBean("orphanReaper"); fReaper = (OrphanReaper)fContext.getBean("orphanReaper");
fSyncService = (AVMSyncService)fContext.getBean("AVMSyncService"); fSyncService = (AVMSyncService)fContext.getBean("AVMSyncService");
AuthenticationService authService = (AuthenticationService)fContext.getBean("authenticationService"); AuthenticationService authService = (AuthenticationService)fContext.getBean("AuthenticationService");
authService.authenticate("admin", "admin".toCharArray()); authService.authenticate("admin", "admin".toCharArray());
CreateStoreTxnListener cstl = (CreateStoreTxnListener)fContext.getBean("createStoreTxnListener"); CreateStoreTxnListener cstl = (CreateStoreTxnListener)fContext.getBean("createStoreTxnListener");
cstl.addCallback( cstl.addCallback(