You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/12/09 14:46:26 UTC
svn commit: r1212417 - in /karaf/trunk/admin:
command/src/main/java/org/apache/karaf/admin/command/ core/
core/src/main/java/org/apache/karaf/admin/internal/
core/src/main/resources/org/apache/karaf/admin/bin/
core/src/main/resources/org/apache/karaf/a...
Author: gnodet
Date: Fri Dec 9 13:46:25 2011
New Revision: 1212417
URL: http://svn.apache.org/viewvc?rev=1212417&view=rev
Log:
Fix admin service
Added:
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf.bat
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf.bat
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/start
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start.bat
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/start.bat
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop.bat
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop.bat
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.management.cfg
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.management.cfg
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.shell.cfg
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/system.properties
- copied, changed from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/system.properties
Removed:
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf.bat
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/start
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/start.bat
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop.bat
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.management.cfg
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.ops4j.pax.url.mvn.cfg
karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/system.properties
Modified:
karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java
karaf/trunk/admin/core/pom.xml
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java
Modified: karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java?rev=1212417&r1=1212416&r2=1212417&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java (original)
+++ karaf/trunk/admin/command/src/main/java/org/apache/karaf/admin/command/StartCommand.java Fri Dec 9 13:46:25 2011
@@ -23,7 +23,10 @@ import org.apache.karaf.admin.Instance;
@Command(scope = "admin", name = "start", description = "Starts an existing container instance.")
public class StartCommand extends AdminCommandSupport {
-
+
+ @Option(name = "-d", aliases = { "--debug"}, description = "Start the instance in debug mode", required = false, multiValued = false)
+ private boolean debug;
+
@Option(name = "-o", aliases = { "--java-opts"}, description = "Java options when launching the instance", required = false, multiValued = false)
private String javaOpts;
@@ -33,12 +36,25 @@ public class StartCommand extends AdminC
@Argument(index = 0, name = "name", description = "The name of the container instance", required = true, multiValued = false)
private String instance = null;
+ static final String DEBUG_OPTS = " -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005";
+ static final String DEFAULT_OPTS = "-server -Xmx512M -Dcom.sun.management.jmxremote";
+
protected Object doExecute() throws Exception {
Instance child = getExistingInstance(instance);
+ String opts = javaOpts;
+ if (opts == null) {
+ opts = child.getJavaOpts();
+ }
+ if (opts == null) {
+ opts = DEFAULT_OPTS;
+ }
+ if (debug) {
+ opts += DEBUG_OPTS;
+ }
if (wait) {
String state = child.getState();
if (Instance.STOPPED.equals(state)) {
- child.start(javaOpts);
+ child.start(opts);
}
if (!Instance.STARTED.equals(state)) {
do {
@@ -47,7 +63,7 @@ public class StartCommand extends AdminC
} while (Instance.STARTING.equals(state));
}
} else {
- child.start(javaOpts);
+ child.start(opts);
}
return null;
}
Modified: karaf/trunk/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/pom.xml?rev=1212417&r1=1212416&r2=1212417&view=diff
==============================================================================
--- karaf/trunk/admin/core/pom.xml (original)
+++ karaf/trunk/admin/core/pom.xml Fri Dec 9 13:46:25 2011
@@ -91,12 +91,17 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </plugin>
+ <!--
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-config-properties</id>
- <!-- here the phase you need -->
<phase>compile</phase>
<goals>
<goal>copy-resources</goal>
@@ -124,17 +129,66 @@
<include>*.cfg</include>
</includes>
</resource>
- <resource>
- <directory>${project.basedir}/src/test/resources/etc</directory>
- <includes>
- <include>startup.properties</include>
- </includes>
- </resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-unix</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <type>kar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${basedir}/target/framework/org/apache/karaf/admin</outputDirectory>
+ <includes>resources/etc/*.properties,resources/etc/*.cfg</includes>
+ <excludes>resources/etc/org.apache.karaf.management.cfg,resources/etc/org.apache.karaf.shell.cfg,resources/etc/org.ops4j.pax.url.mvn.cfg,resources/etc/system.properties</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-resource</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/framework</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Modified: karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java?rev=1212417&r1=1212416&r2=1212417&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java (original)
+++ karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java Fri Dec 9 13:46:25 2011
@@ -175,9 +175,14 @@ public class AdminServiceImpl implements
copyResourceToDir(karafBase, FEATURES_CFG, true);
copyResourceToDir(karafBase, "etc/org.ops4j.pax.logging.cfg", true);
copyResourceToDir(karafBase, "etc/org.ops4j.pax.url.mvn.cfg", true);
- copyResourceToDir(karafBase, "etc/startup.properties", true);
+// copyResourceToDir(karafBase, "etc/startup.properties", true);
copyResourceToDir(karafBase, "etc/users.properties", true);
+ // The startup.properties is now generated by the karaf maven plugin, so
+ // we use the one from the root instance instead of embedding it
+ File curbase = new File(System.getProperty("karaf.base"));
+ copy(new File(curbase, "etc/startup.properties"), new File(karafBase, "etc/startup.properties"));
+
HashMap<String, String> props = new HashMap<String, String>();
props.put("${SUBST-KARAF-NAME}", name);
props.put("${SUBST-KARAF-HOME}", System.getProperty("karaf.home"));
@@ -190,22 +195,18 @@ public class AdminServiceImpl implements
copyFilteredResourceToDir(karafBase, "etc/org.apache.karaf.management.cfg", props);
// If we use batch files, use batch files, else use bash scripts (even on cygwin)
boolean windows = System.getProperty("os.name").startsWith("Win");
- boolean cygwin = windows && new File( System.getProperty("karaf.home"), "bin/admin" ).exists();
- if( windows && !cygwin ) {
- copyFilteredResourceToDir(karafBase, "bin/karaf.bat", props);
- copyFilteredResourceToDir(karafBase, "bin/start.bat", props);
- copyFilteredResourceToDir(karafBase, "bin/stop.bat", props);
- } else {
- copyFilteredResourceToDir(karafBase, "bin/karaf", props);
- copyFilteredResourceToDir(karafBase, "bin/start", props);
- copyFilteredResourceToDir(karafBase, "bin/stop", props);
- if ( !cygwin ) {
- chmod(new File(karafBase, "bin/karaf"), "a+x");
- chmod(new File(karafBase, "bin/start"), "a+x");
- chmod(new File(karafBase, "bin/stop"), "a+x");
- }
+ copyFilteredResourceToDir(karafBase, "bin/karaf.bat", props);
+ copyFilteredResourceToDir(karafBase, "bin/start.bat", props);
+ copyFilteredResourceToDir(karafBase, "bin/stop.bat", props);
+ copyFilteredResourceToDir(karafBase, "bin/karaf", props);
+ copyFilteredResourceToDir(karafBase, "bin/start", props);
+ copyFilteredResourceToDir(karafBase, "bin/stop", props);
+ if ( !windows ) {
+ chmod(new File(karafBase, "bin/karaf"), "a+x");
+ chmod(new File(karafBase, "bin/start"), "a+x");
+ chmod(new File(karafBase, "bin/stop"), "a+x");
}
-
+
handleFeatures(new File(karafBase, FEATURES_CFG), settings);
String javaOpts = settings.getJavaOpts();
@@ -383,7 +384,10 @@ public class AdminServiceImpl implements
File outFile = new File(target, resource);
if( !outFile.exists() ) {
println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
- InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/admin/" + resource);
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/admin/resources/" + resource);
+ if (is == null) {
+ throw new IOException("Unable to find resource " + resource);
+ }
try {
if( text ) {
// Read it line at a time so that we can use the platform line ending when we write it out.
@@ -437,7 +441,7 @@ public class AdminServiceImpl implements
File outFile = new File(target, resource);
if( !outFile.exists() ) {
println(Ansi.ansi().a("Creating file: ").a(Ansi.Attribute.INTENSITY_BOLD).a(outFile.getPath()).a(Ansi.Attribute.RESET).toString());
- InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/admin/" + resource);
+ InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/karaf/admin/resources/" + resource);
copyAndFilterResource(is, new FileOutputStream(outFile), props);
}
}
Modified: karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java?rev=1212417&r1=1212416&r2=1212417&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java (original)
+++ karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/InstanceImpl.java Fri Dec 9 13:46:25 2011
@@ -16,13 +16,20 @@
*/
package org.apache.karaf.admin.internal;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.net.Socket;
import java.net.URL;
import java.net.UnknownHostException;
-import java.util.Set;
-import org.apache.felix.utils.properties.InterpolationHelper;
import org.apache.felix.utils.properties.Properties;
import org.apache.karaf.admin.Instance;
import org.apache.karaf.jpm.Process;
@@ -186,23 +193,8 @@ public class InstanceImpl implements Ins
* @throws Exception in case of read failure.
*/
private String getConfiguration(File configurationFile, String propertyName) throws Exception {
- InputStream is = null;
- try {
- is = new FileInputStream(configurationFile);
- Properties props = new Properties();
- props.load(is);
- return (String) props.get(propertyName);
- } catch (Exception e) {
- throw e;
- } finally {
- if (is != null) {
- try {
- is.close();
- } catch (IOException e) {
- // ignore
- }
- }
- }
+ Properties props = loadPropertiesFile(configurationFile.toURI().toURL());
+ return (String) props.get(propertyName);
}
public String getJavaOpts() {
@@ -318,14 +310,7 @@ public class InstanceImpl implements Ins
File file = new File(new File(location, "etc"), CONFIG_PROPERTIES_FILE_NAME);
URL configPropURL = file.toURI().toURL();
Properties props = loadPropertiesFile(configPropURL);
- props.put("karaf.base", new File(location).getCanonicalPath());
- props.put("karaf.home", System.getProperty("karaf.home"));
- props.put("karaf.data", new File(new File(location), "data").getCanonicalPath());
- for (String name : (Set<String>) props.keySet()) {
- props.put(name,
- InterpolationHelper.substVars((String) props.get(name), name, null, props, null));
- }
-
+
String host = "localhost";
if (props.get(KARAF_SHUTDOWN_HOST) != null)
host = (String) props.get(KARAF_SHUTDOWN_HOST);
@@ -400,11 +385,14 @@ public class InstanceImpl implements Ins
return result;
}
- protected static Properties loadPropertiesFile(URL configPropURL) throws Exception {
+ protected Properties loadPropertiesFile(URL configPropURL) throws Exception {
// Read the properties file.
Properties configProps = new Properties();
InputStream is = null;
try {
+ configProps.put("karaf.base", new File(location).getCanonicalPath());
+ configProps.put("karaf.home", System.getProperty("karaf.home"));
+ configProps.put("karaf.data", new File(new File(location), "data").getCanonicalPath());
is = configPropURL.openConnection().getInputStream();
configProps.load(is);
return configProps;
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf.bat (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf.bat)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf.bat?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/karaf.bat&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/karaf.bat&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/start)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/start&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start.bat (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/start.bat)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start.bat?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/start.bat&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/start.bat&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop.bat (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop.bat)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop.bat?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/bin/stop.bat&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/bin/stop.bat&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.management.cfg (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.management.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.management.cfg?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.management.cfg&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.management.cfg&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.shell.cfg (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.shell.cfg?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.apache.karaf.shell.cfg&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.apache.karaf.shell.cfg&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.ops4j.pax.url.mvn.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/org.ops4j.pax.url.mvn.cfg&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/org.ops4j.pax.url.mvn.cfg&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/system.properties (from r1212003, karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/system.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/system.properties?p2=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/resources/etc/system.properties&p1=karaf/trunk/admin/core/src/main/resources/org/apache/karaf/admin/etc/system.properties&r1=1212003&r2=1212417&rev=1212417&view=diff
==============================================================================
(empty)
Modified: karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java?rev=1212417&r1=1212416&r2=1212417&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java (original)
+++ karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java Fri Dec 9 13:46:25 2011
@@ -72,6 +72,8 @@ public class AdminServiceImplTest extend
AdminServiceImpl service = new AdminServiceImpl();
service.setStorageLocation(new File("target/instances/" + System.currentTimeMillis()));
+ System.setProperty("karaf.base", new File("target/test-classes/").getAbsolutePath());
+
InstanceSettings settings = new InstanceSettings(8122, 1122, 44444, getName(), null, null, null);
Instance instance = service.createInstance(getName(), settings);
@@ -97,6 +99,8 @@ public class AdminServiceImplTest extend
AdminServiceImpl service = new AdminServiceImpl();
service.setStorageLocation(new File("target/instances/" + System.currentTimeMillis()));
+ System.setProperty("karaf.base", new File("target/test-classes/").getAbsolutePath());
+
InstanceSettings settings = new InstanceSettings(8122, 1122, 44444, getName(), null, null, null);
Instance instance = service.createInstance(getName(), settings);