Seam SVN: r11821 - modules/bpm/trunk.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-12-11 18:20:41 -0500 (Fri, 11 Dec 2009)
New Revision: 11821
Modified:
modules/bpm/trunk/pom.xml
Log:
fix bpm module build
Modified: modules/bpm/trunk/pom.xml
===================================================================
--- modules/bpm/trunk/pom.xml 2009-12-11 23:16:07 UTC (rev 11820)
+++ modules/bpm/trunk/pom.xml 2009-12-11 23:20:41 UTC (rev 11821)
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>seam-parent</artifactId>
+ <artifactId>seam-version-matrix</artifactId>
<groupId>org.jboss.seam</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
@@ -38,24 +38,14 @@
<dependency>
<groupId>${seam.groupId}</groupId>
- <artifactId>seam-el</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${seam.groupId}</groupId>
<artifactId>seam-international</artifactId>
</dependency>
<dependency>
- <groupId>${webbeans.groupId}</groupId>
- <artifactId>jsr299-api</artifactId>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
</dependency>
- <dependency>
- <groupId>${webbeans.groupId}</groupId>
- <artifactId>webbeans-logger</artifactId>
- </dependency>
-
</dependencies>
</project>
15 years
Seam SVN: r11820 - in modules/remoting/trunk: src/main/resources/org/jboss/seam/remoting and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-12-11 18:16:07 -0500 (Fri, 11 Dec 2009)
New Revision: 11820
Modified:
modules/remoting/trunk/pom.xml
modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js
Log:
removed dependency on seam-parent
Modified: modules/remoting/trunk/pom.xml
===================================================================
--- modules/remoting/trunk/pom.xml 2009-12-11 23:15:37 UTC (rev 11819)
+++ modules/remoting/trunk/pom.xml 2009-12-11 23:16:07 UTC (rev 11820)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>seam-parent</artifactId>
+ <artifactId>seam-version-matrix</artifactId>
<groupId>org.jboss.seam</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
Modified: modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js
===================================================================
--- modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js 2009-12-11 23:15:37 UTC (rev 11819)
+++ modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js 2009-12-11 23:16:07 UTC (rev 11820)
@@ -649,6 +649,7 @@
this.expressions = new Array();
this.beans = new Array();
this.values = new Array();
+ this.originalValues = new Array();
this.callback = null;
Seam.Model.prototype.addExpression = function(alias, expr) {
15 years
Seam SVN: r11819 - modules/build/trunk.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-12-11 18:15:37 -0500 (Fri, 11 Dec 2009)
New Revision: 11819
Modified:
modules/build/trunk/pom.xml
Log:
added compiler version
Modified: modules/build/trunk/pom.xml
===================================================================
--- modules/build/trunk/pom.xml 2009-12-11 22:43:21 UTC (rev 11818)
+++ modules/build/trunk/pom.xml 2009-12-11 23:15:37 UTC (rev 11819)
@@ -366,6 +366,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -516,6 +520,22 @@
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>jdk5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<distributionManagement>
<repository>
<!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
15 years
Seam SVN: r11818 - modules/build/trunk.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-12-11 17:43:21 -0500 (Fri, 11 Dec 2009)
New Revision: 11818
Modified:
modules/build/trunk/pom.xml
Log:
ws
Modified: modules/build/trunk/pom.xml
===================================================================
--- modules/build/trunk/pom.xml 2009-12-11 22:18:02 UTC (rev 11817)
+++ modules/build/trunk/pom.xml 2009-12-11 22:43:21 UTC (rev 11818)
@@ -7,7 +7,6 @@
<artifactId>seam-version-matrix</artifactId>
<packaging>pom</packaging>
<version>3.0.0-SNAPSHOT</version>
-
<name>Seam Version Matrix</name>
<description>
15 years
Seam SVN: r11817 - modules/build/trunk.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-12-11 17:18:02 -0500 (Fri, 11 Dec 2009)
New Revision: 11817
Removed:
modules/build/trunk/test.txt
Log:
removed test file
Deleted: modules/build/trunk/test.txt
===================================================================
--- modules/build/trunk/test.txt 2009-12-11 22:17:34 UTC (rev 11816)
+++ modules/build/trunk/test.txt 2009-12-11 22:18:02 UTC (rev 11817)
@@ -1 +0,0 @@
-test commit 123
15 years
Seam SVN: r11816 - modules/build/trunk.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-12-11 17:17:34 -0500 (Fri, 11 Dec 2009)
New Revision: 11816
Added:
modules/build/trunk/test.txt
Log:
test commit
Added: modules/build/trunk/test.txt
===================================================================
--- modules/build/trunk/test.txt (rev 0)
+++ modules/build/trunk/test.txt 2009-12-11 22:17:34 UTC (rev 11816)
@@ -0,0 +1 @@
+test commit 123
15 years
Seam SVN: r11814 - modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-12-11 10:09:44 -0500 (Fri, 11 Dec 2009)
New Revision: 11814
Modified:
modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js
Log:
removed trailing comma
Modified: modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js
===================================================================
--- modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js 2009-12-11 14:06:07 UTC (rev 11813)
+++ modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js 2009-12-11 15:09:44 UTC (rev 11814)
@@ -6,7 +6,7 @@
PATH_EXECUTE: "/execute",
PATH_SUBSCRIPTION: "/subscription",
PATH_MODEL: "/model",
- PATH_POLL: "/poll",
+ PATH_POLL: "/poll"
}
Seam.createBean = function(name) {
15 years
Seam SVN: r11813 - in modules/remoting/trunk: src/main/resources/org/jboss/seam/remoting and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-12-11 09:06:07 -0500 (Fri, 11 Dec 2009)
New Revision: 11813
Modified:
modules/remoting/trunk/examples/model/src/main/webapp/model.html
modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js
Log:
minor refactoring
Modified: modules/remoting/trunk/examples/model/src/main/webapp/model.html
===================================================================
--- modules/remoting/trunk/examples/model/src/main/webapp/model.html 2009-12-11 13:33:54 UTC (rev 11812)
+++ modules/remoting/trunk/examples/model/src/main/webapp/model.html 2009-12-11 14:06:07 UTC (rev 11813)
@@ -25,7 +25,7 @@
var callback = function(model) { alert(model.getValue("customer").getFirstName()); };
- model.addBean("customer", "org.jboss.seam.remoting.examples.model.CustomerAction", "customer");
+ model.addBeanProperty("customer", "org.jboss.seam.remoting.examples.model.CustomerAction", "customer");
model.fetch(new Seam.Action()
.setBeanType("org.jboss.seam.remoting.examples.model.CustomerAction")
.setMethod("editCustomer")
Modified: modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js
===================================================================
--- modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js 2009-12-11 13:33:54 UTC (rev 11812)
+++ modules/remoting/trunk/src/main/resources/org/jboss/seam/remoting/remote.js 2009-12-11 14:06:07 UTC (rev 11813)
@@ -6,7 +6,7 @@
PATH_EXECUTE: "/execute",
PATH_SUBSCRIPTION: "/subscription",
PATH_MODEL: "/model",
- PATH_POLL: "/poll",
+ PATH_POLL: "/poll",
}
Seam.createBean = function(name) {
@@ -75,8 +75,8 @@
for (var i=0; i<e.childNodes.length;i++) {
if (e.childNodes.item(i).tagName == tag) n.push(e.childNodes.item(i));
}
- return n;
- }
+ return n;
+ }
}
Seam.extractEncodedSessionId = function(url) {
@@ -278,7 +278,7 @@
var d = "<bean type=\"" + t.__name + "\">\n";
var meta = Seam.getBeanMetadata(obj);
for (var i=0; i<meta.length; i++) {
- d += "<member name=\"" + meta[i].field + "\">" +
+ d += "<member name=\"" + meta[i].field + "\">" +
Seam.serializeValue(obj[meta[i].field], meta[i].type, refs) + "</member>\n";
}
d += "</bean>";
@@ -300,11 +300,11 @@
}
d += "<method>" + methodName + "</method>" + "<params>";
var refs = new Array();
- for (var i = 0; i < params.length; i++) {
+ for (var i=0; i<params.length; i++) {
d += "<param>" + Seam.serializeValue(params[i], null, refs) + "</param>";
}
d += "</params><refs>";
- for (var i = 0; i < refs.length; i++) {
+ for (var i=0; i<refs.length; i++) {
d += "<ref id=\"" + i + "\">" + Seam.serializeType(refs[i], refs) + "</ref>";
}
d += "</refs></call>";
@@ -450,23 +450,42 @@
component.__callback[methodName] = callback;
}
-Seam.processResponse = function(doc) {
+Seam.processResponse = function(doc) {
if (typeof(Seam) == "undefined") return;
if (!doc.documentElement) return;
- var context = new Seam.Context;
+ var ctx = new Seam.Context;
var headerNode = Seam.Xml.childNode(doc.documentElement, "header");
var bodyNode = Seam.Xml.childNode(doc.documentElement, "body");
if (headerNode) {
var contextNode = Seam.Xml.childNode(headerNode, "context");
- if (contextNode && context) {
- Seam.unmarshalContext(contextNode, context);
- if (context.getConversationId() && Seam.context.getConversationId() == null)
- Seam.context.setConversationId(context.getConversationId());
+ if (contextNode) {
+ Seam.unmarshalContext(contextNode, ctx);
+ if (ctx.getConversationId() && Seam.context.getConversationId() == null)
+ Seam.context.setConversationId(ctx.getConversationId());
}
}
- if (bodyNode) {
+ if (bodyNode) {
var n = Seam.Xml.childNode(bodyNode, "result");
- if (n) Seam.processResult(n, context);
+ if (n) {
+ var callId = n.getAttribute("id");
+ var call = Seam.pendingCalls.get(callId);
+ Seam.pendingCalls.remove(callId);
+ if (call && (call.callback || call.exceptionHandler)) {
+ var valueNode = Seam.Xml.childNode(n, "value");
+ var refsNode = Seam.Xml.childNode(n, "refs");
+ var exceptionNode = Seam.Xml.childNode(n, "exception");
+ if (exceptionNode != null) {
+ var msgNode = Seam.Xml.childNode(exceptionNode, "message");
+ var msg = Seam.unmarshalValue(msgNode.firstChild);
+ call.exceptionHandler(new Seam.Exception(msg));
+ }
+ else {
+ var refs = Seam.unmarshalRefs(refsNode);
+ var v = Seam.unmarshalValue(valueNode.firstChild, refs);
+ call.callback(v, ctx, callId);
+ }
+ }
+ }
var cn = Seam.Xml.childNodes(bodyNode, "model");
for (var i=0; i<cn.length; i++) {
var callId = cn[i].getAttribute("callId");
@@ -477,34 +496,14 @@
}
}
-Seam.processResult = function(result, context) {
- var callId = result.getAttribute("id");
- var call = Seam.pendingCalls.get(callId);
- Seam.pendingCalls.remove(callId);
- if (call && (call.callback || call.exceptionHandler)) {
- var valueNode = Seam.Xml.childNode(result, "value");
- var refsNode = Seam.Xml.childNode(result, "refs");
- var exceptionNode = Seam.Xml.childNode(result, "exception");
- if (exceptionNode != null) {
- var msgNode = Seam.Xml.childNode(exceptionNode, "message");
- var msg = Seam.unmarshalValue(msgNode.firstChild);
- call.exceptionHandler(new Seam.Exception(msg));
- }
- else {
- var refs = new Array();
- if (refsNode) Seam.unmarshalRefs(refsNode, refs);
- var value = Seam.unmarshalValue(valueNode.firstChild, refs);
- call.callback(value, context, callId);
- }
- }
-}
-
Seam.unmarshalContext = function(ctxNode, context) {
var c = Seam.Xml.childNode(ctxNode, "conversationId");
if (c) context.setConversationId(c.firstChild.nodeValue);
}
-Seam.unmarshalRefs = function(refsNode, refs) {
+Seam.unmarshalRefs = function(refsNode) {
+ if (!refsNode) return;
+ var refs = {};
var objs = new Array();
var cn = Seam.Xml.childNodes(refsNode, "ref");
for (var i=0; i<cn.length; i++) {
@@ -517,8 +516,8 @@
refs[refId] = obj;
objs.push({obj: obj, node: valueNode});
}
- }
- }
+ }
+ }
for (var i=0; i<objs.length; i++) {
var cn = Seam.Xml.childNodes(objs[i].node, "member");
for (var j=0; j<cn.length; j++) {
@@ -528,6 +527,7 @@
}
}
}
+ return refs;
}
Seam.unmarshalValue = function(element, refs) {
@@ -550,7 +550,7 @@
var value = new Array();
var cn = Seam.Xml.childNodes(element, "element");
for (var i=0; i<cn.length; i++) {
- value.push(Seam.unmarshalValue(cn[i].firstChild, refs));
+ value.push(Seam.unmarshalValue(cn[i].firstChild, refs));
}
return value;
case "map":
@@ -611,8 +611,6 @@
Seam.loadingMsgDiv.style.visibility = 'hidden';
}
-/* Remote Model API */
-
Seam.Action = function() {
this.beanType = null;
this.qualifiers = null;
@@ -647,6 +645,7 @@
}
Seam.Model = function() {
+ this.id = null;
this.expressions = new Array();
this.beans = new Array();
this.values = new Array();
@@ -655,25 +654,36 @@
Seam.Model.prototype.addExpression = function(alias, expr) {
this.expressions.push({alias: alias, expr: expr});
}
-
+
Seam.Model.prototype.getValue = function(alias) {
- for (var i = 0; i < this.values.length; i++) {
+ for (var i=0; i<this.values.length; i++) {
if (this.values[i].alias == alias) {
- return this.values[i].value;
- }
- }
+ return this.values[i].value;
+ }
+ }
return null;
}
- Seam.Model.prototype.addBean = function(alias, bean, property) {
+ Seam.Model.prototype.addBean = function(alias, bean) {
var q = null;
+ if (arguments.length > 2) {
+ q = new Array();
+ for (var i=2; i<arguments.length; i++) {
+ q.push(arguments[i]);
+ }
+ }
+ this.beans.push({alias: alias, bean: bean, qualifiers: q});
+ }
+
+ Seam.Model.prototype.addBeanProperty = function(alias, bean, property) {
+ var q = null;
if (arguments.length > 3) {
q = new Array();
- for (var i = 3; i < arguments.length; i++) {
+ for (var i=3; i<arguments.length; i++) {
q.push(arguments[i]);
}
}
- this.beans.push({alias: alias, bean: bean, property: property, qualifiers: q});
+ this.beans.push({alias: alias, bean: bean, property: property, qualifiers: q});
}
Seam.Model.prototype.fetch = function(action, callback) {
@@ -715,17 +725,18 @@
d += "</action>";
}
if (this.beans.length > 0) {
- for (var i = 0; i < this.beans.length; i++) {
+ for (var i=0; i<this.beans.length; i++) {
var b = this.beans[i];
d += "<bean alias=\"" + b.alias + "\"><name>" + b.bean + "</name>";
if (b.qualifiers && b.qualifiers.length > 0) {
d += "<qualifiers>";
for (var j=0; j<b.qualifiers.length; j++) {
- d += (j > 0 ? "," : "") + b.qualifiers[j];
+ d += (j>0 ? "," : "") + b.qualifiers[j];
}
d += "</qualifiers>";
}
- d += "<property>" + b.property + "</property></bean>";
+ if (b.property) d += "<property>" + b.property + "</property>";
+ d += "</bean>";
}
}
if (this.expressions.length > 0) {
@@ -739,14 +750,14 @@
}
Seam.Model.prototype.processFetchResponse = function(modelNode) {
+ this.id = modelNode.getAttribute("uid");
var valueNodes = Seam.Xml.childNodes(modelNode, "value");
var refsNode = Seam.Xml.childNode(modelNode, "refs");
- var refs = new Array();
- if (refsNode) Seam.unmarshalRefs(refsNode, refs);
+ var refs = Seam.unmarshalRefs(refsNode);
for (var i=0; i<valueNodes.length; i++) {
var value = Seam.unmarshalValue(valueNodes[i].firstChild,refs);
- this.values.push({alias:valueNodes[i].getAttribute("alias"),value:value});
- }
+ this.values.push({alias:valueNodes[i].getAttribute("alias"),value:value});
+ }
if (this.callback) this.callback(this);
}
15 years
Seam SVN: r11812 - branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2009-12-11 08:33:54 -0500 (Fri, 11 Dec 2009)
New Revision: 11812
Modified:
branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyBootstrap.java
Log:
JBSEAM-4406
Modified: branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyBootstrap.java
===================================================================
--- branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyBootstrap.java 2009-12-11 13:20:32 UTC (rev 11811)
+++ branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyBootstrap.java 2009-12-11 13:33:54 UTC (rev 11812)
@@ -48,6 +48,7 @@
import org.jboss.seam.log.Log;
import org.jboss.seam.util.EJB;
import org.jboss.seam.util.Reflections;
+import static org.jboss.seam.annotations.Install.BUILT_IN;
import java.lang.annotation.Annotation;
import java.util.Collection;
@@ -74,7 +75,7 @@
@Scope(ScopeType.APPLICATION)
@Startup
@AutoCreate
-@Install(classDependencies = "org.jboss.resteasy.spi.ResteasyProviderFactory")
+@Install(precedence = BUILT_IN, classDependencies = "org.jboss.resteasy.spi.ResteasyProviderFactory")
public class ResteasyBootstrap
{
15 years
Seam SVN: r11811 - branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/test.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2009-12-11 08:20:32 -0500 (Fri, 11 Dec 2009)
New Revision: 11811
Modified:
branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/test/SubresourceTest.java
Log:
Testcase for JBSEAM-4039
Modified: branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/test/SubresourceTest.java
===================================================================
--- branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/test/SubresourceTest.java 2009-12-11 13:18:27 UTC (rev 11810)
+++ branches/community/Seam_2_2/examples/restbay/src/org/jboss/seam/example/restbay/test/SubresourceTest.java 2009-12-11 13:20:32 UTC (rev 11811)
@@ -13,7 +13,7 @@
public class SubresourceTest extends SeamTest
{
@Test
- public void testResourceHomeRead() throws Exception
+ public void testSubresourceGET() throws Exception
{
final String path = "/restv1/garage/1";
15 years