You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cm...@apache.org on 2010/06/29 10:20:07 UTC
svn commit: r958869 -
/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
Author: cmoulliard
Date: Tue Jun 29 08:20:07 2010
New Revision: 958869
URL: http://svn.apache.org/viewvc?rev=958869&view=rev
Log:
KARAF-64 : Bundle startup level is not taken into account when project bundles are deployed in another local repo than system
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=958869&r1=958868&r2=958869&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Tue Jun 29 08:20:07 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.karaf.main;
+package org.apache.felix.karaf.main;
import java.io.*;
import java.lang.management.ManagementFactory;
@@ -37,7 +37,7 @@ import java.lang.reflect.Method;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.karaf.main.Utils;
+import org.apache.felix.karaf.main.Utils;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -340,7 +340,7 @@ public class Main {
}
private static void processSecurityProperties(Properties m_configProps) {
- String prop = m_configProps.getProperty("org.apache.karaf.security.providers");
+ String prop = m_configProps.getProperty("org.apache.felix.karaf.security.providers");
if (prop != null) {
String[] providers = prop.split(",");
for (String provider : providers) {
@@ -687,7 +687,7 @@ public class Main {
// installation directory. Try to load it from one of these
// places.
- ArrayList<File> bundleDirs = new ArrayList<File>();
+ ArrayList<File> bundleDirs = new ArrayList<File>();
// See if the property URL was specified as a property.
URL configPropURL = null;
@@ -728,7 +728,13 @@ public class Main {
do {
location = nextLocation(st);
if (location != null) {
- File f = new File(location);
+ File f;
+ if (karafBase.equals(karafHome)) {
+ f = new File(karafHome, location);
+ } else {
+ f = new File(karafBase, location);
+ f = new File(karafHome, location);
+ }
if (f.exists() && f.isDirectory()) {
bundleDirs.add(f);
} else {
@@ -1042,7 +1048,7 @@ public class Main {
}
/* (non-Javadoc)
- * @see org.apache.karaf.main.MainService#getArgs()
+ * @see org.apache.felix.karaf.main.MainService#getArgs()
*/
public String[] getArgs() {
return args;
Re: svn commit: r958869 - /karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
Posted by Gert Vanthienen <ge...@gmail.com>.
L.S.,
I noticed this commit coming in right after the package rename commit,
so I have already fixed that up again.
Regards,
Gert Vanthienen
------------------------
Open Source SOA: http://fusesource.com
Blog: http://gertvanthienen.blogspot.com/
On 29 June 2010 10:35, Guillaume Nodet <gn...@gmail.com> wrote:
> I think you forgot to svn up after Gert renamed the packages, didn't you ?
>
> On Tue, Jun 29, 2010 at 10:20, <cm...@apache.org> wrote:
>> Author: cmoulliard
>> Date: Tue Jun 29 08:20:07 2010
>> New Revision: 958869
>>
>> URL: http://svn.apache.org/viewvc?rev=958869&view=rev
>> Log:
>> KARAF-64 : Bundle startup level is not taken into account when project bundles are deployed in another local repo than system
>>
>> Modified:
>> karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
>>
>> Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
>> URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=958869&r1=958868&r2=958869&view=diff
>> ==============================================================================
>> --- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
>> +++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Tue Jun 29 08:20:07 2010
>> @@ -16,7 +16,7 @@
>> * specific language governing permissions and limitations
>> * under the License.
>> */
>> -package org.apache.karaf.main;
>> +package org.apache.felix.karaf.main;
>>
>> import java.io.*;
>> import java.lang.management.ManagementFactory;
>> @@ -37,7 +37,7 @@ import java.lang.reflect.Method;
>> import java.util.regex.Matcher;
>> import java.util.regex.Pattern;
>>
>> -import org.apache.karaf.main.Utils;
>> +import org.apache.felix.karaf.main.Utils;
>> import org.osgi.framework.Bundle;
>> import org.osgi.framework.BundleContext;
>> import org.osgi.framework.Constants;
>> @@ -340,7 +340,7 @@ public class Main {
>> }
>>
>> private static void processSecurityProperties(Properties m_configProps) {
>> - String prop = m_configProps.getProperty("org.apache.karaf.security.providers");
>> + String prop = m_configProps.getProperty("org.apache.felix.karaf.security.providers");
>> if (prop != null) {
>> String[] providers = prop.split(",");
>> for (String provider : providers) {
>> @@ -687,7 +687,7 @@ public class Main {
>> // installation directory. Try to load it from one of these
>> // places.
>>
>> - ArrayList<File> bundleDirs = new ArrayList<File>();
>> + ArrayList<File> bundleDirs = new ArrayList<File>();
>>
>> // See if the property URL was specified as a property.
>> URL configPropURL = null;
>> @@ -728,7 +728,13 @@ public class Main {
>> do {
>> location = nextLocation(st);
>> if (location != null) {
>> - File f = new File(location);
>> + File f;
>> + if (karafBase.equals(karafHome)) {
>> + f = new File(karafHome, location);
>> + } else {
>> + f = new File(karafBase, location);
>> + f = new File(karafHome, location);
>> + }
>> if (f.exists() && f.isDirectory()) {
>> bundleDirs.add(f);
>> } else {
>> @@ -1042,7 +1048,7 @@ public class Main {
>> }
>>
>> /* (non-Javadoc)
>> - * @see org.apache.karaf.main.MainService#getArgs()
>> + * @see org.apache.felix.karaf.main.MainService#getArgs()
>> */
>> public String[] getArgs() {
>> return args;
>>
>>
>>
>
>
>
> --
> Cheers,
> Guillaume Nodet
> ------------------------
> Blog: http://gnodet.blogspot.com/
> ------------------------
> Open Source SOA
> http://fusesource.com
>
Re: svn commit: r958869 - /karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
Posted by Guillaume Nodet <gn...@gmail.com>.
I think you forgot to svn up after Gert renamed the packages, didn't you ?
On Tue, Jun 29, 2010 at 10:20, <cm...@apache.org> wrote:
> Author: cmoulliard
> Date: Tue Jun 29 08:20:07 2010
> New Revision: 958869
>
> URL: http://svn.apache.org/viewvc?rev=958869&view=rev
> Log:
> KARAF-64 : Bundle startup level is not taken into account when project bundles are deployed in another local repo than system
>
> Modified:
> karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
>
> Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
> URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=958869&r1=958868&r2=958869&view=diff
> ==============================================================================
> --- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
> +++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Tue Jun 29 08:20:07 2010
> @@ -16,7 +16,7 @@
> * specific language governing permissions and limitations
> * under the License.
> */
> -package org.apache.karaf.main;
> +package org.apache.felix.karaf.main;
>
> import java.io.*;
> import java.lang.management.ManagementFactory;
> @@ -37,7 +37,7 @@ import java.lang.reflect.Method;
> import java.util.regex.Matcher;
> import java.util.regex.Pattern;
>
> -import org.apache.karaf.main.Utils;
> +import org.apache.felix.karaf.main.Utils;
> import org.osgi.framework.Bundle;
> import org.osgi.framework.BundleContext;
> import org.osgi.framework.Constants;
> @@ -340,7 +340,7 @@ public class Main {
> }
>
> private static void processSecurityProperties(Properties m_configProps) {
> - String prop = m_configProps.getProperty("org.apache.karaf.security.providers");
> + String prop = m_configProps.getProperty("org.apache.felix.karaf.security.providers");
> if (prop != null) {
> String[] providers = prop.split(",");
> for (String provider : providers) {
> @@ -687,7 +687,7 @@ public class Main {
> // installation directory. Try to load it from one of these
> // places.
>
> - ArrayList<File> bundleDirs = new ArrayList<File>();
> + ArrayList<File> bundleDirs = new ArrayList<File>();
>
> // See if the property URL was specified as a property.
> URL configPropURL = null;
> @@ -728,7 +728,13 @@ public class Main {
> do {
> location = nextLocation(st);
> if (location != null) {
> - File f = new File(location);
> + File f;
> + if (karafBase.equals(karafHome)) {
> + f = new File(karafHome, location);
> + } else {
> + f = new File(karafBase, location);
> + f = new File(karafHome, location);
> + }
> if (f.exists() && f.isDirectory()) {
> bundleDirs.add(f);
> } else {
> @@ -1042,7 +1048,7 @@ public class Main {
> }
>
> /* (non-Javadoc)
> - * @see org.apache.karaf.main.MainService#getArgs()
> + * @see org.apache.felix.karaf.main.MainService#getArgs()
> */
> public String[] getArgs() {
> return args;
>
>
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com