Author: rwatler
Date: Fri Jun 26 17:48:48 2009
New Revision: 788789
URL: http://svn.apache.org/viewvc?rev=788789&view=rev
Log:
JS-1034: Add SSO option for data export portlet
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.html
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.java?rev=788789&r1=788788&r2=788789&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.java
Fri Jun 26 17:48:48 2009
@@ -64,6 +64,8 @@
private static final String CAPABILITIES = "capabilities";
+ private static final String SSO = "sso";
+
private static final String USER_PREFS = "userPrefs";
public PortalDataSerializer()
@@ -91,6 +93,8 @@
private boolean doCapabilities = true;
+ private boolean doSSO = true;
+
private boolean doUserPrefs = true;
private boolean doEntities = true;
@@ -114,6 +118,9 @@
add(new ExportCheckBox(CAPABILITIES, new
PropertyModel<Boolean>(this, "doCapabilities")));
add(new Label("capabilitiesLabel", new
ResourceModel("export.capabilities")));
+ add(new ExportCheckBox(SSO, new PropertyModel<Boolean>(this,
"doSSO")));
+ add(new Label("ssoLabel", new ResourceModel("export.sso")));
+
add(new ExportCheckBox(USER_PREFS, new
PropertyModel<Boolean>(this, "doUserPrefs")));
add(new Label("userPrefsLabel", new
ResourceModel("export.user_preferences")));
@@ -133,6 +140,7 @@
settings.put(JetspeedSerializer.KEY_PROCESS_PERMISSIONS,
new Boolean(doPermissions));
settings.put(JetspeedSerializer.KEY_PROCESS_PROFILER, new
Boolean(doProfiling));
settings.put(JetspeedSerializer.KEY_PROCESS_CAPABILITIES,
new Boolean(doCapabilities));
+ settings.put(JetspeedSerializer.KEY_PROCESS_SSO, new
Boolean(doSSO));
settings.put(JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES, new
Boolean(doUserPrefs));
settings.put(JetspeedSerializer.KEY_EXPORT_INDENTATION,
"\t");
settings.put(JetspeedSerializer.KEY_OVERWRITE_EXISTING,
Boolean.TRUE);
@@ -408,4 +416,4 @@
{
return getServiceLocator().getJetspeedSerializer();
}
-}
\ No newline at end of file
+}
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.html?rev=788789&r1=788788&r2=788789&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.html
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/PortalDataSerializer.html
Fri Jun 26 17:48:48 2009
@@ -40,6 +40,10 @@
<label wicket:id="permissionsLabel"
for="permissions" class="portlet-form-field-label">_permissions</label>
</div>
<div>
+ <input type="checkbox" wicket:id="sso" id="sso"
class="portlet-form-field">
+ <label wicket:id="ssoLabel" for="sso"
class="portlet-form-field-label">_sso</label>
+ </div>
+ <div>
<input type="checkbox" wicket:id="userPrefs"
id="userPrefs" class="portlet-form-field">
<label wicket:id="userPrefsLabel"
for="userPrefs" class="portlet-form-field-label">_user_preferences</label>
</div>
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties?rev=788789&r1=788788&r2=788789&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/resources/org/apache/jetspeed/portlets/serializer/resources/PortalDataSerializer.properties
Fri Jun 26 17:48:48 2009
@@ -20,6 +20,7 @@
export.permissions=Permissions (triggers exporting Users/Groups/Roles)
export.profiling_rules=Profiling Rules
export.capabilities=Capabilities (mimetypes, mediatypes, capabilities, clients)
+export.sso=SSO (sites, remote users)
export.user_preferences=User Preferences
export.action=Export
@@ -32,4 +33,4 @@
import.message.nofile=No file selected for import
import.message.exception=Import of file {0} failed: {1}
-import.message.success=Successful import of file {0}
\ No newline at end of file
+import.message.success=Successful import of file {0}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
