ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1446131 [1/3] - in /ace/trunk: build/ cnf/ cnf/buildrepo/ cnf/buildrepo/biz.aQute.junit/ cnf/buildrepo/biz.aQute.launcher/ cnf/buildrepo/ee.foundation/ cnf/buildrepo/ee.minimum/ cnf/buildrepo/junit.osgi/ cnf/buildrepo/org.easymock/ cnf/bui...
Date Thu, 14 Feb 2013 11:44:51 GMT
Author: marrs
Date: Thu Feb 14 11:44:50 2013
New Revision: 1446131

URL: http://svn.apache.org/r1446131
Log:
ACE-335 Applied the patch and did a lot of fixes for the Ant based build.

Added:
    ace/trunk/cnf/build-template.xml
    ace/trunk/cnf/buildrepo/
    ace/trunk/cnf/buildrepo/README.txt
    ace/trunk/cnf/buildrepo/biz.aQute.junit/
    ace/trunk/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-1.1.0.jar   (with props)
    ace/trunk/cnf/buildrepo/biz.aQute.launcher/
    ace/trunk/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-1.0.5.jar   (with props)
    ace/trunk/cnf/buildrepo/ee.foundation/
    ace/trunk/cnf/buildrepo/ee.foundation/ee.foundation-1.1.0.jar   (with props)
    ace/trunk/cnf/buildrepo/ee.minimum/
    ace/trunk/cnf/buildrepo/ee.minimum/ee.minimum-1.2.0.jar   (with props)
    ace/trunk/cnf/buildrepo/junit.osgi/
    ace/trunk/cnf/buildrepo/junit.osgi/junit.osgi-3.8.2.jar   (with props)
    ace/trunk/cnf/buildrepo/org.easymock/
    ace/trunk/cnf/buildrepo/org.easymock/org.easymock-3.1.0.jar   (with props)
    ace/trunk/cnf/buildrepo/org.easymock/org.easymock-latest.jar   (with props)
    ace/trunk/cnf/buildrepo/org.osgi.ee.foundation/
    ace/trunk/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.0.jar   (with
props)
    ace/trunk/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.1.jar   (with
props)
    ace/trunk/cnf/buildrepo/org.osgi.ee.minimum/
    ace/trunk/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.0.jar   (with props)
    ace/trunk/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.1.jar   (with props)
    ace/trunk/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.3.jar   (with props)
    ace/trunk/cnf/buildrepo/osgi.core/
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.0.1.jar   (with props)
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.1.0.jar   (with props)
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.2.0.jar   (with props)
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-4.3.0.jar   (with props)
    ace/trunk/cnf/buildrepo/osgi.core/osgi.core-5.0.0.jar   (with props)
    ace/trunk/cnf/localrepo/
      - copied from r1446121, ace/trunk/cnf/repo/
    ace/trunk/cnf/localrepo/index.xml
    ace/trunk/cnf/localrepo/org.amdatu.mongo/org.amdatu.mongo-1.0.4.jar   (with props)
    ace/trunk/cnf/releaserepo/index.xml
Removed:
    ace/trunk/cnf/localrepo/com.vaadin/com.vaadin-6.5.1.jar
    ace/trunk/cnf/localrepo/org.amdatu.mongo/org.amdatu.mongo-1.0.3.jar
    ace/trunk/cnf/localrepo/org.apache.felix.framework/
    ace/trunk/cnf/localrepo/org.apache.felix.log/
    ace/trunk/cnf/localrepo/org.apache.felix.useradmin.filestore/org.apache.felix.useradmin.filestore-1.0.0.jar
    ace/trunk/cnf/localrepo/org.apache.felix.useradmin/org.apache.felix.useradmin-0.9.9.jar
    ace/trunk/cnf/localrepo/org.knopflerfish.bundle.useradmin/
    ace/trunk/cnf/localrepo/org.knopflerfish.log/
    ace/trunk/cnf/localrepo/repository.xml
    ace/trunk/cnf/releaserepo/repository.xml
    ace/trunk/cnf/repo/
    ace/trunk/org.apache.ace.useradmin.ui.itest/store/
