You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/10/22 20:37:15 UTC
svn commit: r828809 - in /felix/trunk/karaf: ./ admin/command/ admin/core/
assembly/src/main/filtered-resources/bin/ webconsole/admin/
webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/
webconsole/admin/src/test/java/org/apache/fel...
Author: gnodet
Date: Thu Oct 22 18:37:15 2009
New Revision: 828809
URL: http://svn.apache.org/viewvc?rev=828809&view=rev
Log:
FELIX-1766: fix various problems
Modified:
felix/trunk/karaf/admin/command/pom.xml
felix/trunk/karaf/admin/core/pom.xml
felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin
felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin.bat
felix/trunk/karaf/pom.xml
felix/trunk/karaf/webconsole/admin/pom.xml
felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java
felix/trunk/karaf/webconsole/admin/src/test/java/org/apache/felix/karaf/webconsole/admin/AdminPluginTest.java
Modified: felix/trunk/karaf/admin/command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/command/pom.xml?rev=828809&r1=828808&r2=828809&view=diff
==============================================================================
--- felix/trunk/karaf/admin/command/pom.xml (original)
+++ felix/trunk/karaf/admin/command/pom.xml Thu Oct 22 18:37:15 2009
@@ -85,6 +85,7 @@
<Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
<Import-Package>
!${pom.artifactId}*,
+ !org.apache.felix.karaf.admin.internal,
javax.management,
javax.management.loading,
org.osgi.service.command,
@@ -92,7 +93,9 @@
org.apache.felix.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
+ <Private-Package>
+ org.apache.felix.karaf.admin.main
+ </Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
Modified: felix/trunk/karaf/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/admin/core/pom.xml?rev=828809&r1=828808&r2=828809&view=diff
==============================================================================
--- felix/trunk/karaf/admin/core/pom.xml (original)
+++ felix/trunk/karaf/admin/core/pom.xml Thu Oct 22 18:37:15 2009
@@ -205,8 +205,10 @@
*
</Import-Package>
<Private-Package>
+ org.apache.felix.karaf.admin.bin,
+ org.apache.felix.karaf.admin.etc,
org.apache.felix.karaf.admin.internal,
- org.apache.felix.karaf.jpm.impl
+ org.apache.felix.karaf.jpm.impl,
</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin?rev=828809&r1=828808&r2=828809&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin Thu Oct 22 18:37:15 2009
@@ -271,7 +271,7 @@
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- CLASSPATH=${KARAF_HOME}/system/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.admin/${project.version}/org.apache.felix.karaf.shell.admin-${project.version}.jar:${KARAF_HOME}/system/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${project.version}/org.apache.felix.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar:${KARAF_HOME}/system/org/apache/geronimo/blueprint/geronimo-blueprint/${geronimo.blueprint.version}/geronimo-blueprint-${geronimo.blueprint.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+ CLASSPATH=${KARAF_HOME}/system/org/apache/felix/karaf/admin/org.apache.felix.karaf.admin.command/${project.version}/org.apache.felix.karaf.admin.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/felix/karaf/admin/org.apache.felix.karaf.admin.core/${project.version}/org.apache.felix.karaf.admin.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${project.version}/org.apache.felix.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar:${KARAF_HOME}/system/org/apache/geronimo/blueprint/geronimo-blueprint/${geronimo.blueprint.version}/geronimo-blueprint-${geronimo.blueprint.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix
.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
exec $JAVA $JAVA_OPTS -Dstorage.location="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.felix.karaf.admin.main.Execute "$@"
}
Modified: felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin.bat
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin.bat?rev=828809&r1=828808&r2=828809&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin.bat (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/bin/admin.bat Thu Oct 22 18:37:15 2009
@@ -81,7 +81,7 @@
call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
:KARAF_DEBUG_END
-set CLASSPATH=%KARAF_HOME%\system\org\apache\felix\karaf\shell\org.apache.felix.karaf.shell.admin\${project.version}\org.apache.felix.karaf.shell.admin-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\karaf\shell\org.apache.felix.karaf.shell.console\${project.version}\org.apache.felix.karaf.shell.console-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\gogo\org.apache.felix.gogo.runtime\${felix.gogo.version}\org.apache.felix.gogo.runtime-${felix.gogo.version}.jar;%KARAF_HOME%\system\org\apache\geronimo\blueprint\geronimo-blueprint\${geronimo.blueprint.version}\geronimo-blueprint-${geronimo.blueprint.version}.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framework\${felix.framework.version}\org.apache.felix.framework-${felix.framework.version}.jar
+set CLASSPATH=%KARAF_HOME%\system\org\apache\felix\karaf\admin\org.apache.felix.karaf.admin.command\${project.version}\org.apache.felix.karaf.admin.command-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\karaf\admin\org.apache.felix.karaf.admin.core\${project.version}\org.apache.felix.karaf.admin.core-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\karaf\shell\org.apache.felix.karaf.shell.console\${project.version}\org.apache.felix.karaf.shell.console-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\gogo\org.apache.felix.gogo.runtime\${felix.gogo.version}\org.apache.felix.gogo.runtime-${felix.gogo.version}.jar;%KARAF_HOME%\system\org\apache\geronimo\blueprint\geronimo-blueprint\${geronimo.blueprint.version}\geronimo-blueprint-${geronimo.blueprint.version}.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framew
ork\${felix.framework.version}\org.apache.felix.framework-${felix.framework.version}.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=828809&r1=828808&r2=828809&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Thu Oct 22 18:37:15 2009
@@ -249,16 +249,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.admin</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.admin.management</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
<artifactId>org.apache.felix.karaf.shell.obr</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: felix/trunk/karaf/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/pom.xml?rev=828809&r1=828808&r2=828809&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/admin/pom.xml (original)
+++ felix/trunk/karaf/webconsole/admin/pom.xml Thu Oct 22 18:37:15 2009
@@ -59,8 +59,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.admin</artifactId>
+ <groupId>org.apache.felix.karaf.admin</groupId>
+ <artifactId>org.apache.felix.karaf.admin.core</artifactId>
<version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java?rev=828809&r1=828808&r2=828809&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java (original)
+++ felix/trunk/karaf/webconsole/admin/src/main/java/org/apache/felix/karaf/webconsole/admin/AdminPlugin.java Thu Oct 22 18:37:15 2009
@@ -31,9 +31,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.felix.karaf.shell.admin.AdminService;
-import org.apache.felix.karaf.shell.admin.Instance;
-import org.apache.felix.karaf.shell.admin.InstanceSettings;
+import org.apache.felix.karaf.admin.AdminService;
+import org.apache.felix.karaf.admin.Instance;
+import org.apache.felix.karaf.admin.InstanceSettings;
import org.apache.felix.webconsole.AbstractWebConsolePlugin;
import org.json.JSONException;
import org.json.JSONWriter;
Modified: felix/trunk/karaf/webconsole/admin/src/test/java/org/apache/felix/karaf/webconsole/admin/AdminPluginTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/src/test/java/org/apache/felix/karaf/webconsole/admin/AdminPluginTest.java?rev=828809&r1=828808&r2=828809&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/admin/src/test/java/org/apache/felix/karaf/webconsole/admin/AdminPluginTest.java (original)
+++ felix/trunk/karaf/webconsole/admin/src/test/java/org/apache/felix/karaf/webconsole/admin/AdminPluginTest.java Thu Oct 22 18:37:15 2009
@@ -30,9 +30,9 @@
import junit.framework.TestCase;
-import org.apache.felix.karaf.shell.admin.AdminService;
-import org.apache.felix.karaf.shell.admin.Instance;
-import org.apache.felix.karaf.shell.admin.InstanceSettings;
+import org.apache.felix.karaf.admin.AdminService;
+import org.apache.felix.karaf.admin.Instance;
+import org.apache.felix.karaf.admin.InstanceSettings;
import org.easymock.EasyMock;
import org.easymock.IAnswer;