You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by js...@apache.org on 2007/11/22 11:37:22 UTC
svn commit: r597366 - in /servicemix/branches/servicemix-4.0:
apache-servicemix/src/main/descriptors/unix-bin.xml
apache-servicemix/src/main/descriptors/windows-bin.xml
main/src/main/java/org/apache/servicemix/main/Main.java
Author: jstrachan
Date: Thu Nov 22 02:37:21 2007
New Revision: 597366
URL: http://svn.apache.org/viewvc?rev=597366&view=rev
Log:
switched to using the system directory for system configured bundles. We can then use "deploy" as the hot deploy directory that users can drop their stuff into
Modified:
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java
Modified: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=597366&r1=597365&r2=597366&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml Thu Nov 22 02:37:21 2007
@@ -101,7 +101,7 @@
<!-- Mandatory bundles for everything -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -133,7 +133,7 @@
<!-- NMR -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -146,7 +146,7 @@
<!-- GShell -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -158,7 +158,7 @@
<!-- Transaction Manager -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -171,7 +171,7 @@
<!-- Management -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -181,7 +181,7 @@
<!-- JBI 1.0 -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -194,7 +194,7 @@
<!-- OpenEJB -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
Modified: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml?rev=597366&r1=597365&r2=597366&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml Thu Nov 22 02:37:21 2007
@@ -101,7 +101,7 @@
<!-- Mandatory bundles for everything -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -133,7 +133,7 @@
<!-- NMR -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -146,7 +146,7 @@
<!-- GShell -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -157,7 +157,7 @@
<!-- Transaction Manager -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -170,7 +170,7 @@
<!-- Management -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
@@ -180,7 +180,7 @@
<!-- JBI 1.0 -->
<dependencySet>
- <outputDirectory>/bundle</outputDirectory>
+ <outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
Modified: servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java?rev=597366&r1=597365&r2=597366&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java (original)
+++ servicemix/branches/servicemix-4.0/main/src/main/java/org/apache/servicemix/main/Main.java Thu Nov 22 02:37:21 2007
@@ -373,7 +373,7 @@
"conf");
bundleDir = new File(
new File(new File(jarLocation).getAbsolutePath()).getParent(),
- "bundle");
+ "system");
}
else
{