Skip to main content

Source code revision

svn

summary: clean up botched reverse merge
revision: 4577
author: mtaube
date: 2013-05-22 20:35:47 UTC (3 years)
message: clean up botched reverse merge
Change Path Actions
M trunk/hk2/core/src/main/java/com/sun/enterprise/module/ModulesRegistry.java
M trunk/hk2/core/src/main/java/com/sun/enterprise/module/bootstrap/ContextDuplicatePostProcessor.java
M trunk/hk2/core/src/main/java/com/sun/enterprise/module/bootstrap/Main.java
M trunk/hk2/core/src/main/java/com/sun/enterprise/module/common_impl/AbstractModulesRegistryImpl.java
M trunk/hk2/core/src/main/java/com/sun/enterprise/module/impl/ModuleImpl.java
M trunk/hk2/core/src/main/java/com/sun/enterprise/module/impl/ModulesRegistryImpl.java
M trunk/hk2/core/src/main/java/com/sun/enterprise/module/single/ClassPathBasedModulesRegistry.java
M trunk/hk2/core/src/main/java/com/sun/enterprise/module/single/SingleModulesRegistry.java
M trunk/hk2/core/src/main/java/com/sun/enterprise/module/single/StaticModulesRegistry.java
M trunk/hk2/core/src/main/java/org/glassfish/hk2/bootstrap/DescriptorFileFinder.java
M trunk/hk2/core/src/main/java/org/glassfish/hk2/bootstrap/HK2Populator.java
M trunk/hk2/core/src/main/java/org/glassfish/hk2/bootstrap/PopulatorPostProcessor.java
M trunk/hk2/core/src/main/java/org/glassfish/hk2/bootstrap/impl/Hk2LoaderPopulatorPostProcessor.java
M trunk/hk2/core/src/main/java/org/glassfish/hk2/bootstrap/impl/URLDescriptorFileFinder.java
M trunk/hk2/core/src/test/java/org/glassfish/hk2/bootstrap/impl/ServiceLocatorTest.java
A trunk/hk2/hk2-api/src/main/java/org/glassfish/hk2/api/DescriptorFileFinder.java
M trunk/hk2/hk2-api/src/main/java/org/glassfish/hk2/api/DynamicConfigurationService.java
A trunk/hk2/hk2-api/src/main/java/org/glassfish/hk2/api/Populator.java
A trunk/hk2/hk2-api/src/main/java/org/glassfish/hk2/api/PopulatorPostProcessor.java
A trunk/hk2/hk2-api/src/main/java/org/glassfish/hk2/utilities/ClasspathDescriptorFileFinder.java
M trunk/hk2/hk2-api/src/main/java/org/glassfish/hk2/utilities/ServiceLocatorUtilities.java
M trunk/hk2/hk2-api/src/site/apt/index.apt
M trunk/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigModule.java
M trunk/hk2/hk2-config/src/test/java/org/jvnet/hk2/config/test/ConfigTest.java
A trunk/hk2/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/maven/ant
A trunk/hk2/hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/maven/ant/HK2InhabitantGeneratorTask.java
M trunk/hk2/hk2-inhabitant-generator/src/site/apt/index.apt
M trunk/hk2/hk2-locator/src/main/java/org/jvnet/hk2/internal/DynamicConfigurationServiceImpl.java
A trunk/hk2/hk2-locator/src/main/java/org/jvnet/hk2/internal/PopulatorImpl.java
A trunk/hk2/hk2-locator/src/test/java/org/glassfish/hk2/tests/locator/dynamicpopulate
A trunk/hk2/hk2-locator/src/test/java/org/glassfish/hk2/tests/locator/dynamicpopulate/DynamicPopulateTest.java
A trunk/hk2/hk2-testing/ant
A trunk/hk2/hk2-testing/ant/antsrc
A trunk/hk2/hk2-testing/ant/antsrc/org
A trunk/hk2/hk2-testing/ant/antsrc/org/jvnet
A trunk/hk2/hk2-testing/ant/antsrc/org/jvnet/hk2
A trunk/hk2/hk2-testing/ant/antsrc/org/jvnet/hk2/examples
A trunk/hk2/hk2-testing/ant/antsrc/org/jvnet/hk2/examples/ant
A trunk/hk2/hk2-testing/ant/antsrc/org/jvnet/hk2/examples/ant/services
A trunk/hk2/hk2-testing/ant/antsrc/org/jvnet/hk2/examples/ant/services/Service1.java
A trunk/hk2/hk2-testing/ant/build.xml
A trunk/hk2/hk2-testing/ant/pom.xml
A trunk/hk2/hk2-testing/ant/src
A trunk/hk2/hk2-testing/ant/src/main
A trunk/hk2/hk2-testing/ant/src/main/java
A trunk/hk2/hk2-testing/ant/src/main/java/test
A trunk/hk2/hk2-testing/ant/src/main/java/test/Test.java
A trunk/hk2/hk2-testing/ant/src/test
A trunk/hk2/hk2-testing/ant/src/test/java
A trunk/hk2/hk2-testing/ant/src/test/java/org
A trunk/hk2/hk2-testing/ant/src/test/java/org/jvnet
A trunk/hk2/hk2-testing/ant/src/test/java/org/jvnet/hk2
A trunk/hk2/hk2-testing/ant/src/test/java/org/jvnet/hk2/examples
A trunk/hk2/hk2-testing/ant/src/test/java/org/jvnet/hk2/examples/ant
A trunk/hk2/hk2-testing/ant/src/test/java/org/jvnet/hk2/examples/ant/test
A trunk/hk2/hk2-testing/ant/src/test/java/org/jvnet/hk2/examples/ant/test/AntTest.java
M trunk/hk2/hk2-testing/pom.xml
M trunk/hk2/osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/AbstractOSGiModulesRegistryImpl.java
M trunk/hk2/osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/HK2Main.java
M trunk/hk2/osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OSGiModuleDefinition.java
M trunk/hk2/osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OSGiModuleImpl.java
M trunk/hk2/osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OSGiObrModuleImpl.java
M trunk/hk2/osgi/adapter/src/main/java/org/jvnet/hk2/osgiadapter/OsgiPopulatorPostProcessor.java
M trunk/hk2/src/site/apt/develop.apt
M trunk/hk2/src/site/apt/index.apt
 
 
Close
loading
Please Confirm
Close