geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r393787 [1/22] - in /geronimo/trunk/applications: ./ console/ console/console-core/ console/console-core/src/ console/console-core/src/java/ console/console-core/src/java/org/ console/console-core/src/java/org/apache/ console/console-core/s...
Date Thu, 13 Apr 2006 11:36:26 GMT
Author: jlaskowski
Date: Thu Apr 13 04:34:08 2006
New Revision: 393787

URL: http://svn.apache.org/viewcvs?rev=393787&view=rev
Log:
GERONIMO-1660 - Application migration to Maven 2: Console
Submitted by: Prasad Kashyap

Now, we need to ensure the changes for the previous console dirs are applied to the directory, too. We will also have to ask the console developers to start using the directory rather than the previous ones (applications/console-*)

Added:
    geronimo/trunk/applications/console/
    geronimo/trunk/applications/console/console-core/
    geronimo/trunk/applications/console/console-core/pom.xml   (with props)
    geronimo/trunk/applications/console/console-core/src/
    geronimo/trunk/applications/console/console-core/src/java/
    geronimo/trunk/applications/console/console-core/src/java/org/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java   (with props)
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java   (with props)
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyEntryInfo.java   (with props)
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java   (with props)
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/security/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesFileLoginModuleNoCache.java   (with props)
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java   (with props)
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/system/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/SEServerInfo.java   (with props)
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/ServerConstants.java   (with props)
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/util/
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java   (with props)
    geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java   (with props)
    geronimo/trunk/applications/console/console-ear/
    geronimo/trunk/applications/console/console-ear/pom.xml   (with props)
    geronimo/trunk/applications/console/console-framework/
    geronimo/trunk/applications/console/console-framework/pom.xml   (with props)
    geronimo/trunk/applications/console/console-framework/src/
    geronimo/trunk/applications/console/console-framework/src/precompileJSP.xml   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/ColumnFragment.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/Head.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/PageFragment.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/PortletFragmentFooter.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/PortletFragmentHeader.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/RootFragment.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/RowFragment.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/classes/
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/classes/castor.properties   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/config/
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/config/services/
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/config/services.properties   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/config/services/ConfigService.properties   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/config/services/FactoryManagerService.properties   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/config/services/LogService.properties   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/config/services/PageRegistryService.properties   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/config/services/PortletDefinitionRegistryService.properties   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/config/services/PortletEntityRegistryService.properties   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/data/
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/data/pageregistry.xml   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/data/portletcontexts.txt   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/data/xml/
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/data/xml/pageregistrymapping.xml   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/data/xml/portletdefinitionmapping.xml   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/data/xml/portletentitymapping.xml   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/data/xml/servletdefinitionmapping.xml   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/tld/
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/tld/portlet.tld   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/WEB-INF/web.xml   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/about.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/doc/
    geronimo/trunk/applications/console/console-framework/src/webapp/doc/license/
    geronimo/trunk/applications/console/console-framework/src/webapp/doc/license/Apache_License-1.1.txt   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/doc/license/Apache_License-2.0.txt   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/doc/license/Castor_License.txt   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/doc/license/HOWL_License.txt   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/doc/license/dom4j_License.txt   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/doc/license/jdbm_License.txt   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/index.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/js/
    geronimo/trunk/applications/console/console-framework/src/webapp/js/forms.js   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/login.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/login_success.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/loginerror.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/logout.jsp   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/main.css   (with props)
    geronimo/trunk/applications/console/console-framework/src/webapp/pluto_style.css   (with props)
    geronimo/trunk/applications/console/console-standard/
    geronimo/trunk/applications/console/console-standard/pom.xml   (with props)
    geronimo/trunk/applications/console/console-standard/src/
    geronimo/trunk/applications/console/console-standard/src/conf/
    geronimo/trunk/applications/console/console-standard/src/conf/jms-resource-providers.properties   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/
    geronimo/trunk/applications/console/console-standard/src/java/org/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/BasePortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/EmptyPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/GeronimoVersion.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/MultiPageAbstractHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/MultiPageModel.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/MultiPagePortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/CertManagerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ChangeStorePassword.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/GenerateCSR.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/GenerateKeyPair.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ImportCAReply.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ImportTrustedCertificate.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/UploadCertificateFile.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ViewKeyStore.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/certmanager/actions/ViewKeyStoreEntryDetail.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseInfo.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/infomanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/infomanager/JavaSystemInfoPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/infomanager/ShrinkingMap.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/internaldb/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/internaldb/InternalDBHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/internaldb/InternalDBPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/DestinationInfo.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSManagerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/PortletResponseHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/StatisticsHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/CreateDestinationRenderer.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/PortletRenderer.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/StatisticsRenderer.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/server/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/server/BaseJMSPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/server/JMSConnectorPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ConfigureRAInstanceHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/CreateConnectionFactoryHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/CreateDestinationHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/DeployHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectDestinationTypeHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jsr77/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jsr77/DynamicServerInfo.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/jsr77/Jsr77Lookup.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/logmanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/logmanager/LogManagerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/logmanager/LogViewerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/repository/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/AbstractSecurityManagerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/servermanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/CollectionHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/KernelHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/ObjectNameConstants.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/RealmHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/SERealmGroupHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/SERealmUserHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/SecurityConstants.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/SecurityRealmBean.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/util/StringUtils.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/StatisticsHelper.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/welcome/
    geronimo/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/welcome/WelcomePortlet.java   (with props)
    geronimo/trunk/applications/console/console-standard/src/precompileJSP.xml   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/classes/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/classes/login-modules.properties   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/dwr.xml   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/portlet.xml   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/tld/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/tld/portlet.tld   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/changeStorePasswordNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/generateCSRNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/generateKeyPairNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/importCAReplyNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/importTrustedCertNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewCertificateNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreHelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/derbylogmanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/derbylogmanager/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/infomanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysMaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoHelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoMaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/dbViewerHelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/dbViewerMaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/internalDBHelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/internalDBMaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/internalDBNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/listDatabases.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/listTables.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/runSQLHelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/runSQLMaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/internaldb/viewTableContents.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/addACF.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/config.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/detail.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/connectionhelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/createdestination.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/edit.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/editGeneric.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/maximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/connector/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/maximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/statistics.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/viewDLQ.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmsmanager/viewmessages.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testResults.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/repository/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/repository/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/repository/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addnormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/error.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/addnormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/error.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/addnormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/error.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addnormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/error.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/maximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/help.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/maximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeHelp.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeMaximized.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/web.xml   (with props)
    geronimo/trunk/applications/console/console-standard/src/webapp/index.html   (with props)
    geronimo/trunk/applications/console/pom.xml   (with props)