Modified:
    ace/trunk/build/bnd.bnd
    ace/trunk/cnf/.classpath
    ace/trunk/cnf/.project
    ace/trunk/cnf/build.bnd
    ace/trunk/cnf/build.xml
    ace/trunk/cnf/ext/defaults.bnd
    ace/trunk/cnf/ext/repositories.bnd
    ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager.shell/org.apache.felix.dependencymanager.shell-3.0.1.jar
    ace/trunk/cnf/localrepo/org.apache.felix.dependencymanager/org.apache.felix.dependencymanager-3.1.0.jar
    ace/trunk/org.apache.ace.authentication.itest/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.repository.itest/bnd.bnd
    ace/trunk/org.apache.ace.client.rest.itest/bnd.bnd
    ace/trunk/org.apache.ace.configurator.useradmin.itest/bnd.bnd
    ace/trunk/org.apache.ace.deployment.itest/bnd.bnd
    ace/trunk/org.apache.ace.deployment.streamgenerator/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.itest/bnd.bnd
    ace/trunk/org.apache.ace.log.itest/bnd.bnd
    ace/trunk/org.apache.ace.nodelauncher.amazon/bnd.bnd
    ace/trunk/org.apache.ace.processlauncher/bnd.bnd
    ace/trunk/org.apache.ace.repository.itest/bnd.bnd
    ace/trunk/org.apache.ace.server.log.store.itest/bnd.bnd
    ace/trunk/org.apache.ace.test/bnd.bnd
    ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd
    ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd
    ace/trunk/run-server/server.bndrun

Modified: ace/trunk/build/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/build/bnd.bnd?rev=1446131&r1=1446130&r2=1446131&view=diff
==============================================================================
--- ace/trunk/build/bnd.bnd (original)
+++ ace/trunk/build/bnd.bnd Thu Feb 14 11:44:50 2013
@@ -82,3 +82,68 @@
     org.apache.ace.target.mgmt.ui,\
     org.apache.ace.test,\
     org.apache.ace.webui.vaadin
+
+-Xdependson \
+    org.apache.ace.client.repository.helper.base,\
+    org.apache.ace.client.repository.helper.bundle,\
+    org.apache.ace.client.repository.helper.configuration,\
+    org.apache.ace.client.repository.helper.user,\
+    org.apache.ace.client.rest,\
+    org.apache.ace.configurator,\
+    org.apache.ace.configurator.serveruseradmin,\
+    org.apache.ace.configurator.useradmin.task,\
+    org.apache.ace.connectionfactory,\
+    org.apache.ace.consolelogger,\
+    org.apache.ace.deployment.api,\
+    org.apache.ace.deployment.deploymentadmin,\
+    org.apache.ace.deployment.provider.api,\
+    org.apache.ace.deployment.provider.base,\
+    org.apache.ace.deployment.provider.filebased,\
+    org.apache.ace.deployment.provider.repositorybased,\
+    org.apache.ace.deployment.servlet,\
+    org.apache.ace.deployment.streamgenerator,\
+    org.apache.ace.deployment.task,\
+    org.apache.ace.deployment.task.base,\
+    org.apache.ace.deployment.verifier,\
+    org.apache.ace.deployment.verifier.ui,\
+    org.apache.ace.discovery.api,\
+    org.apache.ace.discovery.property,\
+    org.apache.ace.discovery.upnp,\
+    org.apache.ace.gateway.log,\
+    org.apache.ace.gateway.log.store,\
+    org.apache.ace.http.redirector,\
+    org.apache.ace.httplistener,\
+    org.apache.ace.identification.api,\
+    org.apache.ace.identification.ifconfig,\
+    org.apache.ace.identification.property,\
+    org.apache.ace.launcher,\
+    org.apache.ace.location.upnp,\
+    org.apache.ace.log,\
+    org.apache.ace.log.listener,\
+    org.apache.ace.log.servlet,\
+    org.apache.ace.log.task,\
+    org.apache.ace.managementagent,\
+    org.apache.ace.nodelauncher.amazon,\
+    org.apache.ace.nodelauncher.api,\
+    org.apache.ace.nodelauncher.ui,\
+    org.apache.ace.obr.metadata,\
+    org.apache.ace.obr.servlet,\
+    org.apache.ace.obr.storage,\
+    org.apache.ace.processlauncher,\
+    org.apache.ace.range.api,\
+    org.apache.ace.repository.api,\
+    org.apache.ace.repository.ext,\
+    org.apache.ace.repository.impl,\
+    org.apache.ace.repository.servlet,\
+    org.apache.ace.repository.task,\
+    org.apache.ace.resourceprocessor.useradmin,\
+    org.apache.ace.scheduler,\
+    org.apache.ace.scheduler.api,\
+    org.apache.ace.server.action,\
+    org.apache.ace.server.action.popupmessage,\
+    org.apache.ace.server.log.store,\
+    org.apache.ace.server.log.ui,\
+    org.apache.ace.tageditor,\
+    org.apache.ace.target.mgmt.ui,\
+    org.apache.ace.test,\
+    org.apache.ace.webui.vaadin

