ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1362498 [1/3] - in /ace/sandbox/marrs: cnf/ cnf/lib/ cnf/lib/aopalliance/ cnf/lib/guava/ cnf/lib/jsch/ cnf/lib/jsr250-api/ cnf/lib/jsr305/ cnf/lib/oauth/ cnf/repo/ cnf/repo/aws-common/ cnf/repo/aws-ec2/ cnf/repo/com.google.gson/ cnf/repo/c...
Date Tue, 17 Jul 2012 13:57:45 GMT
Author: jawi
Date: Tue Jul 17 13:57:44 2012
New Revision: 1362498

URL: http://svn.apache.org/viewvc?rev=1362498&view=rev
Log:
Cleanups:
- made sure the amazonlauncher uses latest JClouds API (thanks to Paul);
- cleaned up the local repositories from old JClouds & Knopflerfish libraries;
- fixed the main build script to use TestNG library at correct location.


Removed:
    ace/sandbox/marrs/cnf/lib/aopalliance/
    ace/sandbox/marrs/cnf/lib/guava/
    ace/sandbox/marrs/cnf/lib/jsch/
    ace/sandbox/marrs/cnf/lib/jsr250-api/
    ace/sandbox/marrs/cnf/lib/jsr305/
    ace/sandbox/marrs/cnf/lib/oauth/
    ace/sandbox/marrs/cnf/repo/aws-common/
    ace/sandbox/marrs/cnf/repo/aws-ec2/
    ace/sandbox/marrs/cnf/repo/com.google.gson/
    ace/sandbox/marrs/cnf/repo/com.google.guava/
    ace/sandbox/marrs/cnf/repo/com.google.inject/
    ace/sandbox/marrs/cnf/repo/com.google.inject.assistedinject/
    ace/sandbox/marrs/cnf/repo/com.sun.jersey.jersey-core/
    ace/sandbox/marrs/cnf/repo/ec2/
    ace/sandbox/marrs/cnf/repo/jclouds-bouncycastle/
    ace/sandbox/marrs/cnf/repo/jclouds-compute/
    ace/sandbox/marrs/cnf/repo/jclouds-core/
    ace/sandbox/marrs/cnf/repo/jclouds-scriptbuilder/
    ace/sandbox/marrs/cnf/repo/jclouds-slf4j/
    ace/sandbox/marrs/cnf/repo/jclouds-sshj/
    ace/sandbox/marrs/cnf/repo/net.schmizz.sshj/
    ace/sandbox/marrs/cnf/repo/org.apache.commons.io/
    ace/sandbox/marrs/cnf/repo/org.knopflerfish.bundle.useradmin/
    ace/sandbox/marrs/cnf/repo/org.knopflerfish.log/
    ace/sandbox/marrs/cnf/repo/rocoto/
Modified:
    ace/sandbox/marrs/cnf/build.xml
    ace/sandbox/marrs/cnf/lib/repository.xml
    ace/sandbox/marrs/cnf/repo/repository.xml
    ace/sandbox/marrs/org.apache.ace.authenticationprocessor.clientcert/   (props changed)
    ace/sandbox/marrs/org.apache.ace.authenticationprocessor.clientcert/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.nodelauncher.amazon/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.nodelauncher.ui/bnd.bnd

Modified: ace/sandbox/marrs/cnf/build.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/build.xml?rev=1362498&r1=1362497&r2=1362498&view=diff
==============================================================================
--- ace/sandbox/marrs/cnf/build.xml (original)
+++ ace/sandbox/marrs/cnf/build.xml Tue Jul 17 13:57:44 2012
@@ -24,7 +24,7 @@
 		
 		<!-- TestNG support -->
 		<echo message="testng ant tasks..." />
-		<taskdef resource="testngtasks" classpath="${workspacedir}/cnf/lib/testng-6.5.2.jar"
/>
+		<taskdef resource="testngtasks" classpath="${workspacedir}/cnf/lib/testng/testng-6.5.2.jar"
/>
         
 		<echo message="bnd prepare..." />
 		<bndprepare basedir="${projectdir}" print="false" top="${release.dir}" />

Modified: ace/sandbox/marrs/cnf/lib/repository.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/lib/repository.xml?rev=1362498&r1=1362497&r2=1362498&view=diff
==============================================================================
--- ace/sandbox/marrs/cnf/lib/repository.xml (original)
+++ ace/sandbox/marrs/cnf/lib/repository.xml Tue Jul 17 13:57:44 2012
@@ -1,21 +1,14 @@
 <repository>
  <resource id='ant/1.8.4' symbolicname='ant' uri='ant/ant-1.8.4.jar' version='1.8.4'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname' v='ant'/><p
