[jboss-cvs] JBossAS SVN: r92211 - in trunk: hibernate-int and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 10 16:20:52 EDT 2009
Author: emuckenhuber
Date: 2009-08-10 16:20:51 -0400 (Mon, 10 Aug 2009)
New Revision: 92211
Removed:
trunk/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java
trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/remove/test/RemoveGenericValueUnitTestCase.java
Modified:
trunk/ejb3/.classpath
trunk/hibernate-int/.classpath
trunk/profileservice/.classpath
trunk/security/.classpath
trunk/spring-int/.classpath
trunk/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java
trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java
trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/MapCompositeUnitTestCase.java
trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java
trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockServer.java
trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockServerConfig.java
trunk/system/src/tests/org/jboss/test/server/profileservice/test/AbstractProfileServiceTestBase.java
trunk/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java
trunk/system/src/tests/org/jboss/test/server/profileservice/test/DeploymentRepositoryUnitTestCase.java
trunk/thirdparty/.classpath
Log:
fix eclipse build
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/ejb3/.classpath 2009-08-10 20:20:51 UTC (rev 92211)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/hibernate-int/.classpath
===================================================================
--- trunk/hibernate-int/.classpath 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/hibernate-int/.classpath 2009-08-10 20:20:51 UTC (rev 92211)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/profileservice/.classpath
===================================================================
--- trunk/profileservice/.classpath 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/profileservice/.classpath 2009-08-10 20:20:51 UTC (rev 92211)
@@ -3,7 +3,7 @@
<classpathentry kind="src" output="target/classes" path="src/main"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="target/classes"/>
Modified: trunk/security/.classpath
===================================================================
--- trunk/security/.classpath 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/security/.classpath 2009-08-10 20:20:51 UTC (rev 92211)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/spring-int/.classpath
===================================================================
--- trunk/spring-int/.classpath 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/spring-int/.classpath 2009-08-10 20:20:51 UTC (rev 92211)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Deleted: trunk/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/MainWithSimpleHotDeployTestCase.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -1,147 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.server.profileservice;
-
-import java.io.File;
-import java.security.CodeSource;
-
-import org.jboss.Main;
-import org.jboss.bootstrap.microcontainer.ServerImpl;
-import org.jboss.bootstrap.spi.Server;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.registry.KernelRegistry;
-import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.test.BaseTestCase;
-
-/**
- * Test of the jboss main loading a bootstrap configuration via the ProfileService
- * and additional service via a simple hot deployment service.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class MainWithSimpleHotDeployTestCase extends BaseTestCase
-{
- public MainWithSimpleHotDeployTestCase(String name)
- {
- super(name);
- }
-
- // Public --------------------------------------------------------
-
- /* (non-Javadoc)
- * @see org.jboss.test.AbstractTestCase#configureLogging()
- */
- @Override
- protected void configureLogging()
- {
- //enableTrace("org.jboss.kernel");
- }
-
- /**
- * Test the startup of the org.jboss.Main entry point using the "default"
- * profile and bootstrap deployer-beans.xml search logic.
- * @throws Exception
- */
- public void testDefaultStartup() throws Exception
- {
- String deployPrefix = "";
- // If jbosstest.deploy.dir is not defined fail
- String deployDirEnv = System.getenv("jbosstest.deploy.dir");
- String deployDirProp = System.getProperty("jbosstest.deploy.dir");
- if( deployDirProp == null && deployDirEnv != null )
- {
- System.setProperty("jbosstest.deploy.dir", deployDirEnv);
- deployDirProp = deployDirEnv;
- }
- String supportDirEnv = System.getenv("jbosstest.support.dir");
- String supportDirProp = System.getProperty("jbosstest.support.dir");
- if( supportDirProp == null && supportDirEnv != null )
- {
- System.setProperty("jbosstest.support.dir", supportDirEnv);
- supportDirProp = supportDirEnv;
- }
-
- if( supportDirProp == null )
- {
- // If these have not been set, assume running inside eclipse from the system folder
- File resourcesDir = new File("output/eclipse-resources");
- File classesDir = new File("output/eclipse-test-classes");
- deployDirProp = resourcesDir.toURL().toExternalForm();
- supportDirProp = classesDir.toURL().toExternalForm();
- System.setProperty("jbosstest.deploy.dir", deployDirProp);
- System.setProperty("jbosstest.support.dir", supportDirProp);
- deployPrefix = "tests/bootstrap/defaulthotdeploy/";
- }
- assertNotNull("jbosstest.support.dir != null", supportDirProp);
- assertNotNull("jbosstest.deploy.dir != null", deployDirProp);
- // Set the deploy prefix
-
-
- String[] args = {"-c", "defaulthotdeploy", "-Djboss.server.deployerBeansPrefix="+deployPrefix};
- Main main = new Main();
- main.boot(args);
- Server server = main.getServer();
- assertTrue("Server", server instanceof ServerImpl);
- ServerImpl serverImpl = (ServerImpl) server;
-
- // Validate that the expected deployment beans exist
- Kernel kernel = serverImpl.getKernel();
- assertInstalled(kernel, "ProfileService");
- assertInstalled(kernel, "MainDeployer");
- assertInstalled(kernel, "BeanDeployer");
- assertInstalled(kernel, "VFSDeploymentScanner");
- KernelRegistry registry = kernel.getRegistry();
- KernelRegistryEntry entry = registry.getEntry("VFSDeploymentScanner");
- /** TODO DeploymentScanner scanner = (DeploymentScanner) entry.getTarget();
- synchronized( scanner )
- {
- while( scanner.getScanCount() <= 0 )
- scanner.wait(10000);
- }
- log.info("Notified of scan: "+scanner.getScanCount());
- */
-
- // Expected hot deployments
- assertInstalled(kernel, "VFSClassLoader");
- assertInstalled(kernel, "TestBean");
- assertInstalled(kernel, "VFSClassLoader-unpacked");
- assertInstalled(kernel, "TestBean-unpacked");
- entry = registry.getEntry("TestBean");
- Object testBean = entry.getTarget();
- CodeSource testBeanCS = testBean.getClass().getProtectionDomain().getCodeSource();
- log.info("TestBean.CS: "+testBeanCS);
- log.info("TestBean.ClassLoader: "+testBean.getClass().getClassLoader());
-
-
- // Shutdown
- main.shutdown();
- }
-
- private void assertInstalled(Kernel kernel, String name)
- {
- KernelRegistry registry = kernel.getRegistry();
- KernelRegistryEntry entry = registry.getEntry(name);
- assertEquals(name+" Installed", ControllerState.INSTALLED, entry.getState());
- }
-}
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/component/persistence/test/AbstractComponentMapperTest.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -27,18 +27,19 @@
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
+import junit.framework.TestCase;
+
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.system.server.profileservice.persistence.AbstractPersistenceFactory;
import org.jboss.system.server.profileservice.persistence.PersistenceFactory;
import org.jboss.system.server.profileservice.persistence.component.ComponentMapper;
import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
-import org.jboss.test.BaseTestCase;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class AbstractComponentMapperTest extends BaseTestCase
+public class AbstractComponentMapperTest extends TestCase
{
/** The managed object factory. */
Deleted: trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/remove/test/RemoveGenericValueUnitTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/remove/test/RemoveGenericValueUnitTestCase.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/remove/test/RemoveGenericValueUnitTestCase.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.server.profileservice.persistence.remove.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.managed.api.ManagedCommon;
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.metatype.api.values.CollectionValue;
-import org.jboss.metatype.api.values.GenericValue;
-import org.jboss.system.server.profileservice.persistence.ManagedGenericOverrideHandler;
-import org.jboss.system.server.profileservice.persistence.ManagedObjectRemoveHandler;
-import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
-import org.jboss.test.server.profileservice.persistence.support.GenericSupportMetaData;
-import org.jboss.test.server.profileservice.persistence.support.SimpleGenericMetaData;
-import org.jboss.test.server.profileservice.persistence.test.AbstractPersistenceFormatTest;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class RemoveGenericValueUnitTestCase extends AbstractPersistenceFormatTest
-{
-
- public RemoveGenericValueUnitTestCase(String name)
- {
- super(name);
- }
-
- public void test() throws Throwable
- {
- ManagedObject mo = createTestMO();
-
- CollectionValue c = (CollectionValue) mo.getProperty("list").getValue();
- assertNotNull(c);
- GenericValue g = (GenericValue) c.iterator().next();
- assertNotNull(g);
- ManagedCommon removeItem = (ManagedCommon) g.getValue();
-
- ManagedObjectRemoveHandler removeHandler = new ManagedObjectRemoveHandler(removeItem);
-
- PersistedManagedObject moElement = restore(mo, removeHandler);
- assertNotNull(moElement);
-
- // Restore
- ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
- ManagedObject restored = handler.update(createTestMetaData(), moElement);
-
- // Check meta data
- GenericSupportMetaData md = (GenericSupportMetaData) restored.getAttachment();
- assertNotNull(md);
- assertEquals(1, md.getList().size());
- SimpleGenericMetaData parent2 = md.getList().get(0);
- assertEquals("parent2", parent2.getString());
- assertNotNull(parent2.getChild());
- assertEquals("child2", parent2.getChild().getString());
-
- }
-
- private ManagedObject createTestMO()
- {
- return getMOF().initManagedObject(createTestMetaData(), null);
- }
-
- private GenericSupportMetaData createTestMetaData()
- {
- GenericSupportMetaData metaData = new GenericSupportMetaData();
-
- List<SimpleGenericMetaData> list = new ArrayList<SimpleGenericMetaData>();
-
- SimpleGenericMetaData child1 = createSImple("child1", 11, null);
- SimpleGenericMetaData child2 = createSImple("child2", 21, null);
-
- list.add(createSImple("parent1", 1, child1));
- list.add(createSImple("parent2", 2, child2));
-
- metaData.setList(list);
-
- return metaData;
- }
-
- private SimpleGenericMetaData createSImple(String string, int integer, SimpleGenericMetaData child)
- {
- return new SimpleGenericMetaData(string, integer, child);
- }
-
-}
-
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/AbstractPersistenceFormatTest.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -27,6 +27,9 @@
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
+import junit.framework.TestCase;
+
+import org.jboss.logging.Logger;
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.metatype.api.types.MetaTypeFactory;
@@ -35,13 +38,12 @@
import org.jboss.system.server.profileservice.persistence.ManagedObjectPersistencePlugin;
import org.jboss.system.server.profileservice.persistence.ManagedObjectRecreationHelper;
import org.jboss.system.server.profileservice.persistence.xml.PersistedManagedObject;
-import org.jboss.test.BaseTestCase;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public abstract class AbstractPersistenceFormatTest extends BaseTestCase
+public abstract class AbstractPersistenceFormatTest extends TestCase
{
/** The managed object factory */
@@ -59,6 +61,9 @@
/** The persistence plugin. */
private DelegatingPersistencePlugin plugin = new DelegatingPersistencePlugin(helper);
+ /** The logger. */
+ protected Logger log = Logger.getLogger(getClass());
+
static
{
helper = new ManagedObjectRecreationHelper(managedObjectFactory);
@@ -130,5 +135,9 @@
return getPersistencePlugin().updateManagedObject(persisted, mo);
}
+ public Logger getLog()
+ {
+ return log;
+ }
}
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/MapCompositeUnitTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/MapCompositeUnitTestCase.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/MapCompositeUnitTestCase.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -53,7 +53,6 @@
assertNotNull(value.get("test1"));
getLog().debug("keys: " + value.getMetaType().itemSet());
- enableTrace("org.jboss.system");
PersistedManagedObject moElement = restore(mo);
assertNotNull(moElement);
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -96,8 +96,6 @@
assertNotNull(collection);
PersistedManagedObject o = ((PersistedGenericValue) collection.getValues().get(0)).getManagedObject();
assertNotNull(o);
-
- enableTrace("org.jboss.system.server.profileservice.persistence");
// Recreate
mo = update(createNestedTestMetaData(), restored);
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockServer.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockServer.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockServer.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -23,11 +23,20 @@
import java.util.Collections;
import java.util.Date;
+import java.util.EnumSet;
import java.util.Map;
import java.util.Properties;
-import org.jboss.bootstrap.spi.Server;
-import org.jboss.bootstrap.spi.ServerConfig;
+import org.jboss.bootstrap.spi.Bootstrap;
+import org.jboss.bootstrap.spi.config.ConfigurationInitializer;
+import org.jboss.bootstrap.spi.config.ConfigurationValidator;
+import org.jboss.bootstrap.spi.config.InvalidConfigurationException;
+import org.jboss.bootstrap.spi.config.ServerConfig;
+import org.jboss.bootstrap.spi.lifecycle.LifecycleEventException;
+import org.jboss.bootstrap.spi.lifecycle.LifecycleEventHandler;
+import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
+import org.jboss.bootstrap.spi.server.Server;
+import org.jboss.bootstrap.spi.server.ServerInitializer;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -139,5 +148,111 @@
}
+ public void addBootstrap(Bootstrap bootstrap) throws IllegalArgumentException
+ {
+ // FIXME addBootstrap
+
+ }
+
+ public ConfigurationInitializer getConfigInitializer()
+ {
+ // FIXME getConfigInitializer
+ return null;
+ }
+
+ public ServerConfig getConfiguration()
+ {
+ // FIXME getConfiguration
+ return null;
+ }
+
+ public ServerInitializer getServerInitializer()
+ {
+ // FIXME getServerInitializer
+ return null;
+ }
+
+ public LifecycleState getState()
+ {
+ // FIXME getState
+ return null;
+ }
+
+ public ConfigurationValidator getValidator()
+ {
+ // FIXME getValidator
+ return null;
+ }
+
+ public void initialize() throws IllegalStateException, InvalidConfigurationException, LifecycleEventException
+ {
+ // FIXME initialize
+
+ }
+
+ public void registerEventHandler(LifecycleState state, LifecycleEventHandler handler)
+ throws IllegalArgumentException
+ {
+ // FIXME registerEventHandler
+
+ }
+
+ public void registerEventHandler(LifecycleEventHandler handler, EnumSet states) throws IllegalArgumentException
+ {
+ // FIXME registerEventHandler
+
+ }
+
+ public void registerEventHandler(LifecycleEventHandler handler, LifecycleState... states)
+ throws IllegalArgumentException
+ {
+ // FIXME registerEventHandler
+
+ }
+
+ public void registerEventHandlers(LifecycleState state, LifecycleEventHandler... handlers)
+ throws IllegalArgumentException
+ {
+ // FIXME registerEventHandlers
+
+ }
+
+ public void removeBootstrap(Bootstrap bootstrap) throws IllegalArgumentException
+ {
+ // FIXME removeBootstrap
+
+ }
+
+ public void setConfigInitializer(ConfigurationInitializer configInitializer) throws IllegalStateException
+ {
+ // FIXME setConfigInitializer
+
+ }
+
+ public void setConfiguration(ServerConfig config)
+ {
+ // FIXME setConfiguration
+
+ }
+
+ public void setServerInitializer(ServerInitializer serverInitializer) throws IllegalStateException
+ {
+ // FIXME setServerInitializer
+
+ }
+
+ public void setValidator(ConfigurationValidator validator) throws IllegalStateException
+ {
+ // FIXME setValidator
+
+ }
+
+ public boolean unregisterEventHandler(LifecycleEventHandler handler, LifecycleState state)
+ throws IllegalArgumentException
+ {
+ // FIXME unregisterEventHandler
+ return false;
+ }
+
}
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockServerConfig.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockServerConfig.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/support/MockServerConfig.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -23,8 +23,10 @@
import java.io.File;
import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
-import org.jboss.bootstrap.spi.ServerConfig;
+import org.jboss.bootstrap.spi.config.ServerConfig;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -228,5 +230,95 @@
}
+ public ServerConfig bootstrapHome(URL bootstrapHome) throws IllegalArgumentException, IllegalStateException
+ {
+ // FIXME bootstrapHome
+ return null;
+ }
+
+ public ServerConfig bootstrapHome(String bootstrapHome) throws IllegalArgumentException, IllegalStateException
+ {
+ // FIXME bootstrapHome
+ return null;
+ }
+
+ public ServerConfig bootstrapName(String name) throws IllegalArgumentException, IllegalStateException
+ {
+ // FIXME bootstrapName
+ return null;
+ }
+
+ public ServerConfig bootstrapUrl(URL bootstrapLocation) throws IllegalArgumentException, IllegalStateException
+ {
+ // FIXME bootstrapUrl
+ return null;
+ }
+
+ public ServerConfig bootstrapUrl(String bootstrapUrl) throws IllegalArgumentException, IllegalStateException
+ {
+ // FIXME bootstrapUrl
+ return null;
+ }
+
+ public void freeze() throws IllegalStateException
+ {
+ // FIXME freeze
+
+ }
+
+ public URL getBootstrapHome()
+ {
+ // FIXME getBootstrapHome
+ return null;
+ }
+
+ public String getBootstrapName()
+ {
+ // FIXME getBootstrapName
+ return null;
+ }
+
+ public URL getBootstrapUrl()
+ {
+ // FIXME getBootstrapUrl
+ return null;
+ }
+
+ public Map getProperties()
+ {
+ // FIXME getProperties
+ return null;
+ }
+
+ public String getProperty(String key) throws IllegalArgumentException
+ {
+ // FIXME getProperty
+ return null;
+ }
+
+ public boolean isFrozen()
+ {
+ // FIXME isFrozen
+ return false;
+ }
+
+ public ServerConfig properties(Map properties) throws IllegalArgumentException, IllegalStateException
+ {
+ // FIXME properties
+ return null;
+ }
+
+ public ServerConfig properties(Properties properties) throws IllegalArgumentException, IllegalStateException
+ {
+ // FIXME properties
+ return null;
+ }
+
+ public ServerConfig property(String key, String value) throws IllegalArgumentException, IllegalStateException
+ {
+ // FIXME property
+ return null;
+ }
+
}
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/test/AbstractProfileServiceTestBase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/test/AbstractProfileServiceTestBase.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/test/AbstractProfileServiceTestBase.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -25,12 +25,14 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.jboss.bootstrap.spi.Server;
-import org.jboss.bootstrap.spi.ServerConfig;
+import junit.framework.TestCase;
+
+import org.jboss.bootstrap.spi.config.ServerConfig;
+import org.jboss.bootstrap.spi.server.Server;
import org.jboss.deployers.client.spi.main.MainDeployer;
+import org.jboss.logging.Logger;
import org.jboss.system.server.profileservice.repository.AbstractProfileFactory;
import org.jboss.system.server.profileservice.repository.FilteredProfileFactory;
-import org.jboss.test.BaseTestCase;
import org.jboss.test.server.profileservice.support.MockMainDeployer;
import org.jboss.test.server.profileservice.support.MockServer;
import org.jboss.test.server.profileservice.support.MockServerConfig;
@@ -39,9 +41,11 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class AbstractProfileServiceTestBase extends BaseTestCase
+public class AbstractProfileServiceTestBase extends TestCase
{
+ protected final Logger log = Logger.getLogger(getClass());
+
public AbstractProfileServiceTestBase(String name)
{
super(name);
@@ -75,5 +79,9 @@
return new FilteredProfileFactory();
}
+ protected Logger getLog()
+ {
+ return log;
+ }
}
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/test/BootstrapProfileFactoryUnitTestCase.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -53,7 +53,6 @@
public void testParsing() throws Exception
{
- enableTrace("org.jboss.system.server.profileservice.repository");
// Set the server base url as system property for the repository generation.
File serverBaseDir = new File("src/resources/server-root/");
Modified: trunk/system/src/tests/org/jboss/test/server/profileservice/test/DeploymentRepositoryUnitTestCase.java
===================================================================
--- trunk/system/src/tests/org/jboss/test/server/profileservice/test/DeploymentRepositoryUnitTestCase.java 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/system/src/tests/org/jboss/test/server/profileservice/test/DeploymentRepositoryUnitTestCase.java 2009-08-10 20:20:51 UTC (rev 92211)
@@ -31,7 +31,6 @@
import org.jboss.system.server.profile.repository.metadata.ImmutableProfileSourceMetaData;
import org.jboss.system.server.profileservice.repository.BasicDeploymentRepository;
import org.jboss.system.server.profileservice.repository.DefaultDeploymentRepositoryFactory;
-import org.jboss.test.BaseTestCase;
/**
* Test the basic deployment repository.
@@ -39,7 +38,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class DeploymentRepositoryUnitTestCase extends BaseTestCase
+public class DeploymentRepositoryUnitTestCase extends AbstractProfileServiceTestBase
{
/** The default key. */
Modified: trunk/thirdparty/.classpath
===================================================================
--- trunk/thirdparty/.classpath 2009-08-10 20:11:46 UTC (rev 92210)
+++ trunk/thirdparty/.classpath 2009-08-10 20:20:51 UTC (rev 92211)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
More information about the jboss-cvs-commits
mailing list