taylor 02/05/26 08:33:35
Modified: build/torque/schema Tag: security_14 security-schema.xml
src/java/org/apache/jetspeed/om/profile Tag: security_14
Security.java
src/java/org/apache/jetspeed/om/profile/psml Tag:
security_14 PsmlSecurity.java
src/java/org/apache/jetspeed/services/psmlmanager Tag:
security_14 TestMarshalPsml.java
webapp/WEB-INF/conf Tag: security_14 psml-mapping.xml
webapp/WEB-INF/db Tag: security_14 jetspeed.properties
jetspeed.script
webapp/WEB-INF/psml/test Tag: security_14 testcase.psml
testsecurity.psml
Log:
Revision Changes Path
No revision
No revision
1.1.2.2 +24 -1 jakarta-jetspeed/build/torque/schema/Attic/security-schema.xml
Index: security-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/Attic/security-schema.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- security-schema.xml 25 May 2002 18:18:15 -0000 1.1.2.1
+++ security-schema.xml 26 May 2002 15:33:34 -0000 1.1.2.2
@@ -13,7 +13,7 @@
<!-- users, and security. -->
<!-- ==================================================================== -->
<!-- @author: <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a> -->
-<!-- @version $Id: security-schema.xml,v 1.1.2.1 2002/05/25 18:18:15 taylor Exp $
-->
+<!-- @version $Id: security-schema.xml,v 1.1.2.2 2002/05/26 15:33:34 taylor Exp $
-->
<!-- ==================================================================== -->
<database name="@DATABASE_NAME@">
@@ -37,7 +37,30 @@
</unique>
</table>
+
+ <table name="JETSPEED_SECURITY">
+ <column name="SECURITY_ID" required="true" primaryKey="true" type="INTEGER"/>
+ </table>
+ <table name="JETSPEED_ACL">
+ <column name="ACCESS_ID" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="SECURITY_ID" required="true" primaryKey="true" type="INTEGER"/>
+ <column name="RESOURCE" required="true" size="99" type="VARCHAR"/>
+ <column name="RESOURCE_TYPE" required="true" size="32" type="VARCHAR"/>
+ <column name="ACTION" required="true" size="32" type="VARCHAR"/>
+ <column name="ALLOW_TYPE" required="true" size="32" type="VARCHAR"/>
+ <column name="PRINCIPAL" required="true" size="32" type="VARCHAR"/>
+
+ <foreign-key foreignTable="JETSPEED_SECURITY" onDelete="cascade">
+ <reference local="SECURITY_ID" foreign="SECURITY_ID" />
+ </foreign-key>
+
+ <index>
+ <index-column name="SECURITY_ID"/>
+ </index>
+
+ </table>
+
<table name="TURBINE_ROLE" idMethod="idbroker" >
<column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="ROLE_NAME" required="true" size="99" type="VARCHAR"/>
No revision
No revision
1.2.2.1 +17 -13
jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/Security.java
Index: Security.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/Security.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Security.java 25 Mar 2002 21:42:03 -0000 1.2
+++ Security.java 26 May 2002 15:33:34 -0000 1.2.2.1
@@ -59,19 +59,23 @@
* Interface describing security for an entry.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: Security.java,v 1.2 2002/03/25 21:42:03 taylor Exp $
+ * @version $Id: Security.java,v 1.2.2.1 2002/05/26 15:33:34 taylor Exp $
*/
public interface Security
{
- public boolean hasRole(String name);
-
- public Iterator getRolesIterator();
-
- public int getRolesCount();
-
- public void removeAllRoles();
-
- public Role removeRole(String role);
-
- public void addRole(Role role);
-}
\ No newline at end of file
+ /**
+ * Gets the security entry unique id.
+ * This value is guaranteed to be unique in the security provider namespace.
+ *
+ * @return the id of this entry.
+ */
+ public String getId();
+
+ /**
+ * Sets the security entry unique id.
+ * This value is guaranteed to be unique in the security provider namespace.
+ *
+ * @param id the unique id of the security entry.
+ */
+ public void setId(String id);
+ }
\ No newline at end of file
No revision
No revision
1.2.2.1 +16 -70
jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/psml/PsmlSecurity.java
Index: PsmlSecurity.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/psml/PsmlSecurity.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- PsmlSecurity.java 25 Mar 2002 21:42:03 -0000 1.2
+++ PsmlSecurity.java 26 May 2002 15:33:35 -0000 1.2.2.1
@@ -54,11 +54,7 @@
package org.apache.jetspeed.om.profile.psml;
-import java.util.Vector;
-import java.util.Iterator;
-
import org.apache.jetspeed.om.profile.Security;
-import org.apache.jetspeed.om.profile.Role;
/**
* Bean like implementation of the Security interface suitable for
@@ -66,85 +62,35 @@
*
* @see org.apache.jetspeed.om.registry.Security
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
- * @version $Id: PsmlSecurity.java,v 1.2 2002/03/25 21:42:03 taylor Exp $
+ * @version $Id: PsmlSecurity.java,v 1.2.2.1 2002/05/26 15:33:35 taylor Exp $
*/
public class PsmlSecurity implements Security, java.io.Serializable
{
- private Vector roles = null;
+ private String id;
public PsmlSecurity()
{}
- public boolean hasRole(String name)
- {
- if (roles == null)
- return false;
-
- for (int ix=0; ix < roles.size(); ix++)
- {
- Role role = (Role)roles.elementAt(ix);
- if (role.getName().equals(name))
- return true;
- }
- return false;
- }
-
- public Iterator getRolesIterator()
- {
- return roles.iterator();
- }
-
- public int getRolesCount()
- {
- return roles.size();
- }
-
- public void removeAllRoles()
- {
- roles.removeAllElements();
- }
-
- public Role removeRole(String name)
- {
- if (roles == null)
- return null;
-
- for (int ix=0; ix < roles.size(); ix++)
- {
- Role role = (Role)roles.elementAt(ix);
- if (role.getName().equals(name))
- {
- roles.removeElementAt(ix);
- return role;
- }
- }
- return null;
- }
-
- public void addRole(Role role)
- {
- roles.addElement(role);
- }
-
-
- /*
- * CASTOR mapping functions
+ /**
+ * Gets the security entry unique id.
+ * This value is guaranteed to be unique in the security provider namespace.
*
+ * @return the id of this entry.
*/
-
- /** @return the role name that is required for accessing this entry */
- public Vector getRoles()
+ public String getId()
{
- return this.roles;
+ return id;
}
-
- /** Sets the role name required for accessing this entry
- * @param role the required role name
+
+ /**
+ * Sets the security entry unique id.
+ * This value is guaranteed to be unique in the security provider namespace.
+ *
+ * @param id the unique id of the security entry.
*/
- public void setRoles( Vector roles )
+ public void setId(String id)
{
- this.roles = roles;
+ this.id = id;
}
-
}
No revision
No revision
1.6.2.1 +6 -14
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java
Index: TestMarshalPsml.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- TestMarshalPsml.java 26 Apr 2002 20:53:02 -0000 1.6
+++ TestMarshalPsml.java 26 May 2002 15:33:35 -0000 1.6.2.1
@@ -40,7 +40,7 @@
* TestMarshalPsml
*
* @author <a href="[EMAIL PROTECTED]">David Sean Taylor</a>
- * @version $Id: TestMarshalPsml.java,v 1.6 2002/04/26 20:53:02 taylor Exp $
+ * @version $Id: TestMarshalPsml.java,v 1.6.2.1 2002/05/26 15:33:35 taylor Exp $
*/
//public class TestMarshalPsml extends ServletTestCase {
public class TestMarshalPsml extends TestCase {
@@ -182,11 +182,7 @@
Security security = rootset.getSecurity();
assertNotNull(security);
- Iterator itRoles = security.getRolesIterator();
- Role role = (Role)itRoles.next();
- assertTrue(role.getName().equals("manager"));
- role = (Role)itRoles.next();
- assertTrue(role.getName().equals("user"));
+ assertTrue(security.getId().equals("999"));
Iterator params = rootset.getParameterIterator();
Parameter param = (Parameter)params.next();
@@ -364,14 +360,10 @@
is.setSystemId( mapFile );
mapping.loadMapping( is );
Unmarshaller unmarshaller = new Unmarshaller(mapping);
- Security rootset = (Security)unmarshaller.unmarshal(reader);
- Iterator roles = rootset.getRolesIterator();
- Role role = (Role)roles.next();
- assertTrue(role.getName().equals("admin"));
- role = (Role)roles.next();
- assertTrue(role.getName().equals("user"));
- role = (Role)roles.next();
- assertTrue(role.getName().equals("manager"));
+ Security security = (Security)unmarshaller.unmarshal(reader);
+ assertNotNull(security);
+ assertTrue(security.getId().equals("1000"));
+
}
catch (Exception e)
{
No revision
No revision
1.4.2.1 +3 -6 jakarta-jetspeed/webapp/WEB-INF/conf/psml-mapping.xml
Index: psml-mapping.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/psml-mapping.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- psml-mapping.xml 6 Apr 2002 01:48:44 -0000 1.4
+++ psml-mapping.xml 26 May 2002 15:33:35 -0000 1.4.2.1
@@ -115,16 +115,13 @@
</class>
-
-
<class name="org.apache.jetspeed.om.profile.psml.PsmlSecurity">
<map-to xml="security"/>
- <field name="roles"
- type="org.apache.jetspeed.om.profile.psml.PsmlRole"
- collection="vector">
- <bind-xml name="role"/>
+ <field name="id" type="java.lang.String">
+ <bind-xml name="id" node="attribute"/>
</field>
+
</class>
<class name="org.apache.jetspeed.om.profile.psml.PsmlParameter">
No revision
No revision
1.11.2.1 +2 -2 jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties
Index: jetspeed.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- jetspeed.properties 5 Apr 2002 21:10:07 -0000 1.11
+++ jetspeed.properties 26 May 2002 15:33:35 -0000 1.11.2.1
@@ -1,4 +1,4 @@
#Hypersonic SQL database
-#Fri Apr 05 12:45:05 PST 2002
+#Sun May 26 08:26:59 PDT 2002
version=1.4
-modified=no
+modified=yes
1.13.2.1 +1 -0 jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script
Index: jetspeed.script
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- jetspeed.script 5 Apr 2002 21:10:07 -0000 1.13
+++ jetspeed.script 26 May 2002 15:33:35 -0000 1.13.2.1
@@ -139,3 +139,4 @@
INSERT INTO COFFEES VALUES('CantThinkOfAnymoreGrade',4,7.99,1,2)
/*C4*/CONNECT USER sa PASSWORD ""
+/*C1*/CONNECT USER sa PASSWORD ""
No revision
No revision
1.4.2.1 +1 -4 jakarta-jetspeed/webapp/WEB-INF/psml/test/testcase.psml
Index: testcase.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/test/testcase.psml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- testcase.psml 6 Apr 2002 01:49:48 -0000 1.4
+++ testcase.psml 26 May 2002 15:33:35 -0000 1.4.2.1
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<portlets id="01" name="theRootSet">
- <security>
- <role name="manager"/>
- <role name="user"/>
- </security>
+ <security id="999"/>
<metainfo>
<title>Jetspeed</title>
1.1.2.1 +1 -5 jakarta-jetspeed/webapp/WEB-INF/psml/test/testsecurity.psml
Index: testsecurity.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/test/testsecurity.psml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- testsecurity.psml 22 Mar 2002 18:31:15 -0000 1.1
+++ testsecurity.psml 26 May 2002 15:33:35 -0000 1.1.2.1
@@ -1,6 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<security>
- <role name="admin"/>
- <role name="user"/>
- <role name="manager"/>
-</security>
\ No newline at end of file
+<security id="1000"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