Modified: ace/trunk/cnf/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/.classpath?rev=1446131&r1=1446130&r2=1446131&view=diff
==============================================================================
--- ace/trunk/cnf/.classpath (original)
+++ ace/trunk/cnf/.classpath Thu Feb 14 11:44:50 2013
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: ace/trunk/cnf/.project
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/.project?rev=1446131&r1=1446130&r2=1446131&view=diff
==============================================================================
--- ace/trunk/cnf/.project (original)
+++ ace/trunk/cnf/.project Thu Feb 14 11:44:50 2013
@@ -10,14 +10,8 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>bndtools.core.bndbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>bndtools.core.bndnature</nature>
 	</natures>
 </projectDescription>

Added: ace/trunk/cnf/build-template.xml
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/build-template.xml?rev=1446131&view=auto
==============================================================================
--- ace/trunk/cnf/build-template.xml (added)
+++ ace/trunk/cnf/build-template.xml Thu Feb 14 11:44:50 2013
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="template" default="none">
+
+	<!--
+	     WARNING!!!
+	     
+	     This file is maintained automatically by Bndtools! You should not edit it directly.
+	     Instead, insert overrides into build.xml as follows:
+	     
+	     <target name="compile">
+	        <echo message="This task executed before compilation..."/>
+	        <antcall target="template.compile"/>
+	        <echo message="This task executed AFTER compilation."/>
+	     </target>
+	-->
+
+	<!-- 
+	     INIT
+	     The target is a dependent of all other targets.
+	     It's purpose is to set up the environment only once
+	     and avoid it being repeatedly done for each antcall.
+	-->
+
+	<target name="init" unless="initialized">
+		<!-- Initialise some basic properties -->
+		<tstamp>
+			<format property="NOW" pattern="yyyyMMdd-HHmmss" timezone="UTC"/>
+		</tstamp>
+		<dirname property="projectdir" file="${ant.file}" />
+		<dirname property="workspacedir" file="${projectdir}" />
+
+		<!-- Define the location of bnd -->
+		<path id="bnd-classpath" location="${workspacedir}/cnf/plugins/biz.aQute.bnd/biz.aQute.bnd-2.0.0.jar"
/>
+
+		<!-- Load bnd and prepare the workspace -->
+		<taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd-classpath" />
+		<bndprepare basedir="${projectdir}" print="false" top="${release.dir}" />
+
+		<condition property="testDirExists">
+			<available file="${basedir}/test" type="dir"/>
+		</condition>
+
+		<!-- Create a marker property to indicate that initialisation has been completed -->
+		<property name="initialized" value="set" />
+		<echo message="Enter project ${project.name}"/>
+	</target>
+
+	<!-- 
+		DEPENDENCIES
+		Build project dependencies.
+	-->
+	<target name="dependencies" depends="init" if="project.dependson" unless="donotrecurse">
+		<subant target="build" inheritAll="false" buildpath="${project.dependson}">
+			<property name="donotrecurse" value="true" />
+		</subant>
+	</target>
+
+	<!--
+	     Test
+	-->
+	<target name="test" depends="compile">
+		<bndtest/>
+	</target>
+
+	<!--
+	     COMPILE
+	     Compile the sources. 
+	-->
+	<target name="compile" depends="dependencies" if="project.sourcepath">
+		<mkdir dir="${project.output}"/>
+		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}"
classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true"
listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}"
includeAntRuntime="no" verbose="${verbose}" />
+		<copy todir="${project.output}" verbose="${verbose}" preservelastmodified="true">
+			<fileset dir="${project.sourcepath}">
+				<exclude name="**/*.java" />
+				<exclude name="**/*.class" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- 
+		JARS
+		Iterate of the jars to build.
+	-->
+	<target name="build" depends="compile">
+		<mkdir dir="${target}"/>
+		<bnd command="build" exceptions="true" basedir="${project}" />
+	</target>
+
+	<target name="release" depends="build">
+		<subant target="release" inheritAll="false" buildpath="${project.dependson}">
+			<property name="donotrecurse" value="true" />
+		</subant>
+		<bndrelease/>
+	</target>
+
+	<!-- 
+		JUNIT
+	-->
+	<target name="compileTests" depends="init,build" if="testDirExists">
+		<mkdir dir="bin_test"/>
+		<javac fork="yes" executable="${javac}" srcdir="test" destdir="bin_test" classpath="${project.buildpath}:${project.testpath}"
bootclasspath="${project.bootclasspath}" deprecation="true" listfiles="true" target="${javac.target}"
source="${javac.source}" debug="${javac.debug}" includeAntRuntime="no" verbose="${verbose}"
/>
+		<!--
+		  The eclipse compiler copies resources but the Javac compiler does not
+		  If ${src} == ${bin} then this is not necessary, but unfortunately, now
+		  it is.
+		-->
+		<copy todir="bin_test" verbose="${verbose}" preservelastmodified="true">
+			<fileset dir="test">
+				<exclude name="**/*.java" />
+				<exclude name="**/*.class" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="junit" depends="init,compileTests" if="testDirExists">
+		<junit showoutput="false" printsummary="true" failureproperty='stop' errorproperty='stop'
fork="true" dir="${basedir}">
+			<classpath path="${project.buildpath}:bin_test/" />
+			<formatter type="xml"/>
+			<batchtest todir="${target}">
+				<fileset dir="test">
+					<include name="**/*.java"/>
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+
+	<!--
+	     CLEAN
+	-->
+	<target name="deepclean" depends="init,clean" if="project.dependson">
+		<subant target="clean" inheritAll="false" buildpath="${project.dependson}" />
+	</target>
+
+	<target name="clean" depends="init">
+		<bnd command="clean" exceptions="true" basedir="${project}" />
+		<delete dir="bin"/>
+		<delete dir="bin_test"/>
+		<delete dir="${target}"/>
+	</target>
+
+	<!--
+	     ECHO
+	-->
+	<target name="echo" depends="init">
+		<echo>verbose:                ${verbose}</echo>
+		<echo>project.name:           ${project.name}</echo>
+		<echo>Bundle-Version:         ${Bundle-Version}</echo>
+		<echo>project.output:         ${project.output}</echo>
+		<echo>project.sourcepath:     ${project.sourcepath}</echo>
+		<echo>project.allsourcepath:  ${project.allsourcepath}</echo>
+		<echo>project.buildpath:      ${project.buildpath}</echo>
+		<echo>project.testpath:       ${project.testpath}</echo>
+		<echo>project.dependson:      ${project.dependson}</echo>
+		<echo>project.bootclasspath:  ${project.bootclasspath}</echo>
+		<echo>javac:                  ${javac}</echo>
+		<echo>javac.debug:            ${javac.debug}</echo>
+		<echo>javac.source:           ${javac.source}</echo>
+		<echo>javac.target:           ${javac.target}</echo>
+		<echo>p:                      ${p}</echo>
+		<echo>btool.manifestVersion:  ${btool.manifestVersion}</echo>
+		<echo>btool.analyse:          ${btool.analyse}</echo>
+		<echo>btool.showmanifest:     ${btool.showmanifest}</echo>
+		<echo>btool.noversion:     	  ${btool.noversion}</echo>
+		<echo>btool.sources:     	  ${btool.sources}</echo>
+		<echo>btool.noextraheaders:   ${btool.noextraheaders}</echo>
+		<echo>jars.compile.order:     ${jars.compile.order}</echo>
+		<echo>bin.includes:           ${bin.includes}</echo>
+		<echo>base.modfied:           ${base.modified} (${base.modified.readable})</echo>
+		<echo>target:                 ${target}</echo>
+		<echo>release.target:         ${release.target}</echo>
+		<echo>licensed repo:          ${licensed-repo}</echo>
+		<echo>repo:                   ${repo}</echo>
+		<echo>use.bnd:                ${use.bnd}</echo>
+		<echo>nodeploy:               ${nodeploy}</echo>
+		<echo>-dependson:             ${-dependson}</echo>
+
+	</target>
+
+	<!--
+	     Default Target
+	-->
+	<target name="none">
+		<fail message="This ant script should never be directly called." />
+	</target>
+
+</project>

