Seam SVN: r11488 - branches/community/Seam_2_2/src/main/org/jboss/seam/async.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-09-15 14:14:24 -0400 (Tue, 15 Sep 2009)
New Revision: 11488
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/async/Schedule.java
branches/community/Seam_2_2/src/main/org/jboss/seam/async/TimerSchedule.java
Log:
JBSEAM-4408
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/async/Schedule.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/async/Schedule.java 2009-09-15 08:09:44 UTC (rev 11487)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/async/Schedule.java 2009-09-15 18:14:24 UTC (rev 11488)
@@ -18,17 +18,17 @@
private Date expiration;
private Date finalExpiration;
- Long getDuration()
+ public Long getDuration()
{
return duration;
}
- Date getExpiration()
+ public Date getExpiration()
{
return expiration;
}
- Date getFinalExpiration()
+ public Date getFinalExpiration()
{
return finalExpiration;
}
@@ -37,7 +37,7 @@
* @param duration the delay before the event occurs
* @param expiration the datetime at which the event occurs
*/
- Schedule(Long duration, Date expiration)
+ public Schedule(Long duration, Date expiration)
{
this.duration = duration;
this.expiration = expiration;
@@ -48,7 +48,7 @@
* @param expiration the datetime at which the event occurs
* @param finalExpiration the datetime at which the event ends
*/
- Schedule(Long duration, Date expiration, Date finalExpiration)
+ public Schedule(Long duration, Date expiration, Date finalExpiration)
{
this.duration = duration;
this.expiration = expiration;
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/async/TimerSchedule.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/async/TimerSchedule.java 2009-09-15 08:09:44 UTC (rev 11487)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/async/TimerSchedule.java 2009-09-15 18:14:24 UTC (rev 11488)
@@ -15,7 +15,7 @@
{
private Long intervalDuration;
- Long getIntervalDuration()
+ public Long getIntervalDuration()
{
return intervalDuration;
}
15 years, 3 months
Seam SVN: r11487 - in branches/enterprise/JBPAPP_5_0/src/test/ftest: examples/openid and 2 other directories.
by seam-commits@lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2009-09-15 04:09:44 -0400 (Tue, 15 Sep 2009)
New Revision: 11487
Modified:
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/build.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/openid/jboss5.xml
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/openid/src/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java
branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
Log:
JBPAPP-2796 Added a functional test for OpenID seam example
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/build.xml 2009-09-15 07:52:41 UTC (rev 11486)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/build.xml 2009-09-15 08:09:44 UTC (rev 11487)
@@ -104,6 +104,8 @@
<sysproperty key="selenium.speed" value="${selenium.speed}" />
<sysproperty key="selenium.timeout" value="${selenium.timeout}" />
<sysproperty key="example.context.path" value="${context.path}" />
+ <sysproperty key="openid.account" value="${openid.account}" />
+ <sysproperty key="openid.password" value="${openid.password}" />
</testng>
</target>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/openid/jboss5.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/openid/jboss5.xml 2009-09-15 07:52:41 UTC (rev 11486)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/openid/jboss5.xml 2009-09-15 08:09:44 UTC (rev 11487)
@@ -17,11 +17,10 @@
-->
<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
<suite name="OpenId example" verbose="2" parallel="false">
- <test name="openid_jboss4">
+ <test name="openid_jboss5">
<parameter name="PROPERTY_FILE" value="" />
<classes>
- <class
- name="org.jboss.seam.example.openid.test.selenium.SeleniumOpenIdTest" />
+ <class name="org.jboss.seam.example.openid.test.selenium.SeleniumOpenIdTest" />
</classes>
</test>
</suite>
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/openid/src/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/openid/src/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java 2009-09-15 07:52:41 UTC (rev 11486)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/openid/src/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java 2009-09-15 08:09:44 UTC (rev 11487)
@@ -1,19 +1,83 @@
+/*
+ * 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.
+ */
package org.jboss.seam.example.openid.test.selenium;
+import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
-
import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
+/**
+ * This class tests basic functionality of Seam OpenId example.
+ *
+ * For executing this test a selenium.browser property is automaticly changed:
+ *
+ * selenium.browser=*chrome (to test Mozilla Firefox)
+ * selenium.browser=*iehta (to test Internet Explorer)
+ *
+ * This parameter tells browser to increase its privileges to be able to
+ * work across multiple domains.
+ *
+ *
+ * @author Martin Gencur
+ *
+ */
public class SeleniumOpenIdTest extends SeamSeleniumTest
{
public static final String HOME_PAGE_TITLE = "OpenID Wall";
-
+ public static final String LOGIN_LINK = "xpath=//input[@value='OpenID Login']";
+ public static final String LOGIN_INPUT = "xpath=//input[@class='openid_input']";
+ public static final String PASSWORD_INPUT = "id=password";
+ public static final String SIGNIN_BUTTON = "id=signin_button";
+ public static final String CONTINUE_BUTTON = "xpath=//button[contains(text(),'Continue')]";
+ public static final String LOGOUT_BUTTON = "xpath=//input[@value='Logout']";
+
+ public static String OPENID_ACCOUNT;
+ public static String OPENID_PASSWORD;
+
+ public static String ORIGINAL_BROWSER;
+
+ @BeforeClass
+ @Parameters( { "openid.account", "openid.password" })
+ public void setCredentials(String account, String password) {
+ OPENID_ACCOUNT = account;
+ OPENID_PASSWORD = password;
+ }
+
+ @AfterClass
+ public void returnBrowser(){
+ super.setBrowser(ORIGINAL_BROWSER);
+ }
+
@BeforeMethod
@Override
public void setUp()
{
+ /*setting browser with enhanced security privileges for selenium*/
+ setProperBrowser(SeamSeleniumTest.getBrowser());
super.setUp();
browser.open(CONTEXT_PATH);
}
@@ -26,4 +90,43 @@
{
assertEquals("Unexpected page title.", HOME_PAGE_TITLE, browser.getTitle());
}
+
+ /**
+ * Method verifies login and logout operations.
+ */
+ @Test(dependsOnMethods={"homePageLoadTest"})
+ public void openIdLoginLogoutTest(){
+ deleteCookies();
+ browser.type(LOGIN_INPUT, OPENID_ACCOUNT);
+ browser.clickAndWait(LOGIN_LINK);
+ browser.type(PASSWORD_INPUT, OPENID_PASSWORD);
+ browser.clickAndWait(SIGNIN_BUTTON);
+ if (browser.isElementPresent(CONTINUE_BUTTON)) {
+ browser.clickAndWait(CONTINUE_BUTTON);
+ }
+ assertTrue("Page should contain information about successfull login", browser.isTextPresent("OpenID login successful..."));
+ browser.clickAndWait(LOGOUT_BUTTON);
+ assertTrue("Page should contain input field which means that user is not logged in anymore", browser.isElementPresent(LOGIN_INPUT));
+ }
+
+ private void deleteCookies(){
+ browser.deleteCookie("session_id","");
+ browser.deleteCookie("secure_session_id","");
+ }
+
+ /**
+ * Method for setting proper browser for selenium so that it can work
+ * across multiple domains.
+ *
+ * @param origBrowser Originally intended browser
+ */
+ private void setProperBrowser(String origBrowser){
+ ORIGINAL_BROWSER = origBrowser;
+ if (origBrowser.equals("*firefox") || origBrowser.equals("*firefoxproxy")) {
+ super.setBrowser("*chrome");
+ }
+ if (origBrowser.equals("*iexplore") || origBrowser.equals("*iexploreproxy")) {
+ super.setBrowser("*iehta");
+ }
+ }
}
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2009-09-15 07:52:41 UTC (rev 11486)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2009-09-15 08:09:44 UTC (rev 11487)
@@ -104,4 +104,14 @@
}
return properties.getProperty(key, "Property not found: " + key);
}
+
+ public static String getBrowser()
+ {
+ return BROWSER;
+ }
+
+ public static void setBrowser(String browser)
+ {
+ BROWSER = browser;
+ }
}
15 years, 3 months
Seam SVN: r11486 - in branches/community/Seam_2_2/src/test/ftest: examples/openid and 2 other directories.
by seam-commits@lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2009-09-15 03:52:41 -0400 (Tue, 15 Sep 2009)
New Revision: 11486
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/build.xml
branches/community/Seam_2_2/src/test/ftest/examples/openid/jboss5.xml
branches/community/Seam_2_2/src/test/ftest/examples/openid/src/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java
branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
Log:
JBSEAM-4412 Added a functional test for OpenID example
Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-09-15 03:19:39 UTC (rev 11485)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml 2009-09-15 07:52:41 UTC (rev 11486)
@@ -118,6 +118,8 @@
<sysproperty key="selenium.speed" value="${selenium.speed}" />
<sysproperty key="selenium.timeout" value="${selenium.timeout}" />
<sysproperty key="example.context.path" value="${context.path}" />
+ <sysproperty key="openid.account" value="${openid.account}" />
+ <sysproperty key="openid.password" value="${openid.password}" />
</testng>
</target>
Modified: branches/community/Seam_2_2/src/test/ftest/examples/openid/jboss5.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/openid/jboss5.xml 2009-09-15 03:19:39 UTC (rev 11485)
+++ branches/community/Seam_2_2/src/test/ftest/examples/openid/jboss5.xml 2009-09-15 07:52:41 UTC (rev 11486)
@@ -17,11 +17,10 @@
-->
<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
<suite name="OpenId example" verbose="2" parallel="false">
- <test name="openid_jboss4">
+ <test name="openid_jboss5">
<parameter name="PROPERTY_FILE" value="" />
<classes>
- <class
- name="org.jboss.seam.example.openid.test.selenium.SeleniumOpenIdTest" />
+ <class name="org.jboss.seam.example.openid.test.selenium.SeleniumOpenIdTest" />
</classes>
</test>
</suite>
Modified: branches/community/Seam_2_2/src/test/ftest/examples/openid/src/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/openid/src/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java 2009-09-15 03:19:39 UTC (rev 11485)
+++ branches/community/Seam_2_2/src/test/ftest/examples/openid/src/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java 2009-09-15 07:52:41 UTC (rev 11486)
@@ -1,19 +1,83 @@
+/*
+ * 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.
+ */
package org.jboss.seam.example.openid.test.selenium;
+import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
-
import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
+/**
+ * This class tests basic functionality of Seam OpenId example.
+ *
+ * For executing this test a selenium.browser property is automaticly changed:
+ *
+ * selenium.browser=*chrome (to test Mozilla Firefox)
+ * selenium.browser=*iehta (to test Internet Explorer)
+ *
+ * This parameter tells browser to increase its privileges to be able to
+ * work across multiple domains.
+ *
+ *
+ * @author Martin Gencur
+ *
+ */
public class SeleniumOpenIdTest extends SeamSeleniumTest
{
public static final String HOME_PAGE_TITLE = "OpenID Wall";
-
+ public static final String LOGIN_LINK = "xpath=//input[@value='OpenID Login']";
+ public static final String LOGIN_INPUT = "xpath=//input[@class='openid_input']";
+ public static final String PASSWORD_INPUT = "id=password";
+ public static final String SIGNIN_BUTTON = "id=signin_button";
+ public static final String CONTINUE_BUTTON = "xpath=//button[contains(text(),'Continue')]";
+ public static final String LOGOUT_BUTTON = "xpath=//input[@value='Logout']";
+
+ public static String OPENID_ACCOUNT;
+ public static String OPENID_PASSWORD;
+
+ public static String ORIGINAL_BROWSER;
+
+ @BeforeClass
+ @Parameters( { "openid.account", "openid.password" })
+ public void setCredentials(String account, String password) {
+ OPENID_ACCOUNT = account;
+ OPENID_PASSWORD = password;
+ }
+
+ @AfterClass
+ public void returnBrowser(){
+ super.setBrowser(ORIGINAL_BROWSER);
+ }
+
@BeforeMethod
@Override
public void setUp()
{
+ /*setting browser with enhanced security privileges for selenium*/
+ setProperBrowser(SeamSeleniumTest.getBrowser());
super.setUp();
browser.open(CONTEXT_PATH);
}
@@ -26,4 +90,43 @@
{
assertEquals("Unexpected page title.", HOME_PAGE_TITLE, browser.getTitle());
}
+
+ /**
+ * Method verifies login and logout operations.
+ */
+ @Test(dependsOnMethods={"homePageLoadTest"})
+ public void openIdLoginLogoutTest(){
+ deleteCookies();
+ browser.type(LOGIN_INPUT, OPENID_ACCOUNT);
+ browser.clickAndWait(LOGIN_LINK);
+ browser.type(PASSWORD_INPUT, OPENID_PASSWORD);
+ browser.clickAndWait(SIGNIN_BUTTON);
+ if (browser.isElementPresent(CONTINUE_BUTTON)) {
+ browser.clickAndWait(CONTINUE_BUTTON);
+ }
+ assertTrue("Page should contain information about successfull login", browser.isTextPresent("OpenID login successful..."));
+ browser.clickAndWait(LOGOUT_BUTTON);
+ assertTrue("Page should contain input field which means that user is not logged in anymore", browser.isElementPresent(LOGIN_INPUT));
+ }
+
+ private void deleteCookies(){
+ browser.deleteCookie("session_id","");
+ browser.deleteCookie("secure_session_id","");
+ }
+
+ /**
+ * Method for setting proper browser for selenium so that it can work
+ * across multiple domains.
+ *
+ * @param origBrowser Originally intended browser
+ */
+ private void setProperBrowser(String origBrowser){
+ ORIGINAL_BROWSER = origBrowser;
+ if (origBrowser.equals("*firefox") || origBrowser.equals("*firefoxproxy")) {
+ super.setBrowser("*chrome");
+ }
+ if (origBrowser.equals("*iexplore") || origBrowser.equals("*iexploreproxy")) {
+ super.setBrowser("*iehta");
+ }
+ }
}
Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2009-09-15 03:19:39 UTC (rev 11485)
+++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2009-09-15 07:52:41 UTC (rev 11486)
@@ -104,4 +104,14 @@
}
return properties.getProperty(key, "Property not found: " + key);
}
+
+ public static String getBrowser()
+ {
+ return BROWSER;
+ }
+
+ public static void setBrowser(String browser)
+ {
+ BROWSER = browser;
+ }
}
15 years, 3 months
Seam SVN: r11485 - branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-09-14 23:19:39 -0400 (Mon, 14 Sep 2009)
New Revision: 11485
Modified:
branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
Log:
JBSEAM-2852
Modified: branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java
===================================================================
--- branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2009-09-14 14:20:35 UTC (rev 11484)
+++ branches/community/Seam_2_2/src/remoting/org/jboss/seam/remoting/InterfaceGenerator.java 2009-09-15 03:19:39 UTC (rev 11485)
@@ -269,7 +269,7 @@
{
StringBuilder componentSrc = new StringBuilder();
- Class type = null;
+ Set<Class> componentTypes = new HashSet<Class>();
if (component.getType().isSessionBean() &&
component.getBusinessInterfaces().size() > 0)
@@ -279,12 +279,12 @@
// Use the Local interface
if (c.isAnnotationPresent(EJB.LOCAL))
{
- type = c;
+ componentTypes.add(c);
break;
}
}
- if (type == null)
+ if (componentTypes.isEmpty())
throw new RuntimeException(String.format(
"Type cannot be determined for component [%s]. Please ensure that it has a local interface.", component));
}
@@ -301,25 +301,34 @@
{
if (m.getAnnotation(WebRemote.class) != null)
{
- type = component.getBeanClass();
+ componentTypes.add(component.getBeanClass());
break;
}
}
- if (type == null)
+ if (componentTypes.isEmpty())
{
appendTypeSource(out, component.getBeanClass(), types);
return;
}
}
else
- type = component.getBeanClass();
+ {
+ componentTypes.add(component.getBeanClass());
+ }
- if (types.contains(type))
- return;
-
- types.add(type);
-
+ // If types already contains all the component types, then return
+ boolean foundNew = false;
+ for (Class type : componentTypes)
+ {
+ if (!types.contains(type))
+ {
+ foundNew = true;
+ break;
+ }
+ }
+ if (!foundNew) return;
+
if (component.getName().contains("."))
{
componentSrc.append("Seam.Remoting.createNamespace('");
@@ -332,64 +341,75 @@
componentSrc.append(component.getName());
componentSrc.append(" = function() {\n");
componentSrc.append(" this.__callback = new Object();\n");
-
- for (Method m : type.getDeclaredMethods())
+
+ for (Class type : componentTypes)
{
- if (m.getAnnotation(WebRemote.class) == null) continue;
+ if (types.contains(type))
+ {
+ break;
+ }
+ else
+ {
+ types.add(type);
- // Append the return type to the source block
- appendTypeSource(out, m.getGenericReturnType(), types);
+ for (Method m : type.getDeclaredMethods())
+ {
+ if (m.getAnnotation(WebRemote.class) == null) continue;
- componentSrc.append(" Seam.Remoting.type.");
- componentSrc.append(component.getName());
- componentSrc.append(".prototype.");
- componentSrc.append(m.getName());
- componentSrc.append(" = function(");
+ // Append the return type to the source block
+ appendTypeSource(out, m.getGenericReturnType(), types);
- // Insert parameters p0..pN
- for (int i = 0; i < m.getGenericParameterTypes().length; i++)
- {
- appendTypeSource(out, m.getGenericParameterTypes()[i], types);
+ componentSrc.append(" Seam.Remoting.type.");
+ componentSrc.append(component.getName());
+ componentSrc.append(".prototype.");
+ componentSrc.append(m.getName());
+ componentSrc.append(" = function(");
- if (i > 0) componentSrc.append(", ");
- componentSrc.append("p");
- componentSrc.append(i);
- }
+ // Insert parameters p0..pN
+ for (int i = 0; i < m.getGenericParameterTypes().length; i++)
+ {
+ appendTypeSource(out, m.getGenericParameterTypes()[i], types);
- if (m.getGenericParameterTypes().length > 0) componentSrc.append(", ");
- componentSrc.append("callback, exceptionHandler) {\n");
+ if (i > 0) componentSrc.append(", ");
+ componentSrc.append("p");
+ componentSrc.append(i);
+ }
- componentSrc.append(" return Seam.Remoting.execute(this, \"");
- componentSrc.append(m.getName());
- componentSrc.append("\", [");
+ if (m.getGenericParameterTypes().length > 0) componentSrc.append(", ");
+ componentSrc.append("callback, exceptionHandler) {\n");
- for (int i = 0; i < m.getParameterTypes().length; i++)
- {
- if (i > 0) componentSrc.append(", ");
- componentSrc.append("p");
- componentSrc.append(i);
- }
+ componentSrc.append(" return Seam.Remoting.execute(this, \"");
+ componentSrc.append(m.getName());
+ componentSrc.append("\", [");
- componentSrc.append("], callback, exceptionHandler);\n");
+ for (int i = 0; i < m.getParameterTypes().length; i++)
+ {
+ if (i > 0) componentSrc.append(", ");
+ componentSrc.append("p");
+ componentSrc.append(i);
+ }
- componentSrc.append(" }\n");
- }
+ componentSrc.append("], callback, exceptionHandler);\n");
- componentSrc.append("}\n");
+ componentSrc.append(" }\n");
+ }
+ }
+ componentSrc.append("}\n");
- // Set the component name
- componentSrc.append("Seam.Remoting.type.");
- componentSrc.append(component.getName());
- componentSrc.append(".__name = \"");
- componentSrc.append(component.getName());
- componentSrc.append("\";\n\n");
+ // Set the component name
+ componentSrc.append("Seam.Remoting.type.");
+ componentSrc.append(component.getName());
+ componentSrc.append(".__name = \"");
+ componentSrc.append(component.getName());
+ componentSrc.append("\";\n\n");
- // Register the component
- componentSrc.append("Seam.Component.register(Seam.Remoting.type.");
- componentSrc.append(component.getName());
- componentSrc.append(");\n\n");
+ // Register the component
+ componentSrc.append("Seam.Component.register(Seam.Remoting.type.");
+ componentSrc.append(component.getName());
+ componentSrc.append(");\n\n");
- out.write(componentSrc.toString().getBytes());
+ out.write(componentSrc.toString().getBytes());
+ }
}
/**
15 years, 3 months
Seam SVN: r11484 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jmx.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2009-09-14 10:20:35 -0400 (Mon, 14 Sep 2009)
New Revision: 11484
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java
Log:
JBPAPP-2787
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java 2009-09-11 19:42:44 UTC (rev 11483)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java 2009-09-14 14:20:35 UTC (rev 11484)
@@ -139,10 +139,10 @@
protected MBeanServer locateJBoss()
{
- for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext(); )
+ for (Object o : MBeanServerFactory.findMBeanServer(null))
{
- MBeanServer server = (MBeanServer) i.next();
- if (server.getDefaultDomain().equals("jboss"))
+ MBeanServer server = (MBeanServer) o;
+ if ("jboss".equals(server.getDefaultDomain()))
{
return server;
}
15 years, 3 months
Seam SVN: r11483 - branches/community/Seam_2_2/examples.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-09-11 15:42:44 -0400 (Fri, 11 Sep 2009)
New Revision: 11483
Modified:
branches/community/Seam_2_2/examples/build.xml
Log:
JBSEAM-4409
Modified: branches/community/Seam_2_2/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/examples/build.xml 2009-09-11 19:41:54 UTC (rev 11482)
+++ branches/community/Seam_2_2/examples/build.xml 2009-09-11 19:42:44 UTC (rev 11483)
@@ -161,7 +161,6 @@
<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" />
@@ -169,6 +168,21 @@
<include name="jcommon.jar" if="seam.pdf.lib" />
</fileset>
+
+ <!-- seam flex integration and dependencies-->
+ <fileset id="seam.flex.jar" dir="${lib.dir}">
+ <include name="jboss-seam-flex.jar" if="seam.flex.lib" />
+ </fileset>
+ <fileset id="seam.flex.extra.jar" dir="${lib.dir}">
+ <include name="blazeds-common.jar" if="seam.flex.lib" />
+ <include name="blazeds-core.jar" if="seam.flex.lib" />
+ <include name="blazeds-proxy.jar" if="seam.flex.lib" />
+ <include name="blazeds-remoting.jar" if="seam.flex.lib" />
+ <include name="backport-util-concurrent.jar" if="seam.flex.lib"/>
+ <include name="commons-httpclient.jar" if="seam.flex.lib"/>
+ </fileset>
+
+
<!-- Seam excel, with required dependencies -->
<fileset id="seam.excel.jar" dir="${lib.dir}">
<include name="jboss-seam-excel.jar" if="seam.excel.lib" />
@@ -555,6 +569,7 @@
<exclude name="jboss-seam-ui.jar" />
<exclude name="jboss-seam-mail.jar" />
<exclude name="jboss-seam-pdf.jar" />
+ <!-- <exclude name="jboss-seam-flex.jar" /> -->
<exclude name="jboss-seam-excel.jar" />
<exclude name="jboss-seam-rss.jar" />
</fileset>
@@ -690,6 +705,7 @@
<fileset refid="seam.excel.jar" />
<fileset refid="seam.rss.jar" />
<fileset refid="seam.pdf.jar" />
+ <!-- <fileset refid="seam.flex.jar" /> -->
<fileset refid="seam.ui.jar" />
<fileset refid="facelets.jar" />
<fileset refid="urlrewrite.jar" />
@@ -767,6 +783,7 @@
<fileset refid="gwt.jar" />
<fileset refid="quartz.jar" />
<fileset refid="seam.pdf.extra.jar" />
+ <fileset refid="seam.flex.extra.jar" />
<fileset refid="spring.jar" />
<fileset refid="jcaptcha.jar" />
<fileset refid="antlr.jar" />
@@ -775,6 +792,7 @@
<fileset refid="seam.wicket.jar" />
<fileset refid="seam.resteasy.jar" />
<fileset refid="seam.remoting.jar" />
+ <fileset refid="seam.flex.jar" />
<fileset refid="seam.ioc-guice.jar" />
<fileset refid="el-ri.jar" />
<fileset refid="trinidad-api.jar" />
@@ -962,6 +980,7 @@
<fileset refid="search.jar" />
<fileset refid="richfaces-api.jar" />
<fileset refid="seam.pdf.extra.jar" />
+ <fileset refid="seam.flex.extra.jar" />
<mapper type="flatten" />
</copy>
<!-- Copy in resources, with filtering -->
15 years, 3 months
Seam SVN: r11482 - branches/community/Seam_2_2.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-09-11 15:41:54 -0400 (Fri, 11 Sep 2009)
New Revision: 11482
Modified:
branches/community/Seam_2_2/build.xml
Log:
JBSEAM-4409
Modified: branches/community/Seam_2_2/build.xml
===================================================================
--- branches/community/Seam_2_2/build.xml 2009-09-11 19:41:09 UTC (rev 11481)
+++ branches/community/Seam_2_2/build.xml 2009-09-11 19:41:54 UTC (rev 11482)
@@ -22,6 +22,7 @@
<property name="classes.dir" value="${tmp.dir}" />
<property name="classes.core.dir" value="${classes.dir}/coreclasses" />
<property name="classes.pdf.dir" value="${classes.dir}/pdfclasses" />
+ <property name="classes.flex.dir" value="${classes.dir}/flexclasses" />
<property name="classes.excel.dir" value="${classes.dir}/excelclasses" />
<property name="classes.ioc.dir" value="${classes.dir}/iocclasses" />
<property name="classes.mail.dir" value="${classes.dir}/mailclasses" />
@@ -43,6 +44,7 @@
<property name="src.core.dir" value="src/main" />
<property name="src.ui.dir" value="${ui.dir}/src" />
<property name="src.pdf.dir" value="src/pdf" />
+ <property name="src.flex.dir" value="src/flex" />
<property name="src.excel.dir" value="src/excel" />
<property name="src.ioc.dir" value="src/ioc" />
<property name="src.mail.dir" value="src/mail" />
@@ -80,6 +82,7 @@
<property name="dist.ui.dir" value="${dist.dir}/ui" />
<property name="dist.src.excel.dir" value="${dist.dir}/src/excel" />
<property name="dist.src.pdf.dir" value="${dist.dir}/src/pdf" />
+ <property name="dist.src.flex.dir" value="${dist.dir}/src/flex" />
<property name="dist.src.ioc.dir" value="${dist.dir}/src/ioc" />
<property name="dist.src.mail.dir" value="${dist.dir}/src/mail" />
<property name="dist.src.rss.dir" value="${dist.dir}/src/rss" />
@@ -175,7 +178,7 @@
<delete dir="${lib.dir}" quiet="${quietclean}" />
</target>
- <target name="build" depends="jarcore,jarexcel,jarrss,jarpdf,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" />
+ <target name="build" depends="jarcore,jarexcel,jarrss,jarpdf,jarflex,jarioc,jarmail,jarremoting,jardebug,jargen,jarui,jarwicket, jarjul, jarresteasy" description="Build all distribution .jar files" />
<target name="select-compiler">
<available classname="org.eclipse.jdt.core.JDTCompilerAdapter" property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
@@ -245,6 +248,21 @@
<archive classesdir="${classes.pdf.dir}" module="jboss-seam-pdf" pom="${pdf.pom}" srcdir="${src.pdf.dir}" />
</target>
+ <!-- ########################### FLEX TARGETS ###########################-->
+
+ <target name="initflex" depends="init, jarcore, jarui">
+ <init classesdir="${classes.flex.dir}" srcdir="${src.flex.dir}" modulename="flex" pom="${flex.pom}" />
+ </target>
+
+ <target name="compileflex" depends="initflex, select-compiler">
+ <compile classesdir="${classes.flex.dir}" srcdir="${src.flex.dir}" classpath="compile.flex.path" />
+ </target>
+
+ <target name="jarflex" depends="compileflex" description="Build the distribution .jar file for the FLEX package">
+ <archive classesdir="${classes.flex.dir}" module="jboss-seam-flex" pom="${flex.pom}" srcdir="${src.flex.dir}" />
+ </target>
+
+
<!-- ########################### EXCEL TARGETS ###########################-->
<target name="initexcel" depends="init, jarcore, jarui">
@@ -589,6 +607,7 @@
<target name="copysource">
<copysource destdir="${dist.src.core.dir}" srcdir="${src.core.dir}" />
<copysource destdir="${dist.src.pdf.dir}" srcdir="${src.pdf.dir}" />
+ <copysource destdir="${dist.src.flex.dir}" srcdir="${src.flex.dir}" />
<copysource destdir="${dist.src.rss.dir}" srcdir="${src.rss.dir}" />
<copysource destdir="${dist.src.excel.dir}" srcdir="${src.excel.dir}" />
<copysource destdir="${dist.src.ioc.dir}" srcdir="${src.ioc.dir}" />
@@ -1166,6 +1185,7 @@
<propertyref name="remoting.pom" />
<propertyref name="gen.pom" />
<propertyref name="pdf.pom" />
+ <propertyref name="flex.pom" />
<propertyref name="excel.pom" />
<propertyref name="rss.pom" />
<propertyref name="ioc.pom" />
@@ -1189,6 +1209,7 @@
<dependenciesWithSources id="ioc" scope="compile" pom="${ioc.pom}" />
<dependenciesWithSources id="mail" scope="compile" pom="${mail.pom}" />
<dependenciesWithSources id="pdf" scope="compile" pom="${pdf.pom}" />
+ <dependenciesWithSources id="flex" scope="compile" pom="${flex.pom}" />
<dependenciesWithSources id="excel" scope="compile" pom="${excel.pom}" />
<dependenciesWithSources id="rss" scope="compile" pom="${rss.pom}" />
<dependenciesWithSources id="remoting" scope="compile" pom="${remoting.pom}" />
@@ -1210,6 +1231,7 @@
<dependencies id="ioc" scope="compile" pom="${ioc.pom}" />
<dependencies id="mail" scope="compile" pom="${mail.pom}" />
<dependencies id="pdf" scope="compile" pom="${pdf.pom}" />
+ <dependencies id="flex" scope="compile" pom="${flex.pom}" />
<dependencies id="excel" scope="compile" pom="${excel.pom}" />
<dependencies id="rss" scope="compile" pom="${rss.pom}" />
<dependencies id="remoting" scope="compile" pom="${remoting.pom}" />
@@ -1221,6 +1243,7 @@
<path refid="compile.ioc.path" />
<path refid="compile.mail.path" />
<path refid="compile.pdf.path" />
+ <path refid="compile.flex.path" />
<path refid="compile.excel.path" />
<path refid="compile.rss.path" />
<path refid="compile.remoting.path" />
15 years, 3 months
Seam SVN: r11481 - branches/community/Seam_2_2/build.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-09-11 15:41:09 -0400 (Fri, 11 Sep 2009)
New Revision: 11481
Added:
branches/community/Seam_2_2/build/flex.pom.xml
Modified:
branches/community/Seam_2_2/build/common.build.xml
branches/community/Seam_2_2/build/root.pom.xml
Log:
JBSEAM-4409
Modified: branches/community/Seam_2_2/build/common.build.xml
===================================================================
--- branches/community/Seam_2_2/build/common.build.xml 2009-09-11 19:39:06 UTC (rev 11480)
+++ branches/community/Seam_2_2/build/common.build.xml 2009-09-11 19:41:09 UTC (rev 11481)
@@ -106,6 +106,7 @@
<pomfile name="ioc.pom" value="${build.dir}/ioc.pom.xml" />
<pomfile name="mail.pom" value="${build.dir}/mail.pom.xml" />
<pomfile name="pdf.pom" value="${build.dir}/pdf.pom.xml" />
+ <pomfile name="flex.pom" value="${build.dir}/flex.pom.xml" />
<pomfile name="excel.pom" value="${build.dir}/excel.pom.xml" />
<pomfile name="rss.pom" value="${build.dir}/rss.pom.xml" />
<pomfile name="remoting.pom" value="${build.dir}/remoting.pom.xml" />
@@ -121,23 +122,25 @@
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" />
+ <copyDependencies id="flex" pom="${flex.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="excel" pom="${excel.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="resteasy" pom="${resteasy.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="runtime" />
- <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}/gen" scope="runtime" />
+ <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}/gen" scope="runtime" />
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
+ <copyDependencies id="flex" pom="${flex.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="excel" pom="${excel.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="rss" pom="${rss.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="resteasy" pom="${resteasy.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" />
- <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}/gen" scope="compile" />
+ <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}/gen" scope="compile" />
<property name="copyseamdependenciesdone" value="true" />
</target>
@@ -149,6 +152,7 @@
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ioc" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-mail" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" />
+ <dependency groupId="org.jboss.seam" artifactId="jboss-seam-flex" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-resteasy" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" />
@@ -190,6 +194,7 @@
<deploy pom="${remoting.pom}" jar="${seam.dir}/lib/jboss-seam-remoting.jar" repositoryId="@{repositoryId}" />
<deploy pom="${resteasy.pom}" jar="${seam.dir}/lib/jboss-seam-resteasy.jar" repositoryId="@{repositoryId}" />
<deploy pom="${pdf.pom}" jar="${seam.dir}/lib/jboss-seam-pdf.jar" repositoryId="@{repositoryId}" />
+ <deploy pom="${flex.pom}" jar="${seam.dir}/lib/jboss-seam-flex.jar" repositoryId="@{repositoryId}" />
<deploy pom="${excel.pom}" jar="${seam.dir}/lib/jboss-seam-excel.jar" repositoryId="@{repositoryId}" />
<deploy pom="${rss.pom}" jar="${seam.dir}/lib/jboss-seam-rss.jar" repositoryId="@{repositoryId}" />
<deploy pom="${mail.pom}" jar="${seam.dir}/lib/jboss-seam-mail.jar" repositoryId="@{repositoryId}" />
@@ -218,6 +223,7 @@
<propertyref name="remoting.pom" />
<propertyref name="resteasy.pom" />
<propertyref name="pdf.pom" />
+ <propertyref name="flex.pom" />
<propertyref name="rss.pom" />
<propertyref name="gen.pom" />
<propertyref name="excel.pom" />
@@ -255,14 +261,15 @@
<propertyref name="parent.pom" />
<propertyref name="ui.pom" />
<propertyref name="remoting.pom" />
- <propertyref name="resteasy.pom" />
+ <propertyref name="resteasy.pom" />
<propertyref name="gen.pom" />
<propertyref name="pdf.pom" />
+ <propertyref name="flex.pom" />
<propertyref name="excel.pom" />
<propertyref name="ioc.pom" />
<propertyref name="mail.pom" />
<propertyref name="debug.pom" />
- <propertyref name="wicket.pom" />
+ <propertyref name="wicket.pom" />
<propertyref name="testng.jvmargs"/>
</propertyset>
</ant>
@@ -295,6 +302,7 @@
<propertyref name="resteasy.pom" />
<propertyref name="gen.pom" />
<propertyref name="pdf.pom" />
+ <propertyref name="flex.pom" />
<propertyref name="rss.pom" />
<propertyref name="excel.pom" />
<propertyref name="ioc.pom" />
@@ -361,6 +369,7 @@
<outputDependencyReport module="remoting" />
<outputDependencyReport module="mail" />
<outputDependencyReport module="pdf" />
+ <outputDependencyReport module="flex" />
<outputDependencyReport module="excel" />
<outputDependencyReport module="rss" />
<outputDependencyReport module="ioc" />
Added: branches/community/Seam_2_2/build/flex.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/flex.pom.xml (rev 0)
+++ branches/community/Seam_2_2/build/flex.pom.xml 2009-09-11 19:41:09 UTC (rev 11481)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-flex</artifactId>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>parent</artifactId>
+ <version>@seam.version@</version>
+ </parent>
+
+ <!-- See parent pom for notes on how to declare dependencies -->
+
+ <dependencies>
+ <dependency>
+ <groupId>com.adobe.blazeds</groupId>
+ <artifactId>blazeds-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.blazeds</groupId>
+ <artifactId>blazeds-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.blazeds</groupId>
+ <artifactId>blazeds-remoting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.adobe.blazeds</groupId>
+ <artifactId>blazeds-proxy</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Modified: branches/community/Seam_2_2/build/root.pom.xml
===================================================================
--- branches/community/Seam_2_2/build/root.pom.xml 2009-09-11 19:39:06 UTC (rev 11480)
+++ branches/community/Seam_2_2/build/root.pom.xml 2009-09-11 19:41:09 UTC (rev 11481)
@@ -985,6 +985,30 @@
</dependency>
<dependency>
+ <groupId>com.adobe.blazeds</groupId>
+ <artifactId>blazeds-common</artifactId>
+ <version>3.2.0.3978</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.adobe.blazeds</groupId>
+ <artifactId>blazeds-proxy</artifactId>
+ <version>3.2.0.3978</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.adobe.blazeds</groupId>
+ <artifactId>blazeds-core</artifactId>
+ <version>3.2.0.3978</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.adobe.blazeds</groupId>
+ <artifactId>blazeds-remoting</artifactId>
+ <version>3.2.0.3978</version>
+ </dependency>
+
+ <dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<version>2.1.2</version>
15 years, 3 months
Seam SVN: r11480 - in branches/community/Seam_2_2/src: flex and 5 other directories.
by seam-commits@lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2009-09-11 15:39:06 -0400 (Fri, 11 Sep 2009)
New Revision: 11480
Added:
branches/community/Seam_2_2/src/flex/
branches/community/Seam_2_2/src/flex/META-INF/
branches/community/Seam_2_2/src/flex/META-INF/seam-deployment.properties
branches/community/Seam_2_2/src/flex/org/
branches/community/Seam_2_2/src/flex/org/jboss/
branches/community/Seam_2_2/src/flex/org/jboss/seam/
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexAuthenticationBridge.java
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexFilter.java
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexRemote.java
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexSeamFactory.java
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/MessageBrokerManager.java
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/Remote.java
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/SeamAdapter.java
branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/package-info.java
branches/community/Seam_2_2/src/flex/seam.properties
Log:
flex support
Added: branches/community/Seam_2_2/src/flex/META-INF/seam-deployment.properties
===================================================================
--- branches/community/Seam_2_2/src/flex/META-INF/seam-deployment.properties (rev 0)
+++ branches/community/Seam_2_2/src/flex/META-INF/seam-deployment.properties 2009-09-11 19:39:06 UTC (rev 11480)
@@ -0,0 +1 @@
+org.jboss.seam.deployment.annotationTypes=org.jboss.seam.flex.FlexRemote
\ No newline at end of file
Added: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexAuthenticationBridge.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexAuthenticationBridge.java (rev 0)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexAuthenticationBridge.java 2009-09-11 19:39:06 UTC (rev 11480)
@@ -0,0 +1,37 @@
+package org.jboss.seam.flex;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Install;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.jboss.seam.security.Credentials;
+import org.jboss.seam.security.Identity;
+
+
+@Name("org.jboss.seam.flex.login")
+@Install(false)
+@FlexRemote(name="login")
+public class FlexAuthenticationBridge
+{
+ private static final LogProvider log = Logging.getLogProvider(FlexAuthenticationBridge.class);
+
+ @In Identity identity;
+ @In Credentials credentials;
+
+ public String login(String username, String password) {
+ log.info("*LOGIN " + username + " " + password);
+ credentials.setUsername(username);
+ credentials.setPassword(password);
+
+ String result = identity.login();
+
+ log.info("*LOGIN RESULT " + result);
+ return result;
+ }
+
+ public void logout() {
+ log.info("*LOGOUT ");
+ identity.logout();
+ }
+}
Added: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexFilter.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexFilter.java (rev 0)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexFilter.java 2009-09-11 19:39:06 UTC (rev 11480)
@@ -0,0 +1,130 @@
+package org.jboss.seam.flex;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import java.io.*;
+import java.util.*;
+
+import org.jboss.seam.*;
+
+import org.jboss.seam.annotations.*;
+import org.jboss.seam.annotations.intercept.*;
+import org.jboss.seam.deployment.AnnotationDeploymentHandler;
+import org.jboss.seam.deployment.DeploymentStrategy;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.jboss.seam.servlet.ContextualHttpServletRequest;
+import org.jboss.seam.web.AbstractFilter;
+
+(a)Scope(ScopeType.APPLICATION)
+@Name("org.jboss.seam.flex.flexFilter")
+@Startup
+(a)Install(precedence=Install.BUILT_IN)
+@BypassInterceptors
+(a)org.jboss.seam.annotations.web.Filter //within={"org.jboss.seam.????"}
+public class FlexFilter
+ extends AbstractFilter
+{
+ private static final LogProvider log = Logging.getLogProvider(FlexFilter.class);
+
+ MessageBrokerManager messageBrokerManager;
+ List<Class<?>> scanned = new ArrayList<Class<?>>();
+
+ private AnnotationDeploymentHandler annotationDeploymentHandler() {
+ DeploymentStrategy deployment = (DeploymentStrategy) Component.getInstance("deploymentStrategy");
+
+ if (deployment != null) {
+ return (AnnotationDeploymentHandler)
+ deployment.getDeploymentHandlers().get(AnnotationDeploymentHandler.NAME);
+ }
+
+ return null;
+ }
+
+ private Collection<Class<?>> scannedClasses() {
+ Collection<Class<?>> result = null;
+
+ AnnotationDeploymentHandler handler = annotationDeploymentHandler();
+ if (handler !=null) {
+ result = handler.getClassMap().get(FlexRemote.class.getName());
+ }
+
+ return result != null ? result : new ArrayList<Class<?>>(0);
+ }
+
+ @Create
+ public void seamInit() {
+ // deployment handler only knows about scanned classes during startup
+ // so we need to get them now and save them
+ scanned.addAll(scannedClasses());
+ }
+
+ @Override
+ public void init(FilterConfig filterConfig)
+ throws ServletException
+ {
+ super.init(filterConfig);
+
+ messageBrokerManager = new MessageBrokerManager();
+ messageBrokerManager.init(new FlexServletConfig(filterConfig.getServletContext()));
+ messageBrokerManager.addDestinations(scanned);
+ }
+
+
+ public void doFilter(final ServletRequest request, final ServletResponse response, FilterChain chain)
+ throws IOException, ServletException
+ {
+ if (isMappedToCurrentRequestPath(request)) {
+ new ContextualHttpServletRequest((HttpServletRequest) request)
+ {
+ @Override
+ public void process()
+ throws ServletException, IOException
+ {
+ messageBrokerManager.service((HttpServletRequest)request,
+ (HttpServletResponse)response);
+ }
+ }.run();
+ } else {
+ chain.doFilter(request, response);
+ }
+ }
+
+
+ private static class FlexServletConfig
+ implements ServletConfig
+ {
+ Map<String,String> params;
+ ServletContext context;
+
+ public FlexServletConfig(ServletContext context) {
+ this(context, null);
+ }
+
+ public FlexServletConfig(ServletContext context, Map<String,String> params) {
+ this.context = context;
+ this.params = (params!=null) ? params : new HashMap<String,String>();
+ }
+
+ public ServletContext getServletContext() {
+ return context;
+ }
+
+ public String getServletName() {
+ return "FlexServlet";
+ }
+
+ public String getInitParameter(String param) {
+ log.info("*** FSC getInitParam " + param);
+ return params.get(param);
+ }
+
+ @SuppressWarnings("unchecked")
+ public Enumeration getInitParameterNames() {
+ return Collections.enumeration(params.keySet());
+ }
+
+ }
+}
\ No newline at end of file
Added: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexRemote.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexRemote.java (rev 0)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexRemote.java 2009-09-11 19:39:06 UTC (rev 11480)
@@ -0,0 +1,16 @@
+package org.jboss.seam.flex;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+(a)Target(ElementType.TYPE)
+@Documented
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface FlexRemote
+{
+ abstract String name();
+}
Added: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexSeamFactory.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexSeamFactory.java (rev 0)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/FlexSeamFactory.java 2009-09-11 19:39:06 UTC (rev 11480)
@@ -0,0 +1,45 @@
+package org.jboss.seam.flex;
+
+import org.jboss.seam.Component;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+
+import flex.messaging.FlexFactory;
+import flex.messaging.FactoryInstance;
+import flex.messaging.config.ConfigMap;
+
+
+public class FlexSeamFactory
+ implements FlexFactory
+{
+ private static final LogProvider log = Logging.getLogProvider(FlexSeamFactory.class);
+
+ String destinationName;
+ String componentName;
+
+ public FlexSeamFactory(String destinationName, String componentName) {
+ this.componentName = componentName;
+ this.destinationName = destinationName;
+ }
+
+ public void initialize(String id, ConfigMap configMap) {
+ log.info("!FSF init " + id + " props=" + configMap);
+ }
+
+ public FactoryInstance createFactoryInstance(String id, ConfigMap properties) {
+ log.info("!FSF create factory " + id + " props=" + properties);
+ return new FactoryInstance(this, id, properties);
+ }
+
+ public Object lookup(FactoryInstance factory) {
+ log.info("!FSF lookup " + factory);
+
+ try {
+ Object instance = Component.getInstance(componentName, true);
+ return instance;
+ } catch (Exception e) {
+ log.error(e);
+ return null;
+ }
+ }
+}
Added: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/MessageBrokerManager.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/MessageBrokerManager.java (rev 0)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/MessageBrokerManager.java 2009-09-11 19:39:06 UTC (rev 11480)
@@ -0,0 +1,246 @@
+package org.jboss.seam.flex;
+
+import java.io.*;
+import java.lang.reflect.Method;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Collection;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+
+import flex.messaging.*;
+import flex.messaging.config.*;
+import flex.messaging.endpoints.Endpoint;
+import flex.messaging.log.ServletLogTarget;
+import flex.messaging.services.RemotingService;
+import flex.messaging.services.remoting.*;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+import org.jboss.seam.util.Reflections;
+import org.jboss.seam.util.Resources;
+
+
+public class MessageBrokerManager
+{
+ private static final LogProvider log = Logging.getLogProvider(MessageBrokerManager.class);
+
+ private static String FLEXDIR = "/WEB-INF/flex/";
+
+ private flex.messaging.MessageBroker broker;
+
+ private ServletConfig servletConfig;
+
+
+ public void init(ServletConfig servletConfig)
+ throws ServletException
+ {
+ this.servletConfig = servletConfig;
+
+ // allocate thread local variables
+ createThreadLocals();
+
+ try
+ {
+ FlexContext.setThreadLocalObjects(null, null, null, null, null, servletConfig);
+ ServletLogTarget.setServletContext(servletConfig.getServletContext());
+
+ FlexConfigurationManager configManager = new FlexConfigurationManager();
+ MessagingConfiguration config = configManager.getMessagingConfiguration(servletConfig);
+
+ config.createLogAndTargets();
+ broker = config.createBroker(servletConfig.getInitParameter("messageBrokerId"),
+ Thread.currentThread().getContextClassLoader());
+
+ // Set the servlet config as thread local
+ FlexContext.setThreadLocalObjects(null, null, broker, null, null, servletConfig);
+
+ setupInternalPathResolver(servletConfig.getServletContext());
+ setInitServletContext(broker, servletConfig.getServletContext());
+
+ // Create endpoints, services, security, and logger on the broker based on configuration
+ config.configureBroker(broker);
+
+ //initialize the httpSessionToFlexSessionMap
+ synchronized(HttpFlexSession.mapLock)
+ {
+ if (servletConfig.getServletContext().getAttribute(HttpFlexSession.SESSION_MAP) == null) {
+ servletConfig.getServletContext().setAttribute(HttpFlexSession.SESSION_MAP, new ConcurrentHashMap());
+ }
+ }
+
+ broker.start();
+
+ configManager.reportTokens();
+ config.reportUnusedProperties();
+
+ // clear the broker and servlet config as this thread is done
+ FlexContext.clearThreadLocalObjects();
+
+ } catch (Throwable t){
+ log.error("MessageBrokerServlet failed to initialize due to runtime exception");
+ destroy();
+ throw new ServletException(t);
+ }
+ }
+
+
+ private void setInitServletContext(flex.messaging.MessageBroker broker, ServletContext ctx)
+ throws Exception
+ {
+ Method setMethod = flex.messaging.MessageBroker.class.
+ getDeclaredMethod("setInitServletContext", ServletContext.class);
+ setMethod.setAccessible(true);
+ Reflections.invoke(setMethod, broker, ctx);
+ }
+
+ private void setupInternalPathResolver(final ServletContext servletContext)
+ {
+ broker.setInternalPathResolver(
+ new flex.messaging.MessageBroker.InternalPathResolver()
+ {
+ public InputStream resolve(String filename)
+ {
+ log.info("internal path resolver " + filename);
+ return Resources.getResourceAsStream(FLEXDIR + filename, servletContext);
+ }
+ }
+ );
+ }
+
+ public void destroy()
+ {
+ if (broker != null) {
+ broker.stop();
+ // release static thread locals
+ destroyThreadLocals();
+ }
+ }
+
+ public void service(HttpServletRequest req, HttpServletResponse res)
+ {
+ log.info("=========== START FLEX REQUEST");
+ try {
+ broker.initThreadLocals();
+
+ FlexContext.setThreadLocalObjects(null, null, broker, req, res, servletConfig);
+
+ // necessary to create for later
+ HttpFlexSession fs = HttpFlexSession.getFlexSession(req);
+ log.info("flex session is " + fs);
+
+ Endpoint endpoint = findEndpoint(req, res);
+ log.info("Endpoint: " + endpoint.describeEndpoint());
+
+ endpoint.service(req, res);
+ } catch (UnsupportedOperationException ue) {
+ sendError(res);
+ } finally {
+ FlexContext.clearThreadLocalObjects();
+ }
+ }
+
+
+ private void sendError(HttpServletResponse res)
+ {
+ if (!res.isCommitted()) {
+ try {
+ res.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
+ } catch (IOException ignored) {
+
+ }
+ }
+ }
+
+
+ private Endpoint findEndpoint(HttpServletRequest req, HttpServletResponse res)
+ {
+ String contextPath = req.getContextPath();
+ String pathInfo = req.getPathInfo();
+ String endpointPath = req.getServletPath();
+ if (pathInfo != null) {
+ endpointPath = endpointPath + pathInfo;
+ }
+
+ log.info("flex request for cp=" + contextPath + " ep=" + endpointPath);
+ try {
+ return broker.getEndpoint(endpointPath, contextPath);
+ } catch (MessageException me) {
+ if (!res.isCommitted()) {
+ try {
+ res.sendError(HttpServletResponse.SC_NOT_FOUND);
+ } catch (IOException ignore) {
+ // ignore
+ }
+ }
+ return null;
+ }
+ }
+
+
+ // Call ONLY on servlet startup
+ public void createThreadLocals()
+ {
+ // allocate static thread local objects
+ flex.messaging.MessageBroker.createThreadLocalObjects();
+ FlexContext.createThreadLocalObjects();
+ flex.messaging.io.SerializationContext.createThreadLocalObjects();
+ flex.messaging.io.TypeMarshallingContext.createThreadLocalObjects();
+ }
+
+ protected void destroyThreadLocals()
+ {
+ // Destroy static thread local objects
+ flex.messaging.MessageBroker.releaseThreadLocalObjects();
+ FlexContext.releaseThreadLocalObjects();
+ flex.messaging.io.SerializationContext.releaseThreadLocalObjects();
+ flex.messaging.io.TypeMarshallingContext.releaseThreadLocalObjects();
+ }
+
+
+ private RemotingService findRemotingService() {
+ return (RemotingService) broker.getServiceByType(RemotingService.class.getName());
+ }
+
+ private void registerSeamAdapter(RemotingService remotingService) {
+ if (remotingService.getRegisteredAdapters().get(SeamAdapter.SEAM_ADAPTER_ID) == null) {
+ remotingService.registerAdapter(SeamAdapter.SEAM_ADAPTER_ID,SeamAdapter.class.getName());
+ }
+ }
+
+ private Destination createDestination(String destinationName, String componentName) {
+ RemotingService remotingService = findRemotingService();
+
+ RemotingDestination destination =
+ (RemotingDestination) remotingService.createDestination(destinationName);
+
+ destination.setFactory(new FlexSeamFactory(destinationName, componentName));
+
+
+ // configure adapter
+ registerSeamAdapter(remotingService);
+ destination.createAdapter(SeamAdapter.SEAM_ADAPTER_ID);
+
+ // configure channel?
+ //System.out.println("-channels " + destination.getChannels());
+
+ return destination;
+ }
+
+ public void addDestinations(Collection<Class<?>> destinations) {
+ for (Class<?> annotatedClass: destinations) {
+ log.info("Adding scanned flex desitionation for class " + annotatedClass);
+ FlexRemote fr = annotatedClass.getAnnotation(FlexRemote.class);
+
+ Name name = annotatedClass.getAnnotation(Name.class);
+
+ String destinationName = fr.name();
+ String componentName = name.value();
+ Destination destination = createDestination(destinationName, componentName);
+
+ destination.start();
+ }
+ }
+
+}
Added: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/Remote.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/Remote.java (rev 0)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/Remote.java 2009-09-11 19:39:06 UTC (rev 11480)
@@ -0,0 +1,41 @@
+package org.jboss.seam.flex;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Create;
+import org.jboss.seam.annotations.Install;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.Startup;
+
+@Name("org.jboss.seam.flex.remote")
+@Startup
+@Install(false)
+(a)Scope(ScopeType.APPLICATION)
+public class Remote
+{
+ String destinationName;
+ String componentName;
+
+ public void setDestinationName(String destionationName) {
+ this.destinationName = destionationName;
+ }
+
+ public String getDestinationName() {
+ return destinationName;
+ }
+
+ public void setComponentName(String componentName) {
+ this.componentName = componentName;
+ }
+
+ public String getComponentName() {
+ return componentName;
+ }
+
+
+ @Create
+ public void init() {
+ //System.out.println("** remoting destination " + destinationName + " for " + componentName);
+ }
+
+}
Added: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/SeamAdapter.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/SeamAdapter.java (rev 0)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/SeamAdapter.java 2009-09-11 19:39:06 UTC (rev 11480)
@@ -0,0 +1,27 @@
+package org.jboss.seam.flex;
+
+
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+
+import flex.messaging.services.remoting.adapters.JavaAdapter;
+import flex.messaging.messages.Message;
+
+/**
+ * The Seam adaptor should translate seam exceptions and do any other additional
+ * management needed
+ */
+public class SeamAdapter
+ extends JavaAdapter
+{
+ public static final String SEAM_ADAPTER_ID = "seam-adapter";
+
+ private static final LogProvider log = Logging.getLogProvider(SeamAdapter.class);
+
+ @Override
+ public Object invoke(Message message) {
+ log.info("SeamAdapter: " + message);
+ return super.invoke(message);
+ }
+
+}
Added: branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/package-info.java
===================================================================
--- branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/package-info.java (rev 0)
+++ branches/community/Seam_2_2/src/flex/org/jboss/seam/flex/package-info.java 2009-09-11 19:39:06 UTC (rev 11480)
@@ -0,0 +1,7 @@
+@Namespace(value="http://jboss.com/products/seam/flex", prefix="org.jboss.seam.flex")
+@AutoCreate
+package org.jboss.seam.flex;
+
+import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.annotations.Namespace;
+
Added: branches/community/Seam_2_2/src/flex/seam.properties
===================================================================
15 years, 3 months
Seam SVN: r11479 - branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2009-09-11 10:07:03 -0400 (Fri, 11 Sep 2009)
New Revision: 11479
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedEntityIdentityInterceptor.java
Log:
JBPAPP-1616
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedEntityIdentityInterceptor.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedEntityIdentityInterceptor.java 2009-09-11 11:35:28 UTC (rev 11478)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/persistence/ManagedEntityIdentityInterceptor.java 2009-09-11 14:07:03 UTC (rev 11479)
@@ -175,11 +175,11 @@
{
Reflections.set(field, bean, null);
}
- else
- {
- // TODO: comment it or not JBPAPP-1616
- setWrappedData(dataModel, null);
- }
+// else
+// {
+// // TODO: comment it or not JBPAPP-1616
+// setWrappedData(dataModel, null);
+// }
}
private void clearWrapper(Field field) throws Exception
15 years, 3 months