portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r771584 - in /portals/jetspeed-2: applications/j2-admin/trunk/src/webapp/WEB-INF/ portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/ portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages...
Date Tue, 05 May 2009 06:39:16 GMT
Author: taylor
Date: Tue May  5 06:39:16 2009
New Revision: 771584

URL: http://svn.apache.org/viewvc?rev=771584&view=rev
Log:
This message is for Vivek as I have reviewed the J2-Admin User Manager enhancements 

In reviewing the J2-admin changes to the User Manager, I made a few cosmetic cleanups while
in there. For example I don't like using the word "Wicket" in the portlet deployment descriptors,
so I removed it. Also fixed a few naming conventions for portlet names. After reviewing the
j2-admin User Manager, I have discovered that:

1. from my review, i see that 3 features were added back in
* default subsite
* default profile
* default role

- however the default profile doesn't seem to auto select on the new user page
- and, there is no place to override the subsite like in 2.1.3

2. we have lost several features from 2.1.3
* new User Template Directory
* required Role (not needed because the role filtering capabilities were also removed in 2.2.0,
guess it can go back in in 2.2.1)
* subSiteRootFolder

3. i get this stack trace during switching between edit and view mode.

Unexpected RuntimeException

Root cause:

java.lang.ClassNotFoundException: org.apache.jetspeed.security.impl.RoleImpl
at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1363)
at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1209)
at org.apache.wicket.application.DefaultClassResolver.resolveClass(DefaultClassResolver.java:111)
at org.apache.wicket.util.io.IObjectStreamFactory$DefaultObjectStreamFactory$1.resolveClass(IObjectStreamFactory.java:88)
at java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1544)
at java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1466)
at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1699)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
at java.io.ObjectInputStream.defaultReadFields(ObjectInputStream.java:1908)
at java.io.ObjectInputStream.readSerialData(ObjectInputStream.java:1832)
at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1719)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
at java.io.ObjectInputStream.readArray(ObjectInputStream.java:1634)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1299)
at java.io.ObjectInputStream.defaultReadFields(ObjectInputStream.java:1908)
at java.io.ObjectInputStream.readSerialData(ObjectInputStream.java:1832)
at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1719)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
at java.io.ObjectInputStream.defaultReadFields(ObjectInputStream.java:1908)
at java.io.ObjectInputStream.readSerialData(ObjectInputStream.java:1832)
at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1719)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
at java.io.ObjectInputStream.readArray(ObjectInputStream.java:1634)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1299)
at java.io.ObjectInputStream.defaultReadFields(ObjectInputStream.java:1908)
at java.io.ObjectInputStream.readSerialData(ObjectInputStream.java:1832)
at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1719)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
at java.io.ObjectInputStream.readArray(ObjectInputStream.java:1634)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1299)
at java.io.ObjectInputStream.defaultReadFields(ObjectInputStream.java:1908)
at java.io.ObjectInputStream.readSerialData(ObjectInputStream.java:1832)
at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1719)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
at java.io.ObjectInputStream.defaultReadFields(ObjectInputStream.java:1908)
at java.io.ObjectInputStream.readSerialData(ObjectInputStream.java:1832)
at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1719)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
at java.io.ObjectInputStream.readArray(ObjectInputStream.java:1634)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1299)
at java.io.ObjectInputStream.defaultReadFields(ObjectInputStream.java:1908)
at java.io.ObjectInputStream.readSerialData(ObjectInputStream.java:1832)
at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1719)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
at java.io.ObjectInputStream.readArray(ObjectInputStream.java:1634)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1299)
at java.io.ObjectInputStream.defaultReadFields(ObjectInputStream.java:1908)
at java.io.ObjectInputStream.readSerialData(ObjectInputStream.java:1832)
at java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1719)
at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
at java.io.ObjectInputStream.readObject(ObjectInputStream.java:348)
at org.apache.wicket.util.lang.Objects.byteArrayToObject(Objects.java:398)
at org.apache.wicket.protocol.http.pagestore.AbstractPageStore.deserializePage(AbstractPageStore.java:230)
at org.apache.wicket.protocol.http.pagestore.DiskPageStore.getPage(DiskPageStore.java:709)
at org.apache.wicket.protocol.http.SecondLevelCacheSessionStore$SecondLevelCachePageMap.get(SecondLevelCacheSessionStore.java:305)
at org.apache.wicket.Session.getPage(Session.java:778)
at org.apache.wicket.request.AbstractRequestCycleProcessor.resolveRenderedPage(AbstractRequestCycleProcessor.java:458)
at org.apache.wicket.protocol.http.WebRequestCycleProcessor.resolve(WebRequestCycleProcessor.java:139)
at org.apache.wicket.RequestCycle.step(RequestCycle.java:1252)
at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1370)
at org.apache.wicket.RequestCycle.request(RequestCycle.java:501)
at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:455)
at org.apache.wicket.protocol.http.WicketFilter.doFilter(WicketFilter.java:288)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:679)
at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:584)
at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:497)
at org.apache.pluto.container.impl.PortletRequestDispatcherImpl.doDispatch(PortletRequestDispatcherImpl.java:174)
at org.apache.pluto.container.impl.PortletRequestDispatcherImpl.include(PortletRequestDispatcherImpl.java:222)
at org.apache.wicket.protocol.http.portlet.WicketPortlet.processMimeResponseRequest(WicketPortlet.java:655)
at org.apache.wicket.protocol.http.portlet.WicketPortlet.processRequest(WicketPortlet.java:608)
at org.apache.wicket.protocol.http.portlet.WicketPortlet.doView(WicketPortlet.java:469)
at javax.portlet.GenericPortlet.doDispatch(GenericPortlet.java:354)
at javax.portlet.GenericPortlet.render(GenericPortlet.java:259)
at org.apache.jetspeed.portlet.PortletObjectProxy.proxyRender(PortletObjectProxy.java:244)
at org.apache.jetspeed.portlet.PortletObjectProxy.invoke(PortletObjectProxy.java:159)
at $Proxy49.render(Unknown Source)
at org.apache.jetspeed.factory.JetspeedPortletInstance.render(JetspeedPortletInstance.java:110)
at org.apache.jetspeed.container.services.JetspeedFilterChain.doFilter(JetspeedFilterChain.java:142)
at org.apache.jetspeed.container.services.JetspeedFilterChain.processFilter(JetspeedFilterChain.java:92)
at org.apache.jetspeed.container.services.JetspeedFilterManager.processFilter(JetspeedFilterManager.java:112)
at org.apache.jetspeed.container.JetspeedContainerServlet.doGet(JetspeedContainerServlet.java:272)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:690)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:803)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:269)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:679)
at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:584)
at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:497)
at org.apache.jetspeed.container.invoker.ServletPortletInvoker.invoke(ServletPortletInvoker.java:165)
at org.apache.jetspeed.container.invoker.JetspeedPortletInvokerService.render(JetspeedPortletInvokerService.java:127)
at org.apache.pluto.container.impl.PortletContainerImpl.doRender(PortletContainerImpl.java:158)
at org.apache.jetspeed.container.JetspeedPortletContainerWrapper.doRender(JetspeedPortletContainerWrapper.java:69)
at org.apache.jetspeed.aggregator.impl.RenderingJobImpl.execute(RenderingJobImpl.java:183)
at org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:160)
at org.apache.jetspeed.aggregator.impl.PortletRendererImpl.renderNow(PortletRendererImpl.java:138)
at org.apache.jetspeed.aggregator.impl.PageAggregatorImpl.aggregateAndRender(PageAggregatorImpl.java:108)
at org.apache.jetspeed.aggregator.impl.PageAggregatorImpl.aggregateAndRender(PageAggregatorImpl.java:103)
at org.apache.jetspeed.aggregator.impl.PageAggregatorImpl.build(PageAggregatorImpl.java:77)
at org.apache.jetspeed.aggregator.AggregatorValve.invoke(AggregatorValve.java:46)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.aggregator.HeaderAggregatorValve.invoke(HeaderAggregatorValve.java:53)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.decoration.DecorationValve.invoke(DecorationValve.java:137)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.resource.ResourceValveImpl.invoke(ResourceValveImpl.java:106)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl.invoke(ActionValveImpl.java:149)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.container.ContainerValve.invoke(ContainerValve.java:88)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.container.PageHistoryValve.invoke(PageHistoryValve.java:108)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.profiler.impl.RefreshUserHomepageValveImpl.invoke(RefreshUserHomepageValveImpl.java:94)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.profiler.impl.ProfilerValveImpl.invoke(ProfilerValveImpl.java:248)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.security.impl.LoginValidationValveImpl.invoke(LoginValidationValveImpl.java:158)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.security.impl.PasswordCredentialValveImpl.invoke(PasswordCredentialValveImpl.java:151)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.localization.impl.LocalizationValveImpl.invoke(LocalizationValveImpl.java:170)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.security.impl.AbstractSecurityValve$1.run(AbstractSecurityValve.java:138)
at java.security.AccessController.doPrivileged(Native Method)
at javax.security.auth.Subject.doAsPrivileged(Subject.java:454)
at org.apache.jetspeed.security.JSSubject.doAsPrivileged(JSSubject.java:179)
at org.apache.jetspeed.security.impl.AbstractSecurityValve.invoke(AbstractSecurityValve.java:132)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.container.url.impl.PortalURLValveImpl.invoke(PortalURLValveImpl.java:67)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.capabilities.impl.CapabilityValveImpl.invoke(CapabilityValveImpl.java:127)
at org.apache.jetspeed.pipeline.JetspeedPipeline$Invocation.invokeNext(JetspeedPipeline.java:167)
at org.apache.jetspeed.pipeline.JetspeedPipeline.invoke(JetspeedPipeline.java:146)
at org.apache.jetspeed.engine.JetspeedEngine.service(JetspeedEngine.java:225)
at org.apache.jetspeed.engine.JetspeedServlet.doGet(JetspeedServlet.java:282)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:690)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:803)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:269)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at org.apache.jetspeed.engine.servlet.XXSUrlAttackFilter.doFilter(XXSUrlAttackFilter.java:52)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:213)
at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:174)
at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:433)
at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127)
at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:117)
at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:108)
at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:174)
at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:874)
at org.apache.coyote.http11.Http11BaseProtocol$Http11ConnectionHandler.processConnection(Http11BaseProtocol.java:665)
at org.apache.tomcat.util.net.PoolTcpEndpoint.processSocket(PoolTcpEndpoint.java:528)
at org.apache.tomcat.util.net.LeaderFollowerWorkerThread.runIt(LeaderFollowerWorkerThread.java:81)
at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:689)
at java.lang.Thread.run(Thread.java:613)