Modified: ace/trunk/cnf/build.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/build.bnd?rev=1446131&r1=1446130&r2=1446131&view=diff
==============================================================================
--- ace/trunk/cnf/build.bnd (original)
+++ ace/trunk/cnf/build.bnd Thu Feb 14 11:44:50 2013
@@ -1,9 +1,16 @@
-# Place your specific settings here.
+## Place your specific settings here.
 
-# Default settings are in ext/*.bnd and they will be overridden by anything
-# you specify in this file.
 
-# If you use git, you might want to uncomment the following lines:
-#Git-Descriptor: ${system;git describe --dirty --always}
-#Git-SHA: ${system;git rev-list -1 HEAD}
+## Default settings are in ext/*.bnd and they will be overridden by anything
+## you specify in this file.
+
+
+## Properties from ext/*.bnd can be referenced in order to extend them.
+## For example, to add one addtional plugin to the list defined in ext/repositories.bnd:
+# -plugin: ${ext.repositories.-plugin}, org.example.MyPlugin
+
+
+## If you use git, you might want to uncomment the following lines:
+# Git-Descriptor: ${system-allow-fail;git describe --dirty --always}
+# Git-SHA: ${system-allow-fail;git rev-list -1 HEAD}
 

Modified: ace/trunk/cnf/build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/build.xml?rev=1446131&r1=1446130&r2=1446131&view=diff
==============================================================================
--- ace/trunk/cnf/build.xml (original)
+++ ace/trunk/cnf/build.xml Thu Feb 14 11:44:50 2013
@@ -1,227 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="master" default="none">
-
-	<!-- 
-	     INIT
-	     The target is a dependent of all other targets.
-	     It's purpose is to set up the environment only once
-	     and avoid it being repeatedly done for each antcall.
-	-->
-
-	<target name="init" unless="initialized">
-		<tstamp>
-			<format property="NOW" pattern="yyyyMMdd-HHmm" timezone="UTC"/>
-		</tstamp>
+	
+	<import file="build-template.xml"/>
+	
+	<!--
+		Use this file to provide your workspace-specific tasks. Several examples follow.
+		
+		1. To execute tasks before/after compilation:
 		
