geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r610590 [2/2] - in /geronimo/server/trunk: assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-tomcat6-javaee5/ plugins/console/ plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ajax/ plugins/console/conso...
Date Wed, 09 Jan 2008 21:54:47 GMT
Modified: geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/web.xml?rev=610590&r1=610569&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/web.xml Wed
Jan  9 13:53:11 2008
@@ -26,8 +26,6 @@
       <init-param>
         <param-name>classes</param-name>
         <param-value>
-            org.apache.geronimo.console.jsr77.Jsr77Lookup,
-            org.apache.geronimo.console.jsr77.DynamicServerInfo,
             org.apache.geronimo.console.ajax.ProgressMonitor,
             org.apache.geronimo.console.ajax.ProgressInfo
         </param-value>
@@ -37,7 +35,28 @@
           <param-value>true</param-value>
       </init-param>
     </servlet>
-
+    <!--
+    For security reasons requests to the dwr servlet go through
+    the "/console" web-app context. The purpose of dwr-filter is
+    to map the attributes such as pathInfo, requestURI, etc. of
+    the original request into the request that is delivered to
+    the dwr-invoker servlet.  The dwr-invoker servlet uses those
+    attributes to create URLs that it sends back to the client.
+     -->
+    <filter>
+        <filter-name>dwr-filter</filter-name>
+        <filter-class>org.apache.geronimo.console.servlet.ForwardDispatchFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>dwr-filter</filter-name>
+        <servlet-name>dwr-invoker</servlet-name>
+        <dispatcher>FORWARD</dispatcher>
+    </filter-mapping>
+    <servlet-mapping>
+        <servlet-name>dwr-invoker</servlet-name>
+        <url-pattern>/dwr/*</url-pattern>
+    </servlet-mapping>
+    
     <servlet>
         <servlet-name>car-export</servlet-name>
         <servlet-class>org.apache.geronimo.console.car.CARExportServlet</servlet-class>
@@ -51,150 +70,6 @@
         <servlet-class>org.apache.geronimo.console.configmanager.PlanExportServlet</servlet-class>
     </servlet>
     <servlet>
-        <servlet-name>Welcome</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>Welcome</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ServerInfo</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>ServerInfo</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>JavaSysInfo</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>JavaSysInfo</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>LogManager</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>LogManager</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>LogViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>LogViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>WebAccessLogViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>WebAccessLogViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ServerManager</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>ServerManager</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>WebServerManager</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>WebServerManager</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ConnectorManager</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>ConnectorManager</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ThreadPool</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>ThreadPool</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>RepositoryViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>RepositoryViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>RealmWizard</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>RealmWizard</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ApacheJK</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>ApacheJK</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>Keystores</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>Keystores</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>CertificationAuthority</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>CertificationAuthority</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>Applications</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>Applications</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>Deployment</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -204,51 +79,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>WARModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>WARModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>SystemModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>SystemModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>SEUsers</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>SEUsers</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>SEGroups</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>SEGroups</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>SecurityRealms</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>SecurityRealms</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>ImportExport</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -257,48 +87,8 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <servlet>
-        <servlet-name>EARModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>EARModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>EJBModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>EJBModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>RARModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>RARModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ClientModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>ClientModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
 
     <servlet-mapping>
-        <servlet-name>dwr-invoker</servlet-name>
-        <url-pattern>/dwr/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>car-export</servlet-name>
         <url-pattern>/car-export</url-pattern>
     </servlet-mapping>
@@ -311,113 +101,13 @@
         <url-pattern>/plan-export</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>Welcome</servlet-name>
-        <url-pattern>/PlutoInvoker/Welcome</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ServerInfo</servlet-name>
-        <url-pattern>/PlutoInvoker/ServerInfo</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>JavaSysInfo</servlet-name>
-        <url-pattern>/PlutoInvoker/JavaSysInfo</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>LogManager</servlet-name>
-        <url-pattern>/PlutoInvoker/LogManager</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>LogViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/LogViewer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>WebAccessLogViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/WebAccessLogViewer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ServerManager</servlet-name>
-        <url-pattern>/PlutoInvoker/ServerManager</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>WebServerManager</servlet-name>
-        <url-pattern>/PlutoInvoker/WebServerManager</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ConnectorManager</servlet-name>
-        <url-pattern>/PlutoInvoker/ConnectorManager</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ThreadPool</servlet-name>
-        <url-pattern>/PlutoInvoker/ThreadPool</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>RepositoryViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/RepositoryViewer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>RealmWizard</servlet-name>
-        <url-pattern>/PlutoInvoker/RealmWizard</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ApacheJK</servlet-name>
-        <url-pattern>/PlutoInvoker/ApacheJK</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Keystores</servlet-name>
-        <url-pattern>/PlutoInvoker/Keystores</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>CertificationAuthority</servlet-name>
-        <url-pattern>/PlutoInvoker/CertificationAuthority</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>Applications</servlet-name>
-        <url-pattern>/PlutoInvoker/Applications</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>Deployment</servlet-name>
         <url-pattern>/PlutoInvoker/Deployment</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>WARModules</servlet-name>
-        <url-pattern>/PlutoInvoker/WARModules</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SystemModules</servlet-name>
-        <url-pattern>/PlutoInvoker/SystemModules</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SEUsers</servlet-name>
-        <url-pattern>/PlutoInvoker/SEUsers</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SEGroups</servlet-name>
-        <url-pattern>/PlutoInvoker/SEGroups</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SecurityRealms</servlet-name>
-        <url-pattern>/PlutoInvoker/SecurityRealms</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>ImportExport</servlet-name>
         <url-pattern>/PlutoInvoker/ImportExport</url-pattern>
     </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>EARModules</servlet-name>
-        <url-pattern>/PlutoInvoker/EARModules</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>EJBModules</servlet-name>
-        <url-pattern>/PlutoInvoker/EJBModules</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>RARModules</servlet-name>
-        <url-pattern>/PlutoInvoker/RARModules</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ClientModules</servlet-name>
-        <url-pattern>/PlutoInvoker/ClientModules</url-pattern>
-    </servlet-mapping>
 
     <security-constraint>
         <web-resource-collection>
@@ -448,22 +138,5 @@
         <role-name>admin</role-name>
     </security-role>
 
-    <!--
-    For security reasons requests to the dwr servlet go through
-    the "/console" web-app context. The purpose of dwr-filter is
-    to map the attributes such as pathInfo, requestURI, etc. of
-    the original request into the request that is delivered to
-    the dwr-invoker servlet.  The dwr-invoker servlet uses those
-    attributes to create URLs that it sends back to the client.
-     -->
-    <filter>
-        <filter-name>dwr-filter</filter-name>
-        <filter-class>org.apache.geronimo.console.servlet.ForwardDispatchFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>dwr-filter</filter-name>
-        <servlet-name>dwr-invoker</servlet-name>
-        <dispatcher>FORWARD</dispatcher>
-    </filter-mapping>
 
 </web-app>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml
(original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml
Wed Jan  9 13:53:11 2008
@@ -80,9 +80,11 @@
     </page>
 
 <!-- APPLICATIONS -->
+<!--
     <page name="Applications/Deploy New" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console-base" name="Deployment"/>
     </page>
+-->
 
     <page name="Applications/Web App WARs" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console-base" name="WARModules"/>
@@ -108,9 +110,11 @@
       <portlet context="/console-base" name="ClientModules"/>
     </page>
 
+<!--
     <page name="Applications/Plugins" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console-base" name="ImportExport"/>
     </page>
+-->
 
 <!-- SECURITY -->
     <page name="Security/Users and Groups" uri="/WEB-INF/themes/default-theme.jsp">

Modified: geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/pom.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/pom.xml Wed Jan  9 13:53:11 2008
@@ -44,26 +44,27 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-support</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        <!-- TODO temporary? -->
+
+        <!-- TODO temporary? for realm wizard-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>plugin</artifactId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
- 
+
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
@@ -86,6 +87,13 @@
         </dependency>
 
          <!-- to force build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>

Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml Wed Jan  9
13:53:11 2008
@@ -192,7 +192,4 @@
         </role-mappings>
     </security>
 
-    <!-- TODO: what is this? -->
-    <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel"
/>
-
 </application>

Modified: geronimo/server/trunk/plugins/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/pom.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/pom.xml Wed Jan  9 13:53:11 2008
@@ -45,6 +45,9 @@
         <module>console-ear</module>
         <module>console-tomcat</module>
         <module>console-jetty</module>
+        <module>console-plugin</module>
+        <module>console-plugin-jetty</module>
+        <module>console-plugin-tomcat</module>
     </modules>
 
 </project>



Mime
View raw message