Complete stack:

java.lang.RuntimeException: Could not deserialize object using `org.apache.wicket.util.io.IObjectStreamFactory$DefaultObjectStreamFactory`
object factory
at org.apache.wicket.util.lang.Objects.byteArrayToObject(Objects.java:411)
at org.apache.wicket.protocol.http.pagestore.AbstractPageStore.deserializePage(AbstractPageStore.java:230)
at org.apache.wicket.protocol.http.pagestore.DiskPageStore.getPage(DiskPageStore.java:709)
at org.apache.wicket.protocol.http.SecondLevelCacheSessionStore$SecondLevelCachePageMap.get(SecondLevelCacheSessionStore.java:305)
at org.apache.wicket.Session.getPage(Session.java:778)
at org.apache.wicket.request.AbstractRequestCycleProcessor.resolveRenderedPage(AbstractRequestCycleProcessor.java:458)
at org.apache.wicket.protocol.http.WebRequestCycleProcessor.resolve(WebRequestCycleProcessor.java:139)
at org.apache.wicket.RequestCycle.step(RequestCycle.java:1252)
at org.apache.wicket.RequestCycle.steps(RequestCycle.java:1370)
at org.apache.wicket.RequestCycle.request(RequestCycle.java:501)
at org.apache.wicket.protocol.http.WicketFilter.doGet(WicketFilter.java:455)

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/group-mgt.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/role-mgt.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/user-mgt.psml

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml?rev=771584&r1=771583&r2=771584&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml Tue May
 5 06:39:16 2009
