Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/descriptor/DescriptorFactoryTest.java URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/descriptor/DescriptorFactoryTest.java?rev=745010&r1=745009&r2=745010&view=diff ============================================================================== --- servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/descriptor/DescriptorFactoryTest.java (original) +++ servicemix/smx4/nmr/trunk/jbi/deployer/src/test/java/org/apache/servicemix/jbi/deployer/descriptor/DescriptorFactoryTest.java Tue Feb 17 12:33:05 2009 @@ -28,11 +28,7 @@ import org.junit.Test; /** - * Created by IntelliJ IDEA. - * User: gnodet - * Date: Nov 8, 2007 - * Time: 5:35:15 PM - * To change this template use File | Settings | File Templates. + * Test JBI descriptor parsing */ public class DescriptorFactoryTest {
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=745010&r1=745009&r2=745010&view=diff ============================================================================== --- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original) +++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Tue Feb 17 12:33:05 2009 @@ -101,11 +101,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.servicemix.jbi</groupId> - <artifactId>org.apache.servicemix.jbi.management</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.servicemix.kernel</groupId> <artifactId>org.apache.servicemix.kernel.management</artifactId> <scope>test</scope> Copied: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java (from r744748, servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java) URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?p2=servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java&p1=servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java&r1=744748&r2=745010&rev=745010&view=diff ============================================================================== --- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java (original) +++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java Tue Feb 17 12:33:05 2009 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.jbi; +package org.apache.servicemix.jbi.itests; import java.io.File; import java.util.Properties; @@ -72,6 +72,8 @@ getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"), getBundle("org.apache.felix", "org.apache.felix.prefs"), getBundle("org.apache.xbean", "xbean-classloader"), + getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.filemonitor"), + getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.management"), getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"), getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"), getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"), @@ -80,9 +82,6 @@ getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.runtime"), getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.deployer"), getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.osgi"), - getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.management"), - getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.filemonitor"), - getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.management"), getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.ant"), getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.woodstox"), getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"), Copied: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java (from r744748, servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/ManagementTest.java) URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?p2=servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java&p1=servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/ManagementTest.java&r1=744748&r2=745010&rev=745010&view=diff ============================================================================== --- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/ManagementTest.java (original) +++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java Tue Feb 17 12:33:05 2009 @@ -14,27 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicemix.jbi; +package org.apache.servicemix.jbi.itests; -import java.util.Properties; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.net.URL; -import java.net.URLConnection; -import java.io.File; - -import javax.jbi.component.Component; import javax.jbi.management.DeploymentException; import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest; -import org.apache.servicemix.nmr.api.NMR; -import org.apache.servicemix.jbi.deployer.ServiceAssembly; -import org.apache.servicemix.jbi.deployer.handler.JBIDeploymentListener; -import org.apache.servicemix.jbi.management.AdminCommandsServiceMBean; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; +import org.apache.servicemix.jbi.deployer.AdminCommands; public class ManagementTest extends AbstractIntegrationTest { @@ -73,6 +58,8 @@ getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"), getBundle("org.apache.felix", "org.apache.felix.prefs"), getBundle("org.apache.xbean", "xbean-classloader"), + getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.filemonitor"), + getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.management"), getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"), getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"), getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"), @@ -81,9 +68,6 @@ getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.runtime"), getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.deployer"), getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.osgi"), - getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.management"), - getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.filemonitor"), - getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.management"), getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.ant"), getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.woodstox"), getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"), @@ -101,10 +85,10 @@ getBundleVersion("org.apache.servicemix.samples.wsdl-first", "wsdl-first-sa"), null, "zip").getPath(); - AdminCommandsServiceMBean admin = getAdminCommands(); + AdminCommands admin = getAdminCommands(); try { - String res = admin.installComponent(smxJsr181); + String res = admin.installComponent(smxJsr181, null, false); System.err.println(res); fail("Call should have failed: " + res); } catch (Throwable t) { @@ -115,11 +99,11 @@ } } - System.err.println(admin.installSharedLibrary(smxShared)); - System.err.println(admin.installComponent(smxJsr181)); + System.err.println(admin.installSharedLibrary(smxShared, false)); + System.err.println(admin.installComponent(smxJsr181, null, false)); try { - String res = admin.installComponent(smxJsr181); + String res = admin.installComponent(smxJsr181, null, false); System.err.println(res); fail("Call should have failed: " + res); } catch (Throwable t) { @@ -132,16 +116,16 @@ System.err.println(admin.uninstallComponent("servicemix-jsr181")); - System.err.println(admin.installComponent(smxJsr181)); - System.err.println(admin.installComponent(smxHttp)); + System.err.println(admin.installComponent(smxJsr181, null, false)); + System.err.println(admin.installComponent(smxHttp, null, false)); System.err.println(admin.startComponent("servicemix-jsr181")); System.err.println(admin.startComponent("servicemix-http")); - System.err.println(admin.deployServiceAssembly(wsdlFirst)); + System.err.println(admin.deployServiceAssembly(wsdlFirst, false)); System.err.println(admin.undeployServiceAssembly("wsdl-first-sa")); - System.err.println(admin.deployServiceAssembly(wsdlFirst)); + System.err.println(admin.deployServiceAssembly(wsdlFirst, false)); System.err.println(admin.startServiceAssembly("wsdl-first-sa")); System.err.println(admin.stopServiceAssembly("wsdl-first-sa")); System.err.println(admin.shutdownServiceAssembly("wsdl-first-sa")); @@ -159,8 +143,8 @@ System.err.println(admin.uninstallSharedLibrary("servicemix-shared")); } - protected AdminCommandsServiceMBean getAdminCommands() { - return getOsgiService(AdminCommandsServiceMBean.class); + protected AdminCommands getAdminCommands() { + return getOsgiService(AdminCommands.class); } } Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=745010&r1=745009&r2=745010&view=diff ============================================================================== --- servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF (original) +++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF Tue Feb 17 12:33:05 2009 @@ -29,7 +29,6 @@ org.apache.servicemix.nmr.core, org.apache.servicemix.jbi.deployer, org.apache.servicemix.jbi.deployer.handler, - org.apache.servicemix.jbi.management, org.apache.servicemix.kernel.testing.support, org.springframework.osgi.util, javax.jbi.component, Modified: servicemix/smx4/nmr/trunk/jbi/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/pom.xml?rev=745010&r1=745009&r2=745010&view=diff ============================================================================== --- servicemix/smx4/nmr/trunk/jbi/pom.xml (original) +++ servicemix/smx4/nmr/trunk/jbi/pom.xml Tue Feb 17 12:33:05 2009 @@ -36,7 +36,6 @@ <module>cluster</module> <module>deployer</module> <module>osgi</module> - <module>management</module> <module>commands</module> <module>itests</module> </modules> Modified: servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/EnvironmentImpl.java URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/EnvironmentImpl.java?rev=745010&r1=745009&r2=745010&view=diff ============================================================================== --- servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/EnvironmentImpl.java (original) +++ servicemix/smx4/nmr/trunk/jbi/runtime/src/main/java/org/apache/servicemix/jbi/runtime/impl/EnvironmentImpl.java Tue Feb 17 12:33:05 2009 @@ -97,7 +97,7 @@ return namingContexts; } - public void setNamingContexts(List<InitialContext> namingContexts) { + public void setNamingContexts(List namingContexts) { this.namingContexts = namingContexts; } } Modified: servicemix/smx4/nmr/trunk/pom.xml URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=745010&r1=745009&r2=745010&view=diff ============================================================================== --- servicemix/smx4/nmr/trunk/pom.xml (original) +++ servicemix/smx4/nmr/trunk/pom.xml Tue Feb 17 12:33:05 2009 @@ -314,11 +314,6 @@ </dependency> <dependency> <groupId>org.apache.servicemix.jbi</groupId> - <artifactId>org.apache.servicemix.jbi.management</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.servicemix.jbi</groupId> <artifactId>org.apache.servicemix.jbi.osgi</artifactId> <version>${pom.version}</version> </dependency> @@ -408,12 +403,17 @@ <artifactId>geronimo-jta_1.1_spec</artifactId> <version>${geronimo.jta.version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.xbean</groupId> <artifactId>xbean-classloader</artifactId> <version>${xbean.version}</version> </dependency> <dependency> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-naming</artifactId> + <version>${xbean.version}</version> + </dependency> + <dependency> <groupId>org.springframework.osgi</groupId> <artifactId>spring-osgi-core</artifactId> <version>${spring.osgi.version}</version>
