Seam SVN: r14327 - in branches/community/Seam_2_3: jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf and 3 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-02-20 06:11:59 -0500 (Mon, 20 Feb 2012)
New Revision: 14327
Modified:
branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/Contexts.java
branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java
branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConversationTest.java
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityTest.java
Log:
JBSEAM-4898 applied patch from jira issue
Modified: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/Contexts.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/Contexts.java 2012-02-20 08:18:11 UTC (rev 14326)
+++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/Contexts.java 2012-02-20 11:11:59 UTC (rev 14327)
@@ -8,6 +8,9 @@
import java.util.Map;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+
import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.bpm.BusinessProcess;
@@ -91,6 +94,19 @@
public static boolean isPageContextActive()
{
+ if (pageContext.get() == null) {
+ try {
+ // lazy initialize the page context during restore view
+ // this is similar to the ViewScopedContext.isActive() in Seam 3
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ if (facesContext != null) {
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+ if (viewRoot != null) {
+ pageContext.set( new PageContext() );
+ }
+ }
+ } catch (NoClassDefFoundError e) {} // seam-remote does not have this dependency
+ }
return pageContext.get() != null;
}
Modified: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java 2012-02-20 08:18:11 UTC (rev 14326)
+++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java 2012-02-20 11:11:59 UTC (rev 14327)
@@ -378,6 +378,12 @@
protected void beforeRestoreView(FacesContext facesContext)
{
FacesLifecycle.beginRequest( facesContext.getExternalContext() );
+
+ // this is the same place that WELD restores the conversation
+ Map parameters = facesContext.getExternalContext().getRequestParameterMap();
+ ConversationPropagation.instance().restoreConversationId(parameters);
+ boolean conversationFound = Manager.instance().restoreConversation();
+ FacesLifecycle.resumeConversation( facesContext.getExternalContext() );
}
/**
@@ -387,9 +393,9 @@
{
FacesLifecycle.resumePage();
Map parameters = facesContext.getExternalContext().getRequestParameterMap();
- ConversationPropagation.instance().restoreConversationId(parameters);
+// ConversationPropagation.instance().restoreConversationId(parameters);
boolean conversationFound = Manager.instance().restoreConversation();
- FacesLifecycle.resumeConversation( facesContext.getExternalContext() );
+// FacesLifecycle.resumeConversation( facesContext.getExternalContext() );
postRestorePage(facesContext, parameters, conversationFound);
}
Modified: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java 2012-02-20 08:18:11 UTC (rev 14326)
+++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java 2012-02-20 11:11:59 UTC (rev 14327)
@@ -118,6 +118,11 @@
return Manager.instance().isLongRunningConversation();
}
+ protected String getConversationIdParameter()
+ {
+ return "conversationId";
+ }
+
/**
* Search in all contexts
*/
@@ -729,6 +734,11 @@
private void restoreViewPhase()
{
+ if (conversationId != null)
+ {
+ setParameter(getConversationIdParameter(), conversationId);
+ }
+
phases.beforePhase(new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE));
try
{
Modified: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java 2012-02-20 08:18:11 UTC (rev 14326)
+++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java 2012-02-20 11:11:59 UTC (rev 14327)
@@ -92,7 +92,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
@@ -163,7 +163,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
@@ -226,7 +226,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
@@ -283,7 +283,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
@@ -325,7 +325,7 @@
assert Contexts.isEventContextActive();
assert Contexts.isSessionContextActive();
assert Contexts.isApplicationContextActive();
- assert !Contexts.isConversationContextActive();
+ assert Contexts.isConversationContextActive();
phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) );
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConversationTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConversationTest.java 2012-02-20 08:18:11 UTC (rev 14326)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConversationTest.java 2012-02-20 11:11:59 UTC (rev 14327)
@@ -438,4 +438,9 @@
}.run();
}
+
+ protected String getConversationIdParameter()
+ {
+ return "cid";
+ }
}
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java 2012-02-20 08:18:11 UTC (rev 14326)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java 2012-02-20 11:11:59 UTC (rev 14327)
@@ -231,6 +231,11 @@
}
+ protected String getConversationIdParameter()
+ {
+ return "cid";
+ }
+
@Name("entitytest.nestedComponent")
@Scope(ScopeType.CONVERSATION)
@AutoCreate
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityTest.java 2012-02-20 08:18:11 UTC (rev 14326)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityTest.java 2012-02-20 11:11:59 UTC (rev 14327)
@@ -136,6 +136,11 @@
}
}
+ protected String getConversationIdParameter()
+ {
+ return "cid";
+ }
+
@Name("entityExceptionObserver")
public static class EntityExceptionObserver {
12 years, 9 months
Seam SVN: r14326 - branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-02-20 03:18:11 -0500 (Mon, 20 Feb 2012)
New Revision: 14326
Modified:
branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit/ContextTest.java
Log:
fixed tests after adding context.setAttribute(SERVLET_CONTEXT_KEY, context) in JBPAPP-8150
Modified: branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit/ContextTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit/ContextTest.java 2012-02-17 22:15:11 UTC (rev 14325)
+++ branches/enterprise/JBPAPP_5_0/src/test/unit/org/jboss/seam/test/unit/ContextTest.java 2012-02-20 08:18:11 UTC (rev 14326)
@@ -118,7 +118,7 @@
assert ((MockHttpSession) externalContext.getSession(false))
.getAttributes().size() == 4;
assert ((MockServletContext) externalContext.getContext())
- .getAttributes().size() == 11;
+ .getAttributes().size() == 12;
FacesLifecycle.beginRequest(externalContext);
@@ -151,7 +151,7 @@
assert Contexts.getSessionContext().get("foo") == foo;
assert Contexts.getConversationContext().getNames().length == 2;
- assert Contexts.getApplicationContext().getNames().length == 11;
+ assert Contexts.getApplicationContext().getNames().length == 12;
assert Contexts.getSessionContext().getNames().length == 2;
assert seamVariableResolver.getValue(elContext, null, "zzz").equals(
@@ -186,7 +186,7 @@
assert ((MockHttpSession) externalContext.getSession(false))
.getAttributes().size() == 3; // foo, zzz, org.jboss.seam.core.conversationEntries
assert ((MockServletContext) externalContext.getContext())
- .getAttributes().size() == 11;
+ .getAttributes().size() == 12;
ServletLifecycle.endSession(((HttpServletRequest) externalContext
.getRequest()).getSession());
12 years, 9 months
Seam SVN: r14325 - in branches/enterprise/JBPAPP_5_0: src/main/org/jboss/seam/core and 1 other directories.
by seam-commits@lists.jboss.org
Author: ivassile
Date: 2012-02-17 17:15:11 -0500 (Fri, 17 Feb 2012)
New Revision: 14325
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/ServletLifecycle.java
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/core/ResourceLoader.java
branches/enterprise/JBPAPP_5_0/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java
Log:
JBPAPP-8150
Integrate changes 12127 and 11185
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/ServletLifecycle.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2012-02-17 19:55:13 UTC (rev 14324)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2012-02-17 22:15:11 UTC (rev 14325)
@@ -160,7 +160,7 @@
WeakReference<ClassLoader> ref = new WeakReference<ClassLoader>(Thread.currentThread().getContextClassLoader());
context.setAttribute("seam.context.classLoader",ref);
log.debug("Cached the context classloader in servletContext as 'seam.context.classLoader'");
-
+ context.setAttribute(SERVLET_CONTEXT_KEY, context);
servletContext = context;
Lifecycle.beginApplication( new ServletApplicationMap(context) );
}
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/core/ResourceLoader.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/core/ResourceLoader.java 2012-02-17 19:55:13 UTC (rev 14324)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/core/ResourceLoader.java 2012-02-17 22:15:11 UTC (rev 14325)
@@ -52,12 +52,12 @@
public InputStream getResourceAsStream(String resource)
{
- return Resources.getResourceAsStream( resource, ServletLifecycle.getServletContext() );
+ return Resources.getResourceAsStream( resource, ServletLifecycle.getCurrentServletContext() );
}
public URL getResource(String resource)
{
- return Resources.getResource( resource, ServletLifecycle.getServletContext() );
+ return Resources.getResource( resource, ServletLifecycle.getCurrentServletContext() );
}
/**
Modified: branches/enterprise/JBPAPP_5_0/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java 2012-02-17 19:55:13 UTC (rev 14324)
+++ branches/enterprise/JBPAPP_5_0/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java 2012-02-17 22:15:11 UTC (rev 14325)
@@ -30,9 +30,9 @@
public void create()
{
// TODO A bit of a hack, we should store the servlet context properly
- if (ServletLifecycle.getServletContext() != null)
+ if (ServletLifecycle.getCurrentServletContext() != null)
{
- servletContext = ServletLifecycle.getServletContext();
+ servletContext = ServletLifecycle.getCurrentServletContext();
}
else
{
12 years, 9 months
Seam SVN: r14324 - in branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149: src/main/org/jboss/seam/core and 1 other directories.
by seam-commits@lists.jboss.org
Author: ivassile
Date: 2012-02-17 14:55:13 -0500 (Fri, 17 Feb 2012)
New Revision: 14324
Modified:
branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/src/main/org/jboss/seam/contexts/ServletLifecycle.java
branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/src/main/org/jboss/seam/core/ResourceLoader.java
branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java
Log:
One-off patch JBPAPP-8149
Integrate changes 12127 and 11185
Modified: branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/src/main/org/jboss/seam/contexts/ServletLifecycle.java
===================================================================
--- branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2012-02-17 19:52:18 UTC (rev 14323)
+++ branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/src/main/org/jboss/seam/contexts/ServletLifecycle.java 2012-02-17 19:55:13 UTC (rev 14324)
@@ -160,7 +160,7 @@
WeakReference<ClassLoader> ref = new WeakReference<ClassLoader>(Thread.currentThread().getContextClassLoader());
context.setAttribute("seam.context.classLoader",ref);
log.debug("Cached the context classloader in servletContext as 'seam.context.classLoader'");
-
+ context.setAttribute(SERVLET_CONTEXT_KEY, context);
servletContext = context;
Lifecycle.beginApplication( new ServletApplicationMap(context) );
}
Modified: branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/src/main/org/jboss/seam/core/ResourceLoader.java
===================================================================
--- branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/src/main/org/jboss/seam/core/ResourceLoader.java 2012-02-17 19:52:18 UTC (rev 14323)
+++ branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/src/main/org/jboss/seam/core/ResourceLoader.java 2012-02-17 19:55:13 UTC (rev 14324)
@@ -52,12 +52,12 @@
public InputStream getResourceAsStream(String resource)
{
- return Resources.getResourceAsStream( resource, ServletLifecycle.getServletContext() );
+ return Resources.getResourceAsStream( resource, ServletLifecycle.getCurrentServletContext() );
}
public URL getResource(String resource)
{
- return Resources.getResource( resource, ServletLifecycle.getServletContext() );
+ return Resources.getResource( resource, ServletLifecycle.getCurrentServletContext() );
}
/**
Modified: branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java
===================================================================
--- branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java 2012-02-17 19:52:18 UTC (rev 14323)
+++ branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/ui/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java 2012-02-17 19:55:13 UTC (rev 14324)
@@ -30,9 +30,9 @@
public void create()
{
// TODO A bit of a hack, we should store the servlet context properly
- if (ServletLifecycle.getServletContext() != null)
+ if (ServletLifecycle.getCurrentServletContext() != null)
{
- servletContext = ServletLifecycle.getServletContext();
+ servletContext = ServletLifecycle.getCurrentServletContext();
}
else
{
12 years, 9 months
Seam SVN: r14323 - in branches/community/Seam_2_3: examples/blog/blog-tests and 28 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-02-17 14:52:18 -0500 (Fri, 17 Feb 2012)
New Revision: 14323
Removed:
branches/community/Seam_2_3/examples/icefaces/icefaces-tests/src/test/resources/WEB-INF/components-backup.xml
Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml
branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml
branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml
branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml
branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml
branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml
branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml
branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml
branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml
branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml
branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml
branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml
branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml
branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml
branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml
branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml
branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml
branches/community/Seam_2_3/examples/pom.xml
branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml
branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml
branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml
branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml
branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml
branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml
branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml
branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml
branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml
Log:
JBSEAM-4896 changed maven-dependency-plugin
Modified: branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -87,10 +87,6 @@
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
- <testResource>
- <directory>src/test/bootstrap</directory>
- <filtering>false</filtering>
- </testResource>
<testResource> <!-- this takes datasource blog-ds.xml -->
<directory>${basedir}/../blog-ear/src/main/resources</directory>
<filtering>true</filtering>
@@ -98,11 +94,11 @@
<testResource> <!-- this takes treecache.xml -->
<directory>${basedir}/../blog-ear/src/main/application</directory>
<filtering>true</filtering>
- </testResource>
- <testResource> <!-- this takes themes aka *.properties -->
- <directory>${basedir}/../blog-web/src/main/resources</directory>
- <filtering>true</filtering>
</testResource>
+ <testResource> <!-- this takes themes aka *.properties -->
+ <directory>${basedir}/../blog-web/src/main/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
</testResources>
<plugins>
<plugin>
@@ -113,6 +109,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../blog-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -130,6 +127,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -137,7 +135,6 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -149,12 +146,6 @@
<configuration>
<filesets>
<fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- <fileset>
<directory>${basedir}/blogindexes</directory>
</fileset>
</filesets>
Modified: branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -101,6 +101,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../contactlist-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -118,6 +119,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -125,26 +127,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/META-INF</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -105,6 +105,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../drools-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -122,6 +123,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -129,26 +131,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -113,6 +113,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../dvdstore-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -130,6 +131,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -137,7 +139,6 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -149,12 +150,6 @@
<configuration>
<filesets>
<fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- <fileset>
<directory>${basedir}/dvdindexes</directory>
</fileset>
</filesets>
Modified: branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -164,6 +164,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../excel-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -181,6 +182,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -188,26 +190,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -101,6 +101,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../guice-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -118,6 +119,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -125,26 +127,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/META-INF</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -99,6 +99,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../hibernate-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -134,6 +135,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -141,26 +143,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -88,10 +88,6 @@
<filtering>true</filtering>
</testResource>
<testResource>
- <directory>src/test/bootstrap</directory>
- <filtering>false</filtering>
- </testResource>
- <testResource>
<directory>${basedir}/../icefaces-ear/src/main/resources</directory>
<filtering>true</filtering>
</testResource>
@@ -105,6 +101,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../icefaces-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -122,6 +119,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -129,26 +127,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Deleted: branches/community/Seam_2_3/examples/icefaces/icefaces-tests/src/test/resources/WEB-INF/components-backup.xml
===================================================================
--- branches/community/Seam_2_3/examples/icefaces/icefaces-tests/src/test/resources/WEB-INF/components-backup.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/icefaces/icefaces-tests/src/test/resources/WEB-INF/components-backup.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -1,24 +0,0 @@
-<components xmlns="http://jboss.com/products/seam/components"
- xmlns:pdf="http://jboss.com/products/seam/pdf"
- xmlns:core="http://jboss.com/products/seam/core"
- xmlns:framework="http://jboss.com/products/seam/framework"
- xmlns:web="http://jboss.com/products/seam/web"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd
- http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd
- http://jboss.com/products/seam/pdf http://jboss.com/products/seam/pdf-2.3.xsd
- http://jboss.com/products/seam/web /Users/orb/proj/jboss/seam/trunk/src/main/org/jboss/seam/web-2.3.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd">
-
- <component name="org.jboss.seam.document.documentStore">
- <property name="useExtensions">true</property>
- <property name="errorPage">/pdfMissing.seam</property>
- </component>
-
- <pdf:key-store-config key-store="pdf.keystore"
- key-store-password="storepass"
- key-password="keypass"
- key-alias="pdfKey" />
-
- <core:init debug="true" jndi-pattern="#{ejbName}/local" />
-</components>
Modified: branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -108,16 +108,6 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>src/test/bootstrap</directory>
- <filtering>false</filtering>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -126,7 +116,8 @@
<skipTests>false</skipTests>
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
- <additionalClasspathElement>${basedir}/../itext-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/../nestedbooking-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -144,6 +135,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -151,26 +143,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -93,10 +93,6 @@
<filtering>true</filtering>
</testResource>
<testResource>
- <directory>src/test/bootstrap</directory>
- <filtering>false</filtering>
- </testResource>
- <testResource>
<directory>${basedir}/../jpa-web/src/main/resources</directory>
<filtering>true</filtering>
</testResource>
@@ -110,6 +106,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../jpa-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -145,6 +142,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -152,26 +150,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -107,17 +107,16 @@
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
- <testResource>
- <directory>src/test/bootstrap</directory>
- <filtering>false</filtering>
- </testResource>
<testResource> <!-- this takes datasource mail-ds.xml -->
<directory>${basedir}/../mail-ear/src/main/resources</directory>
<filtering>true</filtering>
</testResource>
<testResource> <!-- this takes themes aka *.properties -->
- <directory>${basedir}/../mail-web/src/main/resources</directory>
+ <directory>${basedir}/../mail-web/src/main/webapp</directory>
<filtering>true</filtering>
+ <excludes>
+ <exclude>WEB-INF/components.xml</exclude>
+ </excludes>
</testResource>
</testResources>
<plugins>
@@ -128,7 +127,8 @@
<skipTests>false</skipTests>
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
- <additionalClasspathElement>${basedir}/../mail-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/../nestedbooking-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -146,6 +146,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -153,26 +154,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -101,6 +101,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../messages-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -118,6 +119,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -125,26 +127,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -108,7 +108,8 @@
<skipTests>false</skipTests>
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
- <additionalClasspathElement>${basedir}/../booking-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/../nestedbooking-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -126,6 +127,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -133,26 +135,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -87,10 +87,6 @@
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
- <testResource>
- <directory>src/test/bootstrap</directory>
- <filtering>false</filtering>
- </testResource>
<testResource> <!-- this takes datasource dvdstore-ds.xml -->
<directory>${basedir}/../dvdstore-ear/src/main/resources</directory>
<filtering>true</filtering>
@@ -113,6 +109,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../dvdstore-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -130,6 +127,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -137,7 +135,6 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -149,12 +146,6 @@
<configuration>
<filesets>
<fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- <fileset>
<directory>${basedir}/dvdindexes</directory>
</fileset>
</filesets>
Modified: branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -109,6 +109,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../nestedbooking-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -126,6 +127,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -133,26 +135,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -120,6 +120,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../numberguess-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -137,6 +138,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -144,26 +146,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -52,7 +52,8 @@
<module>tasks</module>
<module>todo</module>
<module>ui</module>
- <module>wicket</module>
+<!-- wicket example can't be compiled with java6 due bug in compiler?, only with java 5/7
+ <module>wicket</module> -->
<!-- <module>wiki</module> -->
</modules>
Modified: branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -113,6 +113,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../quartz-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -130,6 +131,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -137,26 +139,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -101,6 +101,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../registration-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -118,6 +119,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -125,26 +127,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/META-INF</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -142,6 +142,7 @@
<skipTests>false</skipTests>
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
<additionalClasspathElement>${basedir}/../restbay-web/src/main/webapp</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
@@ -160,6 +161,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -167,26 +169,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -112,6 +112,7 @@
<skipTests>false</skipTests>
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
<additionalClasspathElement>${basedir}/../seambay-web/src/main/webapp</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
@@ -128,8 +129,9 @@
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
- </goals>
+ </goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -137,26 +139,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -125,6 +125,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../seamdiscs-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -142,6 +143,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -149,26 +151,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -109,6 +109,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../seampay-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -126,6 +127,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -133,26 +135,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -109,6 +109,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../seamspace-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -126,6 +127,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -133,26 +135,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -139,6 +139,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../tasks-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -156,6 +157,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -163,26 +165,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -139,6 +139,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../todo-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -156,6 +157,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -163,26 +165,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -109,6 +109,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../booking-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -126,33 +127,20 @@
<goal>unpack</goal>
</goals>
<configuration>
- <artifactItems>
+ <includes>bootstrap/**</includes>
+ <artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-embedded-bootstrap</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -164,18 +152,6 @@
</properties>
<build>
<plugins>
-<!-- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
- <param>${basedir}/../booking-ear/src/main/resources/jboss-seam-booking-ds.xml</param>
- <param>${basedir}/../booking-ear/target/seam-booking.ear</param>
- </fileNames>
- </configuration>
- </plugin> -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -129,6 +129,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../mail-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -146,6 +147,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -153,26 +155,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-02-17 19:52:18 UTC (rev 14323)
@@ -101,6 +101,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../messages-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -118,6 +119,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
@@ -125,26 +127,12 @@
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
12 years, 9 months
Seam SVN: r14322 - branches/community/Seam_2_3/jboss-seam-parent.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-02-17 14:51:10 -0500 (Fri, 17 Feb 2012)
New Revision: 14322
Modified:
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
Log:
tidy up jboss-seam-parent
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-02-17 19:51:00 UTC (rev 14321)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-02-17 19:51:10 UTC (rev 14322)
@@ -1605,27 +1605,10 @@
</distributionManagement>
<build>
-
<defaultGoal>package</defaultGoal>
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
-
-<!-- <plugin> -->
-<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
-<!-- <version>2.7</version> -->
-<!-- <configuration> -->
-<!-- <links> -->
-<!-- <link>http://java.sun.com/j2se/5.0/docs/api</link> -->
-<!-- </links> -->
-<!-- <keywords>true</keywords> -->
-<!-- <author>true</author> -->
-<!-- <stylesheetfile>jdstyle.css</stylesheetfile> -->
-<!-- <doctitle>JBoss Seam ${project.name} API ${project.version}</doctitle> Used by javadoc:javadoc goal -->
-<!-- <detectOfflineLinks>false</detectOfflineLinks> -->
-<!-- </configuration> -->
-<!-- </plugin> -->
-
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
@@ -1648,9 +1631,6 @@
<configuration>
<source>${java.compiler.version}</source>
<target>${java.compiler.version}</target>
- <!-- javac doesn't compile all package-info.java,
- therefore use eclipse compiler -->
-<!-- <compilerId>eclipse</compilerId> -->
</configuration>
<dependencies>
<!-- <dependency> -->
@@ -1659,7 +1639,6 @@
<!-- <version>1.8.2</version> -->
<!-- </dependency> -->
</dependencies>
-
</plugin>
<plugin>
@@ -1676,27 +1655,16 @@
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<configuration>
- <archive>
- <manifestEntries>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- </manifestEntries>
- <manifestSections>
- <manifestSection>
- <name>Build-Information</name>
- <manifestEntries>
- <Java-Version>${java.version}</Java-Version>
- <Java-Vendor>${java.vendor}</Java-Vendor>
- <Build-Time>${maven.build.timestamp}</Build-Time>
- </manifestEntries>
- </manifestSection>
- </manifestSections>
- </archive>
- </configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Seam-Version>${project.version}</Seam-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
</plugin>
<plugin>
@@ -1734,88 +1702,85 @@
<artifactId>maven-site-plugin</artifactId>
<version>2.2</version>
</plugin>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>enforce</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>seam-build-req</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <inherited>true</inherited>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.5.0</version>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>[3.0.0,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- Packaging -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- <manifestEntries>
- <Seam-Version>${project.version}</Seam-Version>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <!-- just for jboss-seam core as it is EJB type not jar -->
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- <manifestEntries>
- <Seam-Version>${project.version}</Seam-Version>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin></plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>seam-build-req</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <inherited>true</inherited>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.5.0</version>
+ </requireJavaVersion>
+ <requireMavenVersion>
+ <version>[3.0.0,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Packaging -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Seam-Version>${project.version}</Seam-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <!-- just for jboss-seam core as it is EJB type not jar -->
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Seam-Version>${project.version}</Seam-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
- <dependencies>
-
- </dependencies>
-
<modules>
<module>../jboss-seam-gen</module>
<module>../jboss-seam-excel</module>
@@ -1846,6 +1811,7 @@
<id>distribution</id>
<modules>
<module>../examples</module>
+ <module>../examples-ee6</module>
<module>../seam-reference-guide</module>
<module>../distribution</module>
</modules>
@@ -1933,7 +1899,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -1955,7 +1921,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
12 years, 9 months
Seam SVN: r14321 - in branches/community/Seam_2_3: examples/booking/booking-tests and 1 other directories.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-02-17 14:51:00 -0500 (Fri, 17 Feb 2012)
New Revision: 14321
Modified:
branches/community/Seam_2_3/examples-ee6/pom.xml
branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml
branches/community/Seam_2_3/examples/pom.xml
Log:
JBSEAM-4896 booking cleaned maven project settings to comply with M2e plugin
Modified: branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml 2012-02-17 18:58:59 UTC (rev 14320)
+++ branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml 2012-02-17 19:51:00 UTC (rev 14321)
@@ -109,6 +109,7 @@
<argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/../booking-web/src/main/webapp</additionalClasspathElement>
+ <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
</additionalClasspathElements>
<suiteXmlFiles>
<suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
@@ -126,33 +127,20 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <includes>bootstrap/**</includes>
<artifactItems>
<artifactItem>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-embedded-bootstrap</artifactId>
<version>${project.version}</version>
<type>jar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${basedir}/src/test</outputDirectory>
+ <overWrite>false</overWrite>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/test/META-INF/</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/test/bootstrap</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: branches/community/Seam_2_3/examples/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/pom.xml 2012-02-17 18:58:59 UTC (rev 14320)
+++ branches/community/Seam_2_3/examples/pom.xml 2012-02-17 19:51:00 UTC (rev 14321)
@@ -1,6 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-parent</artifactId>
@@ -8,10 +7,8 @@
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam</groupId>
<artifactId>examples</artifactId>
<packaging>pom</packaging>
-
<name>Seam 2 examples</name>
<description>Examples for Seam 2 Framework</description>
@@ -64,7 +61,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
<configuration>
<excludedGroups>${tests.excludedGroups}</excludedGroups>
</configuration>
@@ -74,6 +70,31 @@
<artifactId>jboss-maven-plugin</artifactId>
<version>1.4.1</version>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute><runOnIncremental>false</runOnIncremental></execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -340,7 +361,7 @@
<plugins>
<!-- skip unit tests when running functional tests -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
@@ -470,7 +491,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -546,7 +566,7 @@
<plugins>
<!-- skip unit tests when running functional tests -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
@@ -670,7 +690,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -757,7 +777,6 @@
<plugins>
<!-- skip unit tests when running functional tests -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
@@ -887,7 +906,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-02-17 18:58:59 UTC (rev 14320)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-02-17 19:51:00 UTC (rev 14321)
@@ -31,6 +31,31 @@
<excludedGroups>${tests.excludedGroups}</excludedGroups>
</configuration>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute><runOnIncremental>false</runOnIncremental></execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
12 years, 9 months
Seam SVN: r14320 - branches/enterprise.
by seam-commits@lists.jboss.org
Author: ivassile
Date: 2012-02-17 13:58:59 -0500 (Fri, 17 Feb 2012)
New Revision: 14320
Added:
branches/enterprise/JBPAPP_5_1_1_JBPAPP-8149/
Log:
Create one-off branch
12 years, 9 months