taylor 2003/08/12 22:01:02
Modified: src/java/org/apache/jetspeed/om/registry/base
BaseSecurityAccess.java
src/java/org/apache/jetspeed/services/registry
TestCastor.java
webapp/WEB-INF/conf admin.xreg
Added: test/conf registry-mapping.xml test-registry.xreg
Log:
Stumped. Can't figure this one out, dl'ed the Castor source, it doesn't make any
sense.
This unit test isolates the bug. Just replace Castor in lib dir with 0.9.5 Castor jar
Seems to be BaseSecurityAccess class causing this:
[junit] This Test is for testing compatibility with new versions of Castor as they
are released.
[junit] ------------- ---------------- ---------------
[junit] ------------- Standard Error -----------------
[junit] java.lang.NullPointerException
[junit] at java.lang.Class.isAssignableFrom(Native Method)
[junit] at
org.exolab.castor.xml.util.XMLFieldDescriptorImpl.<init>(XMLFieldDescriptorImpl.java:320)
Revision Changes Path
1.8 +2 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/BaseSecurityAccess.java
Index: BaseSecurityAccess.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/BaseSecurityAccess.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseSecurityAccess.java 15 Apr 2003 20:44:55 -0000 1.7
+++ BaseSecurityAccess.java 13 Aug 2003 05:01:02 -0000 1.8
@@ -266,7 +266,7 @@
allAllows.ensureCapacity(elementCount);
allAllows.addAll(this.ownerAllows);
}
- }
+ }
return this.allAllows;
}
}
1.2 +3 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestCastor.java
Index: TestCastor.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/registry/TestCastor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestCastor.java 13 Aug 2003 04:18:17 -0000 1.1
+++ TestCastor.java 13 Aug 2003 05:01:02 -0000 1.2
@@ -92,8 +92,8 @@
public void testUnMarshall()
{
System.out.println("This Test is for testing compatibility with new
versions of Castor as they are released.");
- String mapFile = "../webapp/WEB-INF/conf/registry.xml";
- String registryFile = "../webapp/WEB-INF/conf/admin.xreg";
+ String mapFile = "../test/conf/registry-mapping.xml";
+ String registryFile = "../test/conf/test-registry.xreg";
File map = new File(mapFile);
try
1.1 jakarta-jetspeed/test/conf/registry-mapping.xml
Index: registry-mapping.xml
===================================================================
<?xml version="1.0"?>
<mapping>
<class name="org.apache.jetspeed.services.registry.RegistryFragment">
<map-to xml="registry"/>
</class>
<class name="org.apache.jetspeed.om.registry.base.BaseSecurityAccess">
<map-to xml="access"/>
<field name="action" type="java.lang.String">
<bind-xml name="action" node="attribute"/>
</field>
<field name="allows"
collection="vector">
<bind-xml name="allow-if"/>
</field>
</class>
</mapping>
1.1 jakarta-jetspeed/test/conf/test-registry.xreg
Index: test-registry.xreg
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<registry>
</registry>
1.42 +86 -86 jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg
Index: admin.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- admin.xreg 13 Jul 2003 22:17:49 -0000 1.41
+++ admin.xreg 13 Aug 2003 05:01:02 -0000 1.42
@@ -537,93 +537,93 @@
<category group="Jetspeed">admin</category>
</portlet-entry>
- <portlet-entry name="PsmlManager" hidden="false" type="ref"
parent="GenericMVCPortlet" application="false">
- <security-ref parent="user-only"/>
- <meta-info>
- <title>PSML Page Manager</title>
- <description>Hierarchical tree browser and manager of PSML
resources.</description>
- </meta-info>
- <parameter name="viewtype" value="Velocity" hidden="true"/>
- <parameter name="action" value="portlets.PsmlManagerAction"
hidden="true"/>
- <parameter name="template" value="manager-psml" hidden="true"/>
- <parameter name="detail-template" value="psml-detail" hidden="true"/>
- <parameter name="default-search" type="boolean" value="true"
hidden="false">
- <security-ref parent="admin-only"/>
- <meta-info>
- <title>Auto-search current user pages</title>
- <description>Use this parameter to automatically
search current user psml</description>
- </meta-info>
- </parameter>
- <parameter name="can-search" value="" hidden="true">
- <security-ref parent="admin-only"/>
- <meta-info>
- <description>Adjust the security-ref for this
parameter to control who can search psml</description>
- </meta-info>
- </parameter>
- <parameter name="can-export" value="" hidden="true">
- <security-ref parent="admin-only"/>
- <meta-info>
- <description>Adjust the security-ref for this
parameter to control who can export psml</description>
- </meta-info>
- </parameter>
- <parameter name="can-export-all" value="" hidden="true">
- <security-ref parent="admin-only"/>
- <meta-info>
- <description>Adjust the security-ref for this
parameter to control who can export all psml</description>
- </meta-info>
- </parameter>
- <parameter name="can-import" value="" hidden="true">
- <security-ref parent="admin-only"/>
- <meta-info>
- <description>Adjust the security-ref for this
parameter to control who can import psml</description>
- </meta-info>
- </parameter>
- <parameter name="can-import-all" value="" hidden="true">
- <security-ref parent="admin-only"/>
- <meta-info>
- <description>Adjust the security-ref for this
parameter to control who can import all psml</description>
- </meta-info>
- </parameter>
- <parameter name="can-clone" value="" hidden="true">
- <security-ref parent="admin-only"/>
- <meta-info>
- <description>Adjust the security-ref for this
parameter to control who can clone psml</description>
- </meta-info>
- </parameter>
- <parameter name="can-remove" value="" hidden="true">
- <security-ref parent="user-only"/>
- <meta-info>
- <description>Adjust the security-ref for this
parameter to control who can remove psml</description>
- </meta-info>
- </parameter>
- <parameter name="can-add" value="" hidden="true">
- <security-ref parent="user-only"/>
- <meta-info>
- <description>Adjust the security-ref for this
parameter to control who can add psml</description>
- </meta-info>
- </parameter>
- <parameter name="page-size" value="25" hidden="false">
- <meta-info>
- <title>Page size</title>
- <description>Maximum number of psml resources to
display per page</description>
- </meta-info>
- </parameter>
- <media-type ref="html"/>
- <category group="Jetspeed">Tools</category>
- </portlet-entry>
+ <portlet-entry name="PsmlManager" hidden="false" type="ref"
parent="GenericMVCPortlet" application="false">
+ <security-ref parent="user-only"/>
+ <meta-info>
+ <title>PSML Page Manager</title>
+ <description>Hierarchical tree browser and manager of PSML
resources.</description>
+ </meta-info>
+ <parameter name="viewtype" value="Velocity" hidden="true"/>
+ <parameter name="action" value="portlets.PsmlManagerAction" hidden="true"/>
+ <parameter name="template" value="manager-psml" hidden="true"/>
+ <parameter name="detail-template" value="psml-detail" hidden="true"/>
+ <parameter name="default-search" type="boolean" value="true" hidden="false">
+ <security-ref parent="admin-only"/>
+ <meta-info>
+ <title>Auto-search current user pages</title>
+ <description>Use this parameter to automatically search current
user psml</description>
+ </meta-info>
+ </parameter>
+ <parameter name="can-search" value="" hidden="true">
+ <security-ref parent="admin-only"/>
+ <meta-info>
+ <description>Adjust the security-ref for this parameter to control
who can search psml</description>
+ </meta-info>
+ </parameter>
+ <parameter name="can-export" value="" hidden="true">
+ <security-ref parent="admin-only"/>
+ <meta-info>
+ <description>Adjust the security-ref for this parameter to control
who can export psml</description>
+ </meta-info>
+ </parameter>
+ <parameter name="can-export-all" value="" hidden="true">
+ <security-ref parent="admin-only"/>
+ <meta-info>
+ <description>Adjust the security-ref for this parameter to control
who can export all psml</description>
+ </meta-info>
+ </parameter>
+ <parameter name="can-import" value="" hidden="true">
+ <security-ref parent="admin-only"/>
+ <meta-info>
+ <description>Adjust the security-ref for this parameter to control
who can import psml</description>
+ </meta-info>
+ </parameter>
+ <parameter name="can-import-all" value="" hidden="true">
+ <security-ref parent="admin-only"/>
+ <meta-info>
+ <description>Adjust the security-ref for this parameter to control
who can import all psml</description>
+ </meta-info>
+ </parameter>
+ <parameter name="can-clone" value="" hidden="true">
+ <security-ref parent="admin-only"/>
+ <meta-info>
+ <description>Adjust the security-ref for this parameter to control
who can clone psml</description>
+ </meta-info>
+ </parameter>
+ <parameter name="can-remove" value="" hidden="true">
+ <security-ref parent="user-only"/>
+ <meta-info>
+ <description>Adjust the security-ref for this parameter to control
who can remove psml</description>
+ </meta-info>
+ </parameter>
+ <parameter name="can-add" value="" hidden="true">
+ <security-ref parent="user-only"/>
+ <meta-info>
+ <description>Adjust the security-ref for this parameter to control
who can add psml</description>
+ </meta-info>
+ </parameter>
+ <parameter name="page-size" value="25" hidden="false">
+ <meta-info>
+ <title>Page size</title>
+ <description>Maximum number of psml resources to display per
page</description>
+ </meta-info>
+ </parameter>
+ <media-type ref="html"/>
+ <category group="Jetspeed">Tools</category>
+ </portlet-entry>
- <portlet-entry name="IndexManager" hidden="false" type="ref"
parent="GenericMVCPortlet" application="false">
- <security-ref parent="admin-only"/>
- <meta-info>
- <title>Portlet Index Manager</title>
- <description>Utility portlet to rebuild the portlet entry
index</description>
- </meta-info>
- <parameter name="viewtype" value="Velocity" hidden="true"/>
- <parameter name="action" value="portlets.IndexPortletRegistry"
hidden="true"/>
- <parameter name="template" value="index-registry" hidden="true"/>
- <media-type ref="html"/>
- <category group="Jetspeed">admin</category>
- </portlet-entry>
+ <portlet-entry name="IndexManager" hidden="false" type="ref"
parent="GenericMVCPortlet" application="false">
+ <security-ref parent="admin-only"/>
+ <meta-info>
+ <title>Portlet Index Manager</title>
+ <description>Utility portlet to rebuild the portlet entry
index</description>
+ </meta-info>
+ <parameter name="viewtype" value="Velocity" hidden="true"/>
+ <parameter name="action" value="portlets.IndexPortletRegistry"
hidden="true"/>
+ <parameter name="template" value="index-registry" hidden="true"/>
+ <media-type ref="html"/>
+ <category group="Jetspeed">admin</category>
+ </portlet-entry>
</registry>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
