/[Apache-SVN]
ViewVC logotype

Revision 1339155


Jump to revision: Previous Next
Author: xiaming
Date: Wed May 16 13:22:05 2012 UTC (11 years, 11 months ago)
Changed paths: 63
Log Message:
Merge 1333350,1333352,1334031,1334300,GERONIMO-6345,GERONIMO-6348 into trunk

Changed paths

Path Details
Directorygeronimo/server/trunk/ modified , props changed
Directorygeronimo/server/trunk/framework/ modified , props changed
Directorygeronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client modified , props changed
Directorygeronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo modified , props changed
Directorygeronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown modified , props changed
Directorygeronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat modified , props changed
Directorygeronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat modified , props changed
Directorygeronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat modified , props changed
Directorygeronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/ConfiguredEncryption.java
(Copied from geronimo/server/branches/3.0-beta/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/ConfiguredEncryption.java, r1334031)
added
Directorygeronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java modified , text changed
Directorygeronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-deploy-tool/ modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/ modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/ modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/ modified , props changed
Directorygeronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java modified , text changed
Directorygeronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/ modified , props changed
Directorygeronimo/server/trunk/plugins/ modified , props changed
Directorygeronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ modified , props changed
Directorygeronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java modified , props changed
Directorygeronimo/server/trunk/plugins/bval/bval-deployer/pom.xml modified , text changed
Directorygeronimo/server/trunk/plugins/bval/geronimo-bval/pom.xml modified , text changed
Directorygeronimo/server/trunk/plugins/bval/pom.xml modified , text changed
Directorygeronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/ modified , props changed
Directorygeronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java modified , props changed
Directorygeronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java modified , props changed
Directorygeronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java modified , props changed
Directorygeronimo/server/trunk/plugins/connector-1_6/ modified , props changed
Directorygeronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/ modified , props changed
Directorygeronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/ modified , props changed
Directorygeronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml modified , text changed
Directorygeronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java modified , text changed
Directorygeronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSXSRFFilter.java modified , text changed
Directorygeronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml modified , text changed
Directorygeronimo/server/trunk/plugins/openejb/ modified , props changed
Directorygeronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java modified , props changed
Directorygeronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml modified , text changed
Directorygeronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/ modified , props changed
Directorygeronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java modified , props changed
Directorygeronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java modified , text changed
Directorygeronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java modified , text changed
Directorygeronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java modified , props changed
Directorygeronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java modified , props changed
Directorygeronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java modified , props changed
Directorygeronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java modified , props changed
Directorygeronimo/server/trunk/pom.xml modified , text changed
Directorygeronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources/ modified , props changed
Directorygeronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources/ modified , props changed
Directorygeronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/ modified , props changed
Directorygeronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/ modified , props changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26