geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r892414 - in /geronimo/server/trunk/plugins/console: ./ console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/ console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/ console-base-port...
Date Sat, 19 Dec 2009 01:36:01 GMT
Author: djencks
Date: Sat Dec 19 01:36:01 2009
New Revision: 892414

URL: http://svn.apache.org/viewvc?rev=892414&view=rev
Log:
GERONIMO-4965 bundleize console. Remove spliit package, add tomcat test server. Mostly works
for me with some uncomitted changes to pluto and our pluto integration

Added:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/RealmHelper.java
  (contents, props changed)
      - copied, changed from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/RealmHelper.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmGroupHelper.java
  (contents, props changed)
      - copied, changed from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SERealmGroupHelper.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmUserHelper.java
  (contents, props changed)
      - copied, changed from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SERealmUserHelper.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SecurityRealmBean.java
  (contents, props changed)
      - copied, changed from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SecurityRealmBean.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/TimeUtils.java
  (contents, props changed)
      - copied, changed from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/TimeUtils.java
    geronimo/server/trunk/plugins/console/console-tomcat-server/
      - copied from r891395, geronimo/server/trunk/plugins/console/console-jetty-server/
Removed:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/
Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
    geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml
    geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml
    geronimo/server/trunk/plugins/console/pom.xml

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java?rev=892414&r1=892413&r2=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java
Sat Dec 19 01:36:01 2009
@@ -29,8 +29,8 @@
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
 
-import org.apache.geronimo.console.util.SERealmGroupHelper;
-import org.apache.geronimo.console.util.SERealmUserHelper;
+import org.apache.geronimo.console.securitymanager.util.SERealmGroupHelper;
+import org.apache.geronimo.console.securitymanager.util.SERealmUserHelper;
 
 public class SEGroupsPortlet extends AbstractSecurityManagerPortlet {
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java?rev=892414&r1=892413&r2=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
Sat Dec 19 01:36:01 2009
@@ -30,8 +30,8 @@
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
 
-import org.apache.geronimo.console.util.SERealmGroupHelper;
-import org.apache.geronimo.console.util.SERealmUserHelper;
+import org.apache.geronimo.console.securitymanager.util.SERealmGroupHelper;
+import org.apache.geronimo.console.securitymanager.util.SERealmUserHelper;
 
 /**
  * @version $Rev$ $Date$

Copied: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/RealmHelper.java
(from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/RealmHelper.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/RealmHelper.java?p2=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/RealmHelper.java&p1=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/RealmHelper.java&r1=890386&r2=892414&rev=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/RealmHelper.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/RealmHelper.java
Sat Dec 19 01:36:01 2009
@@ -15,12 +15,14 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.console.util;
+package org.apache.geronimo.console.securitymanager.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.geronimo.console.util.KernelHelper;
+import org.apache.geronimo.console.util.ObjectNameConstants;
 
-public abstract class RealmHelper extends KernelHelper {        
+public abstract class RealmHelper extends KernelHelper {
     
     private static final Logger logger = LoggerFactory.getLogger(RealmHelper.class);
 

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/RealmHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/RealmHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/RealmHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmGroupHelper.java
(from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SERealmGroupHelper.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmGroupHelper.java?p2=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmGroupHelper.java&p1=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SERealmGroupHelper.java&r1=890386&r2=892414&rev=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SERealmGroupHelper.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmGroupHelper.java
Sat Dec 19 01:36:01 2009
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.console.util;
+package org.apache.geronimo.console.securitymanager.util;
 
 import java.util.Collection;
 import java.util.Hashtable;
@@ -23,6 +23,8 @@
 
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.console.util.ObjectNameConstants;
+import org.apache.geronimo.console.util.StringUtils;
 
 public class SERealmGroupHelper extends RealmHelper {
 

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmGroupHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmGroupHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmGroupHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmUserHelper.java
(from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SERealmUserHelper.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmUserHelper.java?p2=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmUserHelper.java&p1=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SERealmUserHelper.java&r1=890386&r2=892414&rev=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SERealmUserHelper.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmUserHelper.java
Sat Dec 19 01:36:01 2009
@@ -15,12 +15,13 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.console.util;
+package org.apache.geronimo.console.securitymanager.util;
 
 import java.util.Hashtable;
 
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.console.util.ObjectNameConstants;
 
 public class SERealmUserHelper extends RealmHelper {
 

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmUserHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmUserHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SERealmUserHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SecurityRealmBean.java
(from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SecurityRealmBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SecurityRealmBean.java?p2=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SecurityRealmBean.java&p1=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SecurityRealmBean.java&r1=890386&r2=892414&rev=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/SecurityRealmBean.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SecurityRealmBean.java
Sat Dec 19 01:36:01 2009
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.console.util;
+package org.apache.geronimo.console.securitymanager.util;
 
 import java.util.Map;
 

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SecurityRealmBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SecurityRealmBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/util/SecurityRealmBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/TimeUtils.java
(from r890386, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/TimeUtils.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/TimeUtils.java?p2=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/TimeUtils.java&p1=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/TimeUtils.java&r1=890386&r2=892414&rev=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/TimeUtils.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/TimeUtils.java
Sat Dec 19 01:36:01 2009
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.console.util;
+package org.apache.geronimo.console.webmanager;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/TimeUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/TimeUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/TimeUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java?rev=892414&r1=892413&r2=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
Sat Dec 19 01:36:01 2009
@@ -19,7 +19,7 @@
 
 import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.console.util.TimeUtils;
+import org.apache.geronimo.console.webmanager.TimeUtils;
 import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.management.geronimo.stats.WebContainerStats;

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp?rev=892414&r1=892413&r2=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
Sat Dec 19 01:36:01 2009
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@ page import="org.apache.geronimo.console.util.SERealmGroupHelper" %>
+<%@ page import="org.apache.geronimo.console.securitymanager.util.SERealmGroupHelper"
%>
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.Iterator" %>
 

Modified: geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml?rev=892414&r1=892413&r2=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml Sat Dec 19 01:36:01
2009
@@ -71,5 +71,11 @@
       <version>${version}</version>
       <type>car</type>
     </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.plugins</groupId>
+      <artifactId>plugin-console-jetty</artifactId>
+      <version>${version}</version>
+      <type>car</type>
+    </dependency>
   </dependencies>
 </project>

Modified: geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml?rev=892414&r1=891395&r2=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml Sat Dec 19 01:36:01
2009
@@ -8,7 +8,7 @@
     <version>3.0-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.geronimo.plugins</groupId>
-  <artifactId>console-jetty-server</artifactId>
+  <artifactId>console-tomcat-server</artifactId>
   <packaging>server-assembly</packaging>
   <build>
     <pluginManagement>
@@ -67,7 +67,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.plugins</groupId>
-      <artifactId>console-jetty</artifactId>
+      <artifactId>console-tomcat</artifactId>
+      <version>${version}</version>
+      <type>car</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.plugins</groupId>
+      <artifactId>plugin-console-tomcat</artifactId>
       <version>${version}</version>
       <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/pom.xml?rev=892414&r1=892413&r2=892414&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/pom.xml Sat Dec 19 01:36:01 2009
@@ -44,8 +44,9 @@
         <module>plugin-portlets</module>
         <module>plugin-console-jetty</module>
         <module>plugin-console-tomcat</module>
-    <module>console-jetty-server</module>
-  </modules>
+        <module>console-jetty-server</module>
+        <module>console-tomcat-server</module>
+    </modules>
 
     <dependencyManagement>
         <dependencies>



Mime
View raw message