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 2005/07/21 03:38:23 UTC
svn commit: r219976 [1/12] - in /geronimo/trunk: ./ etc/
sandbox/console-core/ sandbox/console-core/src/
sandbox/console-core/src/java/ sandbox/console-core/src/java/org/
sandbox/console-core/src/java/org/apache/
sandbox/console-core/src/java/org/apach...
Author: ammulder
Date: Wed Jul 20 18:38:12 2005
New Revision: 219976
URL: http://svn.apache.org/viewcvs?rev=219976&view=rev
Log:
Web console donation
Added:
geronimo/trunk/COPYRIGHT
geronimo/trunk/sandbox/console-core/
geronimo/trunk/sandbox/console-core/maven.xml (with props)
geronimo/trunk/sandbox/console-core/project.properties (with props)
geronimo/trunk/sandbox/console-core/project.xml (with props)
geronimo/trunk/sandbox/console-core/src/
geronimo/trunk/sandbox/console-core/src/java/
geronimo/trunk/sandbox/console-core/src/java/org/
geronimo/trunk/sandbox/console-core/src/java/org/apache/
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java (with props)
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java (with props)
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesFileLoginModuleNoCache.java (with props)
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java (with props)
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/SEServerInfo.java (with props)
geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/ServerConstants.java (with props)
geronimo/trunk/sandbox/console-ear/
geronimo/trunk/sandbox/console-ear/maven.xml (with props)
geronimo/trunk/sandbox/console-ear/project.properties (with props)
geronimo/trunk/sandbox/console-ear/project.xml (with props)
geronimo/trunk/sandbox/console-ear/src/
geronimo/trunk/sandbox/console-ear/src/application/
geronimo/trunk/sandbox/console-ear/src/application/META-INF/
geronimo/trunk/sandbox/console-ear/src/application/META-INF/application.xml (with props)
geronimo/trunk/sandbox/console-ear/src/plan/
geronimo/trunk/sandbox/console-ear/src/plan/geronimo-application.xml (with props)
geronimo/trunk/sandbox/console-framework/
geronimo/trunk/sandbox/console-framework/maven.xml
geronimo/trunk/sandbox/console-framework/project.properties (with props)
geronimo/trunk/sandbox/console-framework/project.xml (with props)
geronimo/trunk/sandbox/console-framework/src/
geronimo/trunk/sandbox/console-framework/src/webapp/
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/Banner.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/ColumnFragment.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/Head.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/PageFragment.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/PortletFragmentFooter.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/PortletFragmentHeader.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/RootFragment.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/RowFragment.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/classes/
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/classes/castor.properties (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/config/
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/config/services/
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/config/services.properties (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/config/services/ConfigService.properties (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/config/services/FactoryManagerService.properties (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/config/services/LogService.properties (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/config/services/PageRegistryService.properties (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/config/services/PortletDefinitionRegistryService.properties (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/config/services/PortletEntityRegistryService.properties (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/pageregistry.xml (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/portletcontexts.txt (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/xml/
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/xml/pageregistrymapping.xml (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/xml/portletdefinitionmapping.xml (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/xml/portletentitymapping.xml (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/xml/servletdefinitionmapping.xml (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/tld/
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/tld/portlet.tld
geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/web.xml (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/about.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/doc/
geronimo/trunk/sandbox/console-framework/src/webapp/doc/license/
geronimo/trunk/sandbox/console-framework/src/webapp/doc/license/Apache_License-1.1.txt (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/doc/license/Apache_License-2.0.txt (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/doc/license/Castor_License.txt (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/doc/license/HOWL_License.txt (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/doc/license/Sun_Binary_Code_License.txt (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/doc/license/dom4j_License.txt (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/doc/license/jdbm_License.txt (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/favicon.ico (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/
geronimo/trunk/sandbox/console-framework/src/webapp/images/add.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/back.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/browse.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/bullet.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/cancel.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/clear.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/collapsed_white.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/create.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/delete.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/expanded_white.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/install.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/joe_logo.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/mgmtconsole.jpg (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/related_links.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/reset.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/run_sql.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/spacer.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/submit.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/images/update.gif (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/index.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/js/
geronimo/trunk/sandbox/console-framework/src/webapp/js/forms.js (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/login.html
geronimo/trunk/sandbox/console-framework/src/webapp/login_success.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/loginerror.html
geronimo/trunk/sandbox/console-framework/src/webapp/logout.jsp (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/main.css (with props)
geronimo/trunk/sandbox/console-framework/src/webapp/pluto_style.css (with props)
geronimo/trunk/sandbox/console-standard/
geronimo/trunk/sandbox/console-standard/maven.xml
geronimo/trunk/sandbox/console-standard/project.properties (with props)
geronimo/trunk/sandbox/console-standard/project.xml (with props)
geronimo/trunk/sandbox/console-standard/src/
geronimo/trunk/sandbox/console-standard/src/java/
geronimo/trunk/sandbox/console-standard/src/java/org/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/configmanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/AbstractConnectionFactoryManagerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/DetailViewRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/connectionmanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/connectionmanager/ConnectionManagerInfo.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/connectionmanager/ConnectionManagerRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyConnectorRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/derby/DerbyInfo.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/generic/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/generic/ConnectorRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLConnectorRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/mssql/MSSQLInfo.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLConnectorRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/databasemanager/tranql/TranQLInfo.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/infomanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/infomanager/JavaSystemInfoPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/infomanager/ServerInfoPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/internaldb/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/internaldb/InternalDBHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/internaldb/InternalDBPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/DestinationInfo.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSConnectionFactoryManagerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/JMSManagerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/PortletResponseHandler.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/RemoveDestinationHandler.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/StatisticsHandler.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/CreateDestinationRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/PortletRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/StatisticsRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDLQRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewDestinationsRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/jmsmanager/renderers/ViewMessagesRenderer.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/logmanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/logmanager/LogManagerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/logmanager/LogViewerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/logmanager/WebAccessLogCriteria.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/logmanager/WebAccessLogHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/repository/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/securitymanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/securitymanager/AbstractSecurityManagerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/servermanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/CollectionHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/KernelHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/LogHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/ObjectNameConstants.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/RealmHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/SERealmGroupHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/SERealmUserHelper.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/SecurityConstants.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/SecurityRealmBean.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/StringUtils.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/AJP13ConnectorPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorInfo.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/HttpConnectorBean.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/HttpConnectorPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/HttpsConnectorBean.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/HttpsConnectorPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java (with props)
geronimo/trunk/sandbox/console-standard/src/test/
geronimo/trunk/sandbox/console-standard/src/webapp/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/tld/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/tld/portlet.tld
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/config.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysMaximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoHelp.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoMaximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/dbViewerHelp.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/dbViewerMaximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/internalDBHelp.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/internalDBMaximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/internalDBNormal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/listDatabases.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/listTables.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/runSQLHelp.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/runSQLMaximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/internaldb/viewTableContents.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/addACF.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/config.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/detail.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/activemq/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/connectionhelp.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/createdestination.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/edit.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/statistics.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/viewDLQ.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/jmsmanager/viewmessages.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addnormal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/error.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/addnormal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/error.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/addnormal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/error.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addnormal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/error.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/http/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/http/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/http/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/http/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/https/
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/https/help.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/https/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/https/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/maximized.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp (with props)
geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/web.xml (with props)
Modified:
geronimo/trunk/NOTICE.txt
geronimo/trunk/etc/project.properties
Added: geronimo/trunk/COPYRIGHT
URL: http://svn.apache.org/viewcvs/geronimo/trunk/COPYRIGHT?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/COPYRIGHT (added)
+++ geronimo/trunk/COPYRIGHT Wed Jul 20 18:38:12 2005
@@ -0,0 +1,5 @@
+The following copyright notice(s) were affixed to portions of the code
+with which this file is now or was at one time distributed
+and are placed here unaltered.
+
+(C) Copyright 2004, 2005 International Business Machines Corporation. All rights reserved.
Modified: geronimo/trunk/NOTICE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/NOTICE.txt?rev=219976&r1=219975&r2=219976&view=diff
==============================================================================
--- geronimo/trunk/NOTICE.txt (original)
+++ geronimo/trunk/NOTICE.txt Wed Jul 20 18:38:12 2005
@@ -0,0 +1,5 @@
+Portions of the Web Console were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "IBM Console CLA".
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=219976&r1=219975&r2=219976&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Wed Jul 20 18:38:12 2005
@@ -72,8 +72,8 @@
#####################################################
# Dependency Version
#####################################################
-activeio_version=1.0
-activemq_version=3.1-M4
+activeio_version=1.1
+activemq_version=3.1-M5
geronimo_version=1.0-SNAPSHOT
openejb_version=2.0-SNAPSHOT
tranql_version=1.0-20050713
@@ -97,6 +97,7 @@
geronimo_spec_servlet_version=2.4-rc4
geronimo_spec_qname_version=1.1-rc4
+ant_version=1.5
antlr_version=2.7.2
asm_version=1.4.3
axion_version=1.0-M3-dev
@@ -111,7 +112,7 @@
commons_discovery_version=0.2
commons_el_version=1.0
commons_io_version=1.0
-commons_fileupload_version=1.0
+commons_fileupload_version=1.1-dev
commons_httpclient_version=2.0.1
commons_jelly_version=1.0-beta-4
commons_jxpath_version=1.1
@@ -130,6 +131,7 @@
javacc_version=2.1
jelly_velocity_tags_version=1.0
jetty_version=5.1.4
+jstl_version=1.1.1
juddi_version=SNAPSHOT
junit_version=3.8.1
log4j_version=1.2.8
@@ -138,12 +140,15 @@
mockobjects_version=0.09
mx4j_version=3.0.1
oro_version=2.0.8
+pluto_version=1.0.1-rc2
+portlet_api_version=1.0
p2psockets_version=1.1.2
regexp_version=1.3
scout_version=1.0-SNAPSHOT
servicemix_spring_version=1.2.2-dev-2
servicemix_version=1.0-SNAPSHOT
spring_version=1.1.3
+standard_taglibs_version=1.1.1
stax_version=1.1.1-dev
stax_api_version=1.0
tomcat_ajp_version=5.5.9
Added: geronimo/trunk/sandbox/console-core/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-core/maven.xml?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-core/maven.xml (added)
+++ geronimo/trunk/sandbox/console-core/maven.xml Wed Jul 20 18:38:12 2005
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="jar:install" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
+
+ <postGoal name="java:compile">
+ <!-- generate the version properties file -->
+ <j:new var="now" className="java.util.Date"/>
+ <j:new var="dateFormat" className="java.text.SimpleDateFormat">
+ <j:arg type="java.lang.String" value="yyyy.MM.dd"/>
+ </j:new>
+ <j:new var="timeFormat" className="java.text.SimpleDateFormat">
+ <j:arg type="java.lang.String" value="HH:mm:ss.SSSZ"/>
+ </j:new>
+ <j:new var="yearFormat" className="java.text.SimpleDateFormat">
+ <j:arg type="java.lang.String" value="yyyy"/>
+ </j:new>
+ <ant:echo file="${basedir}/target/classes/org/apache/geronimo/console/core/system/serverinfo/geronimo-version.properties">##### Generated by Maven ####
+ version=${pom.currentVersion}
+ build.date=${dateFormat.format(now)}
+ build.time=${timeFormat.format(now)}
+ copyright=Copyright (C) 2003-${yearFormat.format(now)}
+ geronimo.build.version=${pom.currentVersion}
+ geronimo.spec.version =${geronimo_spec_jms_version}
+ portal.core.version=${pluto_version}
+ </ant:echo>
+ </postGoal>
+
+</project>
Propchange: geronimo/trunk/sandbox/console-core/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-core/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-core/project.properties?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-core/project.properties (added)
+++ geronimo/trunk/sandbox/console-core/project.properties Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+maven.multiproject.type=jar
Propchange: geronimo/trunk/sandbox/console-core/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-core/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-core/project.xml?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-core/project.xml (added)
+++ geronimo/trunk/sandbox/console-core/project.xml Wed Jul 20 18:38:12 2005
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+ <id>geronimo-console-core</id>
+ <name>Geronimo :: Console :: Common Code</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>${jetty_version}</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-jetty</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-security</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons_logging_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>${regexp_version}</version>
+ </dependency>
+
+ <!-- JMS dependencies -->
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jms</artifactId>
+ <version>${geronimo_spec_jms_version}</version>
+ </dependency>
+
+ <!-- Testing dependencies -->
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>${cglib_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+
+ </build>
+</project>
\ No newline at end of file
Propchange: geronimo/trunk/sandbox/console-core/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java (added)
+++ geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java Wed Jul 20 18:38:12 2005
@@ -0,0 +1,88 @@
+/**
+ *
+ * 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.info("JMSConnection started");
+
+ }
+
+ public synchronized void doStop() {
+
+ }
+
+ public synchronized void doFail() {
+
+ }
+
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+
+ GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(
+ "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/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/JMSConnectionFactoryBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java (added)
+++ geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java Wed Jul 20 18:38:12 2005
@@ -0,0 +1,212 @@
+/**
+ *
+ * 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.info("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.info("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.info(subscriberName + " unsubscribed from Topic "
+ + topic.getTopicName() + ".");
+ }
+ }
+ }
+
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(
+ "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/sandbox/console-core/src/java/org/apache/geronimo/console/core/jms/TopicBrowserGBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesFileLoginModuleNoCache.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesFileLoginModuleNoCache.java?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesFileLoginModuleNoCache.java (added)
+++ geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesFileLoginModuleNoCache.java Wed Jul 20 18:38:12 2005
@@ -0,0 +1,224 @@
+/**
+ *
+ * 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.security;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.common.GeronimoSecurityException;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
+import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
+import org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+
+public class PropertiesFileLoginModuleNoCache implements LoginModule {
+
+ Kernel kernel;
+
+ ServerInfo serverInfo;
+
+ URI usersURI;
+
+ URI groupsURI;
+
+ public final static String USERS_URI = "usersURI";
+
+ public final static String GROUPS_URI = "groupsURI";
+
+ private static Log log = LogFactory
+ .getLog(PropertiesFileLoginModuleNoCache.class);
+
+ final Properties users = new Properties();
+
+ final Map groups = new HashMap();
+
+ Subject subject;
+
+ CallbackHandler handler;
+
+ String username;
+
+ String password;
+
+ public void initialize(Subject subject, CallbackHandler callbackHandler,
+ Map sharedState, Map options) {
+ this.subject = subject;
+ this.handler = callbackHandler;
+ try {
+ kernel = KernelRegistry.getKernel((String) options
+ .get(JaasLoginModuleUse.KERNEL_LM_OPTION));
+ serverInfo = (ServerInfo) options
+ .get(JaasLoginModuleUse.SERVERINFO_LM_OPTION);
+ usersURI = new URI((String) options.get(USERS_URI));
+ groupsURI = new URI((String) options.get(GROUPS_URI));
+ } catch (Exception e) {
+ log.error(e);
+ throw new IllegalArgumentException(
+ "Unable to configure properties file login module: " + e);
+ }
+ }
+
+ public void loadProperties(Kernel kernel, ServerInfo serverInfo,
+ URI userURI, URI groupURI) throws GeronimoSecurityException {
+ try {
+ URI userFile = serverInfo.resolve(userURI);
+ URI groupFile = serverInfo.resolve(groupURI);
+ InputStream stream = userFile.toURL().openStream();
+ // always get a fresh group of users.
+ users.clear();
+ users.load(stream);
+ stream.close();
+
+ Properties temp = new Properties();
+ stream = groupFile.toURL().openStream();
+ temp.load(stream);
+ stream.close();
+ // refresh groups.
+ groups.clear();
+ Enumeration e = temp.keys();
+ while (e.hasMoreElements()) {
+ String groupName = (String) e.nextElement();
+ String[] userList = ((String) temp.get(groupName)).split(",");
+
+ Set userset = (Set) groups.get(groupName);
+ if (userset == null) {
+ userset = new HashSet();
+ groups.put(groupName, userset);
+ }
+
+ for (int i = 0; i < userList.length; i++) {
+ userset.add(userList[i]);
+ }
+ }
+
+ } catch (Exception e) {
+ log.error("Properties File Login Module - data load failed", e);
+ throw new GeronimoSecurityException(e);
+ }
+ }
+
+ public boolean login() throws LoginException {
+ // This is the fundamental modification to the parent class. load
+ // properties before login.
+ loadProperties(kernel, serverInfo, usersURI, groupsURI);
+
+ Callback[] callbacks = new Callback[2];
+
+ callbacks[0] = new NameCallback("User name");
+ callbacks[1] = new PasswordCallback("Password", false);
+ try {
+ handler.handle(callbacks);
+ } catch (IOException ioe) {
+ throw (LoginException) new LoginException().initCause(ioe);
+ } catch (UnsupportedCallbackException uce) {
+ throw (LoginException) new LoginException().initCause(uce);
+ }
+ assert callbacks.length == 2;
+ username = ((NameCallback) callbacks[0]).getName();
+ if (username == null || username.equals("")) {
+ return false;
+ }
+ password = users.getProperty(username);
+
+ return new String(((PasswordCallback) callbacks[1]).getPassword())
+ .equals(password);
+ }
+
+ public boolean commit() throws LoginException {
+ Set principals = subject.getPrincipals();
+
+ principals.add(new GeronimoUserPrincipal(username));
+
+ Iterator e = groups.keySet().iterator();
+ while (e.hasNext()) {
+ String groupName = (String) e.next();
+ Set users = (Set) groups.get(groupName);
+ Iterator iter = users.iterator();
+ while (iter.hasNext()) {
+ String user = (String) iter.next();
+ if (username.equals(user)) {
+ principals.add(new GeronimoGroupPrincipal(groupName));
+ break;
+ }
+ }
+ }
+
+ return true;
+ }
+
+ public boolean abort() throws LoginException {
+ username = null;
+ password = null;
+
+ return true;
+ }
+
+ public boolean logout() throws LoginException {
+ username = null;
+ password = null;
+
+ return true;
+ }
+
+ /**
+ * Gets the names of all principal classes that may be populated into a
+ * Subject.
+ */
+ public String[] getPrincipalClassNames() {
+ return new String[] { GeronimoUserPrincipal.class.getName(),
+ GeronimoGroupPrincipal.class.getName() };
+ }
+
+ /**
+ * Gets a list of all the principals of a particular type (identified by the
+ * principal class). These are available for manual role mapping.
+ */
+ public String[] getPrincipalsOfClass(String className) {
+ Set s;
+ if (className.equals(GeronimoGroupPrincipal.class.getName())) {
+ s = groups.keySet();
+ } else if (className.equals(GeronimoUserPrincipal.class.getName())) {
+ s = users.keySet();
+ } else {
+ throw new IllegalArgumentException("No such principal class "
+ + className);
+ }
+ return (String[]) s.toArray(new String[s.size()]);
+ }
+}
Propchange: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesFileLoginModuleNoCache.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java (added)
+++ geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java Wed Jul 20 18:38:12 2005
@@ -0,0 +1,273 @@
+/**
+ *
+ * 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.security;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.geronimo.common.GeronimoSecurityException;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.security.jaas.LoginModuleGBean;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+
+public class PropertiesLoginModuleManager {
+
+ private ServerInfo serverInfo;
+
+ private LoginModuleGBean loginModule;
+
+ private Properties users = new Properties();
+
+ private Properties groups = new Properties();
+
+ private static final String usersKey = "usersURI";
+
+ private static final String groupsKey = "groupsURI";
+
+ public PropertiesLoginModuleManager(ServerInfo serverInfo,
+ LoginModuleGBean loginModule) {
+ this.serverInfo = serverInfo;
+ this.loginModule = loginModule;
+ }
+
+ private void refreshUsers() {
+ users.clear();
+ try {
+ users.load(serverInfo.resolve(getUsersURI()).toURL().openStream());
+ } catch (Exception e) {
+ throw new GeronimoSecurityException(e);
+ }
+ }
+
+ private void refreshGroups() throws GeronimoSecurityException {
+ groups.clear();
+ try {
+ groups
+ .load(serverInfo.resolve(getGroupsURI()).toURL()
+ .openStream());
+ } catch (Exception e) {
+ throw new GeronimoSecurityException(e);
+ }
+ }
+
+ public String[] getUsers() throws GeronimoSecurityException {
+ users.clear();
+ try {
+ users.load(serverInfo.resolve(getUsersURI()).toURL().openStream());
+ } catch (Exception e) {
+ throw new GeronimoSecurityException(e);
+ }
+ return (String[]) users.keySet().toArray(new String[0]);
+ }
+
+ public String[] getGroups() throws GeronimoSecurityException {
+ groups.clear();
+ try {
+ groups
+ .load(serverInfo.resolve(getGroupsURI()).toURL()
+ .openStream());
+ } catch (Exception e) {
+ throw new GeronimoSecurityException(e);
+ }
+ return (String[]) groups.keySet().toArray(new String[0]);
+ }
+
+ public void addUserPrincipal(Hashtable properties)
+ throws GeronimoSecurityException {
+ if (users.getProperty((String) properties.get("UserName")) != null) {
+ throw new GeronimoSecurityException("User principal "
+ + (String) properties.get("UserName") + " already exists.");
+ }
+ try {
+ refreshUsers();
+ users.setProperty((String) properties.get("UserName"),
+ (String) properties.get("Password"));
+ users.store(serverInfo.resolve(getUsersURI()).toURL()
+ .openConnection().getOutputStream(), null);
+ } catch (Exception e) {
+ throw new GeronimoSecurityException("Cannot add user principal: "
+ + e.getMessage());
+ }
+ }
+
+ public void removeUserPrincipal(String userPrincipal)
+ throws GeronimoSecurityException {
+ try {
+ refreshUsers();
+ users.remove(userPrincipal);
+ users.store(serverInfo.resolve(getUsersURI()).toURL()
+ .openConnection().getOutputStream(), null);
+ } catch (Exception e) {
+ throw new GeronimoSecurityException("Cannot remove user principal "
+ + userPrincipal + ": " + e.getMessage());
+ }
+ }
+
+ public void updateUserPrincipal(Hashtable properties)
+ throws GeronimoSecurityException {
+ //same as add pricipal overriding the property
+ try {
+ refreshUsers();
+ users.setProperty((String) properties.get("UserName"),
+ (String) properties.get("Password"));
+ users.store(serverInfo.resolve(getUsersURI()).toURL()
+ .openConnection().getOutputStream(), null);
+ } catch (Exception e) {
+ throw new GeronimoSecurityException("Cannot add user principal: "
+ + e.getMessage());
+ }
+ }
+
+ public void addGroupPrincipal(Hashtable properties)
+ throws GeronimoSecurityException {
+ refreshGroups();
+ if (groups.getProperty((String) properties.get("GroupName")) != null) {
+ throw new GeronimoSecurityException("Group "
+ + (String) properties.get("GroupName") + " already exists.");
+ }
+ try {
+ groups.setProperty((String) properties.get("GroupName"),
+ (String) properties.get("Members"));
+ groups.store(serverInfo.resolve(getGroupsURI()).toURL()
+ .openConnection().getOutputStream(), null);
+ } catch (Exception e) {
+ throw new GeronimoSecurityException("Cannot add group principal: "
+ + e.getMessage());
+ }
+ }
+
+ public void removeGroupPrincipal(String groupPrincipal)
+ throws GeronimoSecurityException {
+ refreshGroups();
+ try {
+ groups.remove(groupPrincipal);
+ groups.store(serverInfo.resolve(getGroupsURI()).toURL()
+ .openConnection().getOutputStream(), null);
+ } catch (Exception e) {
+ throw new GeronimoSecurityException(
+ "Cannot remove group principal: " + e.getMessage());
+ }
+ }
+
+ public void updateGroupPrincipal(Hashtable properties)
+ throws GeronimoSecurityException {
+ //same as add group principal
+ refreshGroups();
+ try {
+ groups.setProperty((String) properties.get("GroupName"),
+ (String) properties.get("Members"));
+ groups.store(serverInfo.resolve(getGroupsURI()).toURL()
+ .openConnection().getOutputStream(), null);
+ } catch (Exception e) {
+ throw new GeronimoSecurityException("Cannot add group principal: "
+ + e.getMessage());
+ }
+ }
+
+ public void addToGroup(String userPrincipal, String groupPrincipal)
+ throws GeronimoSecurityException {
+ throw new GeronimoSecurityException(
+ "Not implemented for properties file security realm...");
+ }
+
+ public void removeFromGroup(String userPrincipal, String groupPrincipal)
+ throws GeronimoSecurityException {
+ throw new GeronimoSecurityException(
+ "Not implemented for properties file security realm...");
+ }
+
+ public String getPassword(String userPrincipal)
+ throws GeronimoSecurityException {
+ refreshUsers();
+ return users.getProperty(userPrincipal);
+ }
+
+ public Set getGroupMembers(String groupPrincipal)
+ throws GeronimoSecurityException {
+ Set memberSet = new HashSet();
+ groups.clear();
+ refreshGroups();
+ if (groups.getProperty(groupPrincipal) == null) {
+ return memberSet;
+ }
+ String[] members = ((String) groups.getProperty(groupPrincipal))
+ .split(",");
+
+ memberSet.addAll(Arrays.asList(members));
+ return memberSet;
+ }
+
+ private String getUsersURI() {
+ return loginModule.getOptions().getProperty(usersKey);
+ }
+
+ private String getGroupsURI() {
+ return loginModule.getOptions().getProperty(groupsKey);
+ }
+
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(
+ "PropertiesLoginModuleManager",
+ PropertiesLoginModuleManager.class);
+
+ infoFactory.addOperation("addUserPrincipal",
+ new Class[] { Hashtable.class });
+ infoFactory.addOperation("removeUserPrincipal",
+ new Class[] { String.class });
+ infoFactory.addOperation("updateUserPrincipal",
+ new Class[] { Hashtable.class });
+ infoFactory.addOperation("getGroups");
+ infoFactory.addOperation("getUsers");
+
+ infoFactory.addOperation("updateUserPrincipal",
+ new Class[] { Hashtable.class });
+
+ infoFactory.addOperation("getPassword", new Class[] { String.class });
+ infoFactory.addOperation("getGroupMembers",
+ new Class[] { String.class });
+ infoFactory.addOperation("addGroupPrincipal",
+ new Class[] { Hashtable.class });
+ infoFactory.addOperation("removeGroupPrincipal",
+ new Class[] { String.class });
+ infoFactory.addOperation("updateGroupPrincipal",
+ new Class[] { Hashtable.class });
+ infoFactory.addOperation("addToGroup", new Class[] { String.class,
+ String.class });
+ infoFactory.addOperation("removeFromGroup", new Class[] { String.class,
+ String.class });
+
+ infoFactory.addReference("ServerInfo", ServerInfo.class);
+ infoFactory.addReference("LoginModule", LoginModuleGBean.class);
+
+ infoFactory
+ .setConstructor(new String[] { "ServerInfo", "LoginModule" });
+
+ GBEAN_INFO = infoFactory.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+
+}
Propchange: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/security/PropertiesLoginModuleManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/SEServerInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/SEServerInfo.java?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/SEServerInfo.java (added)
+++ geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/SEServerInfo.java Wed Jul 20 18:38:12 2005
@@ -0,0 +1,78 @@
+/**
+ *
+ * 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.system.serverinfo;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+
+public class SEServerInfo {
+ private static final String PLATFORM_ARCH = "os.arch";
+
+ public String getVersion() {
+ return ServerConstants.getVersion();
+ }
+
+ public String getBuildDate() {
+ return ServerConstants.getBuildDate();
+ }
+
+ public String getBuildTime() {
+ return ServerConstants.getBuildTime();
+ }
+
+ public String getCopyright() {
+ return ServerConstants.getCopyright();
+ }
+
+ public String getGeronimoBuildVersion() {
+ return ServerConstants.getGeronimoBuildVersion();
+ }
+
+ public String getGeronimoSpecVersion() {
+ return ServerConstants.getGeronimoSpecVersion();
+ }
+
+ public String getPortalCoreVersion() {
+ return ServerConstants.getPortalCoreVersion();
+ }
+
+ public String getPlatformArch() {
+ return System.getProperty(PLATFORM_ARCH);
+ }
+
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SEServerInfo.class);
+
+ infoFactory.addAttribute("version", String.class, false);
+ infoFactory.addAttribute("buildDate", String.class, false);
+ infoFactory.addAttribute("buildTime", String.class, false);
+ infoFactory.addAttribute("copyright", String.class, false);
+ infoFactory.addAttribute("geronimoBuildVersion", String.class, false);
+ infoFactory.addAttribute("geronimoSpecVersion", String.class, false);
+ infoFactory.addAttribute("portalCoreVersion", String.class, false);
+ infoFactory.addAttribute("platformArch", String.class, false);
+ GBEAN_INFO = infoFactory.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+
+}
Propchange: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/SEServerInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/ServerConstants.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/ServerConstants.java?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/ServerConstants.java (added)
+++ geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/ServerConstants.java Wed Jul 20 18:38:12 2005
@@ -0,0 +1,143 @@
+/**
+ *
+ * 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.system.serverinfo;
+
+import java.util.Properties;
+
+public class ServerConstants {
+
+ private static final String PROPERTIES_FILE = "org/apache/geronimo/console/core/system/serverinfo/geronimo-version.properties";
+
+ private static final String VERSION;
+
+ private static final String BUILD_DATE;
+
+ private static final String BUILD_TIME;
+
+ private static final String COPYRIGHT;
+
+ private static final String GERONIMO_BUILD_VERSION;
+
+ private static final String GERONIMO_SPEC_VERSION;
+
+ private static final String PORTAL_CORE_VERSION;
+
+ /**
+ * Gets the server version
+ *
+ * @return version of the server
+ */
+ public static String getVersion() {
+ return VERSION;
+ }
+
+ public static String getGeronimoBuildVersion() {
+ return GERONIMO_BUILD_VERSION;
+ }
+
+ public static String getGeronimoSpecVersion() {
+ return GERONIMO_SPEC_VERSION;
+ }
+
+ public static String getPortalCoreVersion() {
+ return PORTAL_CORE_VERSION;
+ }
+
+ /**
+ * Gets the date the server was built
+ *
+ * @return date of the server build
+ */
+ public static String getBuildDate() {
+ return BUILD_DATE;
+ }
+
+ /**
+ * Gets the time the server was built
+ *
+ * @return time of the server build
+ */
+ public static String getBuildTime() {
+ return BUILD_TIME;
+ }
+
+ /**
+ * Gets the copyright message for the server
+ *
+ * @return
+ */
+ public static String getCopyright() {
+ return COPYRIGHT;
+ }
+
+ /**
+ * load all of the properties from the geronimo-version.properties file,
+ * which is generated during the build
+ */
+ static {
+ Properties versionInfo = new Properties();
+ try {
+ versionInfo.load(ServerConstants.class.getClassLoader()
+ .getResourceAsStream(PROPERTIES_FILE));
+ } catch (java.io.IOException e) {
+ throw new ExceptionInInitializerError(new Exception(
+ "Could not load geronimo-version.properties", e));
+ }
+ VERSION = versionInfo.getProperty("version");
+ if (VERSION == null || VERSION.length() == 0) {
+ throw new ExceptionInInitializerError(
+ "geronimo-version.properties does not contain a 'version' property");
+ }
+
+ BUILD_DATE = versionInfo.getProperty("build.date");
+ if (BUILD_DATE == null || BUILD_DATE.length() == 0) {
+ throw new ExceptionInInitializerError(
+ "geronimo-version.properties does not contain a 'build.date' property");
+ }
+
+ BUILD_TIME = versionInfo.getProperty("build.time");
+ if (BUILD_TIME == null || BUILD_TIME.length() == 0) {
+ throw new ExceptionInInitializerError(
+ "geronimo-version.properties does not contain a 'build.time' property");
+ }
+
+ COPYRIGHT = versionInfo.getProperty("copyright");
+ if (COPYRIGHT == null || COPYRIGHT.length() == 0) {
+ throw new ExceptionInInitializerError(
+ "geronimo-version.properties does not contain a 'copyright' property");
+ }
+ GERONIMO_BUILD_VERSION = versionInfo
+ .getProperty("geronimo.build.version");
+ if (GERONIMO_BUILD_VERSION == null || COPYRIGHT.length() == 0) {
+ throw new ExceptionInInitializerError(
+ "geronimo-version.properties does not contain a 'copyright' property");
+ }
+ GERONIMO_SPEC_VERSION = versionInfo
+ .getProperty("geronimo.spec.version");
+ if (GERONIMO_SPEC_VERSION == null || COPYRIGHT.length() == 0) {
+ throw new ExceptionInInitializerError(
+ "geronimo-version.properties does not contain a 'copyright' property");
+ }
+ PORTAL_CORE_VERSION = versionInfo.getProperty("portal.core.version");
+ if (PORTAL_CORE_VERSION == null || COPYRIGHT.length() == 0) {
+ throw new ExceptionInInitializerError(
+ "geronimo-version.properties does not contain a 'copyright' property");
+ }
+
+ }
+}
Propchange: geronimo/trunk/sandbox/console-core/src/java/org/apache/geronimo/console/core/system/serverinfo/ServerConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-ear/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-ear/maven.xml?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-ear/maven.xml (added)
+++ geronimo/trunk/sandbox/console-ear/maven.xml Wed Jul 20 18:38:12 2005
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="ear:install"
+ xmlns:ant="jelly:ant"
+ xmlns:velocity="jelly:velocity"
+ >
+
+ <pre-goal name="ear:ear">
+ <ant:mkdir dir="${basedir}/target/plan"/>
+ <velocity:merge basedir="${basedir}/src/application/META-INF" template="application.xml" name="${basedir}/target/plan/application.xml"/>
+ <velocity:merge basedir="${basedir}/src/plan" template="geronimo-application.xml" name="${basedir}/src/application/META-INF/geronimo-application.xml"/>
+ </pre-goal>
+</project>
Propchange: geronimo/trunk/sandbox/console-ear/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/trunk/sandbox/console-ear/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-ear/project.properties?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-ear/project.properties (added)
+++ geronimo/trunk/sandbox/console-ear/project.properties Wed Jul 20 18:38:12 2005
@@ -0,0 +1,2 @@
+maven.multiproject.type=ear
+maven.ear.appxml=target/plan/application.xml
\ No newline at end of file
Propchange: geronimo/trunk/sandbox/console-ear/project.properties
------------------------------------------------------------------------------
svn:eol-style = native