You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2006/12/04 10:42:38 UTC
svn commit: r482113 - in /geronimo/server/trunk:
applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/
applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/certmanager/
applications/console/ge...
Author: vamsic007
Date: Mon Dec 4 01:42:36 2006
New Revision: 482113
URL: http://svn.apache.org/viewvc?view=rev&rev=482113
Log:
GERONIMO-1601 Remove the "Old Keystore" portlet
o Merging rev 482109 from trunk
o Removed "Old Keystore" related entries from console portlet definitions
o Removed java and jsp files related to "Old Keystore"
o Removed "ssl-keystore-1" entries from webconsole configs
Removed:
geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/certmanager/
geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/certmanager/
Modified:
geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml
geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml
geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml
geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml?view=diff&rev=482113&r1=482112&r2=482113
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/pageregistry.xml Mon Dec 4 01:42:36 2006
@@ -17,6 +17,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<portal>
<fragment name="navigation" class="org.apache.pluto.portalImpl.aggregation.navigation.TabNavigation">
@@ -545,20 +548,6 @@
<fragment name="col1" type="column">
<fragment name="p1" type="portlet">
<property name="portlet" value="5.81"/>
- </fragment>
- </fragment>
- </fragment>
- </fragment>
- <fragment name="keystore" type="page">
- <navigation>
- <title>Old Keystore</title>
- <description>ico_doc_16x16.gif Manage the keystore for this server</description>
- </navigation>
-
- <fragment name="row1" type="row">
- <fragment name="col1" type="column">
- <fragment name="p1" type="portlet">
- <property name="portlet" value="5.62"/>
</fragment>
</fragment>
</fragment>
Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml?view=diff&rev=482113&r1=482112&r2=482113
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/data/portletentityregistry.xml Mon Dec 4 01:42:36 2006
@@ -17,6 +17,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<portlet-entity-registry>
<application id="5">
<definition-id>console-standard</definition-id>
@@ -122,10 +125,6 @@
<portlet id="61">
<definition-id>console-standard.SecurityRealms</definition-id>
</portlet>
- <portlet id="62">
- <definition-id>console-standard.Keystore</definition-id>
- </portlet>
-
<portlet id="63">
<definition-id>console-standard.JMSServerManager</definition-id>
</portlet>
Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=482113&r1=482112&r2=482113
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml Mon Dec 4 01:42:36 2006
@@ -17,6 +17,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+<!-- $Rev$ $Date$ -->
+
<portlet-app
xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
version="1.0"
@@ -1014,30 +1017,6 @@
<title>Installed Security Realms</title>
<short-title>Security Realms</short-title>
<keywords>Security Realms</keywords>
- </portlet-info>
- </portlet>
-
- <portlet>
- <description>Portlet for configuring the server keystore</description>
- <portlet-name>Keystore</portlet-name>
- <display-name>Keystore Portlet</display-name>
-
- <portlet-class>org.apache.geronimo.console.certmanager.CertManagerPortlet</portlet-class>
-
- <expiration-cache>-1</expiration-cache>
-
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
-<!-- <portlet-mode>HELP</portlet-mode>-->
- </supports>
-
- <supported-locale>en</supported-locale>
-
- <portlet-info>
- <title>Keystore Configuration</title>
- <short-title>Keystore</short-title>
- <keywords>Keystore SSL</keywords>
</portlet-info>
</portlet>
Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml?view=diff&rev=482113&r1=482112&r2=482113
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml Mon Dec 4 01:42:36 2006
@@ -211,19 +211,6 @@
</init-param>
</servlet>
<servlet>
- <display-name>Pluto Wrapper for Old Keystore Portlet</display-name>
- <servlet-name>Keystore</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-class</param-name>
- <param-value>org.apache.geronimo.console.certmanager.CertManagerPortlet</param-value>
- </init-param>
- <init-param>
- <param-name>portlet-guid</param-name>
- <param-value>console-standard.Keystore</param-value>
- </init-param>
- </servlet>
- <servlet>
<display-name>Pluto Wrapper for Thread Pool Portlet</display-name>
<servlet-name>ThreadPool</servlet-name>
<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
@@ -894,10 +881,6 @@
<servlet-mapping>
<servlet-name>ApacheJK</servlet-name>
<url-pattern>/ApacheJK/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Keystore</servlet-name>
- <url-pattern>/Keystore/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>ThreadPool</servlet-name>
Modified: geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml?view=diff&rev=482113&r1=482112&r2=482113
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml Mon Dec 4 01:42:36 2006
@@ -428,14 +428,4 @@
<!--</reference>-->
<!--</gbean>-->
- <!-- Keystore configuration -->
- <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
- <attribute name="keyStoreType">PKCS12</attribute>
- <attribute name="keyStorePassword">password</attribute>
- <reference name="serverInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
</application>
Modified: geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml?view=diff&rev=482113&r1=482112&r2=482113
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/src/plan/plan.xml Mon Dec 4 01:42:36 2006
@@ -133,14 +133,4 @@
<!--</reference>-->
<!--</gbean>-->
- <!-- Keystore configuration -->
- <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">
- <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
- <attribute name="keyStoreType">PKCS12</attribute>
- <attribute name="keyStorePassword">password</attribute>
- <reference name="serverInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
</application>
Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=482113&r1=482112&r2=482113
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Mon Dec 4 01:42:36 2006
@@ -432,14 +432,4 @@
<!--</reference>-->
<!--</gbean>-->
- <!-- Keystore configuration -->
- <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
- <attribute name="keyStoreType">PKCS12</attribute>
- <attribute name="keyStorePassword">password</attribute>
- <reference name="serverInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
</application>