You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/04/14 20:54:10 UTC
svn commit: r394172 - in /geronimo/branches/1.1:
applications/console-standard/src/java/org/apache/geronimo/console/keystores/
assemblies/j2ee-jetty-server/src/var/config/ configs/j2ee-security/src/plan/
modules/system/src/java/org/apache/geronimo/syst...
Author: ammulder
Date: Fri Apr 14 11:54:06 2006
New Revision: 394172
URL: http://svn.apache.org/viewcvs?rev=394172&view=rev
Log:
Add back the default keystore GBean
Add back the Jetty HTTPS connector
Fix the most eggregious problems with references in the Attribute Manager;
they're still quite broken!
Fix the front page of the keystore portlet
Modified:
geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java
geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java?rev=394172&r1=394171&r2=394172&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java (original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/keystores/ListHandler.java Fri Apr 14 11:54:06 2006
@@ -74,7 +74,7 @@
} catch (KeystoreIsLocked locked) {}
}
}
- request.setAttribute("keystores", keystores);
+ request.setAttribute("keystores", datas);
request.setAttribute("keys", keys);
}
Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=394172&r1=394171&r2=394172&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/config.xml Fri Apr 14 11:54:06 2006
@@ -30,17 +30,6 @@
<gbean name="JMXService">
<attribute name="url">service:jmx:rmi://${PlanServerHostname}:${PlanJMXPort}/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
</gbean>
-<!--
- <gbean name="geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-security/1.2-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=Keystore,name=geronimo-default" gbeanInfo="org.apache.geronimo.security.keystore.FileKeystoreInstance">
- <attribute name="keystoreName">geronimo-default</attribute>
- <attribute name="keystorePassword">{Simple}rO0ABXNyABlqYXZheC5jcnlwdG8uU2VhbGVkT2JqZWN0PjY9psO3VHACAARbAA1lbmNvZGVkUGFyYW1zdAACW0JbABBlbmNyeXB0ZWRDb250ZW50cQB+AAFMAAlwYXJhbXNBbGd0ABJMamF2YS9sYW5nL1N0cmluZztMAAdzZWFsQWxncQB+AAJ4cHB1cgACW0Ks8xf4BghU4AIAAHhwAAAAEArVToThqcjvbXFD5C2uUmpwdAADQUVT</attribute>
- <attribute name="keyPasswords">{Simple}rO0ABXNyABlqYXZheC5jcnlwdG8uU2VhbGVkT2JqZWN0PjY9psO3VHACAARbAA1lbmNvZGVkUGFyYW1zdAACW0JbABBlbmNyeXB0ZWRDb250ZW50cQB+AAFMAAlwYXJhbXNBbGd0ABJMamF2YS9sYW5nL1N0cmluZztMAAdzZWFsQWxncQB+AAJ4cHB1cgACW0Ks8xf4BghU4AIAAHhwAAAAIGdUCEvsw3HNoD82HNiAiTo5m8E/c8pnljroPhWCnB89cHQAA0FFUw==</attribute>
- <attribute name="keystorePath">var/security/keystores/geronimo-default</attribute>
- <reference name="ServerInfo">
- <pattern><gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=geronimo/j2ee-system/1.2-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name></pattern>
- </reference>
- </gbean>
--->
</configuration>
<configuration name="geronimo/j2ee-corba/${pom.currentVersion}/car" load="false">
<gbean name="NameServer">
@@ -80,7 +69,7 @@
<attribute name="port">${PlanHTTPPortPrimary}</attribute>
<attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
</gbean>
- <gbean name="JettySSLConnector" load="false">
+ <gbean name="JettySSLConnector">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanHTTPSPortPrimary}</attribute>
</gbean>
Modified: geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml?rev=394172&r1=394171&r2=394172&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-security/src/plan/plan.xml Fri Apr 14 11:54:06 2006
@@ -107,4 +107,11 @@
</pattern>
</references>
</gbean>
+ <gbean name="geronimo-default" class="org.apache.geronimo.security.keystore.FileKeystoreInstance">
+ <attribute name="keystoreName">geronimo-default</attribute>
+ <attribute name="keystorePath">var/security/keystores/geronimo-default</attribute>
+ <attribute name="keystorePassword">secret</attribute>
+ <attribute name="keyPasswords">geronimo=secret</attribute>
+ <reference name="ServerInfo"><name>ServerInfo</name></reference>
+ </gbean>
</configuration>
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=394172&r1=394171&r2=394172&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java Fri Apr 14 11:54:06 2006
@@ -369,7 +369,13 @@
ReferencePatterns patterns = (ReferencePatterns) entry.getValue();
out.println(" <reference name=\"" + name + "\">");
- for (Iterator patternIterator = patterns.getPatterns().iterator(); patternIterator.hasNext();) {
+ Set patternSet;
+ if(patterns.isResolved()) {
+ patternSet = Collections.singleton(new AbstractNameQuery(patterns.getAbstractName()));
+ } else {
+ patternSet = patterns.getPatterns();
+ }
+ for (Iterator patternIterator = patternSet.iterator(); patternIterator.hasNext();) {
AbstractNameQuery pattern = (AbstractNameQuery) patternIterator.next();
out.println(" <pattern>");
Artifact artifact = pattern.getArtifact();
@@ -382,7 +388,7 @@
out.println(" <version>" + artifact.getVersion() + "</version>");
}
if (artifact.getType() != null) {
- out.println(" <type>" + artifact.getType() + "</ype>");
+ out.println(" <type>" + artifact.getType() + "</type>");
}
Map nameMap = pattern.getName();
if (nameMap.get("module") != null) {