-		<dirname property="projectdir" file="${ant.file}" />
-		<dirname property="workspacedir" file="${projectdir}" />
-		<echo message="bnd ant tasks..." />
-		<taskdef resource="aQute/bnd/ant/taskdef.properties">
-			<classpath>
-				<path location="${workspacedir}/cnf/repo/biz.aQute.bnd/biz.aQute.bnd-1.51.1.jar"/>
-			</classpath>
-		</taskdef>
+		<target name="compile">
+			<echo message="This task executed before compilation..."/>
+			<antcall target="template.compile"/>
+			<echo message="This task executed AFTER compilation."/>
+		</target>
 		
+		2. Insert a build target:
+		
+		<target name="build" dependencies="template.build, findbugs"/>
+		<target name="findbugs">
+			...
+		</target>
+	-->
+
+	<target name="init" depends="template.init">
 		<!-- TestNG support -->
-		<echo message="testng ant tasks..." />
 		<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}" />
-
-		<!-- mark init has been run -->
-		<property name="initialized" value="set" />
-		<echo message="Enter project ${project.name}"/>
-
 		<!-- Test compilation condition -->
 		<condition property="project.testpathexists">
 			<length length="0" when="greater">
 				<fileset dir="${project}/test" erroronmissingdir="false" />
 			</length>
 		</condition>
-		
-		<!-- Is this project an itest? -->
+		<!-- Is this project an integration test project? -->
 		<condition property="project.itest">
 			<matches string="${project}" pattern="\.itest$" />
 		</condition>
 	</target>
 	
