You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/02/07 19:14:41 UTC
svn commit: r741924 - in /tuscany/java/sca:
samples/calculator-equinox/build.xml samples/calculator-osgi/build.xml
tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
Author: rfeng
Date: Sat Feb 7 18:14:41 2009
New Revision: 741924
URL: http://svn.apache.org/viewvc?rev=741924&view=rev
Log:
Update the name for generated manifest to be tuscany-sca-manifest.jar and tuscany-sca-equinox-manifest.jar
Modified:
tuscany/java/sca/samples/calculator-equinox/build.xml
tuscany/java/sca/samples/calculator-osgi/build.xml
tuscany/java/sca/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
Modified: tuscany/java/sca/samples/calculator-equinox/build.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-equinox/build.xml?rev=741924&r1=741923&r2=741924&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-equinox/build.xml (original)
+++ tuscany/java/sca/samples/calculator-equinox/build.xml Sat Feb 7 18:14:41 2009
@@ -32,7 +32,7 @@
target="1.5">
<classpath>
<fileset dir="../../features">
- <include name="manifest.jar" />
+ <include name="tuscany-sca-manifest.jar" />
</fileset>
</classpath>
</javac>
@@ -44,7 +44,7 @@
</target>
<target name="run" depends="compile">
- <java jar="../../features/manifest.jar" fork="true">
+ <java jar="../../features/tuscany-sca-manifest.jar" fork="true">
<jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
<!-- optional to set the deployable composite -->
<arg value="-composite"/>
@@ -57,7 +57,7 @@
</target>
<target name="run-equinox" depends="compile">
- <java jar="../../features/equinox-manifest.jar" fork="true">
+ <java jar="../../features/tuscany-sca-equinox-manifest.jar" fork="true">
<jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
<arg value="-composite"/>
<arg value="Calculator.composite"/>
Modified: tuscany/java/sca/samples/calculator-osgi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/calculator-osgi/build.xml?rev=741924&r1=741923&r2=741924&view=diff
==============================================================================
--- tuscany/java/sca/samples/calculator-osgi/build.xml (original)
+++ tuscany/java/sca/samples/calculator-osgi/build.xml Sat Feb 7 18:14:41 2009
@@ -32,7 +32,7 @@
target="1.5">
<classpath>
<fileset dir="../../features">
- <include name="manifest.jar" />
+ <include name="tuscany-sca-manifest.jar" />
</fileset>
</classpath>
</javac>
@@ -44,7 +44,7 @@
</target>
<target name="run" depends="compile">
- <java jar="../../features/manifest.jar" fork="true">
+ <java jar="../../features/tuscany-sca-manifest.jar" fork="true">
<jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
<!-- optional to set the deployable composite -->
<arg value="-composite"/>
@@ -57,7 +57,7 @@
</target>
<target name="run-equinox" depends="compile">
- <java jar="../../features/equinox-manifest.jar" fork="true">
+ <java jar="../../features/tuscany-sca-equinox-manifest.jar" fork="true">
<jvmarg value="-Djava.util.logging.config.file=../logging.properties"/>
<arg value="-composite"/>
<arg value="Calculator.composite"/>
Modified: tuscany/java/sca/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java?rev=741924&r1=741923&r2=741924&view=diff
==============================================================================
--- tuscany/java/sca/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java (original)
+++ tuscany/java/sca/tools/maven/maven-bundle-plugin/src/main/java/org/apache/tuscany/sca/tools/bundle/plugin/ModuleBundlesBuildMojo.java Sat Feb 7 18:14:41 2009
@@ -123,11 +123,16 @@
/**
* Target directory.
*
- * @parameter expression="${project.build.directory}/plugins"
+ * @parameter expression="${project.build.directory}/modules"
*/
private File targetDirectory;
/**
+ * @parameter default-value="features"
+ */
+ private String featuresName = "features";
+
+ /**
* Directories containing artifacts to exclude.
*
* @parameter
@@ -202,6 +207,17 @@
* @parameter default-value="true"
*/
private boolean generateManifestJar = true;
+
+ /**
+ * @parameter default-value="tuscany-sca-manifest.jar"
+ */
+ private String manifestJarName = "tuscany-sca-manifest.jar";
+
+ /**
+ * @parameter default-value="tuscany-sca-equinox-manifest.jar"
+ */
+ private String equinoxManifestJarName = "tuscany-sca-equinox-manifest.jar";
+
/**
* @parameter default-value="true"
@@ -524,10 +540,10 @@
private void generateANTPath(ProjectSet jarNames, File root, Log log) throws FileNotFoundException, IOException {
for (Map.Entry<String, Set<String>> e : jarNames.nameMap.entrySet()) {
Set<String> jars = e.getValue();
- File feature = new File(root, "../features/" + (useDistributionName ? trim(e.getKey()) : ""));
+ File feature = new File(root, "../" + featuresName + "/" + (useDistributionName ? trim(e.getKey()) : ""));
feature.mkdirs();
File antPath = new File(feature, "build-path.xml");
- log.info("Generating ANT build path: " + antPath);
+ log.info("Generating ANT build path: " + antPath.getCanonicalPath());
FileOutputStream fos = new FileOutputStream(antPath);
PrintStream ps = new PrintStream(fos);
// ps.println(XML_PI);
@@ -535,7 +551,7 @@
String name = trim(e.getKey());
ps.println("<project name=\"tuscany."+name+"\">");
ps.println(" <property name=\"tuscany.distro\" value=\"" + name + "\"/>");
- ps.println(" <property name=\"tuscany.manifest\" value=\"" + new File(feature, "manifest.jar").getCanonicalPath()
+ ps.println(" <property name=\"tuscany.manifest\" value=\"" + new File(feature, manifestJarName).getCanonicalPath()
+ "\"/>");
ps.println(" <path id=\"" + "tuscany.path" + "\">");
ps.println(" <fileset dir=\"" + root.getCanonicalPath() + "\">");
@@ -552,10 +568,10 @@
for (Map.Entry<String, Set<String>> e : jarNames.nameMap.entrySet()) {
MavenProject pom = jarNames.getProject(e.getKey());
Set<String> jars = e.getValue();
- File feature = new File(root, "../features/" + (useDistributionName ? trim(e.getKey()) : ""));
+ File feature = new File(root, "../" + featuresName + "/" + (useDistributionName ? trim(e.getKey()) : ""));
feature.mkdirs();
- File mfJar = new File(feature, "manifest.jar");
- log.info("Generating manifest jar: " + mfJar);
+ File mfJar = new File(feature, manifestJarName);
+ log.info("Generating manifest jar: " + mfJar.getCanonicalPath());
FileOutputStream fos = new FileOutputStream(mfJar);
Manifest mf = new Manifest();
StringBuffer cp = new StringBuffer();
@@ -586,10 +602,10 @@
return;
}
Set artifacts = resolveTransitively(artifact).getArtifacts();
- File feature = new File(root, "../features/");
+ File feature = new File(root, "../" + featuresName + "/");
feature.mkdirs();
- File mfJar = new File(feature, "equinox-manifest.jar");
- log.info("Generating manifest jar: " + mfJar);
+ File mfJar = new File(feature, equinoxManifestJarName);
+ log.info("Generating equinox manifest jar: " + mfJar.getCanonicalPath());
FileOutputStream fos = new FileOutputStream(mfJar);
Manifest mf = new Manifest();
StringBuffer cp = new StringBuffer();
@@ -620,14 +636,14 @@
jos.close();
}
- private void generateEquinoxConfig(ProjectSet bundleLocations, File root, Log log) throws FileNotFoundException {
+ private void generateEquinoxConfig(ProjectSet bundleLocations, File root, Log log) throws IOException {
for (Map.Entry<String, Set<String>> e : bundleLocations.nameMap.entrySet()) {
Set<String> locations = e.getValue();
- File feature = new File(root, "../features/" + (useDistributionName ? trim(e.getKey()) : ""));
+ File feature = new File(root, "../" + featuresName + "/" + (useDistributionName ? trim(e.getKey()) : ""));
File config = new File(feature, "configuration");
config.mkdirs();
File ini = new File(config, "config.ini");
- log.info("Generating configuation: " + ini);
+ log.info("Generating configuation: " + ini.getCanonicalPath());
FileOutputStream fos = new FileOutputStream(ini);
PrintStream ps = new PrintStream(fos);
ps.print("osgi.bundles=");
@@ -651,10 +667,10 @@
for (Map.Entry<String, Set<String>> e : bundleSymbolicNames.nameMap.entrySet()) {
Set<String> bundles = e.getValue();
String name = trim(e.getKey());
- File feature = new File(root, "../features/" + (useDistributionName ? name : ""));
+ File feature = new File(root, "../" + featuresName + "/" + (useDistributionName ? name : ""));
feature.mkdirs();
File target = new File(feature, "tuscany.target");
- log.info("Generating target definition: " + target);
+ log.info("Generating target definition: " + target.getCanonicalPath());
FileOutputStream targetFile = new FileOutputStream(target);
if (!bundles.contains("org.eclipse.osgi")) {
bundles.add("org.eclipse.osgi");