Menu
▾
▴
[Smartfrog-checkins] SF.net SVN: smartfrog: [4298] branches/core-branch-osgi/extras/osgi
|
From: <aft...@us...> - 2007-06-12 13:32:23
|
Revision: 4298
http://svn.sourceforge.net/smartfrog/?rev=4298&view=rev
Author: aftereight
Date: 2007-06-12 06:32:18 -0700 (Tue, 12 Jun 2007)
Log Message:
-----------
build fine again
Modified Paths:
--------------
branches/core-branch-osgi/extras/osgi/build.xml
branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/build.xml
branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/ivy.xml
branches/core-branch-osgi/extras/osgi/test-bundle/build.xml
Added Paths:
-----------
branches/core-branch-osgi/extras/osgi/test-bundle/ivy.xml
Removed Paths:
-------------
branches/core-branch-osgi/extras/osgi/build-common.xml
Deleted: branches/core-branch-osgi/extras/osgi/build-common.xml
===================================================================
--- branches/core-branch-osgi/extras/osgi/build-common.xml 2007-06-12 13:09:46 UTC (rev 4297)
+++ branches/core-branch-osgi/extras/osgi/build-common.xml 2007-06-12 13:32:18 UTC (rev 4298)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project name="common">
- <property name="sf.core.dir" value="../../../smartfrog"/>
-
- <target name="copyJarAround" depends="jar">
- <!--
- <copy file="./build/${bundle.filename}"
- todir="C:\\knopflerfish_osgi_2.0.1\\knopflerfish.org\\osgi"
- overwrite="true"/>
- -->
- <copy file="./build/${bundle.filename}"
- todir="C:\\"
- overwrite="true"/>
- </target>
-
- <target name="compile" depends="init">
- <javac destdir="./build/classes"
- debug="on"
- srcdir="./src"
- target="1.5"
- source="1.5">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <target name="rmic" depends="compile">
- <rmic
- stubversion="1.2"
- base="./build/classes"
- verify="true"
- compiler="sun"
- includes="**/*.class">
- <classpath refid="classpath"/>
- </rmic>
- </target>
-
- <target name="clean">
- <delete dir="./build"/>
- </target>
-
-</project>
\ No newline at end of file
Modified: branches/core-branch-osgi/extras/osgi/build.xml
===================================================================
--- branches/core-branch-osgi/extras/osgi/build.xml 2007-06-12 13:09:46 UTC (rev 4297)
+++ branches/core-branch-osgi/extras/osgi/build.xml 2007-06-12 13:32:18 UTC (rev 4298)
@@ -1,18 +1,31 @@
<?xml version="1.0"?>
<project name="Smartfrog-OSGi" default="all">
- <target name="all" depends="daemon-bundle,test-bundle,rmispi-bundle"/>
+ <target name="all" depends="copyJarsAround"/>
<target name="daemon-bundle">
<ant dir="daemon-bundle" target="all"/>
</target>
<target name="test-bundle">
- <ant dir="test-bundle" target="copyJarAround"/>
+ <ant dir="test-bundle" target="all"/>
</target>
<target name="rmispi-bundle">
- <ant dir="rmiclassloading-extension-bundle" target="copyJarAround"/>
+ <ant dir="rmiclassloading-extension-bundle" target="all"/>
</target>
+ <target name="copyJarsAround" depends="daemon-bundle,test-bundle,rmispi-bundle">
+ <!--
+ <copy file="./build/${bundle.filename}"
+ todir="C:\\knopflerfish_osgi_2.0.1\\knopflerfish.org\\osgi"
+ overwrite="true"/>
+ -->
+ <copy todir="C:/" overwrite="true">
+ <fileset file="daemon-bundle/dist/lib/sf-daemon-osgi*.jar"/>
+ <fileset file="rmiclassloading-extension-bundle/dist/lib/sf-rmi-spi-osgi*.jar"/>
+ <fileset file="test-bundle/dist/lib/sf-test-osgi*.jar"/>
+ </copy>
+ </target>
+
<target name="clean">
<ant dir="daemon-bundle" target="clean"/>
<ant dir="test-bundle" target="clean"/>
Modified: branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/build.xml
===================================================================
--- branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/build.xml 2007-06-12 13:09:46 UTC (rev 4297)
+++ branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/build.xml 2007-06-12 13:32:18 UTC (rev 4298)
@@ -39,6 +39,10 @@
<echo level="verbose">created package ${target.jar}</echo>
</target>
+ <!-- This bundle has no additional sources, it's just a repackaging of the sf-rmi-spi.jar file -->
+ <target name="javadoc"/>
+ <target name="compile"/>
+
<!-- this is done so that the jarfile generated is bound to our project name with
no -components suffix-->
<property name="jarfile.suffix" value=""/>
Modified: branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/ivy.xml
===================================================================
--- branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/ivy.xml 2007-06-12 13:09:46 UTC (rev 4297)
+++ branches/core-branch-osgi/extras/osgi/rmiclassloading-extension-bundle/ivy.xml 2007-06-12 13:32:18 UTC (rev 4298)
@@ -20,7 +20,7 @@
</configurations>
<publications>
- <artifact name="sf-daemon-bundle" conf="compile"/>
+ <artifact name="sf-rmi-spi-bundle" conf="compile"/>
</publications>
<dependencies>
<dependency org="org.smartfrog"
Modified: branches/core-branch-osgi/extras/osgi/test-bundle/build.xml
===================================================================
--- branches/core-branch-osgi/extras/osgi/test-bundle/build.xml 2007-06-12 13:09:46 UTC (rev 4297)
+++ branches/core-branch-osgi/extras/osgi/test-bundle/build.xml 2007-06-12 13:32:18 UTC (rev 4298)
@@ -1,30 +1,42 @@
<?xml version="1.0"?>
-<project name="Test Bundle" default="all">
- <property name="bundle.filename" value="smartfrog-test.jar"/>
- <path id="classpath">
- <fileset dir="build/lib" includes="*.jar"/>
- </path>
+<project name="test-osgi" default="all">
+ <!--
+ /** (C) Copyright Hewlett-Packard Development Company, LP
- <import file="../build-common.xml"/>
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
- <target name="all" depends="sfJars,jar,copyJarAround"/>
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
- <target name="init">
- <copy todir="build/lib" overwrite="true">
- <fileset dir="${sf.core.dir}/dist/lib/">
- <include name="smartfrog*.jar"/>
- </fileset>
- </copy>
- <mkdir dir="./build/classes"/>
- </target>
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- <target name="jar" depends="rmic">
- <jar jarfile="./build/${bundle.filename}"
- compress="true"
- includes="**/*"
- manifest="./META-INF/MANIFEST.MF">
- <zipfileset dir="build/classes"/>
- </jar>
- </target>
+ For more information: www.smartfrog.org
+ */
+ -->
+ <description>
+ Build file for the Smartfrog OSGi test bundle
+ </description>
+ <property name="ivy.enabled" value="true"/>
+ <!-- Import common stuff -->
+ <import file="../../../common.xml"/>
+
+ <!-- this is done so that the jarfile generated is bound to our project name with
+ no -components suffix-->
+ <property name="jarfile.suffix" value=""/>
+
+ <target name="ivy-retrieve" depends="ivy-resolve"
+ xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
+ <property name="ivy.retrieve.path"
+ value="${ivy.lib.dir}/[conf]/[artifact]-[revision].[ext]" />
+ <ivy:retrieve pattern="${ivy.retrieve.path}" sync="true" />
+ </target>
+
</project>
Added: branches/core-branch-osgi/extras/osgi/test-bundle/ivy.xml
===================================================================
--- branches/core-branch-osgi/extras/osgi/test-bundle/ivy.xml (rev 0)
+++ branches/core-branch-osgi/extras/osgi/test-bundle/ivy.xml 2007-06-12 13:32:18 UTC (rev 4298)
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module version="1.0">
+ <info organisation="org.smartfrog" module="sf-daemon-bundle">
+ <license name="LGPL"/>
+ <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/>
+ <description>OSGi Test bundle for SmartFrog</description>
+ </info>
+
+ <configurations defaultconfmapping="default">
+ <conf name="default" extends="compile"
+ description="default configuration contains artifacts"/>
+ <conf name="test"
+ description="the classpath needed to run tests"/>
+ <conf name="daemon" visibility="private"
+ description="the classpath needed to run smartfrog daemons"/>
+
+ <conf name="compile" visibility="private"
+ description="artifacts needed to compile the application"/>
+ </configurations>
+
+ <publications>
+ <artifact name="sf-test-bundle" conf="compile"/>
+ </publications>
+ <dependencies>
+ <dependency org="org.smartfrog"
+ name="smartfrog"
+ changing="true"
+ rev="latest.integration"
+ conf="compile->core"/>
+ </dependencies>
+</ivy-module>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|