-	<target name="bootstrap">
-		<dirname property="projectdir" file="${ant.file}" />
-		<dirname property="workspacedir" file="${projectdir}" />
-		<property name="remote.repository" value="http://svn.apache.org/repos/asf/ace/trunk"
/>
-		<mkdir dir="${workspacedir}/cnf/lib/testng" />
-		<get src="${remote.repository}/cnf/lib/testng/testng-6.5.2.jar" dest="${workspacedir}/cnf/lib/testng/testng-6.5.2.jar"
skipexisting="true" verbose="true" />
-		<mkdir dir="${workspacedir}/cnf/repo/biz.aQute.bnd" />
-		<get src="${remote.repository}/cnf/repo/biz.aQute.bnd/biz.aQute.bnd-1.51.1.jar" dest="${workspacedir}/cnf/repo/biz.aQute.bnd/biz.aQute.bnd-1.51.1.jar"
skipexisting="true" verbose="true" />
-		<mkdir dir="${workspacedir}/cnf/repo/org.osgi.impl.bundle.bindex" />
-		<get src="${remote.repository}/cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar"
dest="${workspacedir}/cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar"
skipexisting="true" verbose="true" />
-	</target>
-
-	<!-- 
-		DEPENDENCIES
-		Build project dependencies.
-	-->
-	<target name="dependencies" depends="init" if="project.dependson" unless="donotrecurse">
-		<subant target="build" inheritAll="false" buildpath="${project.dependson}">
-			<property name="donotrecurse" value="true" />
-		</subant>
-	</target>
-
-	<!--
-	     TEST
-	     Runs the integration tests.
-	-->
-	<target name="deeptest" depends="init" if="project.dependson">
-		<subant target="test" inheritAll="false" buildpath="${project.dependson}">
-			<property name="donotrecurse" value="true" />
-		</subant>
-	</target>
-
-	<target name="test" depends="compile" if="project.itest">
-		<bnd command="test" exceptions="true" basedir="${project}" />
-	</target>
-
-	<!--
-	     COMPILE
-	     Compile the sources. 
-	-->
-	<target name="compile" depends="dependencies" if="project.sourcepath">
-		<mkdir dir="${project.output}"/>
-		<javac fork="yes" executable="${javac}" srcdir="${project.sourcepath}" destdir="${project.output}"
classpath="${project.buildpath}" bootclasspath="${project.bootclasspath}" deprecation="true"
listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}"
includeAntRuntime="no" verbose="${verbose}" />
-		<!-- 
-		  The eclipse compiler copies resources but the Javac compiler does not
-		  If ${src} == ${bin} then this is not necessary, but unfortunately, now 
-		  it is. 
-		-->
-		<copy todir="${project.output}" verbose="${verbose}" preservelastmodified="true">
-			<fileset dir="${project.sourcepath}">
-				<exclude name="**/*.java" />
-				<exclude name="**/*.class" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="compiletest" depends="dependencies" if="project.testpathexists">
-		<mkdir dir="${project}/bin_test"/>
-		<javac fork="yes" executable="${javac}" srcdir="${project}/test" destdir="${project}/bin_test"
classpath="${project.buildpath}:${workspacedir}/cnf/lib/testng/testng-6.5.2.jar" bootclasspath="${project.bootclasspath}"
deprecation="true" listfiles="true" target="${javac.target}" source="${javac.source}" debug="${javac.debug}"
includeAntRuntime="no" verbose="${verbose}" />
-		<!-- 
-		  The eclipse compiler copies resources but the Javac compiler does not
-		  If ${src} == ${bin} then this is not necessary, but unfortunately, now 
-		  it is. 
-		-->
-		<copy todir="${project}/bin_test" verbose="${verbose}" preservelastmodified="true">
-			<fileset dir="${project}/test">
-				<exclude name="**/*.java" />
-				<exclude name="**/*.class" />
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- 
-		JARS
-		Iterate of the jars to build.
-	-->
-	<target name="build" depends="compile">
-		<mkdir dir="${target}"/>
-		<bnd command="build" exceptions="true" basedir="${project}" />
-	</target>
-	
-	<target name="release" depends="build">
-		<subant target="release" inheritAll="false" buildpath="${project.dependson}">
-			<property name="donotrecurse" value="true" />
-		</subant>
-		<bnd command="release" exceptions="true" basedir="${project}"/>
-	</target>
-
-	<target name="junit" depends="build">
-		<junit printsummary="true">			
-			<classpath path="${project.buildpath}" />
-			<formatter type="xml"/>
-			<batchtest todir="tmp" >
-			    <fileset dir="${src}">
-			      <include name="test/**.java"/>
-			    </fileset>
-			</batchtest>
-		</junit>
-	</target>
 	
 	<!-- TestNG support -->
 	<target name="deeptestng" depends="init" if="project.dependson">
 		<subant target="testng" inheritAll="false" buildpath="${project.dependson}" />
 	</target>
 
-	<target name="testng" depends="build, compiletest" if="project.testpathexists">
-		<mkdir dir="tmp" />
+	<target name="testng" depends="init, compileTests" if="project.testpathexists">
+		<mkdir dir="generated/testng" />
 		<testng classpath="${project}/bin_test:${project.buildpath}:${workspacedir}/cnf/lib/testng/testng-6.5.2.jar"
