Author: gnodet
Date: Mon May 4 07:02:13 2009
New Revision: 771208
URL: http://svn.apache.org/viewvc?rev=771208&view=rev
Log:
Rename some missed packages to felix.karaf
Added:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/Process.java
- copied, changed from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/Process.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java
- copied, changed from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilder.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java
- copied, changed from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilderFactory.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
- copied, changed from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderFactoryImpl.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java
- copied, changed from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderImpl.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java
- copied, changed from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessImpl.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java
- copied, changed from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ScriptUtils.java
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/unix/start.sh
- copied unchanged from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/unix/start.sh
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/destroy.vbs
- copied unchanged from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/windows/destroy.vbs
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/running.vbs
- copied unchanged from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/windows/running.vbs
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/felix/karaf/jpm/impl/windows/start.vbs
- copied unchanged from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/jpm/impl/windows/start.vbs
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java
- copied, changed from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/MainTest.java
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java
- copied, changed from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java
Removed:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/org/apache/servicemix/
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/servicemix/
Modified:
felix/trunk/karaf/gshell/gshell-admin/pom.xml
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
Modified: felix/trunk/karaf/gshell/gshell-admin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/pom.xml?rev=771208&r1=771207&r2=771208&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-admin/pom.xml (original)
+++ felix/trunk/karaf/gshell/gshell-admin/pom.xml Mon May 4 07:02:13 2009
@@ -144,7 +144,7 @@
org.apache.felix.karaf.gshell.core,
*
</Import-Package>
-
<Private-Package>org.apache.servicemix.jpm.*</Private-Package>
+
<Private-Package>org.apache.felix.karaf.jpm.*</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
</configuration>
Modified:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java?rev=771208&r1=771207&r2=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/AdminServiceImpl.java
Mon May 4 07:02:13 2009
@@ -36,9 +36,8 @@
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
import org.osgi.service.prefs.PreferencesService;
-import org.springframework.beans.factory.InitializingBean;
-public class AdminServiceImpl implements AdminService, InitializingBean {
+public class AdminServiceImpl implements AdminService {
private static final Log LOGGER =
LogFactory.getLog(AdminServiceImpl.class);
@@ -56,7 +55,7 @@
this.preferences = preferences;
}
- public synchronized void afterPropertiesSet() throws Exception {
+ public synchronized void init() throws Exception {
try {
Preferences prefs =
preferences.getUserPreferences("AdminServiceState");
Preferences child = prefs.node("Instances");
Modified:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java?rev=771208&r1=771207&r2=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/gshell/admin/internal/InstanceImpl.java
Mon May 4 07:02:13 2009
@@ -28,9 +28,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.jpm.Process;
-import org.apache.servicemix.jpm.ProcessBuilderFactory;
-import org.apache.servicemix.jpm.impl.ScriptUtils;
+import org.apache.felix.karaf.jpm.Process;
+import org.apache.felix.karaf.jpm.ProcessBuilderFactory;
+import org.apache.felix.karaf.jpm.impl.ScriptUtils;
import org.apache.felix.karaf.gshell.admin.Instance;
public class InstanceImpl implements Instance {
Copied:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/Process.java
(from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/Process.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/Process.java?p2=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/Process.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/Process.java&r1=771185&r2=771208&rev=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/Process.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/Process.java
Mon May 4 07:02:13 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jpm;
+package org.apache.felix.karaf.jpm;
import java.io.IOException;
import java.io.Serializable;
Copied:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java
(from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilder.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java?p2=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilder.java&r1=771185&r2=771208&rev=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilder.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilder.java
Mon May 4 07:02:13 2009
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jpm;
+package org.apache.felix.karaf.jpm;
import java.io.File;
import java.io.IOException;
+import java.lang.*;
/**
* Interface used to create new processes.
@@ -46,7 +47,7 @@
* @return the process that has been started
* @throws IOException if the process can not be created
*/
- Process start() throws IOException;
+ org.apache.felix.karaf.jpm.Process start() throws IOException;
/**
* Attach to an existing process
@@ -54,6 +55,6 @@
* @return the process that has been attached
* @throws IOException if the process can not be attached to
*/
- Process attach(int pid) throws IOException;
+ org.apache.felix.karaf.jpm.Process attach(int pid) throws IOException;
}
Copied:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java
(from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilderFactory.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java?p2=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilderFactory.java&r1=771185&r2=771208&rev=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/ProcessBuilderFactory.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/ProcessBuilderFactory.java
Mon May 4 07:02:13 2009
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jpm;
+package org.apache.felix.karaf.jpm;
+
+import org.apache.felix.karaf.jpm.impl.ProcessBuilderFactoryImpl;
/**
* Factory for process builders.
@@ -22,7 +24,7 @@
public abstract class ProcessBuilderFactory {
public static ProcessBuilderFactory newInstance() {
- return new org.apache.servicemix.jpm.impl.ProcessBuilderFactoryImpl();
+ return new ProcessBuilderFactoryImpl();
}
public abstract ProcessBuilder newBuilder();
Copied:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
(from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderFactoryImpl.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java?p2=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderFactoryImpl.java&r1=771185&r2=771208&rev=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderFactoryImpl.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
Mon May 4 07:02:13 2009
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jpm.impl;
+package org.apache.felix.karaf.jpm.impl;
-import org.apache.servicemix.jpm.ProcessBuilder;
-import org.apache.servicemix.jpm.ProcessBuilderFactory;
+import org.apache.felix.karaf.jpm.ProcessBuilder;
+import org.apache.felix.karaf.jpm.ProcessBuilderFactory;
public class ProcessBuilderFactoryImpl extends ProcessBuilderFactory {
Copied:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java
(from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderImpl.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java?p2=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderImpl.java&r1=771185&r2=771208&rev=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessBuilderImpl.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessBuilderImpl.java
Mon May 4 07:02:13 2009
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jpm.impl;
+package org.apache.felix.karaf.jpm.impl;
import java.io.File;
import java.io.IOException;
-import org.apache.servicemix.jpm.Process;
-import org.apache.servicemix.jpm.ProcessBuilder;
+import org.apache.felix.karaf.jpm.Process;
+import org.apache.felix.karaf.jpm.ProcessBuilder;
public class ProcessBuilderImpl implements ProcessBuilder {
@@ -42,7 +42,7 @@
return ProcessImpl.create(dir, command);
}
- public Process attach(int pid) throws IOException {
+ public org.apache.felix.karaf.jpm.Process attach(int pid) throws
IOException {
return ProcessImpl.attach(pid);
}
}
Copied:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java
(from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessImpl.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java?p2=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessImpl.java&r1=771185&r2=771208&rev=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ProcessImpl.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ProcessImpl.java
Mon May 4 07:02:13 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jpm.impl;
+package org.apache.felix.karaf.jpm.impl;
import java.io.BufferedReader;
import java.io.File;
@@ -26,7 +26,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.servicemix.jpm.Process;
+import org.apache.felix.karaf.jpm.Process;
public class ProcessImpl implements Process {
@@ -103,7 +103,7 @@
return 0;
}
- public static Process create(File dir, String command) throws IOException {
+ public static org.apache.felix.karaf.jpm.Process create(File dir, String
command) throws IOException {
//File input = File.createTempFile("jpm.", ".input");
//File output = File.createTempFile("jpm.", ".output");
//File error = File.createTempFile("jpm.", ".error");
Copied:
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java
(from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ScriptUtils.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java?p2=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ScriptUtils.java&r1=771185&r2=771208&rev=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/servicemix/jpm/impl/ScriptUtils.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/java/org/apache/felix/karaf/jpm/impl/ScriptUtils.java
Mon May 4 07:02:13 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jpm.impl;
+package org.apache.felix.karaf.jpm.impl;
import java.io.File;
import java.io.FileOutputStream;
Modified:
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml?rev=771208&r1=771207&r2=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/main/resources/META-INF/spring/gshell-admin.xml
Mon May 4 07:02:13 2009
@@ -94,7 +94,7 @@
<osgi:reference id="preferences"
interface="org.osgi.service.prefs.PreferencesService" cardinality="0..1" />
- <bean id="adminService"
class="org.apache.felix.karaf.gshell.admin.internal.AdminServiceImpl">
+ <bean id="adminService"
class="org.apache.felix.karaf.gshell.admin.internal.AdminServiceImpl"
init-method="init">
<property name="preferences" ref="preferences" />
</bean>
Copied:
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java
(from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/MainTest.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java?p2=felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/MainTest.java&r1=771185&r2=771208&rev=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/MainTest.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/MainTest.java
Mon May 4 07:02:13 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jpm;
+package org.apache.felix.karaf.jpm;
public class MainTest {
Copied:
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java
(from r771185,
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java?p2=felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java&p1=felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java&r1=771185&r2=771208&rev=771208&view=diff
==============================================================================
---
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/servicemix/jpm/ProcessTest.java
(original)
+++
felix/trunk/karaf/gshell/gshell-admin/src/test/java/org/apache/felix/karaf/jpm/ProcessTest.java
Mon May 4 07:02:13 2009
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jpm;
+package org.apache.felix.karaf.jpm;
import java.io.File;
import junit.framework.TestCase;
-import org.apache.servicemix.jpm.impl.ScriptUtils;
+import org.apache.felix.karaf.jpm.impl.ScriptUtils;
+import org.apache.felix.karaf.jpm.ProcessBuilder;
public class ProcessTest extends TestCase {
@@ -41,7 +42,7 @@
System.err.println("Executing: " + command.toString());
ProcessBuilder builder =
ProcessBuilderFactory.newInstance().newBuilder();
- Process p = builder.command(command.toString()).start();
+ org.apache.felix.karaf.jpm.Process p =
builder.command(command.toString()).start();
assertNotNull(p);
System.err.println("Process: " + p.getPid());
assertNotNull(p.getPid());
