Skip to main content

Source code revision

svn

summary: Merge umc branch into 3.1.2 branch. QL passed. component owners please make sure that all the changes from the umc branch is in the 3.1.2 branch and please start using the 3.1.2 branch.
revision: 48836
author: Rajiv Mordani
date: 2011-08-17 06:51:05 UTC (4 years)
message: Merge umc branch into 3.1.2 branch. QL passed. component owners please make sure that all the changes from the umc branch is in the 3.1.2 branch and please start using the 3.1.2 branch.
Change Path Actions
M branches/3.1.2
M branches/3.1.2/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/CommandExecutorImpl.java
M branches/3.1.2/admin/cli/src/main/java/com/sun/enterprise/admin/cli/embeddable/DeployerImpl.java
M branches/3.1.2/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Cluster.java
M branches/3.1.2/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Server.java
A branches/3.1.2/admin/config-api/src/test/java/com/sun/enterprise/configapi/tests/ServerTest.java
A branches/3.1.2/admin/config-api/src/test/resources/ClusteredDas.xml
M branches/3.1.2/admin/rest/src/main/java/org/glassfish/admin/rest/LazyJerseyInit.java
M branches/3.1.2/admin/rest/src/main/java/org/glassfish/admin/rest/ResourceUtil.java
M branches/3.1.2/admin/rest/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java
M branches/3.1.2/admin/rest/src/main/java/org/glassfish/admin/rest/resources/TemplateExecCommand.java
M branches/3.1.2/admin/util/src/main/java/org/glassfish/admin/cli/resources/ResourceConflictException.java
M branches/3.1.2/admin/util/src/main/java/org/glassfish/admin/cli/resources/SunResourcesXML.java
M branches/3.1.2/admingui/common/src/main/java/org/glassfish/admingui/common/factories/NavNodeContainerFactory.java
M branches/3.1.2/admingui/common/src/main/java/org/glassfish/admingui/common/util/MiscUtil.java
M branches/3.1.2/admingui/common/src/main/resources/org/glassfish/common/admingui/Strings.properties
M branches/3.1.2/admingui/common/src/main/resources/resourceNode/resourceEditTabs.inc
M branches/3.1.2/admingui/community-theme
M branches/3.1.2/admingui/community-theme/src/main/resources/branding/loginform.inc
M branches/3.1.2/admingui/console-plugin-archetype/src/main/resources/archetype-resources/src/main/java/PluginConsoleProvider.java
M branches/3.1.2/admingui/console-plugin-archetype/src/main/resources/archetype-resources/src/main/java/TestHandlers.java
M branches/3.1.2/admingui/console-plugin-archetype/src/main/resources/archetype-resources/src/main/resources/testPage.jsf
M branches/3.1.2/admingui/core/src/main/resources/templates/baseLayout.xhtml
M branches/3.1.2/admingui/core/src/main/resources/templates/default.layout
M branches/3.1.2/admingui/core/src/main/resources/templates/menuLayout.xhtml
M branches/3.1.2/admingui/core/src/main/resources/templates/treeLayout.xhtml
M branches/3.1.2/admingui/devtests/src/test/java/org/glassfish/admingui/devtests/SecurityTest.java
M branches/3.1.2/admingui/web/src/main/resources/grizzly/networkListenerEdit.jsf
M branches/3.1.2/admingui/web/src/main/resources/grizzly/protocolEdit.jsf
M branches/3.1.2/admingui/web/src/main/resources/org/glassfish/web/admingui/Strings.properties
M branches/3.1.2/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/GetHealthCommand.java
M branches/3.1.2/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java
M branches/3.1.2/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/GMSAdapterService.java
M branches/3.1.2/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/HealthHistory.java
M branches/3.1.2/cluster/gms-bootstrap/src/main/resources/org/glassfish/gms/bootstrap/LogStrings.properties
M branches/3.1.2/common/common-util/src/main
M branches/3.1.2/common/common-util/src/main/java/com/sun/enterprise/loader/ASURLClassLoader.java
M branches/3.1.2/common/common-util/src/test
M branches/3.1.2/common/scattered-archive-api/src/main/java/org/glassfish/embeddable/archive/Assembler.java
M branches/3.1.2/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/PingConnectionPool.java
M branches/3.1.2/connectors/connectors-inbound-runtime/src/main/java/com/sun/enterprise/connectors/inbound/ActiveInboundResourceAdapterImpl.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/service/ConnectorConfigurationParserServiceImpl.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParser.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/AdminObjectConfigParserImpl.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParser.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserFactory.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ConnectorConfigParserUtils.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/DriverLoader.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParser.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MCFConfigParserImpl.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParser.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/MessageListenerConfigParserImpl.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/RARUtils.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/connectors/util/ResourceAdapterConfigParserImpl.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolEmitterImpl.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/ConnectionPoolStatsProviderBootstrap.java
M branches/3.1.2/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/monitor/JdbcConnPoolStatsProvider.java
M branches/3.1.2/connectors/connectors-runtime/src/main/resources/com/sun/enterprise/connectors/LocalStrings.properties
M branches/3.1.2/connectors/connectors-runtime/src/main/resources/com/sun/enterprise/connectors/service/LocalStrings.properties
M branches/3.1.2/connectors/connectors-runtime/src/main/resources/com/sun/enterprise/connectors/util/LocalStrings.properties
M branches/3.1.2/connectors/connectors-runtime/src/main/resources/com/sun/logging/enterprise/resource/resourceadapter/LogStrings.properties
M branches/3.1.2/connectors/descriptors/src/main/resources/glassfish/lib/dtds/connector_1_0.dtd
M branches/3.1.2/connectors/descriptors/src/main/resources/glassfish/lib/dtds/sun-connector_1_0-0.dtd
M branches/3.1.2/connectors/descriptors/src/main/resources/glassfish/lib/dtds/sun-connector_1_5-0.dtd
M branches/3.1.2/connectors/descriptors/src/main/resources/glassfish/lib/dtds/sun-resources_1_0.dtd
M branches/3.1.2/connectors/descriptors/src/main/resources/glassfish/lib/dtds/sun-resources_1_1.dtd
M branches/3.1.2/connectors/descriptors/src/main/resources/glassfish/lib/dtds/sun-resources_1_2.dtd
M branches/3.1.2/connectors/descriptors/src/main/resources/glassfish/lib/dtds/sun-resources_1_3.dtd
M branches/3.1.2/connectors/descriptors/src/main/resources/glassfish/lib/schemas/connector_1_5.xsd
M branches/3.1.2/connectors/javax.resource/src/main/java/javax/resource/spi/work/HintsContext.java
M branches/3.1.2/connectors/javax.resource/src/main/java/javax/resource/spi/work/SecurityContext.java
M branches/3.1.2/connectors/javax.resource/src/main/java/javax/resource/spi/work/TransactionContext.java
M branches/3.1.2/connectors/javax.resource/src/main/java/javax/resource/spi/work/WorkContext.java
M branches/3.1.2/connectors/javax.resource/src/main/java/javax/resource/spi/work/WorkContextErrorCodes.java
M branches/3.1.2/connectors/javax.resource/src/main/java/javax/resource/spi/work/WorkContextLifecycleListener.java
M branches/3.1.2/connectors/javax.resource/src/main/java/javax/resource/spi/work/WorkContextProvider.java
M branches/3.1.2/core/bootstrap
M branches/3.1.2/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/StaticGlassFishRuntimeBuilder.java
M branches/3.1.2/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/BundleProvisioner.java
M branches/3.1.2/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/EmbeddedOSGiGlassFishRuntimeBuilder.java
M branches/3.1.2/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/GlassFishMainActivator.java
M branches/3.1.2/core/kernel/src/main/java/com/sun/enterprise/v3/server/APIClassLoaderServiceImpl.java
M branches/3.1.2/core/kernel/src/main/java/com/sun/enterprise/v3/server/AppServerStartup.java
M branches/3.1.2/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/EarPersistenceArchivist.java
M branches/3.1.2/ejb/ejb-container/src/main/java/org/glassfish/ejb/startup/EjbDeployer.java
M branches/3.1.2/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/MessageBeanListener.java
M branches/3.1.2/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/MessageBeanProtocolManager.java
M branches/3.1.2/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/api/ResourcesExceededException.java
M branches/3.1.2/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/MessageBeanClient.java
M branches/3.1.2/ejb/ejb-internal-api/src/main/java/org/glassfish/ejb/spi/MessageBeanClientFactory.java
M branches/3.1.2/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
M branches/3.1.2/extras/osgi-container/src
M branches/3.1.2/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/monitoring/JdbcStatsProvider.java
M branches/3.1.2/jdbc/jdbc-ra/jdbc-core/src/main/java/com/sun/gjc/monitoring/StatementCacheProbeProvider.java
M branches/3.1.2/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/IIOPUtils.java
M branches/3.1.2/orb/orb-connector/src/main/java/org/glassfish/enterprise/iiop/util/S1ASThreadPoolManager.java
M branches/3.1.2/osgi-platforms/equinox/src/main/resources/glassfish/osgi/equinox/configuration/config.ini
M branches/3.1.2/packager/common-targets.xml
M branches/3.1.2/packager/felix/build.xml
M branches/3.1.2/packager/felix/pom.xml
M branches/3.1.2/packager/glassfish-cluster/build.xml
M branches/3.1.2/packager/glassfish-cluster/pom.xml
M branches/3.1.2/packager/glassfish-cmp/build.xml
M branches/3.1.2/packager/glassfish-cmp/pom.xml
M branches/3.1.2/packager/glassfish-common-full/build.xml
M branches/3.1.2/packager/glassfish-common-full/pom.xml
M branches/3.1.2/packager/glassfish-common-tmp/build.xml
M branches/3.1.2/packager/glassfish-common-tmp/pom.xml
M branches/3.1.2/packager/glassfish-corba-base/build.xml
M branches/3.1.2/packager/glassfish-corba-base/pom.xml
M branches/3.1.2/packager/glassfish-corba/build.xml
M branches/3.1.2/packager/glassfish-corba/pom.xml
M branches/3.1.2/packager/glassfish-ejb-lite/build.xml
M branches/3.1.2/packager/glassfish-ejb-lite/pom.xml
M branches/3.1.2/packager/glassfish-ejb/build.xml
M branches/3.1.2/packager/glassfish-ejb/pom.xml
M branches/3.1.2/packager/glassfish-grizzly-full/build.xml
M branches/3.1.2/packager/glassfish-grizzly-full/pom.xml
M branches/3.1.2/packager/glassfish-grizzly/build.xml
M branches/3.1.2/packager/glassfish-grizzly/pom.xml
M branches/3.1.2/packager/glassfish-gui/build.xml
M branches/3.1.2/packager/glassfish-gui/pom.xml
M branches/3.1.2/packager/glassfish-ha/build.xml
M branches/3.1.2/packager/glassfish-ha/pom.xml
M branches/3.1.2/packager/glassfish-hk2/build.xml
M branches/3.1.2/packager/glassfish-hk2/pom.xml
M branches/3.1.2/packager/glassfish-javahelp/build.xml
M branches/3.1.2/packager/glassfish-javahelp/pom.xml
M branches/3.1.2/packager/glassfish-jca/build.xml
M branches/3.1.2/packager/glassfish-jca/pom.xml
M branches/3.1.2/packager/glassfish-jdbc/build.xml
M branches/3.1.2/packager/glassfish-jdbc/pom.xml
M branches/3.1.2/packager/glassfish-jms/build.xml
M branches/3.1.2/packager/glassfish-jms/pom.xml
M branches/3.1.2/packager/glassfish-jpa/build.xml
M branches/3.1.2/packager/glassfish-jpa/pom.xml
M branches/3.1.2/packager/glassfish-jsf/build.xml
M branches/3.1.2/packager/glassfish-jsf/pom.xml
M branches/3.1.2/packager/glassfish-jta/build.xml
M branches/3.1.2/packager/glassfish-jta/pom.xml
M branches/3.1.2/packager/glassfish-jts/build.xml
M branches/3.1.2/packager/glassfish-jts/pom.xml
M branches/3.1.2/packager/glassfish-management/build.xml
M branches/3.1.2/packager/glassfish-management/pom.xml
M branches/3.1.2/packager/glassfish-nucleus/build.xml
M branches/3.1.2/packager/glassfish-nucleus/pom.xml
M branches/3.1.2/packager/glassfish-osgi-gui/build.xml
M branches/3.1.2/packager/glassfish-osgi-gui/pom.xml
M branches/3.1.2/packager/glassfish-osgi-http/build.xml
M branches/3.1.2/packager/glassfish-osgi-http/pom.xml
M branches/3.1.2/packager/glassfish-registration/build.xml
M branches/3.1.2/packager/glassfish-registration/pom.xml
M branches/3.1.2/packager/glassfish-upgrade/build.xml
M branches/3.1.2/packager/glassfish-upgrade/pom.xml
M branches/3.1.2/packager/glassfish-verifier/build.xml
M branches/3.1.2/packager/glassfish-verifier/pom.xml
M branches/3.1.2/packager/glassfish-web/build.xml
M branches/3.1.2/packager/glassfish-web/pom.xml
M branches/3.1.2/packager/metro/build.xml
M branches/3.1.2/packager/metro/pom.xml
M branches/3.1.2/packager/nucleus-base/build.xml
A branches/3.1.2/packager/nucleus-base/lib/templates/domain.xml.aix.xsl
M branches/3.1.2/packager/nucleus-base/pom.xml
M branches/3.1.2/packager/pom.xml
M branches/3.1.2/packager/resources/pkg_conf.py
M branches/3.1.2/packager/shoal/build.xml
M branches/3.1.2/packager/shoal/pom.xml
M branches/3.1.2/persistence/cmp/ejb-mapping/src/main
M branches/3.1.2/persistence/cmp/ejb-mapping/src/main/java/com
M branches/3.1.2/persistence/cmp/enhancer/src/main/java/com
M branches/3.1.2/persistence/cmp/generator-database/src/main/java/com
M branches/3.1.2/persistence/cmp/internal-api/src/main/java/com/sun/jdo/api
M branches/3.1.2/persistence/cmp/model/src/main/java/com
M branches/3.1.2/persistence/cmp/support-ejb/src/main/antlr/EJBQL.g
M branches/3.1.2/persistence/cmp/support-ejb/src/main/antlr/JDOQLCodeGeneration.g
M branches/3.1.2/persistence/cmp/support-ejb/src/main/antlr/Semantic.g
M branches/3.1.2/persistence/cmp/support-ejb/src/main/java/com
M branches/3.1.2/persistence/cmp/support-sqlstore/src/main/antlr/CodeGeneration.g
M branches/3.1.2/persistence/cmp/support-sqlstore/src/main/antlr/JQL.g
M branches/3.1.2/persistence/cmp/support-sqlstore/src/main/antlr/Optimizer.g
M branches/3.1.2/persistence/cmp/support-sqlstore/src/main/antlr/Semantic.g
M branches/3.1.2/persistence/cmp/support-sqlstore/src/main/java/com
M branches/3.1.2/persistence/cmp/utility/src/main/java/com
M branches/3.1.2/persistence/jpa-connector/src/main/java/org/glassfish/persistence/jpa/JPACompositeSniffer.java
M branches/3.1.2/pom.xml
M branches/3.1.2/security/core/src/main/java/com/sun/enterprise/security/cli/LDAPAdminAccessConfigurator.java
M branches/3.1.2/tests/embedded/cdi_basic/pom.xml
M branches/3.1.2/tests/embedded/ejb/basic/pom.xml
M branches/3.1.2/tests/embedded/ejb/ejb-api/pom.xml
M branches/3.1.2/tests/embedded/ejb/remoteejb/pom.xml
M branches/3.1.2/tests/embedded/ejb/remoteejb/src/test/java/org/glassfish/tests/embedded/ejb/remoteejb/test/EJBTest.java
M branches/3.1.2/tests/embedded/inplanted/pom.xml
M branches/3.1.2/tests/embedded/maven-plugin
M branches/3.1.2/tests/embedded/maven-plugin/jsftest/src/test/java/org/glassfish/tests/embedded/jsftest/JSFTest.java
M branches/3.1.2/tests/embedded/maven-plugin/jsptest/src/test/java/org/glassfish/tests/embedded/jsptest/JspTest.java
M branches/3.1.2/tests/embedded/maven-plugin/secureWebApp/src/test/java/org/glassfish/tests/embedded/securewebapp/SecureWebAppTest.java
M branches/3.1.2/tests/embedded/maven-plugin/websockets/pom.xml
M branches/3.1.2/tests/embedded/scatteredarchive/pom.xml
M branches/3.1.2/tests/embedded/web/web-all/pom.xml
M branches/3.1.2/tests/osgi-javaee/osgi-web/framework-controller/MANIFEST.MF
M branches/3.1.2/tests/osgi-javaee/osgi-web/framework-controller/src/main/java/test/BundleController.java
M branches/3.1.2/tests/osgi-javaee/osgi-web/framework-controller/src/main/java/test/BundleInstaller.java
M branches/3.1.2/tests/osgi-javaee/osgi-web/framework-controller/src/main/java/test/BundleUninstaller.java
M branches/3.1.2/tests/osgi-javaee/osgi-web/framework-controller/src/main/java/test/BundleViewer.java
M branches/3.1.2/tests/osgi-javaee/osgi-web/test1/MANIFEST.MF
M branches/3.1.2/tests/osgi-javaee/osgi-web/test2/MANIFEST.MF
M branches/3.1.2/tests/osgi-javaee/osgi-web/test2/src/main/java/example/LoginServlet.java
M branches/3.1.2/tests/osgi-javaee/osgi-web/test2/src/main/java/example/RegistrationServlet.java
M branches/3.1.2/tests/osgi-javaee/osgi-web/test4/MANIFEST.MF
M branches/3.1.2/tests/osgi-javaee/osgi-web/test6/src/main/java/example/LoginServlet.java
M branches/3.1.2/tests/osgi-javaee/osgi-web/test6/src/main/java/example/RegistrationServlet.java
M branches/3.1.2/tests/osgi-javaee/osgi-web/test7/MANIFEST.MF
M branches/3.1.2/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java
M branches/3.1.2/transaction/jts/src/main/java/com/sun/jts/CosTransactions/Configuration.java
M branches/3.1.2/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedRecoveryManager.java
M branches/3.1.2/transaction/jts/src/main/java/com/sun/jts/CosTransactions/LogDBHelper.java
M branches/3.1.2/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryManager.java
M branches/3.1.2/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java
M branches/3.1.2/transaction/jts/src/main/java/com/sun/jts/jta/TransactionServiceProperties.java
M branches/3.1.2/transaction/jts/src/main/java/com/sun/jts/trace/TraceUtil.java
M branches/3.1.2/transaction/jts/src/main/resources/com/sun/jts/LogStrings.properties
M branches/3.1.2/webservices/metro-glue/src/main/java/org/glassfish/webservices/metroglue/MetroContainer.java
 
 
Close
loading
Please Confirm
Close