-			outputDir="tmp" haltOnfailure="true">
+			outputDir="generated/testng" haltOnfailure="true">
 			<classfileset dir="${project}/bin_test" includes="**/*.class" />
 		</testng>
 	</target>
-
-	<!--
-	     CLEAN
-	-->
-	<target name="deepclean" depends="init,clean" if="project.dependson">
-		<subant target="clean" inheritAll="false" buildpath="${project.dependson}" />
-	</target>
-
-	<target name="clean" depends="init">
-		<bnd command="clean" exceptions="true" basedir="${project}" />
-		<delete dir="bin"/>
-		<delete dir="bin_test"/>
-		<delete dir="${target}"/>
-		
-		<delete dir="${workspacedir}/cnf/tmp"/>
-		<delete dir="${workspacedir}/cnf/p2target"/>
-		
-		<!-- Clean up test tmp folder. -->
-		<delete dir="tmp" />
-	</target>
-
-	<!--
-	     ECHO
-	-->
-	<target name="echo" depends="init">
-		<echo>verbose:                ${verbose}</echo>
-		<echo>project.name:           ${project.name}</echo>
-		<echo>Bundle-Version:         ${Bundle-Version}</echo>
-		<echo>project.output:         ${project.output}</echo>
-		<echo>project.sourcepath:     ${project.sourcepath}</echo>
-		<echo>project.allsourcepath:  ${project.allsourcepath}</echo>
-		<echo>project.buildpath:      ${project.buildpath}</echo>
-		<echo>project.testpath:       ${project.testpath}</echo>
-		<echo>project.dependson:      ${project.dependson}</echo>
-		<echo>project.bootclasspath:  ${project.bootclasspath}</echo>
-		<echo>javac:                  ${javac}</echo>
-		<echo>javac.debug:            ${javac.debug}</echo>
-		<echo>javac.source:           ${javac.source}</echo>
-		<echo>javac.target:           ${javac.target}</echo>
-		<echo>p:                      ${p}</echo>
-		<echo>btool.manifestVersion:  ${btool.manifestVersion}</echo>
-		<echo>btool.analyse:          ${btool.analyse}</echo>
-		<echo>btool.showmanifest:     ${btool.showmanifest}</echo>
-		<echo>btool.noversion:     	  ${btool.noversion}</echo>
-		<echo>btool.sources:     	  ${btool.sources}</echo>
-		<echo>btool.noextraheaders:   ${btool.noextraheaders}</echo>
-		<echo>jars.compile.order:     ${jars.compile.order}</echo>
-		<echo>bin.includes:           ${bin.includes}</echo>
-		<echo>base.modfied:           ${base.modified} (${base.modified.readable})</echo>
-		<echo>target:                 ${target}</echo>
-		<echo>release.target:         ${release.target}</echo>
-		<echo>licensed repo:          ${licensed-repo}</echo>
-		<echo>repo:                   ${repo}</echo>
-		<echo>use.bnd:                ${use.bnd}</echo>
-		<echo>nodeploy:               ${nodeploy}</echo>
-		<echo>-dependson:             ${-dependson}</echo>
-
+	
+	
+	<!-- Integration test support -->
+	<target name="test" depends="init" if="project.itest">
+		<subant target="test" inheritAll="false" buildpath="${project.dependson}" />
 	</target>
 	
-	<!--
-	     Default Target
-	-->
-	<target name="none">
-		<fail message="This ant script should never be directly called." />
+	<target name="deeptest" depends="init" if="project.dependson">
+		<subant target="test" inheritAll="false" buildpath="${project.dependson}">
+			<property name="donotrecurse" value="true" />
+		</subant>
 	</target>
-
-</project>
+</project>
\ No newline at end of file

Added: ace/trunk/cnf/buildrepo/README.txt
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/README.txt?rev=1446131&view=auto
==============================================================================
--- ace/trunk/cnf/buildrepo/README.txt (added)
+++ ace/trunk/cnf/buildrepo/README.txt Thu Feb 14 11:44:50 2013
@@ -0,0 +1,6 @@
+WARNING
+=======
+
+This directory contains JAR file dependencies that are intended ONLY FOR BUILT-TIME usage.
+None are intended to be deployed as bundles into a running OSGi Framework, and indeed they
may cause
+unexpected errors if they are used at runtime.

