/[Apache-SVN]
ViewVC logotype

Revision 1307761


Jump to revision: Previous Next
Author: cumminsh
Date: Sat Mar 31 10:38:57 2012 UTC (12 years ago)
Changed paths: 38
Log Message:
Updated mergeinfo files - consequence of merge

Changed paths

Path Details
Directoryaries/branches/1.0-prototype/ modified , props changed
Directoryaries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java modified , props changed
Directoryaries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java modified , props changed
Directoryaries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java modified , props changed
Directoryaries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java modified , props changed
Directoryaries/branches/1.0-prototype/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java modified , props changed
Directoryaries/branches/1.0-prototype/blueprint/blueprint-cm/src/main/java/org/apache/aries/ modified , props changed
Directoryaries/branches/1.0-prototype/blueprint/blueprint-cm/src/main/resources/org/apache/aries/ modified , props changed
Directoryaries/branches/1.0-prototype/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java modified , props changed
Directoryaries/branches/1.0-prototype/blueprint/blueprint-core/src/main/resources/org/apache/aries/ modified , props changed
Directoryaries/branches/1.0-prototype/blueprint/blueprint-sample/ modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java modified , props changed
Directoryaries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ modified , props changed
Directoryaries/branches/1.0-prototype/jndi/ modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java modified , props changed
Directoryaries/branches/1.0-prototype/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ modified , props changed
Directoryaries/branches/1.0-prototype/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/ modified , props changed
Directoryaries/branches/1.0-prototype/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/ modified , props changed
Directoryaries/branches/1.0-prototype/transaction/ modified , props changed
Directoryaries/branches/1.0-prototype/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java modified , props changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26