Seam SVN: r7400 - trunk/src/remoting/org/jboss/seam/remoting.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-02-08 23:59:13 -0500 (Fri, 08 Feb 2008)
New Revision: 7400
Modified:
trunk/src/remoting/org/jboss/seam/remoting/Call.java
trunk/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java
trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
trunk/src/remoting/org/jboss/seam/remoting/remote.js
Log:
disabled Seam.Remoting.eval() because of security issues
Modified: trunk/src/remoting/org/jboss/seam/remoting/Call.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/Call.java 2008-02-08 20:38:16 UTC (rev 7399)
+++ trunk/src/remoting/org/jboss/seam/remoting/Call.java 2008-02-09 04:59:13 UTC (rev 7400)
@@ -10,7 +10,6 @@
import org.jboss.seam.Component;
import org.jboss.seam.annotations.remoting.WebRemote;
-import org.jboss.seam.core.Expressions;
import org.jboss.seam.remoting.wrapper.ConversionException;
import org.jboss.seam.remoting.wrapper.ConversionScore;
import org.jboss.seam.remoting.wrapper.Wrapper;
@@ -25,7 +24,7 @@
private String id;
private String componentName;
private String methodName;
- private String expression;
+ //private String expression;
private List<Wrapper> params = new ArrayList<Wrapper> ();
@@ -48,18 +47,6 @@
this.methodName = methodName;
this.context = new CallContext();
}
-
- /**
- *
- * @param id
- * @param expression
- */
- public Call(String id, String expression)
- {
- this.id = id;
- this.expression = expression;
- this.context = new CallContext();
- }
/**
* Return the call context.
@@ -123,10 +110,6 @@
{
processInvocation();
}
- else if (expression != null)
- {
- processExpression();
- }
}
private void processInvocation()
@@ -180,11 +163,6 @@
// Invoke!
result = m.invoke(instance, convertParams(m.getGenericParameterTypes()));
}
-
- private void processExpression()
- {
- result = Expressions.instance().createValueExpression(expression).getValue();
- }
/**
* Convert our parameter values to an Object array of the specified target
Modified: trunk/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java 2008-02-08 20:38:16 UTC (rev 7399)
+++ trunk/src/remoting/org/jboss/seam/remoting/ExecutionHandler.java 2008-02-09 04:59:13 UTC (rev 7400)
@@ -186,13 +186,6 @@
calls.add(call);
}
-
- List<Element> exprElements = env.element("body").elements("eval");
- for (Element e : exprElements)
- {
- Call call = new Call(e.attributeValue("id"), e.attributeValue("expr"));
- calls.add(call);
- }
return calls;
}
Modified: trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-02-08 20:38:16 UTC (rev 7399)
+++ trunk/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2008-02-09 04:59:13 UTC (rev 7400)
@@ -317,9 +317,12 @@
for (Method m : type.getDeclaredMethods())
{
- if (m.getAnnotation(WebRemote.class) == null)
- continue;
+ if (m.getAnnotation(WebRemote.class) == null) continue;
+ WebRemote webRemote = m.getAnnotation(WebRemote.class);
+
+ String[] excludes = webRemote.exclude();
+
// Append the return type to the source block
appendTypeSource(out, m.getGenericReturnType(), types);
@@ -334,14 +337,12 @@
{
appendTypeSource(out, m.getGenericParameterTypes()[i], types);
- if (i > 0)
- componentSrc.append(", ");
+ if (i > 0) componentSrc.append(", ");
componentSrc.append("p");
componentSrc.append(i);
}
- if (m.getGenericParameterTypes().length > 0)
- componentSrc.append(", ");
+ if (m.getGenericParameterTypes().length > 0) componentSrc.append(", ");
componentSrc.append("callback) {\n");
componentSrc.append(" return Seam.Remoting.execute(this, \"");
@@ -350,8 +351,7 @@
for (int i = 0; i < m.getParameterTypes().length; i++)
{
- if (i > 0)
- componentSrc.append(", ");
+ if (i > 0) componentSrc.append(", ");
componentSrc.append("p");
componentSrc.append(i);
}
Modified: trunk/src/remoting/org/jboss/seam/remoting/remote.js
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/remote.js 2008-02-08 20:38:16 UTC (rev 7399)
+++ trunk/src/remoting/org/jboss/seam/remoting/remote.js 2008-02-09 04:59:13 UTC (rev 7400)
@@ -435,21 +435,23 @@
Seam.Remoting.__callId = 0;
-Seam.Remoting.eval = function(expression, callback)
-{
- var callId = "" + Seam.Remoting.__callId++;
- var data = "<eval expr=\"";
- data += expression;
- data += "\" id=\"";
- data += callId;
- data += "\"/>";
- var call = {data: data, id: callId, callback: callback};
+// eval() disabled until security issues resolved.
+
+//Seam.Remoting.eval = function(expression, callback)
+//{
+// var callId = "" + Seam.Remoting.__callId++;
+// var data = "<eval expr=\"";
+// data += expression;
+// data += "\" id=\"";
+// data += callId;
+// data += "\"/>";
+// var call = {data: data, id: callId, callback: callback};
- var envelope = Seam.Remoting.createEnvelope(Seam.Remoting.createHeader(), data);
- Seam.Remoting.pendingCalls.put(call.id, call);
+// var envelope = Seam.Remoting.createEnvelope(Seam.Remoting.createHeader(), data);
+// Seam.Remoting.pendingCalls.put(call.id, call);
- call.asyncReq = Seam.Remoting.sendAjaxRequest(envelope, Seam.Remoting.PATH_EXECUTE, Seam.Remoting.processResponse, false);
-}
+// call.asyncReq = Seam.Remoting.sendAjaxRequest(envelope, Seam.Remoting.PATH_EXECUTE, Seam.Remoting.processResponse, false);
+//}
Seam.Remoting.createCall = function(component, methodName, params, callback)
{
16 years, 10 months
Seam SVN: r7399 - trunk/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-02-08 15:38:16 -0500 (Fri, 08 Feb 2008)
New Revision: 7399
Modified:
trunk/doc/reference/en/modules/websphere.xml
Log:
Updated the required jar list with jboss-archive-browsing.jar and removed concurrent.jar references.
Also added some notes about restarting the server after deployments.
Modified: trunk/doc/reference/en/modules/websphere.xml
===================================================================
--- trunk/doc/reference/en/modules/websphere.xml 2008-02-08 20:36:53 UTC (rev 7398)
+++ trunk/doc/reference/en/modules/websphere.xml 2008-02-08 20:38:16 UTC (rev 7399)
@@ -423,6 +423,7 @@
<!--<include name="lib/log4j.jar" />-->
<include name="lib/el-api.jar" />
<include name="examples/jpa/lib/el-ri.jar" />
+ <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/jsf-api.jar" />
<include name="lib/jsf-impl.jar" />
<include name="lib/jboss-seam.jar" />
@@ -671,8 +672,12 @@
</itemizedlist> </para>
</listitem>
</itemizedlist> </para>
- </listitem>
+ </listitem>
<listitem>
+ <para>You should now restart the server before starting your
+ application.</para>
+ </listitem>
+ <listitem>
<para>To start the application return to the
<literal>Enterprise Applications</literal> table and
select our application in the list. Then choose the
@@ -781,6 +786,10 @@
</para>
</listitem>
<listitem>
+ <para>You should now restart the server before starting your
+ application.</para>
+ </listitem>
+ <listitem>
<para>Finally start the application by selecting it in the
<literal>Enterprise Applications</literal> table and clicking
the <literal>Start</literal> button.
@@ -1402,17 +1411,13 @@
<para> Third party dependencies. You will need to copy the
<literal>jboss-archive-browsing.jar</literal> from the
<literal>$SEAM/examples/jpa/lib</literal> directory into the
- the projects <literal>/lib</literal> directory. You will
- also need to acquire the <literal>concurrent.jar</literal>
- and place it in the same directory. You can get this from
- any jboss distribution or just search for it.</para>
+ the projects <literal>/lib</literal> directory. </para>
<programlisting><![CDATA[
<!-- 3rd party and supporting jars -->
<!--<include name="lib/log4j.jar" />-->
<include name="lib/javassist.jar"/>
<include name="lib/dom4j.jar" />
<include name="lib/jboss-archive-browsing.jar" />
- <include name="lib/concurrent.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
@@ -1461,7 +1466,6 @@
<include name="lib/javassist.jar"/>
<include name="lib/dom4j.jar" />
<include name="lib/jboss-archive-browsing.jar" />
- <include name="lib/concurrent.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
@@ -1498,6 +1502,10 @@
<literal>jboss-seam-jee5</literal>.</para>
</listitem>
<listitem>
+ <para>You should now restart the server before starting your
+ application.</para>
+ </listitem>
+ <listitem>
<para> Checkout the app at:
<literal>http://localhost:9080/websphere_example/index.html</literal>
</para>
16 years, 10 months
Seam SVN: r7398 - branches/Seam_2_0/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-02-08 15:36:53 -0500 (Fri, 08 Feb 2008)
New Revision: 7398
Modified:
branches/Seam_2_0/doc/reference/en/modules/websphere.xml
Log:
Updated the required jar list with jboss-archive-browsing.jar and removed concurrent.jar references.
Also added some notes about restarting the server after deployments.
Modified: branches/Seam_2_0/doc/reference/en/modules/websphere.xml
===================================================================
--- branches/Seam_2_0/doc/reference/en/modules/websphere.xml 2008-02-08 19:17:43 UTC (rev 7397)
+++ branches/Seam_2_0/doc/reference/en/modules/websphere.xml 2008-02-08 20:36:53 UTC (rev 7398)
@@ -423,6 +423,7 @@
<!--<include name="lib/log4j.jar" />-->
<include name="lib/el-api.jar" />
<include name="examples/jpa/lib/el-ri.jar" />
+ <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/jsf-api.jar" />
<include name="lib/jsf-impl.jar" />
<include name="lib/jboss-seam.jar" />
@@ -671,6 +672,10 @@
</itemizedlist> </para>
</listitem>
</itemizedlist> </para>
+ </listitem>
+ <listitem>
+ <para>You should now restart the server before starting your
+ application.</para>
</listitem>
<listitem>
<para>To start the application return to the
@@ -781,6 +786,10 @@
</para>
</listitem>
<listitem>
+ <para>You should now restart the server before starting your
+ application.</para>
+ </listitem>
+ <listitem>
<para>Finally start the application by selecting it in the
<literal>Enterprise Applications</literal> table and clicking
the <literal>Start</literal> button.
@@ -1402,17 +1411,13 @@
<para> Third party dependencies. You will need to copy the
<literal>jboss-archive-browsing.jar</literal> from the
<literal>$SEAM/examples/jpa/lib</literal> directory into the
- the projects <literal>/lib</literal> directory. You will
- also need to acquire the <literal>concurrent.jar</literal>
- and place it in the same directory. You can get this from
- any jboss distribution or just search for it.</para>
+ the projects <literal>/lib</literal> directory.</para>
<programlisting><![CDATA[
<!-- 3rd party and supporting jars -->
<!--<include name="lib/log4j.jar" />-->
<include name="lib/javassist.jar"/>
<include name="lib/dom4j.jar" />
<include name="lib/jboss-archive-browsing.jar" />
- <include name="lib/concurrent.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
@@ -1461,7 +1466,6 @@
<include name="lib/javassist.jar"/>
<include name="lib/dom4j.jar" />
<include name="lib/jboss-archive-browsing.jar" />
- <include name="lib/concurrent.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
@@ -1490,7 +1494,6 @@
). The target of the build will be
<literal>dist/websphere_example.ear</literal> . </para>
</listitem>
-
<listitem>
<para>To deploy the application follow the instructions here :
<xref linkend="jee5-websphere-deploy"/> but use references to
@@ -1498,6 +1501,10 @@
<literal>jboss-seam-jee5</literal>.</para>
</listitem>
<listitem>
+ <para>You should now restart the server before starting your
+ application.</para>
+ </listitem>
+ <listitem>
<para> Checkout the app at:
<literal>http://localhost:9080/websphere_example/index.html</literal>
</para>
16 years, 10 months
Seam SVN: r7397 - tags.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-08 14:17:43 -0500 (Fri, 08 Feb 2008)
New Revision: 7397
Added:
tags/JBoss_Seam_2_1_0_A1/
Log:
2.1.0.A1
Copied: tags/JBoss_Seam_2_1_0_A1 (from rev 7396, trunk)
16 years, 10 months
Seam SVN: r7396 - branches.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-08 14:17:13 -0500 (Fri, 08 Feb 2008)
New Revision: 7396
Removed:
branches/JBoss_Seam_2_1_0_A1/
Log:
woops - need a tag not a branch
16 years, 10 months
Seam SVN: r7395 - branches.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-08 14:15:13 -0500 (Fri, 08 Feb 2008)
New Revision: 7395
Added:
branches/JBoss_Seam_2_1_0_A1/
Log:
2.1.0.A1
Copied: branches/JBoss_Seam_2_1_0_A1 (from rev 7394, trunk)
16 years, 10 months
Seam SVN: r7394 - trunk/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-02-08 14:04:20 -0500 (Fri, 08 Feb 2008)
New Revision: 7394
Modified:
trunk/doc/reference/en/modules/websphere.xml
Log:
fixed a minor cut/paste error
Modified: trunk/doc/reference/en/modules/websphere.xml
===================================================================
--- trunk/doc/reference/en/modules/websphere.xml 2008-02-08 19:03:43 UTC (rev 7393)
+++ trunk/doc/reference/en/modules/websphere.xml 2008-02-08 19:04:20 UTC (rev 7394)
@@ -218,7 +218,7 @@
<ejb-ref-name>jboss-seam-jee5/HotelSearchingAction</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<local-home></local-home>
- <local>org.jboss.seam.example.booking.HotelSAll of the examples and informaearching</local>
+ <local>org.jboss.seam.example.booking.HotelSearching</local>
</ejb-local-ref>
<ejb-local-ref>
16 years, 10 months
Seam SVN: r7393 - branches/Seam_2_0/doc/reference/en/modules.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-02-08 14:03:43 -0500 (Fri, 08 Feb 2008)
New Revision: 7393
Modified:
branches/Seam_2_0/doc/reference/en/modules/websphere.xml
Log:
fixed a minor cut/paste error
Modified: branches/Seam_2_0/doc/reference/en/modules/websphere.xml
===================================================================
--- branches/Seam_2_0/doc/reference/en/modules/websphere.xml 2008-02-07 19:41:43 UTC (rev 7392)
+++ branches/Seam_2_0/doc/reference/en/modules/websphere.xml 2008-02-08 19:03:43 UTC (rev 7393)
@@ -218,7 +218,7 @@
<ejb-ref-name>jboss-seam-jee5/HotelSearchingAction</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<local-home></local-home>
- <local>org.jboss.seam.example.booking.HotelSAll of the examples and informaearching</local>
+ <local>org.jboss.seam.example.booking.HotelSearching</local>
</ejb-local-ref>
<ejb-local-ref>
16 years, 10 months
Seam SVN: r7392 - trunk/src/jbas5/org/jboss/seam/as5/vfs.
by seam-commits＠lists.jboss.org
Author: alesj
Date: 2008-02-07 14:41:43 -0500 (Thu, 07 Feb 2008)
New Revision: 7392
Modified:
trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
Log:
Fix last '/' assumption #2.
Modified: trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
===================================================================
--- trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-02-07 19:20:19 UTC (rev 7391)
+++ trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-02-07 19:41:43 UTC (rev 7392)
@@ -173,16 +173,17 @@
{
String rootPathName = root.getPathName();
int rootPathNameLength = rootPathName.length();
- // past last '/'
- if (rootPathName.endsWith("/"))
- rootPathNameLength++;
-
List<VirtualFile> children = root.getChildrenRecursively();
for (VirtualFile child : children)
{
if (child.isLeaf())
{
- getDeploymentStrategy().handle(child.getPathName().substring(rootPathNameLength));
+ String name = child.getPathName();
+ // move past '/'
+ int length = rootPathNameLength;
+ if (name.charAt(length) == '/')
+ length++;
+ getDeploymentStrategy().handle(name.substring(length));
}
}
}
16 years, 10 months
Seam SVN: r7391 - trunk/src/jbas5/org/jboss/seam/as5/vfs.
by seam-commits＠lists.jboss.org
Author: alesj
Date: 2008-02-07 14:20:19 -0500 (Thu, 07 Feb 2008)
New Revision: 7391
Modified:
trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
Log:
Fix last '/' assumption.
Modified: trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
===================================================================
--- trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-02-07 10:40:12 UTC (rev 7390)
+++ trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-02-07 19:20:19 UTC (rev 7391)
@@ -172,7 +172,11 @@
else
{
String rootPathName = root.getPathName();
- int rootPathNameLength = rootPathName.length() + 1; // past last '/'
+ int rootPathNameLength = rootPathName.length();
+ // past last '/'
+ if (rootPathName.endsWith("/"))
+ rootPathNameLength++;
+
List<VirtualFile> children = root.getChildrenRecursively();
for (VirtualFile child : children)
{
16 years, 10 months