geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1213810 [1/6] - in /geronimo/server/branches/3.0-beta: ./ framework/ framework/configs/karaf-framework/src/main/distribution/text/ framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/ framework/configs/karaf-framework/sr...
Date Tue, 13 Dec 2011 18:00:12 GMT
Author: xiaming
Date: Tue Dec 13 18:00:08 2011
New Revision: 1213810

URL: http://svn.apache.org/viewvc?rev=1213810&view=rev
Log:
Merge trunk change between r1184838 and r1213689 to 3.0-beta branch

Added:
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/CircularReferencesException.java
      - copied unchanged from r1213689, geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/CircularReferencesException.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/IllegalNodeConfigException.java
      - copied unchanged from r1213689, geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/IllegalNodeConfigException.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/SortUtils.java
      - copied unchanged from r1213689, geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/SortUtils.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/util/SortUtilsTest.java
      - copied unchanged from r1213689, geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/util/SortUtilsTest.java
    geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationUpdateHelper.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/WebApplicationName.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/WebApplicationName.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/WebModuleEvent.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/WebModuleEvent.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/WebModuleListener.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/WebModuleListener.java
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansHolderInterceptor.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansHolderInterceptor.java
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansSystemInitializer.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansSystemInitializer.java
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebAppContext.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebAppContext.java
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebModuleListener.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OpenWebBeansWebModuleListener.java
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebApplicationNameBasedSingletonService.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebApplicationNameBasedSingletonService.java
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java
      - copied unchanged from r1213689, geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/WebBeansConfigurationListener.java
Removed:
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/util/CircularReferencesException.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/util/FragmentSortUtils.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/util/IllegalConfigurationException.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/util/FragmentSortUtilsTest.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/WebApplicationIdentity.java
    geronimo/server/branches/3.0-beta/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/WebBeansConfigurationListener.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/OWBBeforeAfter.java