@@ -1315,18 +1315,19 @@
             </preference>
         </portlet-preferences>      
    </portlet>
+   
    <portlet>
-    <description>The Wicket User Browser displays a list of users managed in this portal.
From here you can select users for editing.</description>
-    <portlet-name>JetspeedPrincipalmanagementUserPortlet</portlet-name>
+    <description>The User Browser displays a list of users managed in this portal.
From here you can select users for editing.</description>
+    <portlet-name>JetspeedPrincipalManagementUserPortlet</portlet-name>
     <display-name>Jetspeed Principal User Browser</display-name>
     <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
     <init-param>
       <name>wicketFilterPath</name>
-      <value>/jetspeedPrincipalmanagement</value>
+      <value>/jetspeedPrincipalManagement</value>
     </init-param>
     <init-param>
       <name>editPage</name>
-      <value>/jetspeedPrincipalmanagement/builder</value>
+      <value>/jetspeedPrincipalManagement/builder</value>
     </init-param>        
     <init-param>
       <name>principalParam</name>
@@ -1343,15 +1344,41 @@
         <short-title>Users</short-title>
         <keywords>admin,security,users</keywords>            
     </portlet-info>
+    <portlet-preferences>
+        <preference>
+            <name>defaultRole</name>
+            <value>user</value>
+        </preference>
+        <preference>
+            <name>defaultProfile</name>
+            <value>j2</value>
+        </preference>
+        <preference>
+            <name>newUserTemplateDirectory</name>
+            <value></value>
+        </preference>        
+        <preference>
+     		<name>requiredRole</name>
+            <value></value>   
+        </preference>
+        <preference>
+     		<name>subsiteRootFolder</name>
+            <value>/__subsite-root/_hostname/</value>   
+        </preference>        
+        <preference>
+     		<name>defaultSubsite</name>
+            <value></value>   
+        </preference>                    
+	</portlet-preferences>    
   </portlet>
   <portlet>