Modified:
    geronimo/trunk/applications/pom.xml

Added: geronimo/trunk/applications/console/console-core/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-core/pom.xml?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-core/pom.xml (added)
+++ geronimo/trunk/applications/console/console-core/pom.xml Thu Apr 13 04:34:08 2006
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo.applications.console</groupId>
+    <artifactId>console-parent</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>geronimo-console-core</artifactId>
+  <version>1.2-SNAPSHOT</version>
+  <name>Geronimo :: Console :: Common Code</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.modules</groupId>
+      <artifactId>geronimo-jetty</artifactId>
+      <version>${geronimoVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-remote</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <!-- resources>
+      <resource>
+        <directory>${basedir}/src/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources -->
+    <!-- use the antrun plugin till we get timestamp plugin from Geronimo-1659 -->
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <tstamp>
+                  <format property="build.date" pattern="yyyy.MM.dd" />
+                  <format property="build.time" pattern="HH:mm:ss.SSSZ" />
+                  <format property="build.year" pattern="yyyy" />
+                </tstamp>
+                <property name="gen.file.name" value="${basedir}/target/classes/org/apache/geronimo/console/core/system/serverinfo/geronimo-version.properties"/>
+                <touch file="${gen.file.name}" mkdirs="true"/>
+                <echo file="${gen.file.name}">
+                      ##### Generated by Maven2 ####
+version=${geronimoVersion}
+build.date=${build.date}
+build.time=${build.time}
+copyright=Copyright (C) 2003-${build.year}, The Apache Software Foundation
+geronimo.build.version=${geronimoVersion}
+geronimo.spec.version=${geronimoSpecJmsVersion}
+portal.core.version=${plutoVersion}
+                </echo>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Propchange: geronimo/trunk/applications/console/console-core/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-core/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-core/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java (added)
+++ geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java Thu Apr 13 04:34:08 2006
@@ -0,0 +1,87 @@
+/**
+ *
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.core.jms;
+
+import javax.jms.ConnectionFactory;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+
+public class JMSConnectionFactoryBean implements GBeanLifecycle {
+
+    private static Log log = LogFactory.getLog(JMSConnectionFactoryBean.class);
+
+    private final ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper;
+
+    private String connectionFactoryName = "jms/DefaultActiveMQConnectionFactory";
+
+    private ConnectionFactory connectionFactory;
+
+    public JMSConnectionFactoryBean(
+            ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper) {
+        this.managedConnectionFactoryWrapper = managedConnectionFactoryWrapper;
+
+    }
+
+    public ConnectionFactory getConnectionFactory() {
+
+        return this.connectionFactory;
+    }
+
+    public synchronized void doStart() throws Exception {
+
+        connectionFactory = (ConnectionFactory) managedConnectionFactoryWrapper
+                .$getResource();
+
+        log.debug("JMSConnection started");
+
+    }
+
+    public synchronized void doStop() {
+
+    }
+
+    public synchronized void doFail() {
+
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("JMS Connection Factory Bean", JMSConnectionFactoryBean.class);
+        infoFactory.addAttribute("connectionFactory", ConnectionFactory.class,
+                false);
+
+        infoFactory.addReference("ManagedConnectionFactoryWrapper",
+                ManagedConnectionFactoryWrapper.class);
+        infoFactory.addOperation("getConnectionFactory");
+
+        infoFactory
+                .setConstructor(new String[] { "ManagedConnectionFactoryWrapper" });
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}
\ No newline at end of file

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java (added)
+++ geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java Thu Apr 13 04:34:08 2006
@@ -0,0 +1,210 @@
+/**
+ *
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.core.jms;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jms.Message;
+import javax.jms.QueueSession;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.TopicSession;
+import javax.jms.TopicSubscriber;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.connector.AdminObjectWrapper;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.WaitingException;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.management.State;
+
+public class TopicBrowserGBean implements GBeanLifecycle, Runnable {
+
+    private static Log log = LogFactory.getLog(TopicBrowserGBean.class);
+
+    private static Kernel kernel = KernelRegistry.getSingleKernel();
+
+    static {
+        try {
+            ACTIVEMQ_CONTAINER_OBJNAME = ObjectName
+                    .getInstance("geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSServer,name=ActiveMQl");
+            ACTIVEMQ_CONNECTOR_OBJNAME = ObjectName
+                    .getInstance("geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemJMS,j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory");
+        } catch (MalformedObjectNameException moe) {
+            log.warn("Could not initialize ObjectName", moe);
+        }
+    }
+
+    private static ObjectName ACTIVEMQ_CONTAINER_OBJNAME;
+
+    private static ObjectName ACTIVEMQ_CONNECTOR_OBJNAME;
+
+    String subscriberName;
+
+    TopicConnectionFactory tConFactory;
+
+    TopicConnection tConnection;
+
+    AdminObjectWrapper connectionFactoryWrapper, topicWrapper;
+
+    TopicSession tSession;
+
+    TopicSubscriber tSubscriber;
+
+    Topic topic;
+
+    Thread t;
+
+    boolean stop;
+
+    public void run() {
+        try {
+            tConFactory = (TopicConnectionFactory) connectionFactoryWrapper
+                    .$getResource();
+            topic = (Topic) topicWrapper.$getResource();
+            tConnection = tConFactory.createTopicConnection();
+            tConnection.setClientID(subscriberName);
+            tSession = tConnection.createTopicSession(false,
+                    QueueSession.AUTO_ACKNOWLEDGE);
+            tSubscriber = tSession.createDurableSubscriber(topic,
+                    subscriberName);
+            tConnection.start();
+            while (!stop) {
+                Thread.yield();
+            }
+            if (tSession != null) {
+                tSession.close();
+            }
+            if (tConnection != null) {
+                // If the activeMQ connector or container is not running there
+                // is no need to close the connection.
+                // Closing the connection would fail anyway.
+                if (((Integer) kernel.getAttribute(ACTIVEMQ_CONTAINER_OBJNAME,
+                        "state")).intValue() == State.RUNNING_INDEX
+                        && ((Integer) kernel.getAttribute(
+                                ACTIVEMQ_CONNECTOR_OBJNAME, "state"))
+                                .intValue() == State.RUNNING_INDEX) {
+                    tConnection.close();
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        t = null;
+        log.debug("Worker thread stopped.");
+    }
+
+    public TopicBrowserGBean(String subscriberName,
+            AdminObjectWrapper connectionFactoryWrapper,
+            AdminObjectWrapper topicWrapper) {
+        this.subscriberName = subscriberName + "@" + this.getClass().getName();
+        this.connectionFactoryWrapper = connectionFactoryWrapper;
+        this.topicWrapper = topicWrapper;
+    }
+
+    /**
+     * Start the connection on a topic and add a durable subscription.
+     *
+     * @see org.apache.geronimo.gbean.GBeanLifecycle#doStart()
+     */
+    public void doStart() throws WaitingException, Exception {
+        t = new Thread(this);
+        t.start();
+        log.debug("Subscribed to topic.");
+    }
+
+    /**
+     * Close the connection and unregister durable subscription.
+     *
+     * @see org.apache.geronimo.gbean.GBeanLifecycle#doStop()
+     */
+    public void doStop() throws WaitingException, Exception {
+        stop = true;
+        log.debug("Unsubscribed to topic.");
+    }
+
+    public void doFail() {
+        stop = true;
+        log.warn("GBean failed.");
+    }
+
+    /**
+     * Get all the messages since the last call to getMessages(). If this is the
+     * first call returns all the messages sent to the Topic
+     *
+     * @return all the messages since the last call to getMessages() or all the
+     *         messages sent to the topic if this is there was no previous call.
+     * @throws Exception
+     */
+    public List getMessages() throws Exception {
+        List ret = new ArrayList();
+        Message m = null;
+        do {
+            m = tSubscriber.receiveNoWait();
+            if (m != null) {
+                ret.add(m);
+            }
+        } while (m != null);
+        return ret;
+    }
+
+    /**
+     * Remove a durable subscription.
+     */
+    public void unsubscribe() throws Exception {
+        if (tSubscriber != null) {
+            tSubscriber.close();
+            if (tSession != null) {
+                tSession.unsubscribe(subscriberName);
+                log.debug(subscriberName + " unsubscribed from Topic " + topic.getTopicName() + ".");
+            }
+        }
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Topic Browser GBean", TopicBrowserGBean.class);
+        infoFactory.addAttribute("subscriberName", String.class, true);
+
+        infoFactory.addReference("ConnectionFactoryWrapper",
+                AdminObjectWrapper.class);
+        infoFactory.addReference("TopicWrapper", AdminObjectWrapper.class);
+
+        infoFactory.addOperation("getMessages");
+        infoFactory.addOperation("unsubscribe");
+
+        infoFactory.setConstructor(new String[] { "subscriberName",
+                "ConnectionFactoryWrapper", "TopicWrapper" });
+
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+}

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyEntryInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyEntryInfo.java?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyEntryInfo.java (added)
+++ geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyEntryInfo.java Thu Apr 13 04:34:08 2006
@@ -0,0 +1,58 @@
+/**
+ *
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.core.keystore;
+
+import java.util.Date;
+
+public class KeyEntryInfo {
+    public static final String TRUSTED_CERT_TYPE = "trusted certificate";
+
+    public static final String PRIVATE_KEY_TYPE = "private key";
+
+    private String alias;
+
+    private String type;
+
+    private Date created;
+
+    public KeyEntryInfo(String alias, String type, Date created) {
+        this.alias = alias;
+        this.type = type;
+        this.created = created;
+    }
+
+    public String getAlias() {
+        return this.alias;
+    }
+
+    public String getType() {
+        return this.type;
+    }
+
+    public Date getCreated() {
+        return this.created;
+    }
+
+    public boolean isTrustedCertificate() {
+        return type.equals(TRUSTED_CERT_TYPE);
+    }
+
+    public boolean isPrivateKey() {
+        return type.equals(PRIVATE_KEY_TYPE);
+    }
+}

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyEntryInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyEntryInfo.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyEntryInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java (added)
+++ geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java Thu Apr 13 04:34:08 2006
@@ -0,0 +1,497 @@
+/**
+ *
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.core.keystore;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.WaitingException;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.util.asn1.ASN1Set;
+import org.apache.geronimo.util.asn1.DEROutputStream;
+import org.apache.geronimo.util.asn1.x509.X509Name;
+import org.apache.geronimo.util.encoders.Base64;
+import org.apache.geronimo.util.jce.PKCS10CertificationRequest;
+import org.apache.geronimo.util.jce.X509Principal;
+import org.apache.geronimo.util.jce.X509V1CertificateGenerator;
+
+public class KeyStoreGBean implements GBeanLifecycle {
+
+    private static Log log = LogFactory.getLog(KeyStoreGBean.class);
+
+    private String keyStoreType;
+
+    private String keyStoreProvider;
+
+    private String keyStoreLocation;
+
+    private String keyStorePassword;
+
+    private String keyPassword;
+
+    private KeyStore keystore;
+
+    // Used to resolve keystore path.
+    private ServerInfo serverInfo;
+
+    public KeyStoreGBean() {
+        keyPassword = new String("");
+    }
+
+    public void doStart() throws WaitingException, Exception {
+
+        //Security.addProvider(new BouncyCastleProvider());
+
+        this.keystore = KeyStore.getInstance(keyStoreType);
+
+        boolean keystoreExistsFlag = true;
+        InputStream is = null;
+
+        try {
+            File keyStore = serverInfo.resolveServer(this.keyStoreLocation);
+            log.debug("loading keystore from " + keyStore);
+            is = new java.io.FileInputStream(keyStore);
+            this.keystore.load(is, this.keyStorePassword.toCharArray());
+        } catch (java.io.FileNotFoundException e) {
+            keystoreExistsFlag = false;
+        } finally {
+            try {
+                if (is != null) {
+                    is.close();
+                }
+            } catch (Exception e) {
+            }
+        }
+
+        if (keystoreExistsFlag == false) {
+            keystore.load(null, keyStorePassword.toCharArray());
+        }
+    }
+
+    public void doStop() throws WaitingException, Exception {
+    }
+
+    public void doFail() {
+    }
+
+    public void setKeyStoreType(String keyStoreType) {
+        this.keyStoreType = keyStoreType;
+    }
+
+    public String getKeyStoreType() {
+        return this.keyStoreType;
+    }
+
+    public void setKeyStoreProvider(String keyStoreProvider) {
+        this.keyStoreProvider = keyStoreProvider;
+    }
+
+    public String getKeyStoreProvider() {
+        return this.keyStoreProvider;
+    }
+
+    public void setKeyStoreLocation(String keyStoreLocation) {
+        this.keyStoreLocation = keyStoreLocation;
+    }
+
+    public ServerInfo getServerInfo() {
+        return serverInfo;
+    }
+
+    public void setServerInfo(ServerInfo serverInfo) {
+        this.serverInfo = serverInfo;
+    }
+
+    public String getKeyStoreLocation() {
+        return this.keyStoreLocation;
+    }
+
+    public void setKeyStorePassword(String keyStorePassword) {
+        this.keyStorePassword = keyStorePassword;
+    }
+
+    public String getKeyStorePassword() {
+        return this.keyStorePassword;
+    }
+
+    public int getKeyStoreSize() throws KeyStoreException {
+        return this.keystore.size();
+    }
+
+    public KeyEntryInfo getKeyEntryInfo(String alias) throws KeyStoreException {
+        KeyEntryInfo info = null;
+
+        if (this.keystore.isCertificateEntry(alias)) {
+            // certificate entry
+            info = new KeyEntryInfo(alias, "trusted certificate", keystore
+                    .getCreationDate(alias));
+        } else if (this.keystore.isKeyEntry(alias)) {
+            // private key entry
+            info = new KeyEntryInfo(alias, "private key", keystore
+                    .getCreationDate(alias));
+        } else {
+            throw new KeyStoreException("invalid key entry type");
+        }
+        return info;
+    }
+
+    public List getKeyStoreEntries() throws KeyStoreException {
+        List list = new ArrayList();
+
+        Enumeration aliases = this.keystore.aliases();
+
+        while (aliases.hasMoreElements()) {
+            String alias = (String) aliases.nextElement();
+            list.add(getKeyEntryInfo(alias));
+        }
+        return list;
+    }
+
+    public Certificate[] getCertificateChain(String alias)
+            throws KeyStoreException {
+        Certificate[] certs = null;
+
+        if (keystore.isCertificateEntry(alias)) {
+            Certificate cert = keystore.getCertificate(alias);
+            certs = new Certificate[1];
+            certs[0] = cert;
+        } else if (keystore.isKeyEntry(alias)) {
+            certs = keystore.getCertificateChain(alias);
+        } else if (keystore.containsAlias(alias)) {
+            throw new KeyStoreException("Unsupported key-store-entry, alias = "
+                    + alias);
+        } else {
+            throw new KeyStoreException(
+                    "Key-store-entry alias not found, alias = " + alias);
+        }
+
+        return certs;
+    }
+
+    public String generateCSR(String alias) throws Exception {
+
+        // find certificate by alias
+        X509Certificate cert = (X509Certificate) keystore.getCertificate(alias);
+
+        // find private key by alias
+        PrivateKey key = (PrivateKey) keystore.getKey(alias, new String("")
+                .toCharArray());
+
+        // generate csr
+        String csr = generateCSR(cert, key);
+        return csr;
+    }
+
+    public String generateCSR(X509Certificate cert, PrivateKey signingKey)
+            throws Exception {
+
+        String sigalg = cert.getSigAlgName();
+        X509Name subject = new X509Name(cert.getSubjectDN().toString());
+        PublicKey publicKey = cert.getPublicKey();
+        ASN1Set attributes = null;
+
+        PKCS10CertificationRequest csr = new PKCS10CertificationRequest(sigalg,
+                subject, publicKey, attributes, signingKey);
+
+        if (!csr.verify()) {
+            throw new KeyStoreException("CSR verification failed");
+        }
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        DEROutputStream deros = new DEROutputStream(os);
+        deros.writeObject(csr.getDERObject());
+        String b64 = new String(Base64.encode(os.toByteArray()));
+
+        final String BEGIN_CERT_REQ = "-----BEGIN CERTIFICATE REQUEST-----";
+        final String END_CERT_REQ = "-----END CERTIFICATE REQUEST-----";
+        final int CERT_REQ_LINE_LENGTH = 70;
+
+        StringBuffer sbuf = new StringBuffer(BEGIN_CERT_REQ).append('\n');
+
+        int idx = 0;
+        while (idx < b64.length()) {
+
+            int len = (idx + CERT_REQ_LINE_LENGTH > b64.length()) ? b64
+                    .length()
+                    - idx : CERT_REQ_LINE_LENGTH;
+
+            String chunk = b64.substring(idx, idx + len);
+
+            sbuf.append(chunk).append('\n');
+            idx += len;
+        }
+
+        sbuf.append(END_CERT_REQ);
+        return sbuf.toString();
+    }
+
+    public void generateKeyPair(String alias, String keyalg, Integer keysize,
+            String sigalg, Integer validity, String cn, String ou, String o,
+            String l, String st, String c)
+            throws java.security.NoSuchAlgorithmException,
+            java.security.KeyStoreException, java.security.SignatureException,
+            java.security.InvalidKeyException,
+            java.security.cert.CertificateException, java.io.IOException {
+
+        KeyPairGenerator kpgen = KeyPairGenerator.getInstance(keyalg);
+
+        kpgen.initialize(keysize.intValue());
+
+        KeyPair keyPair = kpgen.generateKeyPair();
+
+        X509Certificate cert = generateCert(keyPair.getPublic(), keyPair
+                .getPrivate(), sigalg, validity.intValue(), cn, ou, o, l, st, c);
+
+        keystore.setKeyEntry(alias, keyPair.getPrivate(), new String()
+                .toCharArray(), new Certificate[] { cert });
+
+        saveKeyStore();
+    }
+
+    public void saveKeyStore() throws java.io.IOException,
+            java.security.KeyStoreException,
+            java.security.cert.CertificateException,
+            java.security.NoSuchAlgorithmException {
+
+        FileOutputStream os = null;
+
+        try {
+            File keyStore = serverInfo.resolveServer(this.keyStoreLocation);
+            os = new FileOutputStream(keyStore);
+
+            keystore.store(os, keyStorePassword.toCharArray());
+        } finally {
+            if (os != null) {
+                try {
+                    os.close();
+                } catch (Exception ex) {
+                }
+            }
+        }
+    }
+
+    public X509Certificate generateCert(PublicKey publicKey,
+            PrivateKey privateKey, String sigalg, int validity, String cn,
+            String ou, String o, String l, String st, String c)
+            throws java.security.SignatureException,
+            java.security.InvalidKeyException {
+        X509V1CertificateGenerator certgen = new X509V1CertificateGenerator();
+
+        // issuer dn
+        Vector order = new Vector();
+        Hashtable attrmap = new Hashtable();
+
+        if (cn != null) {
+            attrmap.put(X509Principal.CN, cn);
+            order.add(X509Principal.CN);
+        }
+
+        if (ou != null) {
+            attrmap.put(X509Principal.OU, ou);
+            order.add(X509Principal.OU);
+        }
+
+        if (o != null) {
+            attrmap.put(X509Principal.O, o);
+            order.add(X509Principal.O);
+        }
+
+        if (l != null) {
+            attrmap.put(X509Principal.L, l);
+            order.add(X509Principal.L);
+        }
+
+        if (st != null) {
+            attrmap.put(X509Principal.ST, st);
+            order.add(X509Principal.ST);
+        }
+
+        if (c != null) {
+            attrmap.put(X509Principal.C, c);
+            order.add(X509Principal.C);
+        }
+
+        X509Principal issuerDN = new X509Principal(order, attrmap);
+        certgen.setIssuerDN(issuerDN);
+
+        // validity
+        long curr = System.currentTimeMillis();
+        long untill = curr + (long) validity * 24 * 60 * 60 * 1000;
+
+        certgen.setNotBefore(new Date(curr));
+        certgen.setNotAfter(new Date(untill));
+
+        // subject dn
+        certgen.setSubjectDN(issuerDN);
+
+        // public key
+        certgen.setPublicKey(publicKey);
+
+        // signature alg
+        certgen.setSignatureAlgorithm(sigalg);
+
+        // serial number
+        certgen.setSerialNumber(new BigInteger(String.valueOf(curr)));
+
+        // make certificate
+        X509Certificate cert = certgen.generateX509Certificate(privateKey);
+        return cert;
+    }
+
+    public void importTrustedX509Certificate(String alias, String certfile)
+            throws java.io.FileNotFoundException,
+            java.security.cert.CertificateException,
+            java.security.KeyStoreException, java.io.IOException,
+            java.security.NoSuchAlgorithmException,
+            java.security.NoSuchProviderException {
+        InputStream is = null;
+
+        try {
+            CertificateFactory cf = CertificateFactory.getInstance("X.509",
+                    keyStoreProvider);
+
+            is = new FileInputStream(certfile);
+            Certificate cert = cf.generateCertificate(is);
+
+            keystore.setCertificateEntry(alias, cert);
+
+            saveKeyStore();
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (Exception e) {
+                }
+            }
+        }
+    }
+
+    public void importPKCS7Certificate(String alias, String certbuf)
+            throws java.security.cert.CertificateException,
+            java.security.NoSuchProviderException,
+            java.security.KeyStoreException,
+            java.security.NoSuchAlgorithmException,
+            java.security.UnrecoverableKeyException, java.io.IOException {
+
+        InputStream is = null;
+
+        try {
+            is = new ByteArrayInputStream(certbuf.getBytes());
+            importPKCS7Certificate(alias, is);
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (Exception e) {
+                }
+            }
+        }
+    }
+
+    public void importPKCS7Certificate(String alias, InputStream is)
+            throws java.security.cert.CertificateException,
+            java.security.NoSuchProviderException,
+            java.security.KeyStoreException,
+            java.security.NoSuchAlgorithmException,
+            java.security.UnrecoverableKeyException, java.io.IOException {
+
+        CertificateFactory cf = CertificateFactory.getInstance("X.509",
+                keyStoreProvider);
+        Collection certcoll = cf.generateCertificates(is);
+
+        Certificate[] chain = new Certificate[certcoll.size()];
+
+        Iterator iter = certcoll.iterator();
+        for (int i = 0; iter.hasNext(); i++) {
+            chain[i] = (Certificate) iter.next();
+        }
+
+        char[] password = keyPassword.toCharArray();
+        keystore.setKeyEntry(alias, keystore.getKey(alias, password), password,
+                chain);
+
+        saveKeyStore();
+    }
+
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(KeyStoreGBean.class);
+
+        infoFactory.addAttribute("keyStoreType", String.class, true);
+        infoFactory.addAttribute("keyStoreProvider", String.class, true);
+        infoFactory.addAttribute("keyStoreLocation", String.class, true);
+        infoFactory.addAttribute("keyStorePassword", String.class, true);
+
+        infoFactory.addReference("serverInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
+
+        infoFactory.addOperation("getKeyEntryInfo",
+                new Class[] { String.class });
+        infoFactory.addOperation("getKeyStoreSize");
+        infoFactory.addOperation("getKeyStoreEntries");
+        infoFactory.addOperation("getCertificateChain",
+                new Class[] { String.class });
+        infoFactory.addOperation("generateCSR", new Class[] { String.class });
+
+        infoFactory.addOperation("generateKeyPair", new Class[] { String.class,
+                String.class, Integer.class, String.class, Integer.class,
+                String.class, String.class, String.class, String.class,
+                String.class, String.class });
+
+        infoFactory.addOperation("importTrustedX509Certificate", new Class[] {
+                String.class, String.class });
+        infoFactory.addOperation("importPKCS7Certificate", new Class[] {
+                String.class, String.class });
+
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+}

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-core/src/java/org/apache/geronimo/console/core/keystore/KeyStoreGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message