Seam SVN: r8619 - in trunk/seam-gen: build-scripts and 1 other directory.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-06 15:18:35 -0400 (Wed, 06 Aug 2008)
New Revision: 8619
Modified:
trunk/seam-gen/build-scripts/.project
trunk/seam-gen/build.xml
Log:
JBSEAM-2996, but still problems with exploded launch config
Modified: trunk/seam-gen/build-scripts/.project
===================================================================
--- trunk/seam-gen/build-scripts/.project 2008-08-06 18:37:54 UTC (rev 8618)
+++ trunk/seam-gen/build-scripts/.project 2008-08-06 19:18:35 UTC (rev 8619)
@@ -20,6 +20,11 @@
</dictionary>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.seam.core.seambuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-08-06 18:37:54 UTC (rev 8618)
+++ trunk/seam-gen/build.xml 2008-08-06 19:18:35 UTC (rev 8619)
@@ -127,6 +127,10 @@
<filterset id="project">
<filter token="projectName" value="${project.name}" />
+ <filter token="modelPackage" value="${model.package}" />
+ <filter token="actionPackage" value="${action.package}" />
+ <filter token="testPackage" value="${test.package}" />
+ <filter token="deploymentType" value="${project.type}" />
<filter token="jbossHome" value="${jboss.home}" />
<filter token="iceHome" value="${icefaces.home}" />
<filter token="hbm2ddl" value="${hibernate.hbm2ddl.auto}"/>
15 years, 9 months
Seam SVN: r8618 - trunk/examples/itext/src/org/jboss/seam/example/pdf/test.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-08-06 14:37:54 -0400 (Wed, 06 Aug 2008)
New Revision: 8618
Modified:
trunk/examples/itext/src/org/jboss/seam/example/pdf/test/DocumentTests.java
Log:
JBSEAM-3220
Modified: trunk/examples/itext/src/org/jboss/seam/example/pdf/test/DocumentTests.java
===================================================================
--- trunk/examples/itext/src/org/jboss/seam/example/pdf/test/DocumentTests.java 2008-08-06 18:37:03 UTC (rev 8617)
+++ trunk/examples/itext/src/org/jboss/seam/example/pdf/test/DocumentTests.java 2008-08-06 18:37:54 UTC (rev 8618)
@@ -40,7 +40,7 @@
String docId = (String) getValue("#{docId}");
assert docId != null;
- DocumentStore store = (DocumentStore) getValue("#{org.jboss.seam.pdf.documentStore}");
+ DocumentStore store = (DocumentStore) getValue("#{org.jboss.seam.document.documentStore}");
assert store.idIsValid(docId);
@@ -54,7 +54,7 @@
String docId = (String) getValue("#{docId}");
assert docId != null;
- DocumentStore store = (DocumentStore) getValue("#{org.jboss.seam.pdf.documentStore}");
+ DocumentStore store = (DocumentStore) getValue("#{org.jboss.seam.document.documentStore}");
assert !store.idIsValid(docId);
}
}.run();
@@ -65,7 +65,7 @@
String docId = (String) getValue("#{docId}");
assert docId != null;
- DocumentStore store = (DocumentStore) getValue("#{org.jboss.seam.pdf.documentStore}");
+ DocumentStore store = (DocumentStore) getValue("#{org.jboss.seam.document.documentStore}");
assert store.idIsValid(docId);
DocumentData data = store.getDocumentData(docId);
15 years, 9 months
Seam SVN: r8617 - trunk/src/main/org/jboss/seam/document.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-08-06 14:37:03 -0400 (Wed, 06 Aug 2008)
New Revision: 8617
Added:
trunk/src/main/org/jboss/seam/document/package-info.java
Log:
JBSEAM-3220
Added: trunk/src/main/org/jboss/seam/document/package-info.java
===================================================================
--- trunk/src/main/org/jboss/seam/document/package-info.java (rev 0)
+++ trunk/src/main/org/jboss/seam/document/package-info.java 2008-08-06 18:37:03 UTC (rev 8617)
@@ -0,0 +1,4 @@
+@Namespace(value="http://jboss.com/products/seam/document",prefix="org.jboss.seam.document")
+package org.jboss.seam.document;
+
+import org.jboss.seam.annotations.Namespace;
15 years, 9 months
Seam SVN: r8616 - trunk/src/main/org/jboss/seam.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-06 14:29:04 -0400 (Wed, 06 Aug 2008)
New Revision: 8616
Modified:
trunk/src/main/org/jboss/seam/Component.java
Log:
Better
Modified: trunk/src/main/org/jboss/seam/Component.java
===================================================================
--- trunk/src/main/org/jboss/seam/Component.java 2008-08-06 18:21:44 UTC (rev 8615)
+++ trunk/src/main/org/jboss/seam/Component.java 2008-08-06 18:29:04 UTC (rev 8616)
@@ -2396,7 +2396,7 @@
@Override
protected ClassLoader getClassLoader()
{
- return Seam.class.getClassLoader();
+ return beanClass.getClassLoader();
}
};
factory.setSuperclass( type==JAVA_BEAN ? beanClass : Object.class );
15 years, 9 months
Seam SVN: r8615 - trunk/src/main/org/jboss/seam.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-06 14:21:44 -0400 (Wed, 06 Aug 2008)
New Revision: 8615
Modified:
trunk/src/main/org/jboss/seam/Component.java
Log:
JBSEAM-2845
Modified: trunk/src/main/org/jboss/seam/Component.java
===================================================================
--- trunk/src/main/org/jboss/seam/Component.java 2008-08-06 17:47:50 UTC (rev 8614)
+++ trunk/src/main/org/jboss/seam/Component.java 2008-08-06 18:21:44 UTC (rev 8615)
@@ -2391,7 +2391,14 @@
interfaces.add(Instance.class);
interfaces.add(Proxy.class);
- ProxyFactory factory = new ProxyFactory();
+ ProxyFactory factory = new ProxyFactory()
+ {
+ @Override
+ protected ClassLoader getClassLoader()
+ {
+ return Seam.class.getClassLoader();
+ }
+ };
factory.setSuperclass( type==JAVA_BEAN ? beanClass : Object.class );
factory.setInterfaces( interfaces.toArray( new Class[0] ) );
factory.setFilter(FINALIZE_FILTER);
15 years, 9 months
Seam SVN: r8614 - trunk/src/mail/org/jboss/seam/mail/ui.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-08-06 13:47:50 -0400 (Wed, 06 Aug 2008)
New Revision: 8614
Modified:
trunk/src/mail/org/jboss/seam/mail/ui/UIAttachment.java
Log:
JBSEAM-3220
Modified: trunk/src/mail/org/jboss/seam/mail/ui/UIAttachment.java
===================================================================
--- trunk/src/mail/org/jboss/seam/mail/ui/UIAttachment.java 2008-08-06 17:42:13 UTC (rev 8613)
+++ trunk/src/mail/org/jboss/seam/mail/ui/UIAttachment.java 2008-08-06 17:47:50 UTC (rev 8614)
@@ -126,7 +126,7 @@
InputStream is = (InputStream) getValue();
ds = new ByteArrayDataSource(is, getContentType());
}
- else if (Reflections.isInstanceOf(getValue().getClass(), "org.jboss.seam.pdf.DocumentData"))
+ else if (Reflections.isInstanceOf(getValue().getClass(), "org.jboss.seam.document.DocumentData"))
{
Method dataGetter = Reflections.getGetterMethod(getValue().getClass(), "data");
Method docTypeGetter = Reflections.getGetterMethod(getValue().getClass(), "documentType");
15 years, 9 months
Seam SVN: r8613 - trunk/examples/mail/src/org/jboss/seam/example/mail/test.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-08-06 13:42:13 -0400 (Wed, 06 Aug 2008)
New Revision: 8613
Modified:
trunk/examples/mail/src/org/jboss/seam/example/mail/test/MailTest.java
Log:
JBSEAM-3220
Modified: trunk/examples/mail/src/org/jboss/seam/example/mail/test/MailTest.java
===================================================================
--- trunk/examples/mail/src/org/jboss/seam/example/mail/test/MailTest.java 2008-08-06 17:32:57 UTC (rev 8612)
+++ trunk/examples/mail/src/org/jboss/seam/example/mail/test/MailTest.java 2008-08-06 17:42:13 UTC (rev 8613)
@@ -16,7 +16,7 @@
import org.jboss.seam.mail.ui.UIAttachment;
import org.jboss.seam.mail.ui.UIMessage;
-import org.jboss.seam.pdf.DocumentData;
+import org.jboss.seam.document.DocumentData;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.example.mail.Person;
import org.jboss.seam.mail.MailSession;
15 years, 9 months
Seam SVN: r8612 - trunk/src/main/org/jboss/seam/faces.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-06 13:32:57 -0400 (Wed, 06 Aug 2008)
New Revision: 8612
Modified:
trunk/src/main/org/jboss/seam/faces/FacesExpressions.java
Log:
JBSEAM-2899
Modified: trunk/src/main/org/jboss/seam/faces/FacesExpressions.java
===================================================================
--- trunk/src/main/org/jboss/seam/faces/FacesExpressions.java 2008-08-06 16:30:44 UTC (rev 8611)
+++ trunk/src/main/org/jboss/seam/faces/FacesExpressions.java 2008-08-06 17:32:57 UTC (rev 8612)
@@ -11,6 +11,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.intercept.BypassInterceptors;
+import org.jboss.seam.contexts.FacesLifecycle;
import org.jboss.seam.core.Expressions;
/**
@@ -33,7 +34,8 @@
public ELContext getELContext()
{
FacesContext facesContext = FacesContext.getCurrentInstance();
- return facesContext==null ? super.getELContext() : facesContext.getELContext();
+ return facesContext == null || FacesLifecycle.getPhaseId() == null
+ ? super.getELContext() : facesContext.getELContext();
}
@Override
15 years, 9 months
Seam SVN: r8611 - trunk/build.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-06 12:30:44 -0400 (Wed, 06 Aug 2008)
New Revision: 8611
Modified:
trunk/build/core.pom.xml
trunk/build/root.pom.xml
Log:
Need jaxen for parsing webxml
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-08-06 16:27:01 UTC (rev 8610)
+++ trunk/build/core.pom.xml 2008-08-06 16:30:44 UTC (rev 8611)
@@ -312,6 +312,12 @@
<artifactId>jboss-common-core</artifactId>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-08-06 16:27:01 UTC (rev 8610)
+++ trunk/build/root.pom.xml 2008-08-06 16:30:44 UTC (rev 8611)
@@ -868,18 +868,20 @@
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>1.6.1-jboss</version>
+ <version>1.6.1</version>
<exclusions>
<exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1-beta-4</version>
+ </dependency>
<dependency>
<groupId>org.beanshell</groupId>
15 years, 9 months
Seam SVN: r8610 - trunk/src/main/org/jboss/seam/mock.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-08-06 12:27:01 -0400 (Wed, 06 Aug 2008)
New Revision: 8610
Modified:
trunk/src/main/org/jboss/seam/mock/MockServletContext.java
Log:
Only read webxml if it is present
Modified: trunk/src/main/org/jboss/seam/mock/MockServletContext.java
===================================================================
--- trunk/src/main/org/jboss/seam/mock/MockServletContext.java 2008-08-06 14:47:54 UTC (rev 8609)
+++ trunk/src/main/org/jboss/seam/mock/MockServletContext.java 2008-08-06 16:27:01 UTC (rev 8610)
@@ -48,9 +48,9 @@
webInfClassesRoot = new File(webInfRoot.getParentFile().getPath() + "/classes");
webappRoot = webInfRoot.getParentFile();
}
+ // call processing of context parameters
+ processContextParameters(webxml);
}
- // call processing of context parameters
- processContextParameters();
}
catch (URISyntaxException e)
{
@@ -58,13 +58,13 @@
}
}
- private void processContextParameters()
+ private void processContextParameters(URL webXML)
{
SAXReader reader = new SAXReader();
Document document;
try
{
- document = reader.read(getClass().getResourceAsStream("/WEB-INF/web.xml"));
+ document = reader.read(webXML);
List<Node> nodes = document.selectNodes("//*[name()='context-param']");
for (Node node : nodes)
15 years, 9 months