Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_admin/conf/language/lams/ApplicationResources.properties 23 Apr 2007 05:53:12 -0000 1.2.2.3
+++ lams_admin/conf/language/lams/ApplicationResources.properties 25 May 2007 05:44:33 -0000 1.2.2.4
@@ -233,5 +233,8 @@
label.can.join.joint.lessons = Can join joint lessons
label.can.offer.joint.lessons = Can offer joint lessons
error.cant.write.login.jsp = Couldn't write value of {0} to {1}, please check your {2} configuration.
+heading.federation = Federation Configuration
+error.url.required = URL is required.
+error.privatekey.required = Private key is required.
#======= End labels: Exported 224 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 23 Apr 2007 05:53:12 -0000 1.2.2.3
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 25 May 2007 05:44:33 -0000 1.2.2.4
@@ -233,5 +233,8 @@
label.can.join.joint.lessons = Can join joint lessons
label.can.offer.joint.lessons = Can offer joint lessons
error.cant.write.login.jsp = Couldn't write value of {0} to {1}, please check your {2} configuration.
+heading.federation = Federation Configuration
+error.url.required = URL is required.
+error.privatekey.required = Private key is required.
#======= End labels: Exported 224 labels for en AU =====
Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.22.2.2 -r1.22.2.3
--- lams_admin/conf/xdoclet/struts-forms.xml 20 Apr 2007 06:05:41 -0000 1.22.2.2
+++ lams_admin/conf/xdoclet/struts-forms.xml 25 May 2007 05:44:33 -0000 1.22.2.3
@@ -109,4 +109,12 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: lams_admin/conf/xdoclet/web-settings.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/web-settings.xml,v
diff -u -r1.9 -r1.9.2.1
--- lams_admin/conf/xdoclet/web-settings.xml 20 Oct 2006 02:39:40 -0000 1.9
+++ lams_admin/conf/xdoclet/web-settings.xml 25 May 2007 05:44:33 -0000 1.9.2.1
@@ -14,6 +14,7 @@
classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
classpath:/org/lamsfoundation/lams/integrationContext.xml
classpath:/org/lamsfoundation/lams/admin/adminApplicationContext.xml
+ classpath:/org/lamsfoundation/lams/federationContext.xml
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java,v
diff -u -r1.2.2.1 -r1.2.2.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java 12 Mar 2007 00:40:39 -0000 1.2.2.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java 25 May 2007 05:44:34 -0000 1.2.2.2
@@ -25,6 +25,7 @@
import javax.servlet.ServletContext;
+import org.lamsfoundation.lams.federation.service.IFederationService;
import org.lamsfoundation.lams.integration.service.IIntegrationService;
import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
import org.lamsfoundation.lams.util.MessageService;
@@ -44,6 +45,7 @@
private static IIntegrationService integrationService;
private static IAuditService auditService;
private static IImportService importService;
+ private static IFederationService federationService;
public static final IUserManagementService getService(ServletContext servletContext){
if (manageService == null) {
@@ -86,4 +88,12 @@
}
return importService;
}
+
+ public static final IFederationService getFederationService(ServletContext servletContext){
+ if(federationService==null){
+ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
+ federationService = (IFederationService)ctx.getBean("federationService");
+ }
+ return federationService;
+ }
}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java,v
diff -u -r1.3.2.1 -r1.3.2.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java 12 Mar 2007 00:40:38 -0000 1.3.2.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java 25 May 2007 05:44:33 -0000 1.3.2.2
@@ -78,6 +78,8 @@
links.add(linkBean);
linkBean = new LinkBean("libraryManage.do", "sysadmin.library.management");
links.add(linkBean);
+ linkBean = new LinkBean("federation.do", "heading.federation");
+ links.add(linkBean);
} else if (request.isUserInRole(Role.AUTHOR_ADMIN)) {
LinkBean linkBean = new LinkBean("toolcontentlist.do", "sysadmin.edit.default.tool.content");
links.add(linkBean);
Index: lams_admin/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tiles/Attic/tiles-defs.xml,v
diff -u -r1.24.2.1 -r1.24.2.2
--- lams_admin/web/WEB-INF/tiles/tiles-defs.xml 12 Mar 2007 00:40:42 -0000 1.24.2.1
+++ lams_admin/web/WEB-INF/tiles/tiles-defs.xml 25 May 2007 05:44:33 -0000 1.24.2.2
@@ -1,6 +1,11 @@
+
+
+
+
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_admin/web/federation/federation.jsp'.
Fisheye: No comparison available. Pass `N' to diff?