Seam SVN: r10138 - trunk.
by seam-commits＠lists.jboss.org
Author: cpopetz
Date: 2009-03-10 09:27:54 -0400 (Tue, 10 Mar 2009)
New Revision: 10138
Modified:
trunk/build.xml
Log:
JBSEAM-3981: Make wicket/seam instrumentation implement Java Instrumentation API
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-03-10 09:05:42 UTC (rev 10137)
+++ trunk/build.xml 2009-03-10 13:27:54 UTC (rev 10138)
@@ -338,10 +338,18 @@
<excludes>
<exclude name="**/WicketInstrumentationTask*"/>
</excludes>
+ <manifestExtras>
+ <attribute name="Premain-Class" value="org.jboss.seam.wicket.ioc.JavassistInstrumentor" />
+ </manifestExtras>
+
</archive>
<jar jarfile="${lib.dir}/jboss-seam-wicket-ant.jar" basedir="${classes.wicket.dir}">
<include name="**/WicketInstrumentationTask*" />
</jar>
+ <jar jarfile="${lib.dir}/src/jboss-seam-wicket-ant-sources.jar" basedir="${src.wicket.dir}">
+ <include name="**/WicketInstrumentationTask.java" />
+ </jar>
+
</target>
<!-- ########################### JUL TARGETS ###########################-->
@@ -991,6 +999,7 @@
<attribute name="srcdir" />
<attribute name="outputdir" default="${lib.dir}" />
<element name="excludes" optional="true"/>
+ <element name="manifestExtras" optional="true"/>
<sequential>
<mkdir dir="@{outputdir}" />
<mkdir dir="@{outputdir}/src" />
@@ -1007,6 +1016,7 @@
<attribute name="Specification-Vendor" value="JBoss" />
<attribute name="Implementation-Title" value="@{module}" />
<attribute name="Implementation-Vendor" value="JBoss" />
+ <manifestExtras />
</manifest>
</jar>
<jar jarfile="@{outputdir}/src/(a){module}-sources.jar" basedir="@{srcdir}">
15 years, 2 months
Seam SVN: r10137 - trunk/src/main/org/jboss/seam/security.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-03-10 05:05:42 -0400 (Tue, 10 Mar 2009)
New Revision: 10137
Modified:
trunk/src/main/org/jboss/seam/security/SecurityInterceptor.java
Log:
JBSEAM-4003
Modified: trunk/src/main/org/jboss/seam/security/SecurityInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/SecurityInterceptor.java 2009-03-09 22:17:26 UTC (rev 10136)
+++ trunk/src/main/org/jboss/seam/security/SecurityInterceptor.java 2009-03-10 09:05:42 UTC (rev 10137)
@@ -154,9 +154,11 @@
{
Method interfaceMethod = invocation.getMethod();
- Restriction restriction = getRestriction(interfaceMethod);
-
- if ( restriction != null ) restriction.check(invocation.getParameters());
+ if (!"hashCode".equals(interfaceMethod.getName()))
+ {
+ Restriction restriction = getRestriction(interfaceMethod);
+ if ( restriction != null ) restriction.check(invocation.getParameters());
+ }
return invocation.proceed();
}
15 years, 2 months
Seam SVN: r10136 - trunk/doc/Seam_Reference_Guide/it-IT.
by seam-commits＠lists.jboss.org
Author: nico.ben
Date: 2009-03-09 18:17:26 -0400 (Mon, 09 Mar 2009)
New Revision: 10136
Modified:
trunk/doc/Seam_Reference_Guide/it-IT/Controls.po
Log:
JBSEAM-3767: Italian translation of Seam guide
Modified: trunk/doc/Seam_Reference_Guide/it-IT/Controls.po
===================================================================
--- trunk/doc/Seam_Reference_Guide/it-IT/Controls.po 2009-03-09 19:27:51 UTC (rev 10135)
+++ trunk/doc/Seam_Reference_Guide/it-IT/Controls.po 2009-03-09 22:17:26 UTC (rev 10136)
@@ -6,7 +6,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-05 00:19+0000\n"
-"PO-Revision-Date: 2009-03-03 22:08+0100\n"
+"PO-Revision-Date: 2009-03-09 23:16+0100\n"
"Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -1440,7 +1440,7 @@
#: Controls.xml:942
#, no-c-format
msgid "<literal>contentType</literal> — this value binding receives the file's content type (optional)."
-msgstr ""
+msgstr "<literal>contentType</literal> — questo value binding riceve il contenuto del file (opzionale)."
#. Tag: para
#: Controls.xml:948
@@ -1668,7 +1668,7 @@
#: Controls.xml:1132
#, no-c-format
msgid "<literal>factor</literal> — scale the image by the given factor"
-msgstr ""
+msgstr "<literal>factor</literal> — scala l'immagine col dato fattore "
#. Tag: literal
#: Controls.xml:1142
15 years, 2 months
Seam SVN: r10135 - in trunk/src/wicket/org/jboss/seam/wicket: mock and 1 other directory.
by seam-commits＠lists.jboss.org
Author: cpopetz
Date: 2009-03-09 15:27:51 -0400 (Mon, 09 Mar 2009)
New Revision: 10135
Added:
trunk/src/wicket/org/jboss/seam/wicket/mock/
trunk/src/wicket/org/jboss/seam/wicket/mock/SeamWicketTester.java
Log:
JBSEAM-3696: Support testing of wicket/seam apps
Added: trunk/src/wicket/org/jboss/seam/wicket/mock/SeamWicketTester.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/mock/SeamWicketTester.java (rev 0)
+++ trunk/src/wicket/org/jboss/seam/wicket/mock/SeamWicketTester.java 2009-03-09 19:27:51 UTC (rev 10135)
@@ -0,0 +1,191 @@
+package org.jboss.seam.wicket.mock;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.wicket.protocol.http.HttpSessionStore;
+import org.apache.wicket.protocol.http.WebRequestCycle;
+import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.session.ISessionStore;
+import org.apache.wicket.util.tester.BaseWicketTester;
+import org.apache.wicket.util.tester.DummyHomePage;
+import org.apache.wicket.util.tester.WicketTester;
+import org.jboss.seam.Seam;
+import org.jboss.seam.contexts.Lifecycle;
+import org.jboss.seam.contexts.ServletLifecycle;
+import org.jboss.seam.core.Init;
+import org.jboss.seam.init.Initialization;
+import org.jboss.seam.mock.EmbeddedBootstrap;
+import org.jboss.seam.wicket.SeamWebApplication;
+
+
+/**
+ * A subclass of WicketTester that enforces the use of a SeamWebApplication. This ensures that
+ * ensures that seam contexts are are set up and torn down correctly in testing. Each SeamWebApplication
+ * gets a complete application context, so seam application teardown/restart happens if you create
+ * a new SeamWicketTester without propogating any existing SeamWebApplication through the constructor.
+ */
+public class SeamWicketTester extends WicketTester
+{
+
+ public SeamWicketTester()
+ {
+ this(DummyHomePage.class);
+ }
+
+ public SeamWicketTester(Class homePage)
+ {
+ this(homePage,null);
+ }
+
+ public SeamWicketTester(Class homePage, Class loginPage)
+ {
+ this(createApplication(homePage, loginPage));
+ }
+
+ public SeamWicketTester(final SeamWebApplication application)
+ {
+ this(application,null);
+ }
+
+ public SeamWicketTester(final SeamWebApplication application, final String path)
+ {
+ super(application,path);
+
+ /*
+ * When in tests, we want the contexts destroyed lazily, i.e.
+ * don't destroy the contexts after a request, but rather before the
+ * next request, so that we can inspect the values of wicket components and
+ * their models
+ */
+ Lifecycle.beginCall();
+ ((SeamWebApplication)getApplication()).setDestroyContextsLazily(true);
+ Lifecycle.endCall();
+ }
+
+ /**
+ * Create a SeamWebApplication suitable for testing, a la WicketTester's DummyApplication
+ * @param homePage The WebPage class to start on
+ * @param loginPage The WebPage class to use for any Seam Authentication redirects
+ */
+ private static SeamWebApplication createApplication(final Class homePage, final Class loginPage)
+ {
+ return new SeamWebApplication()
+ {
+ @Override
+ public Class getHomePage()
+ {
+ return homePage;
+ }
+
+ @Override
+ protected Class getLoginPage()
+ {
+ return loginPage;
+ }
+
+ @Override
+ protected ISessionStore newSessionStore()
+ {
+ // Don't use a filestore, or we spawn lots of threads, which
+ // makes things slow.
+ return new HttpSessionStore(this);
+ }
+
+ @Override
+ protected WebResponse newWebResponse(final HttpServletResponse servletResponse)
+ {
+ // Don't use a buffered response in testing
+ return new WebResponse(servletResponse);
+ }
+
+ @Override
+ protected void outputDevelopmentModeWarning()
+ {
+ // Do nothing.
+ }
+ };
+ }
+
+ /**
+ * For each new servletContext, i.e. each new SeamWebApplication instance, we create a new seam
+ * initialization.
+ */
+ @Override
+ public ServletContext newServletContext(String path)
+ {
+ if (ServletLifecycle.getServletContext() != null)
+ {
+ ServletLifecycle.endApplication();
+ }
+ if (path == null)
+ {
+ URL webxml = getClass().getResource("/WEB-INF/web.xml");
+ if (webxml != null)
+ {
+ try
+ {
+ path = new File(webxml.toURI()).getParentFile().getParentFile().getAbsolutePath();
+ }
+ catch (URISyntaxException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ ServletContext context = super.newServletContext(path);
+ startJbossEmbeddedIfNecessary();
+ ServletLifecycle.beginApplication(context);
+ new Initialization(context).create().init();
+ ((Init) context.getAttribute(Seam.getComponentName(Init.class))).setDebug(false);
+ return context;
+ }
+
+ @Override
+ public WebRequestCycle setupRequestAndResponse(boolean isAjax) {
+ WebRequestCycle cycle = super.setupRequestAndResponse(isAjax);
+ /**
+ * FormTester wants to walk the form tree and call getValue() on components
+ * without having started the request cycle. This fails when wicket components have
+ * seam injections. So force a call here
+ */
+ BaseWicketTester.callOnBeginRequest(cycle);
+ return cycle;
+ }
+
+ private static boolean started;
+
+ protected void startJbossEmbeddedIfNecessary()
+ {
+ try
+ {
+ if (!started && embeddedJBossAvailable())
+ {
+ new EmbeddedBootstrap().startAndDeployResources();
+ }
+ started = true;
+ }
+ catch (Exception exception)
+ {
+ throw new RuntimeException("Failure starting up Embedded Jboss",exception);
+ }
+ }
+
+ private boolean embeddedJBossAvailable()
+ {
+ try
+ {
+ Class.forName("org.jboss.embedded.Bootstrap");
+ return true;
+ }
+ catch (ClassNotFoundException e)
+ {
+ return false;
+ }
+ }
+
+}
15 years, 2 months
Seam SVN: r10134 - trunk/src/wicket/org/jboss/seam/wicket/ioc.
by seam-commits＠lists.jboss.org
Author: cpopetz
Date: 2009-03-09 15:26:37 -0400 (Mon, 09 Mar 2009)
New Revision: 10134
Modified:
trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectionInterceptor.java
trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java
Log:
JBSEAM-3933: Sibling inner class wicket component injection conflict
Modified: trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectionInterceptor.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectionInterceptor.java 2009-03-09 18:10:11 UTC (rev 10133)
+++ trunk/src/wicket/org/jboss/seam/wicket/ioc/BijectionInterceptor.java 2009-03-09 19:26:37 UTC (rev 10134)
@@ -1,6 +1,5 @@
package org.jboss.seam.wicket.ioc;
-import org.jboss.seam.wicket.WicketComponent;
public class BijectionInterceptor<T> implements StatelessInterceptor<T>
@@ -10,7 +9,6 @@
{
invocationContext.getComponent().outject(invocationContext.getBean());
invocationContext.getComponent().disinject(invocationContext.getBean());
- disinjectEnclosingInstances(invocationContext);
return result;
}
@@ -19,7 +17,6 @@
try
{
invocationContext.getComponent().inject(invocationContext.getBean());
- injectEnclosingInstances(invocationContext);
}
catch (Exception e)
{
@@ -31,39 +28,5 @@
{
return exception;
}
-
- private static <T> void injectEnclosingInstances(InvocationContext<T> invocationContext)
- {
- InstrumentedComponent enclosingInstance = invocationContext.getInstrumentedComponent().getEnclosingInstance();
- while (enclosingInstance != null)
- {
- if (enclosingInstance.getHandler() != null && !enclosingInstance.getHandler().isReentrant())
- {
- WicketComponent.getInstance(enclosingInstance.getClass()).inject(enclosingInstance);
- enclosingInstance = enclosingInstance.getEnclosingInstance();
- }
- else
- {
- return;
- }
- }
- }
-
- private static <T> void disinjectEnclosingInstances(InvocationContext<T> invocationContext)
- {
- InstrumentedComponent enclosingInstance = invocationContext.getInstrumentedComponent().getEnclosingInstance();
- while (enclosingInstance != null)
- {
- if (enclosingInstance.getHandler() != null && !enclosingInstance.getHandler().isReentrant())
- {
- WicketComponent.getInstance(enclosingInstance.getClass()).disinject(enclosingInstance);
- enclosingInstance = enclosingInstance.getEnclosingInstance();
- }
- else
- {
- return;
- }
- }
- }
}
Modified: trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java 2009-03-09 18:10:11 UTC (rev 10133)
+++ trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java 2009-03-09 19:26:37 UTC (rev 10134)
@@ -67,8 +67,28 @@
}
}
reentrant++;
+ InstrumentedComponent enclosing = getEnclosingInstance(invocationContext.getBean());
+ if (enclosing != null)
+ {
+ enclosing.getHandler().injectEnclosingInstance(enclosing);
+ }
}
+ protected void injectEnclosingInstance(InstrumentedComponent instance)
+ {
+ if (reentrant == 0)
+ {
+ getComponent().inject(instance);
+ }
+ reentrant++;
+ instance = instance.getEnclosingInstance();
+ if (instance != null)
+ {
+ instance.getHandler().injectEnclosingInstance(instance);
+ }
+ }
+
+
public Exception handleException(Object target, Method method, Exception exception)
{
return doHandleException(new InvocationContext(method, target, getComponent()), exception);
@@ -94,6 +114,7 @@
private Object doAfterInvoke(InvocationContext invocationContext, Object result)
{
+
reentrant--;
if (reentrant == 0)
{
@@ -102,14 +123,36 @@
result = ((StatelessInterceptor) getComponent().getInterceptors().get(i)).afterInvoke(invocationContext, result);
}
}
+ InstrumentedComponent enclosing = getEnclosingInstance(invocationContext.getBean());
+ if (enclosing != null)
+ {
+ enclosing.getHandler().disinjectEnclosingInstance(enclosing);
+ }
+
return result;
}
+
+ protected void disinjectEnclosingInstance(InstrumentedComponent instance)
+ {
+ reentrant--;
+ if (reentrant == 0)
+ {
+ getComponent().disinject(instance);
+ }
+ instance = instance.getEnclosingInstance();
+ if (instance != null)
+ {
+ instance.getHandler().disinjectEnclosingInstance(instance);
+ }
+ }
+
public boolean isReentrant()
{
return reentrant > 0;
}
+
public InstrumentedComponent getEnclosingInstance(Object bean)
{
Class enclosingType = getComponent().getClass();
15 years, 2 months
Seam SVN: r10133 - trunk/examples.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-03-09 14:10:11 -0400 (Mon, 09 Mar 2009)
New Revision: 10133
Modified:
trunk/examples/build.xml
Log:
JBSEAM-3995
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2009-03-09 18:04:33 UTC (rev 10132)
+++ trunk/examples/build.xml 2009-03-09 18:10:11 UTC (rev 10133)
@@ -844,7 +844,7 @@
<exclude name="**/*.jar" />
</fileset>
</delete>
- <delete file="${deploy.dir}/${example.name}-ds.xml" failonerror="no" />
+ <delete file="${deploy.dir}/${example.ds}" failonerror="no" />
<delete file="${deploy.dir}/${example.name}-service.xml" failonerror="no" />
<delete dir="${ear.deploy.dir}" failonerror="no" />
<delete failonerror="no">
@@ -1033,7 +1033,7 @@
<target name="jbosswar.unexplode" description="Undeploy the example from JBoss">
<delete dir="${deploy.dir}/${example.name}.war" />
- <delete file="${deploy.dir}/${example.name}-ds.xml" failonerror="no" />
+ <delete file="${deploy.dir}/${example.ds}" failonerror="no" />
<delete file="${deploy.dir}/${example.name}-service.xml" failonerror="no" />
</target>
15 years, 2 months
Seam SVN: r10132 - trunk/examples.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-03-09 14:04:33 -0400 (Mon, 09 Mar 2009)
New Revision: 10132
Modified:
trunk/examples/build.xml
Log:
separate out itext jars
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2009-03-09 18:01:19 UTC (rev 10131)
+++ trunk/examples/build.xml 2009-03-09 18:04:33 UTC (rev 10132)
@@ -159,6 +159,10 @@
<!-- Seam pdf, with required dependencies -->
<fileset id="seam.pdf.jar" dir="${lib.dir}">
<include name="jboss-seam-pdf.jar" if="seam.pdf.lib" />
+ </fileset>
+
+ <!-- Seam pdf, with required dependencies -->
+ <fileset id="seam.pdf.extra.jar" dir="${lib.dir}">
<include name="itext.jar" if="seam.pdf.lib" />
<include name="itext-rtf.jar" if="seam.pdf.lib" />
<include name="jfreechart.jar" if="seam.pdf.lib" />
@@ -696,6 +700,7 @@
<fileset refid="jboss-embedded-api.jar" />
<fileset refid="gwt.jar" />
<fileset refid="quartz.jar" />
+ <fileset refid="seam.pdf.extra.jar" />
<fileset refid="spring.jar" />
<fileset refid="jcaptcha.jar" />
<fileset refid="antlr.jar" />
@@ -886,6 +891,7 @@
<fileset refid="jsf.jar" />
<fileset refid="search.jar" />
<fileset refid="richfaces-api.jar" />
+ <fileset refid="seam.pdf.extra.jar" />
<mapper type="flatten" />
</copy>
<!-- Copy in resources, with filtering -->
15 years, 2 months
Seam SVN: r10131 - trunk/src/main/org/jboss/seam/transaction.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-03-09 14:01:19 -0400 (Mon, 09 Mar 2009)
New Revision: 10131
Modified:
trunk/src/main/org/jboss/seam/transaction/TransactionInterceptor.java
Log:
JBSEAM-3984
Modified: trunk/src/main/org/jboss/seam/transaction/TransactionInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/seam/transaction/TransactionInterceptor.java 2009-03-09 08:14:21 UTC (rev 10130)
+++ trunk/src/main/org/jboss/seam/transaction/TransactionInterceptor.java 2009-03-09 18:01:19 UTC (rev 10131)
@@ -31,6 +31,9 @@
{
private static final long serialVersionUID = -4364203056333738988L;
+ transient
+ private Map<AnnotatedElement,TransactionMetadata> transactionMetadata = new HashMap<AnnotatedElement, TransactionMetadata>();
+
private class TransactionMetadata
{
private boolean annotationPresent;
@@ -81,7 +84,6 @@
return transactionMetadata.get(element);
}
- private Map<AnnotatedElement,TransactionMetadata> transactionMetadata = new HashMap<AnnotatedElement, TransactionMetadata>();
@AroundInvoke
public Object aroundInvoke(final InvocationContext invocation) throws Exception
15 years, 2 months
Seam SVN: r10130 - in trunk/src/test/ftest: examples and 3 other directories.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2009-03-09 04:14:21 -0400 (Mon, 09 Mar 2009)
New Revision: 10130
Added:
trunk/src/test/ftest/examples/wicket-runtime/
trunk/src/test/ftest/examples/wicket-runtime/build.xml
trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml
trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml
Removed:
trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml
trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml
Modified:
trunk/src/test/ftest/build.xml
trunk/src/test/ftest/examples/build.xml
trunk/src/test/ftest/examples/groovybooking/build.xml
trunk/src/test/ftest/examples/wicket/build.xml
Log:
JBSEAM-4000
Modified: trunk/src/test/ftest/build.xml
===================================================================
--- trunk/src/test/ftest/build.xml 2009-03-07 07:13:25 UTC (rev 10129)
+++ trunk/src/test/ftest/build.xml 2009-03-09 08:14:21 UTC (rev 10130)
@@ -78,6 +78,7 @@
<testexample name="todo" />
<testexample name="ui" />
<testexample name="wicket" />
+ <testexample name="wicket-runtime" />
<antcall target="stop.selenium.server" />
</target>
@@ -113,6 +114,7 @@
<testexample name="todo" />
<testexample name="ui" />
<testexample name="wicket" />
+ <testexample name="wicket-runtime" />
<antcall target="stop.selenium.server" />
</target>
@@ -208,6 +210,7 @@
<cleanexample name="todo" />
<cleanexample name="ui" />
<cleanexample name="wicket" />
+ <cleanexample name="wicket-runtime" />
</target>
<target name="undeployall">
Modified: trunk/src/test/ftest/examples/build.xml
===================================================================
--- trunk/src/test/ftest/examples/build.xml 2009-03-07 07:13:25 UTC (rev 10129)
+++ trunk/src/test/ftest/examples/build.xml 2009-03-09 08:14:21 UTC (rev 10130)
@@ -53,6 +53,7 @@
<property name="jboss-embedded.context.path" value="/jboss-seam-${example.name}" />
<property name="tomcat6.context.path" value="${jboss-embedded.context.path}" />
+
<!-- common path setup -->
<path id="classpath.build">
@@ -76,7 +77,7 @@
<target name="build" depends="build.common" description="Compiles the Test">
<javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
<copy todir="${classes.dir}">
- <fileset dir="src">
+ <fileset dir="${src.dir}">
<exclude name="**/*.java" />
</fileset>
</copy>
@@ -89,7 +90,7 @@
<mkdir dir="${classes.dir}" />
<javac srcdir="${common.src.dir}" destdir="${classes.dir}" classpathref="classpath.build" debug="true" />
<copy todir="${classes.dir}">
- <fileset dir="src">
+ <fileset dir="${src.dir}">
<exclude name="**/*.java" />
</fileset>
</copy>
@@ -153,6 +154,7 @@
<ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
<property name="jboss.home" value="${container.home}" />
<property name="tomcat.home" value="${container.home}" />
+ <propertyset refid="deploy.properties" />
</ant>
<!-- wait for the application to be active -->
<!-- TODO is there a better way? -->
@@ -173,21 +175,31 @@
</ant>
</target>
- <target name="container.properties">
+ <target name="container.properties" depends="set.deploy.properties">
<set.container.properties container="${container}" />
</target>
<macrodef name="set.container.properties">
<attribute name="container" />
<sequential>
- <fail unless="@{container}.home" message="@{container}.home property has to be set"/>
+ <fail unless="@{container}.home" message="@{container}.home property has to be set" />
<property name="container.home" value="${(a){container}.home}" />
<property name="deploy.target" value="${(a){container}.deploy.target}" />
<property name="undeploy.target" value="${(a){container}.undeploy.target}" />
<property name="context.path" value="${(a){container}.context.path}" />
<property name="wait.url" value="${context.path}" />
<property name="wait.time" value="${(a){container}.deploy.waittime}" />
+ <propertyset id="deploy.properties" refid="${container}.deploy.properties" />
</sequential>
</macrodef>
+ <!-- this target sets empty deploy property sets by default -->
+ <!-- override this target in example specific build.xml to specify property sets -->
+ <target name="set.deploy.properties">
+ <propertyset id="jboss4.deploy.properties" />
+ <propertyset id="jboss5.deploy.properties" />
+ <propertyset id="tomcat6.deploy.properties" />
+ <propertyset id="jboss-embedded.deploy.properties" />
+ </target>
+
</project>
Modified: trunk/src/test/ftest/examples/groovybooking/build.xml
===================================================================
--- trunk/src/test/ftest/examples/groovybooking/build.xml 2009-03-07 07:13:25 UTC (rev 10129)
+++ trunk/src/test/ftest/examples/groovybooking/build.xml 2009-03-09 08:14:21 UTC (rev 10130)
@@ -25,7 +25,16 @@
<property name="jboss4.deploy.target" value="jbosswar.explode" />
<property name="jboss4.undeploy.target" value="jbosswar.unexplode" />
<property name="jboss4.context.path" value="/jboss-seam-groovybooking" />
-
+
+ <property name="loadPersistenceUnits" value="false" />
+
+ <target name="set.deploy.properties">
+ <propertyset id="jboss4.deploy.properties" />
+ <propertyset id="jboss5.deploy.properties">
+ <propertyref name="loadPersistenceUnits" id="loadPersistenceUnits" />
+ </propertyset>
+ </target>
+
<import file="../build.xml" />
</project>
Modified: trunk/src/test/ftest/examples/wicket/build.xml
===================================================================
--- trunk/src/test/ftest/examples/wicket/build.xml 2009-03-07 07:13:25 UTC (rev 10129)
+++ trunk/src/test/ftest/examples/wicket/build.xml 2009-03-09 08:14:21 UTC (rev 10130)
@@ -22,74 +22,7 @@
-->
<project name="wicket" basedir="." default="build">
<property name="example.name" value="wicket" />
- <property name="jboss.example.ready.check.url" value="seam-wicket/home.seam" />
<import file="../build.xml" />
-
- <target name="test" depends="build, container.properties" description="Run Tests">
- <!-- TODO all of these jboss commands must be optional with checks -->
- <!-- TODO go get JBoss and extract -->
-
- <!-- TODO start JBoss -->
- <!-- clean example -->
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
-
- <!-- deploy the example-->
- <antcall target="deploy.example" />
-
- <!-- execute testng tests -->
- <antcall target="selenium.test" />
-
- <!-- undeploy the example -->
- <antcall target="undeploy.example" />
-
- <!-- clean example -->
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="clean" inheritall="false" dir="${seam.dir}/examples/${example.name}" />
-
- <!-- deploy the example with runtime instrumentation -->
- <antcall target="deploy.example.runtime.instrumentation" />
-
- <!-- execute testng tests -->
- <antcall target="selenium.test.runtime.instrumentation" />
-
- <!-- undeploy the example -->
- <antcall target="undeploy.example" />
- </target>
-
- <target name="deploy.example.runtime.instrumentation" depends="container.properties">
- <property name="absolute.wait.url" value="${selenium.browser.url}${wait.url}" />
- <echo>Deploying ${example.name} example to ${container} using ${deploy.target} target</echo>
- <ant antfile="${seam.dir}/examples/${example.name}/build.xml" target="${deploy.target}" inheritall="false" dir="${seam.dir}/examples/${example.name}">
- <property name="jboss.home" value="${container.home}" />
- <property name="tomcat.home" value="${container.home}" />
- <property name="instrumentAtRunTime" value="true" />
- </ant>
- <!-- wait for the application to be active -->
- <!-- TODO is there a better way? -->
- <echo>Waiting ${wait.time} seconds for ${absolute.wait.url}</echo>
- <waitfor maxwait="${wait.time}" maxwaitunit="second">
- <and>
- <!-- wait for the application to not throw 404 -->
- <http url="${absolute.wait.url}" errorsBeginAt="404" />
- </and>
- </waitfor>
- </target>
- <target name="selenium.test.runtime.instrumentation" depends="build, container.properties" description="Run Tests">
- <taskdef resource="testngtasks" classpathref="classpath.test" />
- <mkdir dir="${test.output.dir}" />
-
- <!-- execute testng tests -->
- <testng haltonfailure="false" outputdir="${test.output.dir}" classpathref="classpath.test">
- <xmlfileset file="${container}-runtime.xml" />
- <sysproperty key="selenium.server.port" value="${selenium.server.port}" />
- <sysproperty key="selenium.host" value="${selenium.host}" />
- <sysproperty key="selenium.browser" value="${selenium.browser}" />
- <sysproperty key="selenium.browser.url" value="${selenium.browser.url}" />
- <sysproperty key="selenium.speed" value="${selenium.speed}" />
- <sysproperty key="selenium.timeout" value="${selenium.timeout}" />
- <sysproperty key="example.context.path" value="${context.path}" />
- </testng>
- </target>
-
</project>
Deleted: trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml
===================================================================
--- trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml 2009-03-07 07:13:25 UTC (rev 10129)
+++ trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml 2009-03-09 08:14:21 UTC (rev 10130)
@@ -1,34 +0,0 @@
-
- <!--
- JBoss, Home of Professional Open Source Copyright 2008, Red Hat
- Middleware LLC, and individual contributors by the @authors tag. See
- the copyright.txt in the distribution for a full listing of individual
- contributors. This is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version. This software is
- distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details. You should have received a copy of the GNU
- Lesser General Public License along with this software; if not, write
- to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="Wicket example with runtime instrumentation" verbose="2"
- parallel="false">
- <test name="wicket_jboss4-runtime instrumentation">
- <parameter name="PROPERTY_FILE"
- value="/org/jboss/seam/example/wicket/test/selenium/wicket.properties" />
- <classes>
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" />
- <class
- name="org.jboss.seam.example.wicket.test.selenium.WicketSimpleBookingTest">
- </class>
- </classes>
- </test>
-</suite>
\ No newline at end of file
Deleted: trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml
===================================================================
--- trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml 2009-03-07 07:13:25 UTC (rev 10129)
+++ trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml 2009-03-09 08:14:21 UTC (rev 10130)
@@ -1,34 +0,0 @@
-
- <!--
- JBoss, Home of Professional Open Source Copyright 2008, Red Hat
- Middleware LLC, and individual contributors by the @authors tag. See
- the copyright.txt in the distribution for a full listing of individual
- contributors. This is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version. This software is
- distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details. You should have received a copy of the GNU
- Lesser General Public License along with this software; if not, write
- to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="Wicket example with runtime instrumentation" verbose="2"
- parallel="false">
- <test name="wicket_jboss5-runtime instrumentation">
- <parameter name="PROPERTY_FILE"
- value="/org/jboss/seam/example/wicket/test/selenium/wicket.properties" />
- <classes>
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" />
- <class
- name="org.jboss.seam.example.wicket.test.selenium.WicketSimpleBookingTest">
- </class>
- </classes>
- </test>
-</suite>
\ No newline at end of file
Added: trunk/src/test/ftest/examples/wicket-runtime/build.xml
===================================================================
--- trunk/src/test/ftest/examples/wicket-runtime/build.xml (rev 0)
+++ trunk/src/test/ftest/examples/wicket-runtime/build.xml 2009-03-09 08:14:21 UTC (rev 10130)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2008, Red Hat Middleware LLC, and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+<project name="wicket" basedir="." default="build">
+ <property name="example.name" value="wicket" />
+ <property name="src.dir" value="../wicket/src" />
+
+ <property name="instrumentAtRunTime" value="true" />
+
+ <target name="set.deploy.properties">
+ <propertyset id="jboss4.deploy.properties">
+ <propertyref name="instrumentAtRunTime" id="instrumentAtRunTime" />
+ </propertyset>
+ <propertyset id="jboss5.deploy.properties" refid="jboss4.deploy.properties" />
+ </target>
+
+ <import file="../build.xml" />
+
+</project>
Property changes on: trunk/src/test/ftest/examples/wicket-runtime/build.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml (from rev 10126, trunk/src/test/ftest/examples/wicket/jboss4-runtime.xml)
===================================================================
--- trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml (rev 0)
+++ trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml 2009-03-09 08:14:21 UTC (rev 10130)
@@ -0,0 +1,34 @@
+
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2008, Red Hat
+ Middleware LLC, and individual contributors by the @authors tag. See
+ the copyright.txt in the distribution for a full listing of individual
+ contributors. This is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version. This software is
+ distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not, write
+ to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+<suite name="Wicket example with runtime instrumentation" verbose="2"
+ parallel="false">
+ <test name="wicket_jboss4-runtime instrumentation">
+ <parameter name="PROPERTY_FILE"
+ value="/org/jboss/seam/example/wicket/test/selenium/wicket.properties" />
+ <classes>
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" />
+ <class
+ name="org.jboss.seam.example.wicket.test.selenium.WicketSimpleBookingTest">
+ </class>
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/wicket-runtime/jboss4.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Copied: trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml (from rev 10126, trunk/src/test/ftest/examples/wicket/jboss5-runtime.xml)
===================================================================
--- trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml (rev 0)
+++ trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml 2009-03-09 08:14:21 UTC (rev 10130)
@@ -0,0 +1,34 @@
+
+ <!--
+ JBoss, Home of Professional Open Source Copyright 2008, Red Hat
+ Middleware LLC, and individual contributors by the @authors tag. See
+ the copyright.txt in the distribution for a full listing of individual
+ contributors. This is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version. This software is
+ distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not, write
+ to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+<suite name="Wicket example with runtime instrumentation" verbose="2"
+ parallel="false">
+ <test name="wicket_jboss5-runtime instrumentation">
+ <parameter name="PROPERTY_FILE"
+ value="/org/jboss/seam/example/wicket/test/selenium/wicket.properties" />
+ <classes>
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" />
+ <class
+ name="org.jboss.seam.example.wicket.test.selenium.WicketSimpleBookingTest">
+ </class>
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Property changes on: trunk/src/test/ftest/examples/wicket-runtime/jboss5.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
15 years, 2 months
Seam SVN: r10129 - trunk/src/main/org/jboss/seam/persistence.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-03-07 02:13:25 -0500 (Sat, 07 Mar 2009)
New Revision: 10129
Modified:
trunk/src/main/org/jboss/seam/persistence/ManagedEntityWrapper.java
Log:
JBPAPP-1616, JBSEAM-1814 - Trying out a more benign wrap for a DataModel field, see if people like it
Modified: trunk/src/main/org/jboss/seam/persistence/ManagedEntityWrapper.java
===================================================================
--- trunk/src/main/org/jboss/seam/persistence/ManagedEntityWrapper.java 2009-03-06 22:31:53 UTC (rev 10128)
+++ trunk/src/main/org/jboss/seam/persistence/ManagedEntityWrapper.java 2009-03-07 07:13:25 UTC (rev 10129)
@@ -192,7 +192,8 @@
}
else
{
- setWrappedData(dataModel, null);
+ // JBSEAM-1814, JBPAPP-1616 Clearing the wrapped data is simply unnecessary. Either we leave it alone, or we set the field to null.
+ //setWrappedData(dataModel, null);
}
}
15 years, 2 months