Commit 7e2027c7 authored by Gwenael Cattez's avatar Gwenael Cattez

Follow changes from frascati-contribution-plugin

parent 29e2cda4
......@@ -391,7 +391,7 @@
</dependency>
<dependency>
<groupId>jdom</groupId>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
</dependency>
......
......@@ -52,7 +52,7 @@ import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.component.factory.api.MembraneGeneration;
import org.ow2.frascati.mojo.ContributionUtil;
import org.ow2.frascati.mojo.contribution.Contribution;
import org.ow2.frascati.util.FrascatiClassLoader;
/**
......@@ -368,14 +368,26 @@ public class SCAJavaCompilerImpl implements CompilerItf {
}
private File generateContribution(String applicationName, String binPath, File jarGenerated, List<File> localJarLib) {
Collection<File> jars = new ArrayList<File>();
List<File> jars = new ArrayList<File>();
jars.add(jarGenerated);
jars.addAll(localJarLib);
Collection<String> deployables = new ArrayList<String>();
List<String> deployables = new ArrayList<String>();
deployables.add(applicationName + ".composite");
return ContributionUtil.makeContribution(jars, deployables, null, null, applicationName, new File(binPath + File.separator + ".." + File.separator));
Contribution contribution=new Contribution(applicationName, deployables, null, null, localJarLib);
contribution.addLib(jarGenerated);
try
{
File destDir=new File(binPath + File.separator + ".." + File.separator);
return contribution.generate(destDir);
}
catch (IOException e)
{
e.printStackTrace();
return null;
}
}
private static boolean isWindows() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment