You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/10/13 14:24:11 UTC
svn commit: r704065 - in /servicemix/smx4/kernel/trunk: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/etc/
filemonitor/
filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/
gshell/gshell-admin/src/main/...
Author: gnodet
Date: Mon Oct 13 05:24:09 2008
New Revision: 704065
URL: http://svn.apache.org/viewvc?rev=704065&view=rev
Log:
SMX4KNL-99: Remove ant from the kernel distribution and replace its use in the filemonitor
Modified:
servicemix/smx4/kernel/trunk/assembly/pom.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/filemonitor/pom.xml
servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
servicemix/smx4/kernel/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/pom.xml?rev=704065&r1=704064&r2=704065&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/pom.xml Mon Oct 13 05:24:09 2008
@@ -143,10 +143,6 @@
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.ant</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=704065&r1=704064&r2=704065&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Oct 13 05:24:09 2008
@@ -167,7 +167,6 @@
<unpack>false</unpack>
<outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=704065&r1=704064&r2=704065&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Oct 13 05:24:09 2008
@@ -159,7 +159,6 @@
<unpack>false</unpack>
<outputFileNameMapping>org/apache/servicemix/bundles/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
Modified: servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=704065&r1=704064&r2=704065&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties Mon Oct 13 05:24:09 2008
@@ -35,7 +35,6 @@
#
# The rest of the services..
#
-org/apache/servicemix/bundles/org.apache.servicemix.bundles.ant/${ant.version}/org.apache.servicemix.bundles.ant-${ant.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}/org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/${cglib.version}/org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.mina/${mina.version}/org.apache.servicemix.bundles.mina-${mina.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/filemonitor/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/pom.xml?rev=704065&r1=704064&r2=704065&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/filemonitor/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/filemonitor/pom.xml Mon Oct 13 05:24:09 2008
@@ -44,10 +44,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.ant</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified: servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java?rev=704065&r1=704064&r2=704065&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java (original)
+++ servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java Mon Oct 13 05:24:09 2008
@@ -43,8 +43,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Jar;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
@@ -82,7 +80,6 @@
private File deployDir;
private File generateDir;
private Scanner scanner = new Scanner();
- private Project project = new Project();
private long scanInterval = 500L;
private boolean loggedConfigAdminWarning;
private List<Bundle> bundlesToStart = new ArrayList<Bundle>();
@@ -203,14 +200,6 @@
this.generateDir = generateDir;
}
- public Project getProject() {
- return project;
- }
-
- public void setProject(Project project) {
- this.project = project;
- }
-
public long getScanInterval() {
return scanInterval;
}
@@ -613,20 +602,12 @@
}
protected File createBundleJar(File dir) throws BundleException, IOException {
- Jar jar = new Jar();
- jar.setProject(project);
File destFile = new File(generateDir, dir.getName() + ".jar");
if (destFile.exists()) {
undeployBundle(destFile);
destFile.delete();
}
- LOGGER.info("Creating jar: " + destFile + " from dir: " + dir);
- jar.setDestFile(destFile);
- jar.setManifest(new File(new File(dir, "META-INF"), "MANIFEST.MF"));
- jar.setBasedir(dir);
-
- jar.init();
- jar.perform();
+ JarUtil.jarDir(dir.getPath(), destFile.getPath());
return destFile;
}
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties?rev=704065&r1=704064&r2=704065&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-admin/src/main/filtered-resources/org/apache/servicemix/kernel/gshell/admin/etc/startup.properties Mon Oct 13 05:24:09 2008
@@ -35,7 +35,6 @@
#
# The rest of the services..
#
-org/apache/servicemix/bundles/org.apache.servicemix.bundles.ant/${ant.version}/org.apache.servicemix.bundles.ant-${ant.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}/org.apache.servicemix.bundles.aopalliance-${aopalliance.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.cglib/${cglib.version}/org.apache.servicemix.bundles.cglib-${cglib.version}.jar=50
org/apache/servicemix/bundles/org.apache.servicemix.bundles.mina/${mina.version}/org.apache.servicemix.bundles.mina-${mina.version}.jar=50
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=704065&r1=704064&r2=704065&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Mon Oct 13 05:24:09 2008
@@ -330,11 +330,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.ant</artifactId>
- <version>${ant.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.mina</artifactId>
<version>${mina.version}</version>
</dependency>