You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2009/06/26 19:47:48 UTC
svn commit: r788787 - in
/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE:
applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/
applications/j2-admin/src/webapp/WEB-INF/view/admin/
components/portal/src/java/org/apache/jetsp...
Author: rwatler
Date: Fri Jun 26 17:47:48 2009
New Revision: 788787
URL: http://svn.apache.org/viewvc?rev=788787&view=rev
Log:
JS-1034: Add SSO option for data export portlet
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/admin/importer-view.vm
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerApplication.java
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java?rev=788787&r1=788786&r2=788787&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/java/org/apache/jetspeed/portlets/admin/JetspeedDataImporter.java Fri Jun 26 17:47:48 2009
@@ -85,6 +85,8 @@
private HashMap rulesMap = new HashMap();
+ private HashMap ssoMap = new HashMap();
+
int refCouter = 0;
private static String ENCODING_STRING = "JETSPEED-SERIALIZER-ENCODING";
@@ -242,6 +244,7 @@
settings.put(JetspeedSerializer.KEY_PROCESS_CAPABILITIES,
Boolean.TRUE);
settings.put(JetspeedSerializer.KEY_PROCESS_PROFILER, Boolean.TRUE);
+ settings.put(JetspeedSerializer.KEY_PROCESS_SSO, Boolean.TRUE);
settings.put(JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES,
Boolean.TRUE);
settings.put(JetspeedSerializer.KEY_OVERWRITE_EXISTING,
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/admin/importer-view.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/admin/importer-view.vm?rev=788787&r1=788786&r2=788787&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/admin/importer-view.vm (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/applications/j2-admin/src/webapp/WEB-INF/view/admin/importer-view.vm Fri Jun 26 17:47:48 2009
@@ -61,8 +61,17 @@
{
permissions.value='n';
}
- var names = new Array("users", "profiles","capabilities", "permissions");
- var values = new Array(users.value,profiling.value,capabilities.value,permissions.value);
+ var sso = document.getElementById('sso');
+ if(sso.checked)
+ {
+ sso.value='y';
+ }
+ else
+ {
+ sso.value='n';
+ }
+ var names = new Array("users", "profiles","capabilities", "permissions", "sso");
+ var values = new Array(users.value,profiling.value,capabilities.value,permissions.value,sso.value);
ajaxInvoke("jetspeedexport", names, values, new exportHandler() );
}
function buildPrefsquery()
@@ -187,8 +196,12 @@
Capabilities (Mimetypes, mediatypes, capabilities,clients)</td>
</tr>
<tr>
- <td colspan="2"><input type="checkbox" name="permissions" id="permissions" value="n">
+ <td colspan="2"><input type="checkbox" name="permissions" id="permissions" value="n">
Permissions</td>
+ </tr>
+ <tr>
+ <td colspan="2"><input type="checkbox" name="sso" id="sso" value="n">
+ SSO</td>
</tr>
<tr>
<td><input type="button" value="Export" onClick="javascript:buildExportquery();"></td>
@@ -223,7 +236,7 @@
#else
<td class="portlet-msg-info">$!msg</td>
#end
-</tr>
+</tr>
#end
<tr>
<td>Choose file to import
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java?rev=788787&r1=788786&r2=788787&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java Fri Jun 26 17:47:48 2009
@@ -56,6 +56,7 @@
private static final String PERMISSIONS = "permissions";
private static final String PROFILES = "profiles";
private static final String CAPABILITIES = "capabilities";
+ private static final String SSO = "sso";
private static final String PREFS = "prefs";
String pathSeprator = System.getProperty("file.separator");
@@ -97,6 +98,8 @@
getNonNullActionParameter(requestContext, PERMISSIONS).equalsIgnoreCase("y") ? Boolean.TRUE : Boolean.FALSE);
settings.put(JetspeedSerializer.KEY_PROCESS_PROFILER,
getNonNullActionParameter(requestContext, PROFILES).equalsIgnoreCase("y") ? Boolean.TRUE : Boolean.FALSE);
+ settings.put(JetspeedSerializer.KEY_PROCESS_SSO,
+ getNonNullActionParameter(requestContext, SSO).equalsIgnoreCase("y") ? Boolean.TRUE : Boolean.FALSE);
settings.put(JetspeedSerializer.KEY_PROCESS_CAPABILITIES,
getNonNullActionParameter(requestContext, CAPABILITIES).equalsIgnoreCase("y") ? Boolean.TRUE : Boolean.FALSE);
}
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerApplication.java?rev=788787&r1=788786&r2=788787&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerApplication.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerApplication.java Fri Jun 26 17:47:48 2009
@@ -47,8 +47,8 @@
* CAPABILITIES - extract/import capabilities
* PROFILE = extract/import profile settings (for export requires USER)
* PERMISSIONS = extract/import permissions
- * PREFS = extract/import portlet preferences (ignored if any of the above is set)
* SSO = extract/import sso sites
+ * PREFS = extract/import portlet preferences (ignored if any of the above is set)
*
* NOOVERWRITE = don't overwrite existing file (for export)
* BACKUP = backup before process
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java?rev=788787&r1=788786&r2=788787&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java Fri Jun 26 17:47:48 2009
@@ -131,6 +131,7 @@
setSetting(JetspeedSerializer.KEY_PROCESS_PROFILER, false);
setSetting(JetspeedSerializer.KEY_PROCESS_PERMISSIONS, false);
setSetting(JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES, false);
+ setSetting(JetspeedSerializer.KEY_PROCESS_SSO, false);
setSetting(JetspeedSerializer.KEY_OVERWRITE_EXISTING, true);
setSetting(JetspeedSerializer.KEY_BACKUP_BEFORE_PROCESS, true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org