-    <description>The Wicket Group Browser displays a list of groups managed in this
portal. From here you can select groups for editing.</description>
-    <portlet-name>JetspeedPrincipalmanagementGroupPortlet</portlet-name>
+    <description>The Group Browser displays a list of groups managed in this portal.
From here you can select groups for editing.</description>
+    <portlet-name>JetspeedPrincipalManagementGroupPortlet</portlet-name>
     <display-name>Jetspeed Principal Group Browser</display-name>
     <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
     <init-param>
       <name>wicketFilterPath</name>
-      <value>/jetspeedPrincipalmanagement</value>
+      <value>/jetspeedPrincipalManagement</value>
     </init-param>
     <init-param>
       <name>principalParam</name>
@@ -1369,13 +1396,13 @@
     </portlet-info>
   </portlet>
   <portlet>
-    <description>The Wicket Roles Browser displays a list of roles managed in this
portal. From here you can select roles for editing.</description>
-    <portlet-name>JetspeedPrincipalmanagementRolesPortlet</portlet-name>
+    <description>The Roles Browser displays a list of roles managed in this portal.
From here you can select roles for editing.</description>
+    <portlet-name>JetspeedPrincipalManagementRolesPortlet</portlet-name>
     <display-name>Jetspeed Principal Roles Browser</display-name>
     <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
     <init-param>
       <name>wicketFilterPath</name>
-      <value>/jetspeedPrincipalmanagement</value>
+      <value>/jetspeedPrincipalManagement</value>
     </init-param>
     <init-param>
       <name>principalParam</name>
@@ -1394,9 +1421,9 @@
    </portlet>
 
     <portlet>
-        <description>wicket profiler admin</description>
+        <description>Profiler Administration</description>
         <portlet-name>WicketProfilerAdmin</portlet-name>
-        <display-name>Wicket Profiler Admin</display-name>
+        <display-name>Profiler Administration</display-name>
         <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
         <init-param>
             <name>wicketFilterPath</name>
@@ -1409,16 +1436,16 @@
         <supported-locale>en</supported-locale>
         <!--<resource-bundle>org.apache.jetspeed.portlets.security.JetspeedPrincipalManagementUsers</resource-bundle>
-->
         <portlet-info>
-            <title>Wicket Profiler Admin</title>
+            <title>Profiler Admin</title>
             <short-title>ProfilerAdmin</short-title>
             <keywords>admin,profiler</keywords>            
         </portlet-info>
     </portlet>
 
     <portlet>
-        <description>wicket portlet tracking portlet</description>
+        <description>Portlet Tracking Portlet</description>
         <portlet-name>WicketPortletTrackingPortlet</portlet-name>
-        <display-name>Wicket Portlet Tracking Portlet</display-name>
+        <display-name>Portlet Tracking Portlet</display-name>
         <portlet-class>org.apache.wicket.protocol.http.portlet.WicketPortlet</portlet-class>
         <init-param>
             <name>wicketFilterPath</name>