n='version' t='version' v='1.8.4'/></capability></resource>
- <resource id='aopalliance/1.0' symbolicname='aopalliance' uri='aopalliance/aopalliance-1.0.jar'
version='1.0'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='aopalliance'/><p n='version' t='version' v='1.0'/></capability></resource>
- <resource id='bcprov-jdk14/1.40' symbolicname='bcprov-jdk14' uri='bcprov-jdk14/bcprov-jdk14-1.40.jar'
version='1.40'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='bcprov-jdk14'/><p n='version' t='version' v='1.40'/></capability></resource>
  <resource id='commons-codec/1.4' symbolicname='commons-codec' uri='commons-codec/commons-codec-1.4.jar'
version='1.4'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='commons-codec'/><p n='version' t='version' v='1.4'/></capability></resource>
  <resource id='commons-collections/3.2.1' symbolicname='commons-collections' uri='commons-collections/commons-collections-3.2.1.jar'
version='3.2.1'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='commons-collections'/><p n='version' t='version' v='3.2.1'/></capability></resource>
  <resource id='commons-io/2.0.1' symbolicname='commons-io' uri='commons-io/commons-io-2.0.1.jar'
version='2.0.1'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='commons-io'/><p n='version' t='version' v='2.0.1'/></capability></resource>
  <resource id='commons-lang/2.4' symbolicname='commons-lang' uri='commons-lang/commons-lang-2.4.jar'
version='2.4'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='commons-lang'/><p n='version' t='version' v='2.4'/></capability></resource>
  <resource id='commons-logging/1.1.1' symbolicname='commons-logging' uri='commons-logging/commons-logging-1.1.1.jar'
version='1.1.1'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='commons-logging'/><p n='version' t='version' v='1.1.1'/></capability></resource>
  <resource id='gson/1.7.1' symbolicname='gson' uri='gson/gson-1.7.1.jar' version='1.7.1'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname' v='gson'/><p
n='version' t='version' v='1.7.1'/></capability></resource>
- <resource id='guava/11.0.2' symbolicname='guava' uri='guava/guava-11.0.2.jar' version='11.0.2'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname' v='guava'/><p
n='version' t='version' v='11.0.2'/></capability></resource>
  <resource id='javax.inject/1' symbolicname='javax.inject' uri='javax.inject/javax.inject-1.jar'
version='1'><capability name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname'
v='javax.inject'/><p n='version' t='version' v='1'/></capability></resource>
- <resource id='jsch/0.1.44.1' symbolicname='jsch' uri='jsch/jsch-0.1.44.1.jar' version='0.1.44.1'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname' v='jsch'/><p
n='version' t='version' v='0.1.44.1'/></capability></resource>
- <resource id='jsr250-api/1.0' symbolicname='jsr250-api' uri='jsr250-api/jsr250-api-1.0.jar'
version='1.0'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='jsr250-api'/><p n='version' t='version' v='1.0'/></capability></resource>
- <resource id='jsr305/1.3.9' symbolicname='jsr305' uri='jsr305/jsr305-1.3.9.jar' version='1.3.9'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname' v='jsr305'/><p
n='version' t='version' v='1.3.9'/></capability></resource>
  <resource id='junit/4.8.2' symbolicname='junit' uri='junit/junit-4.8.2.jar' version='4.8.2'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname' v='junit'/><p
n='version' t='version' v='4.8.2'/></capability></resource>
  <resource id='kxml2/2.3.0' symbolicname='kxml2' uri='kxml2/kxml2-2.3.0.jar' version='2.3.0'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname' v='kxml2'/><p
n='version' t='version' v='2.3.0'/></capability></resource>
- <resource id='oauth/20100527' symbolicname='oauth' uri='oauth/oauth-20100527.jar' version='20100527'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname' v='oauth'/><p
n='version' t='version' v='20100527'/></capability></resource>
  <resource id='pax-exam/2.3.0' symbolicname='pax-exam' uri='pax-exam/pax-exam-2.3.0.jar'
version='2.3.0'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='pax-exam'/><p n='version' t='version' v='2.3.0'/></capability></resource>
  <resource id='pax-exam-container-native/2.3.0' symbolicname='pax-exam-container-native'
uri='pax-exam-container-native/pax-exam-container-native-2.3.0.jar' version='2.3.0'><capability
name='bundle'><p n='manifestversion' v='2'/><p n='symbolicname' v='pax-exam-container-native'/><p
n='version' t='version' v='2.3.0'/></capability></resource>
  <resource id='pax-exam-inject/2.3.0' symbolicname='pax-exam-inject' uri='pax-exam-inject/pax-exam-inject-2.3.0.jar'
version='2.3.0'><capability name='bundle'><p n='manifestversion' v='2'/><p
n='symbolicname' v='pax-exam-inject'/><p n='version' t='version' v='2.3.0'/></capability></resource>



Mime
View raw message