You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2013/02/14 22:30:22 UTC
svn commit: r1446340 [1/3] - in /ace/trunk: cnf/ cnf/buildrepo/osgi.core/ cnf/ext/ cnf/localrepo/ cnf/localrepo/javax.servlet/ cnf/localrepo/org.apache.felix.configadmin/ cnf/localrepo/org.apache.felix.framework/ cnf/localrepo/org.apache.felix.gogo.com...

Author: marrs
Date: Thu Feb 14 21:30:21 2013
New Revision: 1446340

URL: http://svn.apache.org/r1446340
Log:
ACE-335 Removed the Bndtools Hub repository and moved everything we use from it to a local repository.

Added:
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar   (with props)
    ace/trunk/cnf/localrepo/javax.servlet/
    ace/trunk/cnf/localrepo/javax.servlet/javax.servlet-2.5.0.jar   (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.configadmin/
    ace/trunk/cnf/localrepo/org.apache.felix.configadmin/org.apache.felix.configadmin-1.6.0.jar   (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.framework/
    ace/trunk/cnf/localrepo/org.apache.felix.framework/org.apache.felix.framework-4.0.3.jar   (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.gogo.command/
    ace/trunk/cnf/localrepo/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar   (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.gogo.runtime/
    ace/trunk/cnf/localrepo/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar   (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.gogo.shell/
    ace/trunk/cnf/localrepo/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar   (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.http.jetty/
    ace/trunk/cnf/localrepo/org.apache.felix.http.jetty/org.apache.felix.http.jetty-2.2.0.jar   (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.log/
    ace/trunk/cnf/localrepo/org.apache.felix.log/org.apache.felix.log-1.0.1.jar   (with props)
    ace/trunk/cnf/localrepo/org.apache.felix.metatype/
    ace/trunk/cnf/localrepo/org.apache.felix.metatype/org.apache.felix.metatype-1.0.4.jar   (with props)
    ace/trunk/cnf/localrepo/org.mockito.mockito-all/
    ace/trunk/cnf/localrepo/org.mockito.mockito-all/org.mockito.mockito-all-1.9.0.jar   (with props)
    ace/trunk/cnf/localrepo/osgi.cmpn/
    ace/trunk/cnf/localrepo/osgi.cmpn/osgi.cmpn-4.2.0.jar   (with props)
    ace/trunk/cnf/localrepo/osgi.cmpn/osgi.cmpn-4.3.1.jar   (with props)
Removed:
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.0.1.jar
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.1.0.jar
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.3.0.jar
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-5.0.0.jar
Modified:
    ace/trunk/cnf/build-template.xml
    ace/trunk/cnf/build.xml
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.2.0.jar
    ace/trunk/cnf/ext/repositories.bnd
    ace/trunk/cnf/localrepo/index.xml
    ace/trunk/org.apache.ace.authentication.api/bnd.bnd
    ace/trunk/org.apache.ace.authentication/bnd.bnd
    ace/trunk/org.apache.ace.client.repository.impl/bnd.bnd
    ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
    ace/trunk/org.apache.ace.configurator.serveruseradmin/bnd.bnd
    ace/trunk/org.apache.ace.configurator.useradmin.task/bnd.bnd
    ace/trunk/org.apache.ace.consolelogger/bnd.bnd
    ace/trunk/org.apache.ace.deployment.api/bnd.bnd
    ace/trunk/org.apache.ace.deployment.verifier.ui/bnd.bnd
    ace/trunk/org.apache.ace.deployment.verifier/bnd.bnd
    ace/trunk/org.apache.ace.http.redirector/bnd.bnd
    ace/trunk/org.apache.ace.identification.property/bnd.bnd
    ace/trunk/org.apache.ace.launcher/bnd.bnd
    ace/trunk/org.apache.ace.location.upnp/bnd.bnd
    ace/trunk/org.apache.ace.managementagent/bnd.bnd
    ace/trunk/org.apache.ace.processlauncher/bnd.bnd
    ace/trunk/org.apache.ace.repository.task/bnd.bnd
    ace/trunk/org.apache.ace.resourceprocessor.useradmin/bnd.bnd
    ace/trunk/org.apache.ace.server.action/bnd.bnd
    ace/trunk/org.apache.ace.server.log.store.itest/bnd.bnd
    ace/trunk/org.apache.ace.test/bnd.bnd

Modified: ace/trunk/cnf/build-template.xml
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/build-template.xml?rev=1446340&r1=1446339&r2=1446340&view=diff
==============================================================================
--- ace/trunk/cnf/build-template.xml (original)
+++ ace/trunk/cnf/build-template.xml Thu Feb 14 21:30:21 2013
@@ -40,6 +40,11 @@
 			<available file="${basedir}/test" type="dir"/>
 		</condition>
 
+		<!-- Is this project an integration test project? -->
+		<condition property="project.itest">
+			<matches string="${project}" pattern="\.itest$" />
+		</condition>
+
 		<!-- Create a marker property to indicate that initialisation has been completed -->
 		<property name="initialized" value="set" />
 		<echo message="Enter project ${project.name}"/>
@@ -58,7 +63,7 @@
 	<!--
 	     Test
 	-->
-	<target name="test" depends="compile">
+	<target name="test" depends="compile" if="project.itest">
 		<bndtest/>
 	</target>
 

Modified: ace/trunk/cnf/build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/build.xml?rev=1446340&r1=1446339&r2=1446340&view=diff
==============================================================================
--- ace/trunk/cnf/build.xml (original)
+++ ace/trunk/cnf/build.xml Thu Feb 14 21:30:21 2013
@@ -31,10 +31,6 @@
 				<fileset dir="${project}/test" erroronmissingdir="false" />
 			</length>
 		</condition>
-		<!-- Is this project an integration test project? -->
-		<condition property="project.itest">
-			<matches string="${project}" pattern="\.itest$" />
-		</condition>
 	</target>
 	
 	
@@ -53,10 +49,6 @@
 	
 	
 	<!-- Integration test support -->
-	<target name="test" depends="init" if="project.itest">
-		<subant target="test" inheritAll="false" buildpath="${project.dependson}" />
-	</target>
-	
 	<target name="deeptest" depends="init" if="project.dependson">
 		<subant target="test" inheritAll="false" buildpath="${project.dependson}">
 			<property name="donotrecurse" value="true" />

Modified: ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.2.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.2.0.jar?rev=1446340&r1=1446339&r2=1446340&view=diff
==============================================================================
Binary files - no diff available.

Added: ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar?rev=1446340&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.3.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ace/trunk/cnf/ext/repositories.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/ext/repositories.bnd?rev=1446340&r1=1446339&r2=1446340&view=diff
==============================================================================
--- ace/trunk/cnf/ext/repositories.bnd (original)
+++ ace/trunk/cnf/ext/repositories.bnd Thu Feb 14 21:30:21 2013
@@ -4,11 +4,12 @@ plugindir: ${workspace}/cnf/plugins
 
 -plugin: aQute.bnd.deployer.repository.LocalIndexedRepo;name=Release;local=${workspace}/cnf/releaserepo;pretty=true,\
 	aQute.bnd.deployer.repository.LocalIndexedRepo;name=Local;local=${workspace}/cnf/localrepo;pretty=true,\
-	aQute.bnd.deployer.repository.FixedIndexedRepo;name=Bndtools Hub;locations=https://github.com/bndtools/bundle-hub/raw/master/index.xml.gz,\
-	aQute.bnd.deployer.repository.FixedIndexedRepo;name=Library Repository;locations='http://svn.apache.org/repos/asf/ace/trunk/cnf/lib/repository.xml,file://${build}/lib/repository.xml',\
+	aQute.bnd.deployer.repository.FixedIndexedRepo;name=Library Repository;locations='file://${build}/lib/repository.xml',\
 	aQute.lib.deployer.FileRepo;name=Build;location=${workspace}/cnf/buildrepo
 
 -releaserepo: Release
 
 -XXX: \
+	aQute.bnd.deployer.repository.FixedIndexedRepo;name=Bndtools Hub;locations=https://github.com/bndtools/bundle-hub/raw/master/index.xml.gz,\
+	aQute.bnd.deployer.repository.FixedIndexedRepo;name=Library Repository;locations='http://svn.apache.org/repos/asf/ace/trunk/cnf/lib/repository.xml,file://${build}/lib/repository.xml',\
 	aQute.bnd.deployer.repository.FixedIndexedRepo;name=Apache ACE Hub;locations=http://svn.apache.org/repos/asf/ace/trunk/cnf/repo/repository.xml,\