@@ -1431,7 +1458,7 @@
         <supported-locale>en</supported-locale>
         <!--<resource-bundle>org.apache.jetspeed.portlets.security.JetspeedPrincipalManagementUsers</resource-bundle>
-->
         <portlet-info>
-            <title>Wicket Portlet Tracking Portlet</title>
+            <title>Portlet Tracking Portlet</title>
             <short-title>PortletTracking</short-title>
             <keywords>admin,tracking</keywords>            
         </portlet-info>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml?rev=771584&r1=771583&r2=771584&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/web.xml Tue May  5 06:39:16
2009
@@ -138,7 +138,7 @@
 
     <filter-mapping>
       <filter-name>JetspeedPrincipalManagementPortlet</filter-name>
-      <url-pattern>/jetspeedPrincipalmanagement/*</url-pattern>
+      <url-pattern>/jetspeedPrincipalManagement/*</url-pattern>
       <dispatcher>REQUEST</dispatcher>
       <dispatcher>INCLUDE</dispatcher>
     </filter-mapping>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml?rev=771584&r1=771583&r2=771584&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/group-mgt.psml
Tue May  5 06:39:16 2009
@@ -29,7 +29,7 @@
   <metadata name="title" xml:lang="zh-TW">用戶組管理</metadata>
   <metadata name="title" xml:lang="ko">그룹 관리</metadata>
   <fragment id="gm-2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="gm-3" type="portlet" name="j2-admin::JetspeedPrincipalmanagementGroupPortlet">
+    <fragment id="gm-3" type="portlet" name="j2-admin::JetspeedPrincipalManagementGroupPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml?rev=771584&r1=771583&r2=771584&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/role-mgt.psml
Tue May  5 06:39:16 2009
@@ -29,7 +29,7 @@
   <metadata name="title" xml:lang="ko">역할 관리</metadata>
 
   <fragment id="rm-2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="rm-3" type="portlet" name="j2-admin::JetspeedPrincipalmanagementRolesPortlet">
+    <fragment id="rm-3" type="portlet" name="j2-admin::JetspeedPrincipalManagementRolesPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml?rev=771584&r1=771583&r2=771584&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/security/user-mgt.psml
Tue May  5 06:39:16 2009
@@ -30,7 +30,7 @@
   <metadata name="title" xml:lang="ko">사용자 관리</metadata>
 
   <fragment id="um-2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="um-3" type="portlet" name="j2-admin::JetspeedPrincipalmanagementUserPortlet">
+    <fragment id="um-3" type="portlet" name="j2-admin::JetspeedPrincipalManagementUserPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/group-mgt.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/group-mgt.psml?rev=771584&r1=771583&r2=771584&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/group-mgt.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/group-mgt.psml
Tue May  5 06:39:16 2009
@@ -29,7 +29,7 @@
   <metadata name="title" xml:lang="zh-TW">用戶組管理</metadata>
   <metadata name="title" xml:lang="ko">그룹 관리</metadata>
   <fragment id="gm-2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="gm-3" type="portlet" name="j2-admin::JetspeedPrincipalmanagementGroupPortlet">
+    <fragment id="gm-3" type="portlet" name="j2-admin::JetspeedPrincipalManagementGroupPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/role-mgt.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/role-mgt.psml?rev=771584&r1=771583&r2=771584&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/role-mgt.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/role-mgt.psml
Tue May  5 06:39:16 2009
@@ -29,7 +29,7 @@
   <metadata name="title" xml:lang="ko">역할 관리</metadata>
 
   <fragment id="rm-2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="rm-3" type="portlet" name="j2-admin::JetspeedPrincipalmanagementRolesPortlet">
+    <fragment id="rm-3" type="portlet" name="j2-admin::JetspeedPrincipalManagementRolesPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/user-mgt.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/user-mgt.psml?rev=771584&r1=771583&r2=771584&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/user-mgt.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Administrative/user-mgt.psml
Tue May  5 06:39:16 2009
@@ -30,7 +30,7 @@
   <metadata name="title" xml:lang="ko">사용자 관리</metadata>
 
   <fragment id="um-2" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="um-3" type="portlet" name="j2-admin::JetspeedPrincipalmanagementUserPortlet">
+    <fragment id="um-3" type="portlet" name="j2-admin::JetspeedPrincipalManagementUserPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message