geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r388257 - in /geronimo/trunk: assemblies/j2ee-jetty-server/src/var/security/ assemblies/j2ee-jetty-server/src/var/security/keystores/ assemblies/j2ee-tomcat-server/src/var/security/ assemblies/j2ee-tomcat-server/src/var/security/keystores/ ...
Date Thu, 23 Mar 2006 20:12:19 GMT
Author: ammulder
Date: Thu Mar 23 12:12:17 2006
New Revision: 388257

URL: http://svn.apache.org/viewcvs?rev=388257&view=rev
Log:
Move the default keystore into the new keystores/ directory

Added:
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/security/keystores/geronimo-default
      - copied unchanged from r387610, geronimo/trunk/assemblies/j2ee-jetty-server/src/var/security/keystore
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/security/keystores/geronimo-default
      - copied unchanged from r387610, geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/security/keystore
Removed:
    geronimo/trunk/assemblies/j2ee-jetty-server/src/var/security/keystore
    geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/security/keystore
Modified:
    geronimo/trunk/configs/client-system/src/plan/plan.xml
    geronimo/trunk/configs/jetty/src/plan/plan.xml
    geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
    geronimo/trunk/configs/tomcat/src/plan/plan.xml

Modified: geronimo/trunk/configs/client-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-system/src/plan/plan.xml?rev=388257&r1=388256&r2=388257&view=diff
==============================================================================
--- geronimo/trunk/configs/client-system/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-system/src/plan/plan.xml Thu Mar 23 12:12:17 2006
@@ -87,8 +87,8 @@
             javax.net.ssl.trustStorePassword=secret
         </attribute>
         <attribute name="systemPathProperties">
-            javax.net.ssl.keyStore=var/security/keystore
-            javax.net.ssl.trustStore=var/security/keystore
+            javax.net.ssl.keyStore=var/security/keystores/geronimo-default
+            javax.net.ssl.trustStore=var/security/keystores/geronimo-default
         </attribute>
         <reference name="ServerInfo">
             <name>ServerInfo</name>

Modified: geronimo/trunk/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/src/plan/plan.xml?rev=388257&r1=388256&r2=388257&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty/src/plan/plan.xml Thu Mar 23 12:12:17 2006
@@ -93,7 +93,7 @@
     <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPSPort}</attribute>
-        <attribute name="keystoreFileName">var/security/keystore</attribute>
+        <attribute name="keystoreFileName">var/security/keystores/geronimo-default</attribute>
         <attribute name="keystoreType">JKS</attribute>
         <attribute name="keystorePassword">secret</attribute>
         <attribute name="keyPassword">secret</attribute>

Modified: geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/rmi-naming/src/plan/plan.xml?rev=388257&r1=388256&r2=388257&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/rmi-naming/src/plan/plan.xml Thu Mar 23 12:12:17 2006
@@ -50,8 +50,8 @@
             javax.net.ssl.trustStorePassword=secret
         </attribute>
         <attribute name="systemPathProperties">
-            javax.net.ssl.keyStore=var/security/keystore
-            javax.net.ssl.trustStore=var/security/keystore
+            javax.net.ssl.keyStore=var/security/keystores/geronimo-default
+            javax.net.ssl.trustStore=var/security/keystores/geronimo-default
         </attribute>
         <reference name="ServerInfo">
             <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>

Modified: geronimo/trunk/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/src/plan/plan.xml?rev=388257&r1=388256&r2=388257&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat/src/plan/plan.xml Thu Mar 23 12:12:17 2006
@@ -102,7 +102,7 @@
         <attribute name="clientAuthRequired">false</attribute>
         <attribute name="algorithm">Default</attribute>
         <attribute name="secureProtocol">TLS</attribute>
-        <attribute name="keystoreFileName">var/security/keystore</attribute>
+        <attribute name="keystoreFileName">var/security/keystores/geronimo-default</attribute>
         <attribute name="keystorePassword">secret</attribute>
         <reference name="TomcatContainer">
             <name>TomcatWebContainer</name>



Mime
View raw message