From: <aft...@us...> - 2007-07-30 12:27:29
|
Revision: 4832 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=4832&view=rev Author: aftereight Date: 2007-07-30 05:27:27 -0700 (Mon, 30 Jul 2007) Log Message: ----------- fixed build: added Equinox in the team Ivy repository, and fixed the core build.xml that didn't take it into account. Also switched sfExport to true for ClassLoadingEnvironments, as false makes the Management Console fail. Modified Paths: -------------- branches/core-branch-osgi/smartfrog/build.xml branches/core-branch-osgi/smartfrog/ivy.xml branches/core-branch-osgi/smartfrog/ivyconf.xml branches/core-branch-osgi/smartfrog/src/org/smartfrog/osgi/BundleClassLoadingEnvironment.java branches/core-branch-osgi/smartfrog/src/org/smartfrog/osgi/components.sf branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/environments.sf Added Paths: ----------- branches/core-branch-osgi/antbuild/repository/org.eclipse/ branches/core-branch-osgi/antbuild/repository/org.eclipse/equinox/ branches/core-branch-osgi/antbuild/repository/org.eclipse/equinox/3.2.2/ branches/core-branch-osgi/antbuild/repository/org.eclipse/equinox/3.2.2/equinox-3.2.2.jar branches/core-branch-osgi/antbuild/repository/org.eclipse/equinox/3.2.2/equinox-3.2.2.pom Removed Paths: ------------- branches/core-branch-osgi/smartfrog/lib/org.eclipse.osgi_3.2.2.R32x_v20070118.jar Copied: branches/core-branch-osgi/antbuild/repository/org.eclipse/equinox/3.2.2/equinox-3.2.2.jar (from rev 4815, branches/core-branch-osgi/smartfrog/lib/org.eclipse.osgi_3.2.2.R32x_v20070118.jar) =================================================================== (Binary files differ) Property changes on: branches/core-branch-osgi/antbuild/repository/org.eclipse/equinox/3.2.2/equinox-3.2.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/core-branch-osgi/antbuild/repository/org.eclipse/equinox/3.2.2/equinox-3.2.2.pom =================================================================== --- branches/core-branch-osgi/antbuild/repository/org.eclipse/equinox/3.2.2/equinox-3.2.2.pom (rev 0) +++ branches/core-branch-osgi/antbuild/repository/org.eclipse/equinox/3.2.2/equinox-3.2.2.pom 2007-07-30 12:27:27 UTC (rev 4832) @@ -0,0 +1,10 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse</groupId> + <artifactId>equinox</artifactId> + <name>Equinox</name> + <version>3.2.2</version> + <description>OSGi framework implementation from Eclipse. Implementation of OSGi R4.0</description> + <dependencies> + </dependencies> +</project> \ No newline at end of file Modified: branches/core-branch-osgi/smartfrog/build.xml =================================================================== --- branches/core-branch-osgi/smartfrog/build.xml 2007-07-30 11:38:51 UTC (rev 4831) +++ branches/core-branch-osgi/smartfrog/build.xml 2007-07-30 12:27:27 UTC (rev 4832) @@ -187,8 +187,6 @@ </target> - - <!-- ================================================================== --> <!-- running Version.java to generate version information --> <!-- ================================================================== --> @@ -426,10 +424,23 @@ </fileset> </copy> </target> + + <!-- =================================================================== --> + <!-- --> + <!-- =================================================================== --> + <target name="copyIvyDependencies" depends="initbuild"> + <ivy:cachepath conf="redist" pathid="redist.jars"/> + <echo>redist.jars : ${toString:redist.jars}</echo> + <copy todir="${dist.lib.dir}"> + <fileset file="${toString:redist.jars}"/> + <!--<path id="redist.jars"/>--> + </copy> + </target> + <!-- =================================================================== --> <!-- --> <!-- =================================================================== --> - <target name="copylibs" depends="initbuild"> + <target name="copylibs" depends="initbuild,copyIvyDependencies"> <copy todir="${dist.lib.dir}"> <fileset dir="${lib}"> <include name="**/*.jar"/> @@ -972,12 +983,7 @@ <target name="ivy.compile.classpath" depends="ivy-resolve"> - <ivy:cachepath pathid="_compile.classpath" conf="compile" /> - <!-- HACK HACK --> - <path id="compile.classpath"> - <path refid="_compile.classpath"/> - <fileset dir="lib" includes="org.eclipse.*"/> - </path> + <ivy:cachepath pathid="compile.classpath" conf="compile" /> <echo level="verbose">compile.classpath=${toString:compile.classpath}</echo> </target> Modified: branches/core-branch-osgi/smartfrog/ivy.xml =================================================================== --- branches/core-branch-osgi/smartfrog/ivy.xml 2007-07-30 11:38:51 UTC (rev 4831) +++ branches/core-branch-osgi/smartfrog/ivy.xml 2007-07-30 12:27:27 UTC (rev 4832) @@ -68,6 +68,11 @@ name="osgi_R4_compendium" rev="1.0" conf="compile->default"/> + + <dependency org="org.eclipse" + name="equinox" + rev="3.2.2" + conf="compile,redist->default"/> </dependencies> </ivy-module> \ No newline at end of file Modified: branches/core-branch-osgi/smartfrog/ivyconf.xml =================================================================== --- branches/core-branch-osgi/smartfrog/ivyconf.xml 2007-07-30 11:38:51 UTC (rev 4831) +++ branches/core-branch-osgi/smartfrog/ivyconf.xml 2007-07-30 12:27:27 UTC (rev 4832) @@ -20,12 +20,15 @@ <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/> <conf defaultResolver="default"/> <resolvers> - <filesystem name="team"> - ivys="true" artifacts="true" + <filesystem name="team" m2compatible="true" > <artifact pattern="${ivy.conf.dir}/repository/${maven2.pattern.ext}"/> <ivy pattern="${ivy.conf.dir}/repository/${maven2.pattern}.xml"/> </filesystem> + <filesystem name="team2"> + <artifact pattern="${ivy.conf.dir}/../antbuild/repository/${maven2.pattern.ext}"/> + <ivy pattern="${root.dir}/antbuild/repository/${maven2.pattern.ext}"/> + </filesystem> <ibiblio name="maven2" root="${ibiblio-maven2-root}" pattern="${maven2.pattern.ext}" @@ -33,12 +36,12 @@ /> <chain name="default" dual="true"> <resolver ref="local"/> - <resolver ref="team"/> + <resolver ref="team2"/> <resolver ref="maven2"/> </chain> <chain name="internal"> <resolver ref="local"/> - <resolver ref="team"/> + <resolver ref="team2"/> </chain> </resolvers> <modules> Deleted: branches/core-branch-osgi/smartfrog/lib/org.eclipse.osgi_3.2.2.R32x_v20070118.jar =================================================================== (Binary files differ) Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/osgi/BundleClassLoadingEnvironment.java =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/osgi/BundleClassLoadingEnvironment.java 2007-07-30 11:38:51 UTC (rev 4831) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/osgi/BundleClassLoadingEnvironment.java 2007-07-30 12:27:27 UTC (rev 4832) @@ -3,17 +3,10 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; -import org.smartfrog.sfcore.common.SmartFrogCoreKeys; import org.smartfrog.sfcore.common.SmartFrogException; -import org.smartfrog.sfcore.common.SmartFrogResolutionException; -import org.smartfrog.sfcore.componentdescription.ComponentDescription; import org.smartfrog.sfcore.deployer.AbstractClassLoadingEnvironment; -import org.smartfrog.sfcore.prim.Prim; import org.smartfrog.sfcore.prim.TerminationRecord; -import org.smartfrog.sfcore.security.SFSecurity; -import java.io.IOException; -import java.io.InputStream; import java.net.URL; import java.rmi.RemoteException; Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/osgi/components.sf =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/osgi/components.sf 2007-07-30 11:38:51 UTC (rev 4831) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/osgi/components.sf 2007-07-30 12:27:27 UTC (rev 4832) @@ -2,6 +2,6 @@ OSGiBundle extends Prim { sfClass "org.smartfrog.osgi.BundleClassLoadingEnvironment"; - sfExport false; + // sfExport false; // In principle, we don't want to export that, but not doing it makes the Management Console fail location extends String; } \ No newline at end of file Modified: branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/environments.sf =================================================================== --- branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/environments.sf 2007-07-30 11:38:51 UTC (rev 4831) +++ branches/core-branch-osgi/smartfrog/src/org/smartfrog/sfcore/deployer/environments.sf 2007-07-30 12:27:27 UTC (rev 4832) @@ -3,5 +3,5 @@ URLClassLoadingEnvironment extends Prim { sfClass "org.smartfrog.sfcore.deployer.URLClassLoadingEnvironment"; codebase extends Vector; - sfExport false; + // sfExport false; // Would make the Management Console fail when ran remotely } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |