dlestrat 2004/06/05 13:11:31
Modified: portal/src/java/org/apache/jetspeed/tools/pamanager
JetspeedDescriptorUtilities.java FileSystemPAM.java
PortletDescriptorUtilities.java
Log:
User info J2 extension. See http://nagoya.apache.org/jira/browse/JS2-64
Revision Changes Path
1.6 +9 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/JetspeedDescriptorUtilities.java
Index: JetspeedDescriptorUtilities.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/JetspeedDescriptorUtilities.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JetspeedDescriptorUtilities.java 5 Jun 2004 16:18:48 -0000 1.5
+++ JetspeedDescriptorUtilities.java 5 Jun 2004 20:11:31 -0000 1.6
@@ -21,6 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
+import org.apache.jetspeed.om.impl.UserAttributeRefImpl;
import org.apache.jetspeed.tools.pamanager.rules.MetadataRuleSet;
import org.apache.jetspeed.tools.pamanager.rules.PortletRule;
@@ -57,6 +58,11 @@
digester.addRuleSet(new MetadataRuleSet("portlet-app/"));
digester.addRule("portlet-app/portlet/portlet-name", new
PortletRule(app));
digester.addRuleSet(new
MetadataRuleSet("portlet-app/portlet/"));
+
+ digester.addObjectCreate("portlet-app/user-attribute-ref",
UserAttributeRefImpl.class);
+ digester.addBeanPropertySetter("portlet-app/user-attribute-ref/name",
"name");
+
digester.addBeanPropertySetter("portlet-app/user-attribute-ref/name-link", "nameLink");
+ digester.addSetNext("portlet-app/portlet/security-role-ref",
"addUserAttributeRef");
digester.parse(reader);
result = true;
@@ -66,8 +72,9 @@
}
catch (Throwable t)
{
- String msg = "Could not unmarshal \"" + pathPortletXML+"\".
"+t.toString();
+ String msg = "Could not unmarshal \"" + pathPortletXML +"\". " +
t.toString();
log.error(msg, t);
+ throw new PortletApplicationException(msg, t);
}
return result;
1.30 +2 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
Index: FileSystemPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- FileSystemPAM.java 3 Jun 2004 14:20:53 -0000 1.29
+++ FileSystemPAM.java 5 Jun 2004 20:11:31 -0000 1.30
@@ -427,8 +427,7 @@
store.getTransaction().begin();
registry.registerPortletApplication(app);
log.info("Committing registry changes...");
- store.getTransaction().commit();
-
+ store.getTransaction().commit();
}
catch (Exception e)
{
1.12 +2 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletDescriptorUtilities.java
Index: PortletDescriptorUtilities.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletDescriptorUtilities.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PortletDescriptorUtilities.java 5 Jun 2004 16:18:38 -0000 1.11
+++ PortletDescriptorUtilities.java 5 Jun 2004 20:11:31 -0000 1.12
@@ -212,7 +212,6 @@
digester.addBeanPropertySetter("portlet-app/portlet/security-role-ref/description",
"description");
digester.addSetNext("portlet-app/portlet/security-role-ref/description",
"addDescription");
- // PortletApplicationDefinitionImpl pd =
(PortletApplicationDefinitionImpl) beanReader.parse(reader);
PortletApplicationDefinitionImpl pd =
(PortletApplicationDefinitionImpl) digester.parse(reader);
pd.setName(appName);
@@ -222,7 +221,7 @@
catch (Throwable t)
{
t.printStackTrace();
- String msg = "Could not unmarshal \"" + pathPortletXML+"\".
"+t.toString();
+ String msg = "Could not unmarshal \"" + pathPortletXML + "\". " +
t.toString();
log.error(msg, t);
throw new PortletApplicationException(msg, t);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
