Seam SVN: r10897 - in modules/trunk/bridge-api/src: main/java/org/jboss/seam/bridge and 17 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-12 03:00:44 -0400 (Tue, 12 May 2009)
New Revision: 10897
Added:
modules/trunk/bridge-api/src/test/
modules/trunk/bridge-api/src/test/java/
modules/trunk/bridge-api/src/test/java/org/
modules/trunk/bridge-api/src/test/java/org/jboss/
modules/trunk/bridge-api/src/test/java/org/jboss/seam/
modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/
modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeOverrideTest.java
modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeServiceLoaderTest.java
modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeTest.java
modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/
modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderResolverStub.java
modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderStub.java
modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/ManagerProviderResolverStub.java
modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/ManagerProviderStub.java
modules/trunk/bridge-api/src/test/resources/
modules/trunk/bridge-api/src/test/resources/META-INF/
modules/trunk/bridge-api/src/test/resources/META-INF/services/
modules/trunk/bridge-api/src/test/resources/META-INF/services/org.jboss.seam.bridge.spi.ManagerProvider
modules/trunk/bridge-api/src/test/resources/log4j.xml
modules/trunk/bridge-api/src/test/resources/org/
modules/trunk/bridge-api/src/test/resources/org/jboss/
modules/trunk/bridge-api/src/test/resources/org/jboss/testharness/
modules/trunk/bridge-api/src/test/resources/org/jboss/testharness/impl/
modules/trunk/bridge-api/src/test/resources/org/jboss/testharness/impl/packaging/
modules/trunk/bridge-api/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/
modules/trunk/bridge-api/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/default/
modules/trunk/bridge-api/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/default/beans.xml
modules/trunk/bridge-api/src/test/resources/test-suite.xml
Modified:
modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ManagerBridge.java
modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ServiceLoaderManagerProviderResolver.java
Log:
add tests for ManagerBridge and friends
Modified: modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ManagerBridge.java
===================================================================
--- modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ManagerBridge.java 2009-05-12 07:00:27 UTC (rev 10896)
+++ modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ManagerBridge.java 2009-05-12 07:00:44 UTC (rev 10897)
@@ -5,17 +5,21 @@
import javax.inject.manager.Manager;
import org.jboss.seam.bridge.spi.ManagerProvider;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
/**
- * A bridge to the JCDI Manager implementation. This bean observers the event
+ * A bridge to the JCDI Manager implementation. This bean observes the event
* that is fired when the Manager is deployed and attempts to match a provider
* that produces that same Manager. That provider is then used to access the
- * deployed Manager by a non-managed resource (such as a JSF phase listener)
+ * deployed Manager by a non-managed resource (such as a JSF phase listener).
*
* @author Dan Allen
*/
public class ManagerBridge
{
+ private LogProvider log = Logging.getLogProvider(ManagerBridge.class);
+
private static ManagerProvider provider;
private static boolean discover = true;
@@ -23,6 +27,8 @@
// QUESTION: should this be a String, Class, or instance?
private Class<? extends ManagerProviderResolver> resolverClass = ServiceLoaderManagerProviderResolver.class;
+ private static Class<? extends Manager> managerImplClass;
+
public Class<? extends ManagerProviderResolver> getResolverClass()
{
return resolverClass;
@@ -35,22 +41,46 @@
public static ManagerProvider getProvider()
{
+ if (provider == null)
+ {
+ if (managerImplClass == null)
+ {
+ throw new IllegalStateException("The ManagerBridge was not properly initialized.");
+ }
+ else
+ {
+ throw new UnsupportedOperationException("Cannot resolve a ManagerProvider for the deployed Manager implementation " + managerImplClass.getName() + ". " +
+ "Please specify the correct ManagerProvider implementation in the META-INF/services/" + ManagerProvider.class.getName() + " file.");
+ }
+ }
return provider;
}
+ /**
+ * Manually configure the provider. When this value is
+ * set, discovery of a provider is disabled, which is
+ * useful in a mock environment. Calling this method
+ * also resets the manager implementation class that
+ * was detected during initialization in anticipation
+ * of a reinitialization.
+ */
public static void setProvider(ManagerProvider override)
{
provider = override;
+ discover = false;
+ managerImplClass = null;
}
/**
- * Configure whether discovery of the provider when the manager
- * is deployed. The default is to use discovery. This can
- * be disabled in a mock environment.
+ * Reenable discovery if it was disabled by setting a
+ * provider manually. This also resets the provider
+ * and the manager implementation class that was detected.
*/
- public static void setDiscover(boolean flag)
+ public static void enableDiscovery()
{
- discover = flag;
+ discover = true;
+ provider = null;
+ managerImplClass = null;
}
/**
@@ -66,7 +96,7 @@
{
return;
}
-
+
ManagerProviderResolver resolver;
try
{
@@ -74,22 +104,27 @@
}
catch (InstantiationException e)
{
- throw new IllegalStateException("Could not instantiate ManagerProviderResolver class " + resolverClass, e);
+ throw new IllegalStateException("Could not instantiate ManagerProviderResolver class " + resolverClass.getName(), e);
}
catch (IllegalAccessException e)
{
- throw new IllegalStateException("Access was denied while attempting to instantiate ManagerProviderResolver class " + resolverClass, e);
+ throw new IllegalStateException("Access was denied while attempting to instantiate ManagerProviderResolver class " + resolverClass.getName(), e);
}
+ managerImplClass = manager.getClass();
for (ManagerProvider candidate : resolver.getManagerProviders())
{
if (manager.equals(candidate.getRootManager()))
{
provider = candidate;
+ if (log.isDebugEnabled())
+ {
+ log.debug("Using ManagerProvider implementation " + provider.getClass().getName());
+ }
return;
}
}
- throw new IllegalStateException("Cannot resolve a ManagerProvider corresponding to the deployed Manager implementation " + manager.getClass());
+ //throw new IllegalStateException("Cannot resolve a ManagerProvider corresponding to the deployed Manager implementation " + manager.getClass());
}
}
Modified: modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ServiceLoaderManagerProviderResolver.java
===================================================================
--- modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ServiceLoaderManagerProviderResolver.java 2009-05-12 07:00:27 UTC (rev 10896)
+++ modules/trunk/bridge-api/src/main/java/org/jboss/seam/bridge/ServiceLoaderManagerProviderResolver.java 2009-05-12 07:00:44 UTC (rev 10897)
@@ -6,6 +6,8 @@
import java.util.ServiceLoader;
import org.jboss.seam.bridge.spi.ManagerProvider;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
/**
* An implementation of the ManagerProviderResolver interface that utilizes the
@@ -15,6 +17,8 @@
*/
public class ServiceLoaderManagerProviderResolver implements ManagerProviderResolver
{
+ LogProvider log = Logging.getLogProvider(ServiceLoaderManagerProviderResolver.class);
+
public List<ManagerProvider> getManagerProviders()
{
List<ManagerProvider> providers = new ArrayList<ManagerProvider>();
@@ -25,6 +29,11 @@
providers.add(iterator.next());
}
+ if (log.isDebugEnabled())
+ {
+ log.debug("Located " + providers.size() + " ManagerProvider instance(s): " + providers);
+ }
+
return providers;
}
}
Added: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeOverrideTest.java
===================================================================
--- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeOverrideTest.java (rev 0)
+++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeOverrideTest.java 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,53 @@
+package org.jboss.seam.bridge;
+
+import static org.testng.Assert.assertSame;
+
+import javax.el.ELResolver;
+import javax.inject.manager.Manager;
+
+import org.jboss.seam.bridge.spi.ManagerProvider;
+import org.testng.annotations.Test;
+
+/**
+ * A set of basic tests to verify that the ManagerBridge can be used
+ * outside of a managed environment and that scanning does not take
+ * place in this case.
+ *
+ * @author Dan Allen
+ */
+public class ManagerBridgeOverrideTest
+{
+ @Test
+ public void testProviderOverride()
+ {
+ ManagerProvider provider = new MockManagerProvider();
+
+ ManagerBridge.setProvider(provider);
+
+ ManagerBridge bridge = new ManagerBridge();
+ // no scanning should occur; ensure by forcing NullPointerException if it does
+ bridge.setResolverClass(null);
+ bridge.onManagerDeployed(null);
+
+ assertSame(ManagerBridge.getProvider(), provider);
+ }
+
+ class MockManagerProvider implements ManagerProvider
+ {
+ public Manager getRootManager()
+ {
+ return null;
+ }
+
+ public Manager getCurrentManager()
+ {
+ return null;
+ }
+
+ public ELResolver getELResolver()
+ {
+ return null;
+ }
+
+ }
+}
Added: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeServiceLoaderTest.java
===================================================================
--- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeServiceLoaderTest.java (rev 0)
+++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeServiceLoaderTest.java 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,54 @@
+package org.jboss.seam.bridge;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertSame;
+import static org.testng.Assert.assertTrue;
+
+import javax.context.RequestScoped;
+import javax.inject.manager.Manager;
+
+import org.jboss.seam.bridge.stubs.ManagerProviderStub;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ * This test method bootstraps the Manager with the ManagerBridge registered to
+ * verify that the ServiceLoader properly detects the correct ManagerProvider
+ * from META-INF/services/org.jboss.seam.bridge.spi.ManagerProvider. There
+ * should only be one method in this test class.
+ *
+ * @author Dan Allen
+ */
+public
+@Artifact
+class ManagerBridgeServiceLoaderTest extends AbstractWebBeansTest
+{
+ @Override
+ @BeforeClass
+ public void beforeClass() throws Throwable
+ {
+ // reset the statics from previous tests
+ ManagerBridge.enableDiscovery();
+ super.beforeClass();
+ }
+
+ /**
+ * Check that when Web Beans booted, the ManagerBridge was instantiated
+ * and that the ServiceLoader detected and instantiated the ManagerProvider
+ * instance.
+ */
+ @Test
+ public void testLoadValidManagerProvider()
+ {
+ assertNotNull(ManagerBridge.getProvider());
+ assertTrue(ManagerBridge.getProvider() instanceof ManagerProviderStub);
+ assertSame(ManagerBridge.getProvider().getRootManager(), getCurrentManager());
+ assertSame(ManagerBridge.getProvider().getCurrentManager(), getCurrentManager());
+ Manager currentManager = getCurrentManager().setCurrent(RequestScoped.class);
+ assertSame(ManagerBridge.getProvider().getCurrentManager(), currentManager);
+ }
+
+}
Added: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeTest.java
===================================================================
--- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeTest.java (rev 0)
+++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/ManagerBridgeTest.java 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,79 @@
+package org.jboss.seam.bridge;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertSame;
+import static org.testng.Assert.assertTrue;
+
+import javax.context.RequestScoped;
+import javax.inject.manager.Manager;
+
+import org.jboss.seam.bridge.stubs.ManagerProviderStub;
+import org.jboss.seam.bridge.stubs.ManagerProviderResolverStub;
+import org.jboss.seam.bridge.stubs.IncorrectManagerProviderResolverStub;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * This set of tests bootstraps the Manager without the
+ * ManagerBridge present. Then the Manager deployed
+ * observer method on ManagerBridge is called manually
+ * with different provider implementations to verify
+ * it behaves appropriately.
+ *
+ * @author Dan Allen
+ */
+public
+@Artifact(addCurrentPackage = false)
+class ManagerBridgeTest extends AbstractWebBeansTest
+{
+ @Override
+ @BeforeMethod
+ public void before() throws Exception
+ {
+ super.before();
+ ManagerBridge.enableDiscovery();
+ }
+
+ /**
+ * Verify that the provider produced by a proper resolver produces
+ * the same Manager as the one that is deployed.
+ */
+ @Test
+ public void testResolveValidManagerProvider()
+ {
+ ManagerBridge bridge = new ManagerBridge();
+ bridge.setResolverClass(ManagerProviderResolverStub.class);
+ bridge.onManagerDeployed(getCurrentManager());
+ assertTrue(ManagerBridge.getProvider() instanceof ManagerProviderStub);
+ assertSame(ManagerBridge.getProvider().getRootManager(), getCurrentManager());
+ assertSame(ManagerBridge.getProvider().getCurrentManager(), getCurrentManager());
+ Manager currentManager = getCurrentManager().setCurrent(RequestScoped.class);
+ assertSame(ManagerBridge.getProvider().getCurrentManager(), currentManager);
+ }
+
+ /**
+ * Attempt to get the provider when the one discovered didn't match
+ * the Manager that is deployed.
+ */
+ @Test(expectedExceptions = UnsupportedOperationException.class)
+ public void testResolveInvalidManagerProvider()
+ {
+ ManagerBridge bridge = new ManagerBridge();
+ bridge.setResolverClass(IncorrectManagerProviderResolverStub.class);
+ bridge.onManagerDeployed(getCurrentManager());
+ ManagerBridge.getProvider();
+ }
+
+ /**
+ * Attempt to get the provider when hasn't been set or discovered.
+ */
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testUninitializedManagerBridge()
+ {
+ ManagerBridge.getProvider();
+ }
+
+}
Added: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderResolverStub.java
===================================================================
--- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderResolverStub.java (rev 0)
+++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderResolverStub.java 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,19 @@
+/**
+ *
+ */
+package org.jboss.seam.bridge.stubs;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.seam.bridge.ManagerProviderResolver;
+import org.jboss.seam.bridge.spi.ManagerProvider;
+
+public class IncorrectManagerProviderResolverStub implements ManagerProviderResolver
+{
+ public List<ManagerProvider> getManagerProviders()
+ {
+ return new ArrayList<ManagerProvider>(Arrays.asList(new IncorrectManagerProviderStub()));
+ }
+}
\ No newline at end of file
Added: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderStub.java
===================================================================
--- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderStub.java (rev 0)
+++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/IncorrectManagerProviderStub.java 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,23 @@
+/**
+ *
+ */
+package org.jboss.seam.bridge.stubs;
+
+import javax.inject.manager.Manager;
+
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.ManagerImpl;
+
+public class IncorrectManagerProviderStub extends ManagerProviderStub
+{
+ public Manager getRootManager()
+ {
+ return ManagerImpl.newChildManager(CurrentManager.rootManager());
+ }
+
+ public Manager getCurrentManager()
+ {
+ return ManagerImpl.newChildManager(CurrentManager.rootManager());
+ }
+
+}
\ No newline at end of file
Added: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/ManagerProviderResolverStub.java
===================================================================
--- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/ManagerProviderResolverStub.java (rev 0)
+++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/ManagerProviderResolverStub.java 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,17 @@
+package org.jboss.seam.bridge.stubs;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+import org.jboss.seam.bridge.ManagerProviderResolver;
+import org.jboss.seam.bridge.spi.ManagerProvider;
+
+public class ManagerProviderResolverStub implements ManagerProviderResolver
+{
+ public List<ManagerProvider> getManagerProviders()
+ {
+ return new ArrayList<ManagerProvider>(Arrays.asList(new ManagerProviderStub()));
+ }
+}
\ No newline at end of file
Added: modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/ManagerProviderStub.java
===================================================================
--- modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/ManagerProviderStub.java (rev 0)
+++ modules/trunk/bridge-api/src/test/java/org/jboss/seam/bridge/stubs/ManagerProviderStub.java 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,29 @@
+/**
+ *
+ */
+package org.jboss.seam.bridge.stubs;
+
+import javax.el.ELResolver;
+import javax.inject.manager.Manager;
+
+import org.jboss.seam.bridge.spi.ManagerProvider;
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.el.WebBeansELResolver;
+
+public class ManagerProviderStub implements ManagerProvider
+{
+ public Manager getRootManager()
+ {
+ return CurrentManager.rootManager();
+ }
+
+ public Manager getCurrentManager()
+ {
+ return CurrentManager.rootManager().getCurrent();
+ }
+
+ public ELResolver getELResolver()
+ {
+ return new WebBeansELResolver();
+ }
+}
\ No newline at end of file
Added: modules/trunk/bridge-api/src/test/resources/META-INF/services/org.jboss.seam.bridge.spi.ManagerProvider
===================================================================
--- modules/trunk/bridge-api/src/test/resources/META-INF/services/org.jboss.seam.bridge.spi.ManagerProvider (rev 0)
+++ modules/trunk/bridge-api/src/test/resources/META-INF/services/org.jboss.seam.bridge.spi.ManagerProvider 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,2 @@
+org.jboss.seam.bridge.stubs.IncorrectManagerProviderStub
+org.jboss.seam.bridge.stubs.ManagerProviderStub
Added: modules/trunk/bridge-api/src/test/resources/log4j.xml
===================================================================
--- modules/trunk/bridge-api/src/test/resources/log4j.xml (rev 0)
+++ modules/trunk/bridge-api/src/test/resources/log4j.xml 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{2}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!--
+ <category name="org.jboss.seam.bridge">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <root>
+ <priority value="INFO"/>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+
+</log4j:configuration>
Added: modules/trunk/bridge-api/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/default/beans.xml
===================================================================
Added: modules/trunk/bridge-api/src/test/resources/test-suite.xml
===================================================================
--- modules/trunk/bridge-api/src/test/resources/test-suite.xml (rev 0)
+++ modules/trunk/bridge-api/src/test/resources/test-suite.xml 2009-05-12 07:00:44 UTC (rev 10897)
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Seam Bridge Module Test Suite" verbose="1">
+ <test name="Seam Bridge Module - Unit Tests">
+ <packages>
+ <package name="org.jboss.seam.bridge"/>
+ </packages>
+ </test>
+</suite>
14 years, 12 months
Seam SVN: r10896 - modules/trunk/bridge-api.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-12 03:00:27 -0400 (Tue, 12 May 2009)
New Revision: 10896
Modified:
modules/trunk/bridge-api/
Log:
ignore testng junk
Property changes on: modules/trunk/bridge-api
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
temp-testng-customsuite.xml
test-output
14 years, 12 months
Seam SVN: r10895 - modules/trunk/bridge-api.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-12 03:00:05 -0400 (Tue, 12 May 2009)
New Revision: 10895
Modified:
modules/trunk/bridge-api/pom.xml
Log:
reorg
add test dependencies
Modified: modules/trunk/bridge-api/pom.xml
===================================================================
--- modules/trunk/bridge-api/pom.xml 2009-05-12 02:54:22 UTC (rev 10894)
+++ modules/trunk/bridge-api/pom.xml 2009-05-12 07:00:05 UTC (rev 10895)
@@ -16,10 +16,31 @@
<name>Seam Bridge API</name>
<description>An API wrapper around an SPI which Seam uses to lookup providers, such as the JCDI Manager.</description>
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${webbeans.groupId}</groupId>
+ <artifactId>jsr299-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${webbeans.groupId}</groupId>
+ <artifactId>webbeans-logging</artifactId>
+ <scope>provided</scope> <!-- Assumes use of Web Beans RI -->
+ </dependency>
+
+ </dependencies>
+
<build>
<plugins>
- <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -29,25 +50,8 @@
</suiteXmlFiles>
</configuration>
</plugin>
- -->
</plugins>
</build>
- <dependencies>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${webbeans.groupId}</groupId>
- <artifactId>jsr299-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
</project>
14 years, 12 months
Seam SVN: r10894 - modules/trunk/web.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-11 22:54:22 -0400 (Mon, 11 May 2009)
New Revision: 10894
Modified:
modules/trunk/web/
Log:
ignore NetBeans configuration file
Property changes on: modules/trunk/web
___________________________________________________________________
Name: svn:ignore
- target
+ .classpath
.project
.settings
target
14 years, 12 months
Seam SVN: r10893 - in modules/trunk: faces and 2 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-11 22:53:57 -0400 (Mon, 11 May 2009)
New Revision: 10893
Modified:
modules/trunk/el/
modules/trunk/faces/
modules/trunk/international/
modules/trunk/mock/
Log:
ignore NetBeans configuration file
Property changes on: modules/trunk/el
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
nb-configuration.xml
target
Property changes on: modules/trunk/faces
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
temp-testng-customsuite.xml
test-output
+ .classpath
.project
.settings
nb-configuration.xml
target
temp-testng-customsuite.xml
test-output
Property changes on: modules/trunk/international
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
temp-testng-customsuite.xml
test-output
+ .classpath
.project
.settings
nb-configuration.xml
target
temp-testng-customsuite.xml
test-output
Property changes on: modules/trunk/mock
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
nb-configuration.xml
target
14 years, 12 months
Seam SVN: r10892 - in modules/trunk: mock and 4 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-11 22:52:21 -0400 (Mon, 11 May 2009)
New Revision: 10892
Modified:
modules/trunk/bridge-api/
modules/trunk/mock/
modules/trunk/openwebbeans-bridge/
modules/trunk/parent/
modules/trunk/version-matrix/
modules/trunk/webbeans-bridge/
Log:
ignore Eclipse project files
Property changes on: modules/trunk/bridge-api
___________________________________________________________________
Name: svn:ignore
- target
+ .classpath
.project
.settings
target
Property changes on: modules/trunk/mock
___________________________________________________________________
Name: svn:ignore
- target
+ .classpath
.project
.settings
target
Property changes on: modules/trunk/openwebbeans-bridge
___________________________________________________________________
Name: svn:ignore
- target
+ .classpath
.project
.settings
target
Property changes on: modules/trunk/parent
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Property changes on: modules/trunk/version-matrix
___________________________________________________________________
Name: svn:ignore
+ .classpath
.project
.settings
target
Property changes on: modules/trunk/webbeans-bridge
___________________________________________________________________
Name: svn:ignore
- target
+ .classpath
.project
.settings
target
14 years, 12 months
Seam SVN: r10891 - modules/trunk/web.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-11 22:50:24 -0400 (Mon, 11 May 2009)
New Revision: 10891
Modified:
modules/trunk/web/pom.xml
Log:
reorg
add description
Modified: modules/trunk/web/pom.xml
===================================================================
--- modules/trunk/web/pom.xml 2009-05-12 02:50:00 UTC (rev 10890)
+++ modules/trunk/web/pom.xml 2009-05-12 02:50:24 UTC (rev 10891)
@@ -13,25 +13,11 @@
<packaging>jar</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Seam Web Module</name>
+ <description>
+ This module provides life cycle management and API abstractions for web
+ requests in a Seam environment.
+ </description>
- <build>
- <plugins>
-
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources/test-suite.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- -->
-
- </plugins>
- </build>
-
<dependencies>
<dependency>
@@ -60,4 +46,22 @@
</dependencies>
+ <build>
+ <plugins>
+
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/unit-test-suite.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
+ -->
+
+ </plugins>
+ </build>
+
</project>
14 years, 12 months
Seam SVN: r10890 - modules/trunk/webbeans-bridge.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-11 22:50:00 -0400 (Mon, 11 May 2009)
New Revision: 10890
Modified:
modules/trunk/webbeans-bridge/pom.xml
Log:
reorder
Modified: modules/trunk/webbeans-bridge/pom.xml
===================================================================
--- modules/trunk/webbeans-bridge/pom.xml 2009-05-12 02:46:46 UTC (rev 10889)
+++ modules/trunk/webbeans-bridge/pom.xml 2009-05-12 02:50:00 UTC (rev 10890)
@@ -34,6 +34,11 @@
</build>
<dependencies>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
<dependency>
<groupId>${seam.groupId}</groupId>
@@ -51,11 +56,6 @@
<artifactId>webbeans-core</artifactId>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </dependency>
</dependencies>
14 years, 12 months
Seam SVN: r10889 - modules/trunk.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-11 22:46:46 -0400 (Mon, 11 May 2009)
New Revision: 10889
Modified:
modules/trunk/pom-module-template.xml
Log:
reorg
Modified: modules/trunk/pom-module-template.xml
===================================================================
--- modules/trunk/pom-module-template.xml 2009-05-12 02:46:28 UTC (rev 10888)
+++ modules/trunk/pom-module-template.xml 2009-05-12 02:46:46 UTC (rev 10889)
@@ -13,23 +13,8 @@
<packaging>jar</packaging>
<version>3.0.0-SNAPSHOT</version>
<name>Seam %MODULE_NAME% Module</name>
+ <description>%MODULE_DESCRIPTION%</description>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources/test-suite.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
<dependencies>
<dependency>
@@ -47,4 +32,20 @@
</dependencies>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/unit-test-suite.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
</project>
14 years, 12 months
Seam SVN: r10888 - modules/trunk/parent.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-11 22:46:28 -0400 (Mon, 11 May 2009)
New Revision: 10888
Modified:
modules/trunk/parent/pom.xml
Log:
reorg
add maven eclipse configuration
Modified: modules/trunk/parent/pom.xml
===================================================================
--- modules/trunk/parent/pom.xml 2009-05-12 02:42:04 UTC (rev 10887)
+++ modules/trunk/parent/pom.xml 2009-05-12 02:46:28 UTC (rev 10888)
@@ -102,39 +102,40 @@
<module>../view</module>
</modules>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>${webbeans.groupId}</groupId>
+ <artifactId>webbeans-core-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/webbeans/ri/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
<defaultGoal>package</defaultGoal>
-
<pluginManagement>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -143,8 +144,19 @@
<target>1.5</target>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</classpathContainer>
+ </classpathContainers>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
@@ -159,6 +171,7 @@
</archive>
</configuration>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>emma-maven-plugin</artifactId>
@@ -168,38 +181,59 @@
<outputDirectory>${project.build.directory}/generated-classes</outputDirectory>
</configuration>
</plugin>
+
</plugins>
</pluginManagement>
- </build>
+ <plugins>
- <dependencies>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <scope>test</scope>
- </dependency>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <scope>test</scope>
- </dependency>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-8</version>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/webbeans/ri/tags</tagBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency>
+ </plugins>
+ </build>
- <dependency>
- <groupId>${webbeans.groupId}</groupId>
- <artifactId>webbeans-core-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <configuration>
+ <formats>
+ <format>html</format>
+ <format>xml</format>
+ </formats>
+ <instrumentation>
+ </instrumentation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
<profiles>
@@ -278,22 +312,5 @@
<url>dav:https://snapshots.jboss.org/maven2</url>
</snapshotRepository>
</distributionManagement>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- <instrumentation>
- </instrumentation>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
</project>
14 years, 12 months