Modified:
    geronimo/server/branches/3.0-beta/   (props changed)
    geronimo/server/branches/3.0-beta/LICENSE
    geronimo/server/branches/3.0-beta/framework/   (props changed)
    geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/text/LICENSE
    geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
  (props changed)
    geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
  (props changed)
    geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown
  (props changed)
    geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
  (props changed)
    geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
  (props changed)
    geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat
  (props changed)
    geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/GeronimoDeploymentManager.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/eba/EBADeploymentManager.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ExtendedDeploymentManager.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool/   (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-hook/src/main/java/org/apache/geronimo/hook/equinox/SharedLibClassLoaderDelegateHook.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/pom.xml   (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/JarUtils.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/JVM.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
  (props changed)
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-transformer/pom.xml
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-transformer/src/main/java/org/apache/geronimo/transformer/TransformerAgent.java
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-upgrade/src/test/resources/
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/   (props changed)
    geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/pom.xml
    geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java
    geronimo/server/branches/3.0-beta/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/server/branches/3.0-beta/plugins/clustering/geronimo-deploy-farm/   (props changed)
    geronimo/server/branches/3.0-beta/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/connector-1_6/   (props changed)
    geronimo/server/branches/3.0-beta/plugins/connector-1_6/connector-deployer-1_6/   (props
changed)
    geronimo/server/branches/3.0-beta/plugins/connector-1_6/db-connectors/pom.xml
    geronimo/server/branches/3.0-beta/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-builder-1_6/
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/connector-1_6/pom.xml
    geronimo/server/branches/3.0-beta/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/server/branches/3.0-beta/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewHelper.java
    geronimo/server/branches/3.0-beta/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewPortlet.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-j2ee/pom.xml
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/annotation/Holder.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
    geronimo/server/branches/3.0-beta/plugins/j2ee/geronimo-web/src/main/java/org/apache/geronimo/web/WebApplicationConstants.java
    geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
    geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8/pom.xml
    geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/WebAppContextWrapper.java
    geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/GeronimoWebAppContext.java
    geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/handler/IntegrationContext.java
    geronimo/server/branches/3.0-beta/plugins/jetty8/geronimo-jetty8/src/test/java/org/apache/geronimo/jetty8/AbstractWebModuleTest.java
    geronimo/server/branches/3.0-beta/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml
    geronimo/server/branches/3.0-beta/plugins/jetty8/jetty8/pom.xml
    geronimo/server/branches/3.0-beta/plugins/myfaces/geronimo-myfaces/src/main/java/org/apache/geronimo/myfaces/GeronimoFactoryFinderProvider.java
    geronimo/server/branches/3.0-beta/plugins/openejb/   (props changed)
    geronimo/server/branches/3.0-beta/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/GeronimoSingletonService.java
    geronimo/server/branches/3.0-beta/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OpenWebBeansWebInitializer.java
    geronimo/server/branches/3.0-beta/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/ThreadSingletonServiceAdapter.java
    geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-persistence-jpa20-builder/
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans-builder/src/test/java/org/apache/geronimo/openwebbeans/deployment/BasicTest.java
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans-deployer/pom.xml
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans-deployer/src/main/plan/plan.xml
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/pom.xml
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml
    geronimo/server/branches/3.0-beta/plugins/openwebbeans/pom.xml
    geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java
    geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java
    geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
    geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
    geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
    geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/pom.xml
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatDeploymentWatcher.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/WebApplicationIdentityBeforeAfter.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/tomcat7/pom.xml
    geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
  (props changed)
    geronimo/server/branches/3.0-beta/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-api/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-eba/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-impl/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/osgi-service-custom/custom-wab/pom.xml
    geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources/
  (props changed)
    geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources/
  (props changed)
    geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/
  (props changed)
    geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/
  (props changed)
    geronimo/server/branches/3.0-beta/testsuite/javaee6-testsuite/jndi-infer-test/pom.xml

Propchange: geronimo/server/branches/3.0-beta/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 18:00:08 2011
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2:832538,885058
 /geronimo/server/branches/3.0-M1:948864,951792
+/geronimo/server/trunk:1184839-1213689

Modified: geronimo/server/branches/3.0-beta/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/LICENSE?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/LICENSE (original)
+++ geronimo/server/branches/3.0-beta/LICENSE Tue Dec 13 18:00:08 2011
@@ -744,6 +744,185 @@ The file in source code is also covered 
 
 plugins/webservices/geronimo-webservices-builder/src/main/xsd/wsdl.xsd
 
+<<<<<<< .working
+=======
+=========================================================================
+== Academic Free License 2.1                                           ==
+=========================================================================
+
+The Academic Free License
+v. 2.1
+
+This Academic Free License (the "License") applies to any original
+work of authorship (the "Original Work") whose owner (the "Licensor")
+has placed the following notice immediately following the copyright
+notice for the Original Work:
+
+Licensed under the Academic Free License version 2.1
+
+1) Grant of Copyright License. Licensor hereby grants You a
+   world-wide, royalty-free, non-exclusive, perpetual, sublicenseable
+   license to do the following:
+
+a) to reproduce the Original Work in copies;
+
+b) to prepare derivative works ("Derivative Works") based upon the
+   Original Work;
+
+c) to distribute copies of the Original Work and Derivative Works to
+   the public;
+
+d) to perform the Original Work publicly; and
+
+e) to display the Original Work publicly.
+
+2) Grant of Patent License. Licensor hereby grants You a world-wide,
+royalty-free, non-exclusive, perpetual, sublicenseable license, under
+patent claims owned or controlled by the Licensor that are embodied in
+the Original Work as furnished by the Licensor, to make, use, sell and
+offer for sale the Original Work and Derivative Works.
+
+3) Grant of Source Code License. The term "Source Code" means the
+preferred form of the Original Work for making modifications to it and
+all available documentation describing how to modify the Original
+Work. Licensor hereby agrees to provide a machine-readable copy of the
+Source Code of the Original Work along with each copy of the Original
+Work that Licensor distributes. Licensor reserves the right to satisfy
+this obligation by placing a machine-readable copy of the Source Code
+in an information repository reasonably calculated to permit
+inexpensive and convenient access by You for as long as Licensor
+continues to distribute the Original Work, and by publishing the
+address of that information repository in a notice immediately
+following the copyright notice that applies to the Original Work.
+
+4) Exclusions From License Grant. Neither the names of Licensor, nor
+the names of any contributors to the Original Work, nor any of their
+trademarks or service marks, may be used to endorse or promote
+products derived from this Original Work without express prior written
+permission of the Licensor. Nothing in this License shall be deemed to
+grant any rights to trademarks, copyrights, patents, trade secrets or
+any other intellectual property of Licensor except as expressly stated
+herein. No patent license is granted to make, use, sell or offer to
+sell embodiments of any patent claims other than the licensed claims
+defined in Section 2. No right is granted to the trademarks of
+Licensor even if such marks are included in the Original Work. Nothing
+in this License shall be interpreted to prohibit Licensor from
+licensing under different terms from this License any Original Work
+that Licensor otherwise would have a right to license.
+
+5) This section intentionally omitted.
+
+6) Attribution Rights. You must retain, in the Source Code of any
+Derivative Works that You create, all copyright, patent or trademark
+notices from the Source Code of the Original Work, as well as any
+notices of licensing and any descriptive text identified therein as an
+"Attribution Notice." You must cause the Source Code for any
+Derivative Works that You create to carry a prominent Attribution
+Notice reasonably calculated to inform recipients that You have
+modified the Original Work.
+
+7) Warranty of Provenance and Disclaimer of Warranty. Licensor
+warrants that the copyright in and to the Original Work and the patent
+rights granted herein by Licensor are owned by the Licensor or are
+sublicensed to You under the terms of this License with the permission
+of the contributor(s) of those copyrights and patent rights. Except as
+expressly stated in the immediately proceeding sentence, the Original
+Work is provided under this License on an "AS IS" BASIS and WITHOUT
+WARRANTY, either express or implied, including, without limitation,
+the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL
+WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential
+part of this License. No license to Original Work is granted hereunder
+except under this disclaimer.
+
+8) Limitation of Liability. Under no circumstances and under no legal
+theory, whether in tort (including negligence), contract, or
+otherwise, shall the Licensor be liable to any person for any direct,
+indirect, special, incidental, or consequential damages of any
+character arising as a result of this License or the use of the
+Original Work including, without limitation, damages for loss of
+goodwill, work stoppage, computer failure or malfunction, or any and
+all other commercial damages or losses. This limitation of liability
+shall not apply to liability for death or personal injury resulting
+from Licensor's negligence to the extent applicable law prohibits such
+limitation. Some jurisdictions do not allow the exclusion or
+limitation of incidental or consequential damages, so this exclusion
+and limitation may not apply to You.
+
+9) Acceptance and Termination. If You distribute copies of the
+Original Work or a Derivative Work, You must make a reasonable effort
+under the circumstances to obtain the express assent of recipients to
+the terms of this License. Nothing else but this License (or another
+written agreement between Licensor and You) grants You permission to
+create Derivative Works based upon the Original Work or to exercise
+any of the rights granted in Section 1 herein, and any attempt to do
+so except under the terms of this License (or another written
+agreement between Licensor and You) is expressly prohibited by
+U.S. copyright law, the equivalent laws of other countries, and by
+international treaty. Therefore, by exercising any of the rights
+granted to You in Section 1 herein, You indicate Your acceptance of
+this License and all of its terms and conditions.
+
+10) Termination for Patent Action. This License shall terminate
+automatically and You may no longer exercise any of the rights granted
+to You by this License as of the date You commence an action,
+including a cross-claim or counterclaim, against Licensor or any
+licensee alleging that the Original Work infringes a patent. This
+termination provision shall not apply for an action alleging patent
+infringement by combinations of the Original Work with other software
+or hardware.
+
+11) Jurisdiction, Venue and Governing Law. Any action or suit relating
+to this License may be brought only in the courts of a jurisdiction
+wherein the Licensor resides or in which Licensor conducts its primary
+business, and under the laws of that jurisdiction excluding its
+conflict-of-law provisions. The application of the United Nations
+Convention on Contracts for the International Sale of Goods is
+expressly excluded. Any use of the Original Work outside the scope of
+this License or after its termination shall be subject to the
+requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101
+et seq., the equivalent laws of other countries, and international
+treaty. This section shall survive the termination of this License.
+
+12) Attorneys Fees. In any action to enforce the terms of this License
+or seeking damages relating thereto, the prevailing party shall be
+entitled to recover its costs and expenses, including, without
+limitation, reasonable attorneys' fees and costs incurred in
+connection with such action, including any appeal of such action. This
+section shall survive the termination of this License.
+
+13) Miscellaneous. This License represents the complete agreement
+concerning the subject matter hereof. If any provision of this License
+is held to be unenforceable, such provision shall be reformed only to
+the extent necessary to make it enforceable.
+
+14) Definition of "You" in This License. "You" throughout this
+License, whether in upper or lower case, means an individual or a
+legal entity exercising rights under, and complying with all of the
+terms of, this License. For legal entities, "You" includes any entity
+that controls, is controlled by, or is under common control with
+you. For purposes of this definition, "control" means (i) the power,
+direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty
+percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity.
+
+15) Right to Use. You may use the Original Work in all ways not
+otherwise restricted or conditioned by this License or by law, and
+Licensor promises not to interfere with or be responsible for such
+uses by You.
+
+This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights
+reserved. Permission is hereby granted to copy and distribute this
+license without modification. This license may not be modified without
+the express written permission of its copyright owner.
+
+files within plugins/console/console-portal-driver/src/main/webapp/dojo/
+
+#########################################################################
+## APACHE GERONIMO DEPENDENCIES                                        ##
+#########################################################################
+>>>>>>> .merge-right.r1213689
 
 =========================================================================
 == Academic Free License 2.1                                           ==

Propchange: geronimo/server/branches/3.0-beta/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 18:00:08 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework:826768,832538,885058
 /geronimo/server/branches/3.0-M1/framework:948864,951792
-/geronimo/server/trunk/framework:749113,749116-807432,809079-825588
+/geronimo/server/trunk/framework:749113,749116-807432,809079-825588,1184839-1213689



Mime
View raw message