svn commit: r1307761 - in /aries/branches/1.0-prototype: ./ application/application-api/src/main/java/org/apache/aries/application/management/ application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/ application/ap...

[cu...@apache.org]

Author: cumminsh
Date: Sat Mar 31 10:38:57 2012
New Revision: 1307761

URL: http://svn.apache.org/viewvc?rev=1307761&view=rev
Log:
Updated mergeinfo files - consequence of merge

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

Propchange: aries/branches/1.0-prototype/
------------------------------------------------------------------------------
  Merged /aries/trunk:r1307546-1307760

Propchange: aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
------------------------------------------------------------------------------
  Merged /aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java
------------------------------------------------------------------------------
  Merged /aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
------------------------------------------------------------------------------
  Merged /aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java
------------------------------------------------------------------------------
  Merged /aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
------------------------------------------------------------------------------
  Merged /aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/blueprint/blueprint-cm/src/main/java/org/apache/aries/
------------------------------------------------------------------------------
  Merged /aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries:r1307546-1307760

Propchange: aries/branches/1.0-prototype/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
------------------------------------------------------------------------------
  Merged /aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries:r1307546-1307760

Propchange: aries/branches/1.0-prototype/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
------------------------------------------------------------------------------
  Merged /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/blueprint/blueprint-core/src/main/resources/org/apache/aries/
------------------------------------------------------------------------------
  Merged /aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries:r1307546-1307760

Propchange: aries/branches/1.0-prototype/blueprint/blueprint-sample/
------------------------------------------------------------------------------
  Merged /aries/trunk/blueprint/blueprint-sample:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
------------------------------------------------------------------------------
  Merged /aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework:r1307546-1307760

Propchange: aries/branches/1.0-prototype/jndi/
------------------------------------------------------------------------------
  Merged /aries/trunk/jndi:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java:r1307546-1307760

Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
------------------------------------------------------------------------------
  Merged /aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework:r1307546-1307760

Propchange: aries/branches/1.0-prototype/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/
------------------------------------------------------------------------------
  Merged /aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks:r1307546-1307760

Propchange: aries/branches/1.0-prototype/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/
------------------------------------------------------------------------------
  Merged /aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest:r1307546-1307760

Propchange: aries/branches/1.0-prototype/transaction/
            ('svn:mergeinfo' removed)

Propchange: aries/branches/1.0-prototype/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java
------------------------------------------------------------------------------
  Merged /aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java:r1307546-1307760