Added: ace/trunk/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-1.1.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-1.1.0.jar?rev=1446131&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/buildrepo/biz.aQute.junit/biz.aQute.junit-1.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/trunk/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-1.0.5.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-1.0.5.jar?rev=1446131&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/buildrepo/biz.aQute.launcher/biz.aQute.launcher-1.0.5.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/trunk/cnf/buildrepo/ee.foundation/ee.foundation-1.1.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/ee.foundation/ee.foundation-1.1.0.jar?rev=1446131&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/buildrepo/ee.foundation/ee.foundation-1.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/trunk/cnf/buildrepo/ee.minimum/ee.minimum-1.2.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/ee.minimum/ee.minimum-1.2.0.jar?rev=1446131&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/buildrepo/ee.minimum/ee.minimum-1.2.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

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

Added: ace/trunk/cnf/buildrepo/org.easymock/org.easymock-3.1.0.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/org.easymock/org.easymock-3.1.0.jar?rev=1446131&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/buildrepo/org.easymock/org.easymock-3.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ace/trunk/cnf/buildrepo/org.easymock/org.easymock-latest.jar
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/buildrepo/org.easymock/org.easymock-latest.jar?rev=1446131&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ace/trunk/cnf/buildrepo/org.easymock/org.easymock-latest.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

Propchange: ace/trunk/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

Propchange: ace/trunk/cnf/buildrepo/org.osgi.ee.foundation/org.osgi.ee.foundation-1.0.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

Propchange: ace/trunk/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.0.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

Propchange: ace/trunk/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

Propchange: ace/trunk/cnf/buildrepo/org.osgi.ee.minimum/org.osgi.ee.minimum-1.1.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

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

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

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

Added: 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=1446131&view=auto
==============================================================================
Binary file - no diff available.

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

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

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

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

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

Modified: ace/trunk/cnf/ext/defaults.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/ext/defaults.bnd?rev=1446131&r1=1446130&r2=1446131&view=diff
==============================================================================
--- ace/trunk/cnf/ext/defaults.bnd (original)
+++ ace/trunk/cnf/ext/defaults.bnd Thu Feb 14 11:44:50 2013
@@ -5,7 +5,7 @@ project.buildpath       = ${p-buildpath;
 project.sourcepath      = ${p-sourcepath;:}
 project.allsourcepath   = ${p-allsourcepath;:}
 project.output          = ${p-output}
-project.testpath        = ${p-testpath;:}
+project.testpath        = ${p-testpath;:}:${workspace}/cnf/lib/testng/testng-6.5.2.jar
 
 -verbose:     true
 project:      ${basedir}

Modified: ace/trunk/cnf/ext/repositories.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/ext/repositories.bnd?rev=1446131&r1=1446130&r2=1446131&view=diff
==============================================================================
--- ace/trunk/cnf/ext/repositories.bnd (original)
+++ ace/trunk/cnf/ext/repositories.bnd Thu Feb 14 11:44:50 2013
@@ -1,10 +1,14 @@
-repo:           ${build}/repo
-releaserepo:    ${build}/releaserepo
+plugindir: ${workspace}/cnf/plugins
 
--plugin:        aQute.lib.deployer.obr.LocalOBR;name='Local Repository';local=${repo};locations='http://svn.apache.org/repos/asf/ace/trunk/cnf/repo/repository.xml,http://bundles.bndtools.org.s3.amazonaws.com/repository.xml',\
-                aQute.lib.deployer.obr.OBR;name='Library Repository';locations='http://svn.apache.org/repos/asf/ace/trunk/cnf/lib/repository.xml,file://${build}/lib/repository.xml',\
-                aQute.lib.deployer.obr.OBR;name='Build Repository';mode=build;locations='http://buildrepo.bndtools.org.s3.amazonaws.com/repository.xml',\
-                aQute.lib.deployer.obr.LocalOBR;name='Release';local=${releaserepo},\
-                org.osgi.impl.bundle.bindex.BundleAndLibraryIndexer;path:='${build}/bin/'
+-pluginpath: ${plugindir}/biz.aQute.repository/biz.aQute.repository-2.0.5.jar
 
--releaserepo:   Release
+-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.lib.deployer.FileRepo;name=Build;location=${workspace}/cnf/buildrepo
+
+-releaserepo: Release
+
+-XXX: \
+	aQute.bnd.deployer.repository.FixedIndexedRepo;name=Apache ACE Hub;locations=http://svn.apache.org/repos/asf/ace/trunk/cnf/repo/repository.xml,\



Mime
View raw message