Pending merges!!!!

Sat, 04 Nov 2006 14:05:33 -0800 

Its been months now... and there are still pending merges?!
Matt and Aaron can you please resolve your pending merges, so we can finally be done with this. 

Below are the list of pending merges, their comments and affected files.

--jason


<snip>
------------------------------------------------------------------------
r367144 | ammulder | 2006-01-08 16:33:58 -0800 (Sun, 08 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/realmwizard/edit.jsp 

Merge JavaDoc URL change from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r367145 | ammulder | 2006-01-08 16:34:55 -0800 (Sun, 08 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/modules/naming-builder/src/java/org/apache/ geronimo/naming/deployment/ENCConfigBuilder.java M /geronimo/trunk/modules/naming-builder/src/schema/geronimo- naming-1.0.xsd 

Merge fix to GERONIMO-1435 from branch.

------------------------------------------------------------------------
------------------------------------------------------------------------
r371461 | ammulder | 2006-01-22 20:53:26 -0800 (Sun, 22 Jan 2006) | 3 lines 
Changed paths:
M /geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ connector/AdminObjectWrapper.java M /geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ connector/AdminObjectWrapperGBean.java M /geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ connector/outbound/ManagedConnectionFactoryWrapper.java A /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/AdminObjectDCB.java (from / geronimo/branches/1.0/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/AdminObjectDCB.java:370976) A /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/AdminObjectInstance.java (from / geronimo/branches/1.0/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/AdminObjectInstance.java:370976) A /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/ConfigHolder.java (from /geronimo/ branches/1.0/modules/connector-builder/src/java/org/apache/geronimo/ connector/deployment/jsr88/ConfigHolder.java:370976) M /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/ConfigPropertySetting.java M /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/ConnectionDefinitionInstance.java M /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/ConnectionManager.java M /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/Connector15DCBRoot.java M /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/ConnectorDCB.java M /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/ResourceAdapter.java A /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/ResourceAdapterInstance.java (from /geronimo/branches/1.0/modules/connector-builder/src/java/org/ apache/geronimo/connector/deployment/jsr88/ ResourceAdapterInstance.java:370976) M /geronimo/trunk/modules/connector-builder/src/java/org/apache/ geronimo/connector/deployment/jsr88/SinglePool.java M /geronimo/trunk/modules/connector-builder/src/test/org/apache/ geronimo/connector/deployment/jsr88/Connector15DCBTest.java A /geronimo/trunk/modules/connector-builder/src/test-resources/ jms-plan.xml (from /geronimo/branches/1.0/modules/connector-builder/ src/test-resources/jms-plan.xml:370976) A /geronimo/trunk/modules/connector-builder/src/test-resources/ jms.rar (from /geronimo/branches/1.0/modules/connector-builder/src/ test-resources/jms.rar:370976) M /geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/ deployment/Deployer.java A /geronimo/trunk/modules/management/src/java/org/apache/geronimo/ management/geronimo/JCAAdminObject.java (from /geronimo/branches/1.0/ modules/management/src/java/org/apache/geronimo/management/geronimo/ JCAAdminObject.java:371460) M /geronimo/trunk/modules/management/src/java/org/apache/geronimo/ management/geronimo/JCAManagedConnectionFactory.java A /geronimo/trunk/modules/naming-builder/src/java/org/apache/ geronimo/naming/deployment/jsr88 (from /geronimo/branches/1.0/modules/ naming-builder/src/java/org/apache/geronimo/naming/deployment/ jsr88:370976) R /geronimo/trunk/modules/naming-builder/src/java/org/apache/ geronimo/naming/deployment/jsr88/GBeanLocator.java (from /geronimo/ branches/1.0/modules/naming-builder/src/java/org/apache/geronimo/ naming/deployment/jsr88/GBeanLocator.java:370976) R /geronimo/trunk/modules/naming-builder/src/java/org/apache/ geronimo/naming/deployment/jsr88/ObjectNameGroup.java (from /geronimo/ branches/1.0/modules/naming-builder/src/java/org/apache/geronimo/ naming/deployment/jsr88/ObjectNameGroup.java:370976) M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/repository/FileSystemRepository.java M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/serverinfo/BasicServerInfo.java M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/serverinfo/ServerInfo.java
Apply changes from branch (Fixes GERONIMO-1510, contributes to GERONIMO-1137, 
  other minor fixes)

------------------------------------------------------------------------
------------------------------------------------------------------------
r371779 | ammulder | 2006-01-23 18:38:42 -0800 (Mon, 23 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ connector/JCAResourceImpl.java M /geronimo/trunk/modules/connector/src/java/org/apache/geronimo/ connector/JCAResourceImplGBean.java A /geronimo/trunk/modules/management/src/java/org/apache/geronimo/ management/geronimo/JCAResource.java (from /geronimo/branches/1.0/ modules/management/src/java/org/apache/geronimo/management/geronimo/ JCAResource.java:371778) 

Merge JCAResourceAdapter change from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r371787 | ammulder | 2006-01-23 19:10:32 -0800 (Mon, 23 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-core/src/java/org/apache/ geronimo/console/util/KernelManagementHelper.java M /geronimo/trunk/applications/console-core/src/java/org/apache/ geronimo/console/util/ManagementHelper.java 
   M /geronimo/trunk/applications/console-framework/maven.xml
M /geronimo/trunk/applications/console-framework/src/webapp/WEB- INF/data/pageregistry.xml M /geronimo/trunk/applications/console-framework/src/webapp/WEB- INF/data/portletentityregistry.xml 
   M /geronimo/trunk/applications/console-standard/maven.xml
   M /geronimo/trunk/applications/console-standard/project.xml
A /geronimo/trunk/applications/console-standard/src/conf (from / geronimo/branches/1.0/applications/console-standard/src/conf:371785) R /geronimo/trunk/applications/console-standard/src/conf/jms- resource-providers.properties (from /geronimo/branches/1.0/ applications/console-standard/src/conf/jms-resource- providers.properties:371785) M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard (from /geronimo/branches/ 1.0/applications/console-standard/src/java/org/apache/geronimo/ console/jmsmanager/wizard:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java (from / geronimo/branches/1.0/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ ConfigureRAInstanceHandler.java (from /geronimo/branches/1.0/ applications/console-standard/src/java/org/apache/geronimo/console/ jmsmanager/wizard/ConfigureRAInstanceHandler.java:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ CreateConnectionFactoryHandler.java (from /geronimo/branches/1.0/ applications/console-standard/src/java/org/apache/geronimo/console/ jmsmanager/wizard/CreateConnectionFactoryHandler.java:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ CreateDestinationHandler.java (from /geronimo/branches/1.0/ applications/console-standard/src/java/org/apache/geronimo/console/ jmsmanager/wizard/CreateDestinationHandler.java:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/DeployHandler.java (from / geronimo/branches/1.0/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/DeployHandler.java:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java (from / geronimo/branches/1.0/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java (from /geronimo/branches/1.0/applications/console-standard/src/java/ org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java: 371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java (from /geronimo/branches/1.0/applications/console-standard/src/java/ org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java: 371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ SelectConnectionFactoryTypeHandler.java (from /geronimo/branches/1.0/ applications/console-standard/src/java/org/apache/geronimo/console/ jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ SelectDestinationTypeHandler.java (from /geronimo/branches/1.0/ applications/console-standard/src/java/org/apache/geronimo/console/ jmsmanager/wizard/SelectDestinationTypeHandler.java:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java (from /geronimo/branches/1.0/applications/console-standard/src/java/ org/apache/geronimo/console/jmsmanager/wizard/ SelectProviderHandler.java:371785) R /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java (from / geronimo/branches/1.0/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java:371785) M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/util/PortletManager.java M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/portlet.xml M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/basicParams.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/confirmURL.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/edit.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/selectDatabase.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/selectDownload.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/showPlan.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/testConnection.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard (from /geronimo/branches/1.0/applications/console- standard/src/webapp/WEB-INF/view/jmswizard:371785) R /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/destination.jsp (from /geronimo/branches/1.0/ applications/console-standard/src/webapp/WEB-INF/view/jmswizard/ destination.jsp:371785) R /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/destinationType.jsp (from /geronimo/branches/1.0/ applications/console-standard/src/webapp/WEB-INF/view/jmswizard/ destinationType.jsp:371785) R /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/factory.jsp (from /geronimo/branches/1.0/ applications/console-standard/src/webapp/WEB-INF/view/jmswizard/ factory.jsp:371785) R /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/factoryType.jsp (from /geronimo/branches/1.0/ applications/console-standard/src/webapp/WEB-INF/view/jmswizard/ factoryType.jsp:371785) R /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/list.jsp (from /geronimo/branches/1.0/applications/ console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp:371785) R /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/plan.jsp (from /geronimo/branches/1.0/applications/ console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp:371785) R /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/provider.jsp (from /geronimo/branches/1.0/ applications/console-standard/src/webapp/WEB-INF/view/jmswizard/ provider.jsp:371785) R /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/raInstance.jsp (from /geronimo/branches/1.0/ applications/console-standard/src/webapp/WEB-INF/view/jmswizard/ raInstance.jsp:371785) M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/web.xml 

Merge new JMS portlet change from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r371964 | ammulder | 2006-01-24 09:47:26 -0800 (Tue, 24 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-core/src/java/org/apache/ geronimo/console/util/KernelManagementHelper.java M /geronimo/trunk/applications/console-core/src/java/org/apache/ geronimo/console/util/ManagementHelper.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java (from / geronimo/branches/1.0/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java:371961) M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/util/PortletManager.java M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/destination.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/destinationType.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/factory.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/factoryType.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/plan.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/provider.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/raInstance.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/status.jsp (from /geronimo/branches/1.0/ applications/console-standard/src/webapp/WEB-INF/view/jmswizard/ status.jsp:371961) 

Merge JMS portlet improvements from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r372286 | ammulder | 2006-01-25 10:47:53 -0800 (Wed, 25 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/configmanager/normal.jsp 

Merge fix for GERONIMO-1387 from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r372306 | ammulder | 2006-01-25 12:16:54 -0800 (Wed, 25 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/showPlan.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/usage.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/jmswizard/plan.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/realmwizard/usage.jsp 

Mwerge fix for GERONIMO-1450 from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r372312 | ammulder | 2006-01-25 12:52:46 -0800 (Wed, 25 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/databasemanager/wizard/ImportStatus.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/repository/RepositoryViewPortlet.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java 

Merge GERONIMO-1467 change from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r372324 | ammulder | 2006-01-25 13:35:35 -0800 (Wed, 25 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/derbylogmanager/view.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/logmanager/search.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/webaccesslogmanager/view.jsp 

Merge fix for GERONIMO-1474 from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r372334 | ammulder | 2006-01-25 14:08:47 -0800 (Wed, 25 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java 

Merge potential fix for GERONIMO-1426 from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r372352 | ammulder | 2006-01-25 14:54:07 -0800 (Wed, 25 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java 

Merge workaround for GERONIMO-1421 from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r372358 | ammulder | 2006-01-25 15:15:33 -0800 (Wed, 25 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-framework/src/webapp/ login.jsp M /geronimo/trunk/applications/console-framework/src/webapp/ loginerror.jsp 

Merge fix for GERONIMO-1379 from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r372367 | ammulder | 2006-01-25 15:40:20 -0800 (Wed, 25 Jan 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/repository/FileSystemRepository.java 

Merge fix for GERONIMO-1468 from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r374253 | hogstrom | 2006-02-01 21:04:07 -0800 (Wed, 01 Feb 2006) | 1 line 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/confirmURL.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/dbwizard/edit.jsp 

Geronimo-1336 Corrected issue when specifying database pool sizes
------------------------------------------------------------------------
------------------------------------------------------------------------
r374281 | hogstrom | 2006-02-01 22:17:34 -0800 (Wed, 01 Feb 2006) | 1 line 
Changed paths:
M /geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/ web.xml 
   M /geronimo/trunk/applications/uddi-server/src/webapp/happyjuddi.jsp
   M /geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml

Geronimo-1489 Minor fixes to JUDDI JSP application
------------------------------------------------------------------------
------------------------------------------------------------------------
r376866 | ammulder | 2006-02-10 13:40:09 -0800 (Fri, 10 Feb 2006) | 2 lines 
Changed paths:
   M /geronimo/trunk/assemblies/j2ee-installer/project.properties
M /geronimo/trunk/assemblies/j2ee-installer/src/izpack/izpack- user-input.xml M /geronimo/trunk/assemblies/j2ee-installer/src/var/config/ config.xml 
   M /geronimo/trunk/assemblies/j2ee-jetty-server/project.properties
M /geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/ config.xml 
   M /geronimo/trunk/assemblies/j2ee-tomcat-server/project.properties
M /geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/ config.xml M /geronimo/trunk/modules/jmx-remoting/src/java/org/apache/ geronimo/jmxremoting/JMXConnector.java 

Merge GERONIMO-1349 fix from branch

------------------------------------------------------------------------
------------------------------------------------------------------------
r383230 | ammulder | 2006-03-04 16:19:08 -0800 (Sat, 04 Mar 2006) | 5 lines 
Changed paths:
A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/MultiPageAbstractHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/MultiPageModel.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/MultiPagePortlet.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ ConfigureRAInstanceHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ CreateConnectionFactoryHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/CreateDestinationHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/DeployHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ SelectConnectionFactoryTypeHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ SelectDestinationTypeHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java 

I like the way the JMS portlet is structured much more than the way the
  JDBC and Security Realm portlets are.  Extracting the framework for
  that so it can be used by future portlets.
Will use this for GERONIMO-1691

------------------------------------------------------------------------
------------------------------------------------------------------------
r388236 | ammulder | 2006-03-23 11:20:22 -0800 (Thu, 23 Mar 2006) | 8 lines 
Changed paths:
M /geronimo/trunk/applications/console-core/src/java/org/apache/ geronimo/console/util/KernelManagementHelper.java M /geronimo/trunk/applications/console-core/src/java/org/apache/ geronimo/console/util/ManagementHelper.java M /geronimo/trunk/applications/console-framework/src/webapp/WEB- INF/data/pageregistry.xml M /geronimo/trunk/applications/console-framework/src/webapp/WEB- INF/data/portletentityregistry.xml 
   M /geronimo/trunk/applications/console-standard/project.xml
M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/MultiPageAbstractHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/MultiPagePortlet.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/apache A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/apache/jk A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/apache/jk/AJPHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/apache/jk/ApacheConfigPortlet.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/apache/jk/BaseApacheHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/apache/jk/ConfigHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/apache/jk/IndexHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/apache/jk/ResultsHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/apache/jk/WebAppHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/BaseKeystoreHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/ConfigureNewKeyHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/ConfirmCertificateHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/ConfirmKeyHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/CreateKeystoreHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/KeystoresPortlet.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/ListHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/UnlockKeystoreHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/UploadCertificateHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/ViewKeystoreHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/util/PortletManager.java M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/portlet.xml A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/apache A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/apache/jk A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/apache/jk/ajpPort.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/apache/jk/config.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/apache/jk/index.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/apache/jk/results.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/apache/jk/webApps.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/configureKey.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/confirmCertificate.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/confirmKey.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/createKeystore.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/index.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/unlockKeystore.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/uploadCertificate.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/viewKeystore.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/web.xml A /geronimo/trunk/assemblies/j2ee-jetty-server/src/var/security/ keystores A /geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/security/ keystores 
   M /geronimo/trunk/configs/j2ee-security/project.xml
   M /geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
   M /geronimo/trunk/configs/rmi-naming/project.xml
M /geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/ j2eeobjectnames/NameFactory.java M /geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/ management/impl/J2EEServerImpl.java M /geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/ kernel/config/ConfigurationInfo.java M /geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/ kernel/config/ConfigurationManager.java M /geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/ kernel/config/ConfigurationManagerImpl.java M /geronimo/trunk/modules/management/src/java/org/apache/geronimo/ management/geronimo/J2EEServer.java 
   M /geronimo/trunk/modules/security/project.xml
A /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore A /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/FileKeystoreInstance.java A /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/FileKeystoreManager.java A /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/KeyIsLocked.java A /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/KeystoreInstance.java A /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/KeystoreIsLocked.java A /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/KeystoreManager.java A /geronimo/trunk/modules/util/src/java/org/apache/geronimo/util/ CertificateUtil.java 

Console enhancements
- a new portlet to help configure Apache HTTP via mod_jk
- start of a new keystore management portlet that can handle multiple
   keystores
Geronimo improvements as necesary to support those
- new Keystore GBeans
- more logic around parent/child module relationships

------------------------------------------------------------------------
------------------------------------------------------------------------
r388257 | ammulder | 2006-03-23 12:12:17 -0800 (Thu, 23 Mar 2006) | 2 lines 
Changed paths:
D /geronimo/trunk/assemblies/j2ee-jetty-server/src/var/security/ keystore A /geronimo/trunk/assemblies/j2ee-jetty-server/src/var/security/ keystores/geronimo-default (from /geronimo/trunk/assemblies/j2ee- jetty-server/src/var/security/keystore:387610) D /geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/security/ keystore A /geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/security/ keystores/geronimo-default (from /geronimo/trunk/assemblies/j2ee- tomcat-server/src/var/security/keystore:387610) 
   M /geronimo/trunk/configs/client-system/src/plan/plan.xml
   M /geronimo/trunk/configs/jetty/src/plan/plan.xml
   M /geronimo/trunk/configs/rmi-naming/src/plan/plan.xml
   M /geronimo/trunk/configs/tomcat/src/plan/plan.xml

Move the default keystore into the new keystores/ directory

------------------------------------------------------------------------
------------------------------------------------------------------------
r388275 | hogstrom | 2006-03-23 13:27:42 -0800 (Thu, 23 Mar 2006) | 1 line 
Changed paths:
   M /geronimo/trunk/applications/daytrader/derby/derby.txt

Updated derby.txt to point to correct ddl
------------------------------------------------------------------------
------------------------------------------------------------------------
r388671 | ammulder | 2006-03-24 15:01:45 -0800 (Fri, 24 Mar 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/applications/console-framework/src/webapp/WEB- INF/data/pageregistry.xml M /geronimo/trunk/applications/console-framework/src/webapp/WEB- INF/data/portletentityregistry.xml M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/MultiPagePortlet.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/BaseImportExportHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/CARExportServlet.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/DownloadCARHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/ImportExportPortlet.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/IndexHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/ListHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/ResultsHandler.java M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/portlet.xml A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/download.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/index.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/list.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/results.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/web.xml M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/LocalConfigStore.java 

Console can export and download configuration CARs

------------------------------------------------------------------------
------------------------------------------------------------------------
r388832 | ammulder | 2006-03-25 13:11:55 -0800 (Sat, 25 Mar 2006) | 3 lines 
Changed paths:
M /geronimo/trunk/applications/console-core/src/java/org/apache/ geronimo/console/util/KernelManagementHelper.java M /geronimo/trunk/applications/console-core/src/java/org/apache/ geronimo/console/util/ManagementHelper.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/DownloadCARHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/ListHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/util/PortletManager.java M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/list.jsp 
   M /geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
M /geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/ management/impl/J2EEServerImpl.java M /geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/ kernel/repository/WriteableRepository.java M /geronimo/trunk/modules/management/src/java/org/apache/geronimo/ management/geronimo/J2EEServer.java A /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/ConfigInstallerGBean.java A /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/ConfigurationInstaller.java A /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/ConfigurationMetadata.java A /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/DownloadResults.java 

Move the configuration download and install logic from the console
  into a GBean

------------------------------------------------------------------------
------------------------------------------------------------------------
r388868 | ammulder | 2006-03-25 17:09:54 -0800 (Sat, 25 Mar 2006) | 4 lines 
Changed paths:
   M /geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
A /geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/ geronimo/deployment/plugin/GeronimoDeploymentManager.java M /geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/ geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java A /geronimo/trunk/modules/deploy-tool/src/java/org/apache/ geronimo/deployment/cli/CommandListConfigurations.java M /geronimo/trunk/modules/deploy-tool/src/java/org/apache/ geronimo/deployment/cli/DeployTool.java M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/ConfigInstallerGBean.java 

Configuration installer works from the command line
- use deploy tool argument install-configs and pass the Maven repo URL
   as an argument

------------------------------------------------------------------------
------------------------------------------------------------------------
r389206 | ammulder | 2006-03-27 09:43:21 -0800 (Mon, 27 Mar 2006) | 8 lines 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/BaseKeystoreHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/EditKeystoreHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/KeystoresPortlet.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/ListHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/LockEditKeystoreHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/LockKeystoreHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/UnlockKeyHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/keystores/UnlockKeystoreHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/webmanager/ConnectorPortlet.java M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/index.jsp A /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/unlockKey.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/keystore/unlockKeystore.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/webmanager/connector/editHTTPS.jsp M /geronimo/trunk/assemblies/j2ee-installer/src/var/config/ config.xml M /geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/ config.xml M /geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/ config.xml M /geronimo/trunk/assemblies/minimal-tomcat-server/src/var/config/ config.xml M /geronimo/trunk/assemblies/web-jms-tomcat-server/src/var/config/ config.xml 
   M /geronimo/trunk/configs/jetty/project.xml
   M /geronimo/trunk/configs/jetty/src/plan/plan.xml
M /geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/ jetty/JettyManagerImpl.java M /geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/ jetty/JettySecureConnector.java A /geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/ jetty/connector/GeronimoSSLListener.java M /geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/ jetty/connector/HTTPSConnector.java M /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/FileKeystoreInstance.java M /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/FileKeystoreManager.java M /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/KeystoreInstance.java M /geronimo/trunk/modules/security/src/java/org/apache/geronimo/ security/keystore/KeystoreManager.java 

Use the new keystore manager to manage the default keystore distributed
  with Geronimo.
Update the Jetty HTTPS connector to be configured by the keystore manager 
  instead of by hardcoding files, passwords, etc.
Update the console to allow unlocking a keystore and private key for use, and to make the create Jetty HTTPS connector configuration select from 
  the available keystores (still need edit support)

------------------------------------------------------------------------
------------------------------------------------------------------------
r390687 | ammulder | 2006-04-01 07:54:02 -0800 (Sat, 01 Apr 2006) | 6 lines 
Changed paths:
M /geronimo/trunk/applications/console-framework/src/webapp/WEB- INF/web.xml M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/DownloadCARHandler.java A /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/GeronimoAsMavenServlet.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/IndexHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/ListHandler.java M /geronimo/trunk/applications/console-standard/src/java/org/ apache/geronimo/console/car/ResultsHandler.java M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/download.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/index.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/list.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/results.jsp M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/web.xml M /geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/ geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java M /geronimo/trunk/modules/deploy-tool/src/java/org/apache/ geronimo/deployment/cli/CommandListConfigurations.java M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/ConfigInstallerGBean.java M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/ConfigurationInstaller.java M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/ConfigurationMetadata.java 
   A /geronimo/trunk/modules/system/src/schema/config-list.xsd

Now one Geronimo server can pull configurations from another
- Expose the contents of the Geronimo config-store & repository as a Maven 
   repository.
- Add an authentication option to the import configuration process.
- Switch the configuration descriptor file to XML and add more detail

------------------------------------------------------------------------
------------------------------------------------------------------------
r390688 | ammulder | 2006-04-01 08:08:34 -0800 (Sat, 01 Apr 2006) | 3 lines 
Changed paths:
M /geronimo/trunk/applications/console-standard/src/webapp/WEB- INF/view/car/list.jsp 

Don't show configurations where the current server doesn't meet the
  prerequisites

------------------------------------------------------------------------
------------------------------------------------------------------------
r390690 | ammulder | 2006-04-01 08:11:22 -0800 (Sat, 01 Apr 2006) | 2 lines 
Changed paths:
M /geronimo/trunk/modules/deploy-tool/src/java/org/apache/ geronimo/deployment/cli/CommandListConfigurations.java 

Only prompt for eligible configurations at the command line

------------------------------------------------------------------------
------------------------------------------------------------------------
r390692 | ammulder | 2006-04-01 08:23:13 -0800 (Sat, 01 Apr 2006) | 3 lines 
Changed paths:
   M /geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
M /geronimo/trunk/modules/system/src/java/org/apache/geronimo/ system/configuration/ConfigInstallerGBean.java
Only count configurations as eligible for installation if there's a match 
  on the Geronimo version

------------------------------------------------------------------------
------------------------------------------------------------------------
r395886 | hogstrom | 2006-04-21 06:54:11 -0700 (Fri, 21 Apr 2006) | 1 line 
Changed paths:
A /geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/ apache/geronimo/deployment/mavenplugin/MergeWebXML.java
GERONIMO-1844 Precompile jsp pages in console - Added the MergeXML.java from the patch 
------------------------------------------------------------------------
</snip>

Reply via email to