Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A30289C45 for ; Sat, 31 Mar 2012 10:37:11 +0000 (UTC) Received: (qmail 58100 invoked by uid 500); 31 Mar 2012 10:37:11 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 58021 invoked by uid 500); 31 Mar 2012 10:37:10 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 58006 invoked by uid 99); 31 Mar 2012 10:37:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Mar 2012 10:37:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 31 Mar 2012 10:37:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 78A662388860; Sat, 31 Mar 2012 10:36:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1307760 - 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... Date: Sat, 31 Mar 2012 10:36:48 -0000 To: commits@aries.apache.org From: cumminsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120331103648.78A662388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cumminsh Date: Sat Mar 31 10:36:46 2012 New Revision: 1307760 URL: http://svn.apache.org/viewvc?rev=1307760&view=rev Log: Deleting 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/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java (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/blueprint/blueprint-sample/src/main/java/org/apache/aries/ (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:r1306977-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 Propchange: aries/branches/1.0-prototype/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java ('svn:mergeinfo' removed) 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 Propchange: aries/branches/1.0-prototype/blueprint/blueprint-sample/ ------------------------------------------------------------------------------ Merged /aries/trunk/blueprint/blueprint-sample:r1306564-1307545 Propchange: aries/branches/1.0-prototype/blueprint/blueprint-sample/src/main/java/org/apache/aries/ ('svn:mergeinfo' removed) 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 Propchange: aries/branches/1.0-prototype/jndi/ ------------------------------------------------------------------------------ Merged /aries/trunk/jndi:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 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:r1306564-1307545 Propchange: aries/branches/1.0-prototype/transaction/ ------------------------------------------------------------------------------ Merged /aries/trunk/transaction:r1306564-1307545 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:r1306564-1307545