incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r985150 - in /incubator/aries/branches/0.2-incubating-RCx: ./ application/application-api/src/main/java/org/apache/aries/application/management/ application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/ ap...
Date Fri, 13 Aug 2010 10:20:11 GMT
Author: zoe
Date: Fri Aug 13 10:20:09 2010
New Revision: 985150

URL: http://svn.apache.org/viewvc?rev=985150&view=rev
Log:
Merging changes from ARIES-371 and ARIES-377

Added:
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/   (props changed)
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/   (props changed)
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/pom.xml
      - copied unchanged from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/pom.xml
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/java/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/java/org/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/java/org/apache/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/MockQuiesceParticipant.java
      - copied unchanged from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/MockQuiesceParticipant.java
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
      - copied unchanged from r984819, incubator/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/pom.xml
      - copied unchanged from r984819, incubator/aries/trunk/quiesce/quiesce-manager/pom.xml
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/java/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/java/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/java/org/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/java/org/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/java/org/apache/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/java/org/apache/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/java/org/apache/aries/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/java/org/apache/aries/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/manager/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/manager/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/manager/impl/
      - copied from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/manager/impl/
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/manager/impl/Activator.java
      - copied unchanged from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/manager/impl/Activator.java
    incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/manager/impl/QuiesceManagerImpl.java
      - copied unchanged from r984819, incubator/aries/trunk/quiesce/quiesce-manager/src/main/java/org/apache/aries/quiesce/manager/impl/QuiesceManagerImpl.java
Modified:
    incubator/aries/branches/0.2-incubating-RCx/   (props changed)
    incubator/aries/branches/0.2-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContextManager.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/DefaultLocalPlatform.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/NoOpResolver.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-api/   (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/resources/org/apache/aries/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-sample/   (props changed)
    incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jndi/jndi-core/src/main/java/org/apache/aries/jndi/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jndi/jndi-url/src/main/java/org/apache/aries/jndi/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/jndi/jndi-url/src/test/java/org/apache/aries/jndi/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/quiesce/pom.xml
    incubator/aries/branches/0.2-incubating-RCx/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
    incubator/aries/branches/0.2-incubating-RCx/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/
  (props changed)
    incubator/aries/branches/0.2-incubating-RCx/transaction/   (props changed)
    incubator/aries/branches/0.2-incubating-RCx/util/src/test/java/org/apache/aries/util/VersionRangeTest.java
  (props changed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/
------------------------------------------------------------------------------
    svn:mergeinfo = /incubator/aries/trunk:983779,984819,985113

Propchange: incubator/aries/branches/0.2-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContextManager.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/DefaultLocalPlatform.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/application/application-runtime/src/main/java/org/apache/aries/application/runtime/defaults/NoOpResolver.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-api/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/ManagedObjectManager.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/resources/org/apache/aries/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/test/java/org/apache/aries/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-itests/src/test/java/org/apache/aries/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-sample/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/blueprint/blueprint-sample/src/main/java/org/apache/aries/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/RegistrationStandardMBean.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jndi/jndi-core/src/main/java/org/apache/aries/jndi/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jndi/jndi-core/src/test/java/org/apache/aries/jndi/ObjectFactoryTest.java
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jndi/jndi-url/src/main/java/org/apache/aries/jndi/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/jndi/jndi-url/src/test/java/org/apache/aries/jndi/
            ('svn:mergeinfo' removed)

Modified: incubator/aries/branches/0.2-incubating-RCx/quiesce/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.2-incubating-RCx/quiesce/pom.xml?rev=985150&r1=985149&r2=985150&view=diff
==============================================================================
--- incubator/aries/branches/0.2-incubating-RCx/quiesce/pom.xml (original)
+++ incubator/aries/branches/0.2-incubating-RCx/quiesce/pom.xml Fri Aug 13 10:20:09 2010
@@ -41,11 +41,59 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.apache.aries</groupId>
+                <artifactId>org.apache.aries.util</artifactId>
+                <version>0.3-incubating-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.aries.testsupport</groupId>
+                <artifactId>org.apache.aries.testsupport.unit</artifactId>
+                <version>0.3-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.configadmin</artifactId>
+                <version>1.2.4</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.4</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-pool</groupId>
+                <artifactId>commons-pool</artifactId>
+                <version>1.5.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.serp</artifactId>
+                <version>1.13.1_2</version>
+            </dependency> 
         </dependencies>
     </dependencyManagement>
 
     <modules>
         <module>quiesce-api</module>
+        <module>quiesce-manager</module>
+	    <module>quiesce-manager-itest</module>
     </modules>
 
     <build>

Propchange: incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 13 10:20:09 2010
@@ -0,0 +1 @@
+target

Propchange: incubator/aries/branches/0.2-incubating-RCx/quiesce/quiesce-manager-itest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug 13 10:20:09 2010
@@ -0,0 +1 @@
+target

Modified: incubator/aries/branches/0.2-incubating-RCx/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/branches/0.2-incubating-RCx/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini?rev=985150&r1=985149&r2=985150&view=diff
==============================================================================
--- incubator/aries/branches/0.2-incubating-RCx/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
(original)
+++ incubator/aries/branches/0.2-incubating-RCx/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
Fri Aug 13 10:20:09 2010
@@ -22,8 +22,8 @@ pax-logging-api-1.4.jar@start,\
 pax-logging-service-1.4.jar@start,\
 org.apache.aries.util-${ariesUtilVersion}.jar@start,\
 org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start,\
-org.apache.aries.samples.helloworld.blueprint.api-${ariesBlueprintVersion}.jar@1,\
-org.apache.aries.samples.helloworld.blueprint.server-${ariesBlueprintVersion}.jar@1,\
-org.apache.aries.samples.helloworld.blueprint.client-${ariesBlueprintVersion}.jar@1
+org.apache.aries.samples.blueprint.helloworld.api-${ariesBlueprintVersion}.jar@1,\
+org.apache.aries.samples.blueprint.helloworld.server-${ariesBlueprintVersion}.jar@1,\
+org.apache.aries.samples.blueprint.helloworld.client-${ariesBlueprintVersion}.jar@1
 eclipse.ignoreApp=true
 org.ops4j.pax.logging.DefaultServiceLog.level=DEBUG

Propchange: incubator/aries/branches/0.2-incubating-RCx/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/transaction/
            ('svn:mergeinfo' removed)

Propchange: incubator/aries/branches/0.2-incubating-RCx/util/src/test/java/org/apache/aries/util/VersionRangeTest.java
            ('svn:mergeinfo' removed)



Mime
View raw message