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 ta...@apache.org on 2009/03/30 19:37:02 UTC
svn commit: r760066 - in
/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed:
CommonPortletServices.java audit/AuditActivity.java
search/ParsedObject.java search/SearchResults.java
Author: taylor
Date: Mon Mar 30 17:37:01 2009
New Revision: 760066
URL: http://svn.apache.org/viewvc?rev=760066&view=rev
Log:
add additional support for registry audit tracking
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/audit/AuditActivity.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/SearchResults.java
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java?rev=760066&r1=760065&r2=760066&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/CommonPortletServices.java Mon Mar 30 17:37:01 2009
@@ -55,4 +55,6 @@
public final static String CPS_AUDIT_ACTIVITY = "cps:AuditActivity";
public final static String CPS_JETSPEED_SERIALIZER = "cps:JetspeedSerializer";
public final static String CPS_JETSPEED_PRINCIPAL_MANAGER_PROVIDER = "cps:JetspeedPrincipalManagerProvider";
+ public final static String CPS_PORTLET_APPLICATION_MANAGER = "cps:PAM";
+
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/audit/AuditActivity.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/audit/AuditActivity.java?rev=760066&r1=760065&r2=760066&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/audit/AuditActivity.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/audit/AuditActivity.java Mon Mar 30 17:37:01 2009
@@ -60,6 +60,12 @@
public static final String USER_DELETE_ATTRIBUTE = "user-delete-attr";
public static final String USER_UPDATE_ATTRIBUTE = "user-update-attr";
+ public static final String REGISTRY_DEPLOY = "registry-deploy";
+ public static final String REGISTRY_UNDEPLOY = "registry-undeploy";
+ public static final String REGISTRY_STOP = "registry-stop";
+ public static final String REGISTRY_START = "registry-start";
+ public static final String REGISTRY_DELETE = "registry-delete";
+
// General Categories
public static final String CAT_USER_AUTHENTICATION = "authentication";
public static final String CAT_USER_ATTRIBUTE = "user-attribute";
@@ -67,6 +73,7 @@
public static final String CAT_ADMIN_CREDENTIAL_MAINTENANCE = "credential";
public static final String CAT_ADMIN_ATTRIBUTE_MAINTENANCE = "attribute";
public static final String CAT_ADMIN_AUTHORIZATION_MAINTENANCE = "authorization";
+ public static final String CAT_ADMIN_REGISTRY_MAINTENANCE = "registry";
/**
* Enable or disable the service at runtime
@@ -116,7 +123,7 @@
public void logAdminAuthorizationActivity(String username, String ipaddress, String targetUser, String activity, String name, String description);
/**
- * Log auditable activity by an administrator on attirbutes on behalf of a user
+ * Log auditable activity by an administrator on attributes on behalf of a user
*
* @param username
* @param ipaddress
@@ -130,7 +137,7 @@
public void logAdminAttributeActivity(String username, String ipaddress, String targetUser, String activity, String name, String beforeValue, String afterValue, String description);
/**
- * Log auditable activity by an administrator on attirbutes on behalf of a user
+ * Log auditable activity by an administrator on attributes on behalf of a user
*
* @param username
* @param ipaddress
@@ -143,6 +150,16 @@
public void logUserAttributeActivity(String username, String ipaddress, String activity, String name, String beforeValue, String afterValue, String description);
/**
+ * Log auditable activity by an administrator on registry maintenance
+ *
+ * @param adminUser
+ * @param ipaddress
+ * @param activity
+ * @param description
+ */
+ public void logAdminRegistryActivity(String adminUser, String ipaddress, String activity, String description);
+
+ /**
* @return DataSource in use by the logger useful for writing decent tests
*/
public DataSource getDataSource();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java?rev=760066&r1=760065&r2=760066&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java Mon Mar 30 17:37:01 2009
@@ -27,7 +27,7 @@
*/
public interface ParsedObject
{
-
+ public static final String ID = "ID";
public static final String FIELDNAME_KEY = "fieldname.key";
public static final String FIELDNAME_KEY_DEFAULT = "Key";
public static final String FIELDNAME_TYPE = "fieldname.type";
@@ -163,7 +163,7 @@
*
* @return
*/
- public Map getFields();
+ public Map<String, String> getFields();
/**
*
@@ -171,7 +171,7 @@
*
* @param fields
*/
- public void setFields(Map fields);
+ public void setFields(Map<String, String> fields);
/**
* @return
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/SearchResults.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/SearchResults.java?rev=760066&r1=760065&r2=760066&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/SearchResults.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/SearchResults.java Mon Mar 30 17:37:01 2009
@@ -27,11 +27,11 @@
{
public int size();
- public Iterator iterator();
+ public Iterator<ParsedObject> iterator();
public ParsedObject get(int index);
- public List getResults();
+ public List<ParsedObject> getResults();
- public List getResults(int fromIndex, int toIndex);
+ public List<ParsedObject> getResults(int fromIndex, int toIndex);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org