Seam SVN: r14292 - in branches/enterprise/JBPAPP_5_0: examples/itext/view and 4 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-02-03 04:52:54 -0500 (Fri, 03 Feb 2012)
New Revision: 14292
Modified:
branches/enterprise/JBPAPP_5_0/build/root.pom.xml
branches/enterprise/JBPAPP_5_0/examples/itext/view/index.xhtml
branches/enterprise/JBPAPP_5_0/src/gen/org/jboss/seam/tool/EclipseClasspathTask.java
branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChart.java
branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java
branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
branches/enterprise/JBPAPP_5_0/ui/src/main/java/org/jboss/seam/ui/ClientUidSelector.java
Log:
JBPAPP-7183 backed port fix for ClientUidSelector
Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2012-02-03 09:15:47 UTC (rev 14291)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2012-02-03 09:52:54 UTC (rev 14292)
@@ -15,7 +15,7 @@
<version.drools>5.1.0.BRMS</version.drools>
<version.testng>5.9</version.testng>
<version.resteasy>1.2.1.GA_CP02</version.resteasy>
- <version.spring>2.5.6.SEC02</version.spring>
+ <version.spring>2.5.6.SEC03</version.spring>
<version.hibernate-core>3.3.2.GA_CP04</version.hibernate-core>
</properties>
Modified: branches/enterprise/JBPAPP_5_0/examples/itext/view/index.xhtml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/itext/view/index.xhtml 2012-02-03 09:15:47 UTC (rev 14291)
+++ branches/enterprise/JBPAPP_5_0/examples/itext/view/index.xhtml 2012-02-03 09:52:54 UTC (rev 14292)
@@ -45,6 +45,7 @@
</li>
<li><s:link view="/swing.xhtml" value="Swing Component" /></li>
<li><s:link view="/fillform.xhtml" value="Fill-in-forms" /></li>
+ <li><s:link view="/piechart.xhtml" value="Bug in Piechart?" /></li>
<ui:remove>
Modified: branches/enterprise/JBPAPP_5_0/src/gen/org/jboss/seam/tool/EclipseClasspathTask.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/gen/org/jboss/seam/tool/EclipseClasspathTask.java 2012-02-03 09:15:47 UTC (rev 14291)
+++ branches/enterprise/JBPAPP_5_0/src/gen/org/jboss/seam/tool/EclipseClasspathTask.java 2012-02-03 09:52:54 UTC (rev 14292)
@@ -37,9 +37,10 @@
for (String path : uberPath.list())
{
- // avoid placing modules on classpath
- if (!path.contains("jboss-seam"))
+ // avoid placing modules on classpath and pom files
+ if (!path.contains("jboss-seam") && !path.contains(".pom"))
{
+ System.out.println("PATH " + path);
String sourcePath = path.substring(0, path.lastIndexOf(".jar")) + "-sources.jar";
String javadocPath = path.substring(0, path.lastIndexOf(".jar")) + "-javadoc.jar";
String eclipsepath = "\t<classpathentry kind=\"lib\" path=\""
Modified: branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChart.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChart.java 2012-02-03 09:15:47 UTC (rev 14291)
+++ branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChart.java 2012-02-03 09:52:54 UTC (rev 14292)
@@ -342,13 +342,9 @@
}
@Override
- public void encodeBegin(FacesContext context) throws IOException {
- dataset = getDataset();
+ public void encodeBegin(FacesContext context) throws IOException {
// bypass super to avoid createITextObject() before the chart is ready
- if (dataset == null) {
- dataset = createDataset();
- }
-
+ dataset = createDataset();
chart = getChart();
if (chart == null) {
chart = createChart(context);
Modified: branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java 2012-02-03 09:15:47 UTC (rev 14291)
+++ branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java 2012-02-03 09:52:54 UTC (rev 14292)
@@ -141,7 +141,10 @@
if (dataset instanceof DefaultPieDataset) {
DefaultPieDataset piedata = (DefaultPieDataset) dataset;
+ System.out.println("Number of items in dataset " + piedata.getItemCount());
+ System.out.println("Adding value " + getNumericValue() + " into dataset " + getKey() );
piedata.setValue(getKey(), getNumericValue());
+ System.out.println("Number of items in dataset " + piedata.getItemCount());
PiePlot plot = (PiePlot) chart.getChart().getPlot();
@@ -165,7 +168,9 @@
// CategoryPlot plot = (CategoryPlot)
// chart.getChart().getPlot();
- data.addValue(getNumericValue(), getSeries(), getKey());
+ System.out.println("Adding value " + getNumericValue() + " into dataset " + data.getValue(getSeries(), getKey()));
+ data.addValue(getNumericValue(), getSeries(), getKey());
+
// } else if (dataset instanceof DefaultXYDataset) {
// DefaultXYDataset data = (DefaultXYDataset) dataset;
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2012-02-03 09:15:47 UTC (rev 14291)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2012-02-03 09:52:54 UTC (rev 14292)
@@ -96,4 +96,6 @@
test.package=com.example.test
richfaces.skin=classic
jboss.domain=default
+openid.account=seamqa.myopenid.com
+openid.password=jboss42
# ant.exec=/usr/bin/ant
Modified: branches/enterprise/JBPAPP_5_0/ui/src/main/java/org/jboss/seam/ui/ClientUidSelector.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/ui/src/main/java/org/jboss/seam/ui/ClientUidSelector.java 2012-02-03 09:15:47 UTC (rev 14291)
+++ branches/enterprise/JBPAPP_5_0/ui/src/main/java/org/jboss/seam/ui/ClientUidSelector.java 2012-02-03 09:52:54 UTC (rev 14292)
@@ -20,6 +20,9 @@
@Name("org.jboss.seam.ui.clientUidSelector")
public class ClientUidSelector extends Selector
{
+
+ private static final long serialVersionUID = 816459544346114991L;
+
private String clientUid;
@Create
@@ -34,7 +37,7 @@
public void seed()
{
if (!isSet()) {
- clientUid = RandomStringUtils.randomAscii(50);
+ clientUid = RandomStringUtils.random(50, true, true);
setCookieValueIfEnabled(clientUid);
}
}
12 years, 11 months
Seam SVN: r14291 - branches/enterprise/JBPAPP_5_0/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-02-03 04:15:47 -0500 (Fri, 03 Feb 2012)
New Revision: 14291
Modified:
branches/enterprise/JBPAPP_5_0/build/default.build.properties
Log:
raised patch number in Version string
Modified: branches/enterprise/JBPAPP_5_0/build/default.build.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/default.build.properties 2012-02-03 09:09:02 UTC (rev 14290)
+++ branches/enterprise/JBPAPP_5_0/build/default.build.properties 2012-02-03 09:15:47 UTC (rev 14291)
@@ -7,7 +7,7 @@
# ------------
major.version 2
minor.version .2
-patchlevel .5
+patchlevel .6
qualifier .EAP5
#
# Other program locations
12 years, 11 months
Seam SVN: r14290 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-02-03 04:09:02 -0500 (Fri, 03 Feb 2012)
New Revision: 14290
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/SafeActions.java
Log:
JBPAPP-7618 - changed scope to Session for SafeActions component
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/SafeActions.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/SafeActions.java 2012-02-03 00:23:54 UTC (rev 14289)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/navigation/SafeActions.java 2012-02-03 09:09:02 UTC (rev 14290)
@@ -28,7 +28,7 @@
* @author Gavin King
*
*/
-(a)Scope(ScopeType.APPLICATION)
+(a)Scope(ScopeType.SESSION)
@BypassInterceptors
@Name("org.jboss.seam.navigation.safeActions")
@Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
12 years, 11 months
Seam SVN: r14289 - in branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam: util and 1 other directory.
by seam-commits＠lists.jboss.org
Author: smendenh(a)redhat.com
Date: 2012-02-02 19:23:54 -0500 (Thu, 02 Feb 2012)
New Revision: 14289
Modified:
branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/ClassIdentifierStrategy.java
branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/IdentifierPolicy.java
branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/PermissionMetadata.java
branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/util/AnnotatedBeanProperty.java
Log:
Changes required for https://issues.jboss.org/browse/JBPAPP-8037
Modified: branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/ClassIdentifierStrategy.java
===================================================================
--- branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/ClassIdentifierStrategy.java 2012-02-02 23:23:00 UTC (rev 14288)
+++ branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/ClassIdentifierStrategy.java 2012-02-03 00:23:54 UTC (rev 14289)
@@ -11,7 +11,7 @@
*
* @author Shane Bryzak
*/
-public class ClassIdentifierStrategy implements IdentifierStrategy
+public class ClassIdentifierStrategy implements IdentifierStrategy, java.io.Serializable
{
private Map<Class,String> identifierNames = new ConcurrentHashMap<Class,String>();
Modified: branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java
===================================================================
--- branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2012-02-02 23:23:00 UTC (rev 14288)
+++ branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/EntityIdentifierStrategy.java 2012-02-03 00:23:54 UTC (rev 14289)
@@ -19,23 +19,31 @@
*
* @author Shane Bryzak
*/
-public class EntityIdentifierStrategy implements IdentifierStrategy
+public class EntityIdentifierStrategy implements IdentifierStrategy, java.io.Serializable
{
- private ValueExpression<EntityManager> entityManager;
+ private transient ValueExpression<EntityManager> entityManager;
- private PersistenceProvider persistenceProvider;
+ private transient PersistenceProvider persistenceProvider;
private Map<Class,String> identifierNames = new ConcurrentHashMap<Class,String>();
+ public void init()
+ {
+ if (persistenceProvider == null)
+ {
+ persistenceProvider = (PersistenceProvider) Component.getInstance(PersistenceProvider.class, true);
+ }
+
+ if (entityManager == null)
+ {
+ entityManager = Expressions.instance().createValueExpression("#{entityManager}", EntityManager.class);
+ }
+
+ }
+
public EntityIdentifierStrategy()
{
- persistenceProvider = (PersistenceProvider) Component.getInstance(PersistenceProvider.class, true);
-
- if (entityManager == null)
- {
- entityManager = Expressions.instance().createValueExpression("#{entityManager}",
- EntityManager.class);
- }
+ init();
}
public boolean canIdentify(Class targetClass)
@@ -45,6 +53,7 @@
public String getIdentifier(Object target)
{
+ if(persistenceProvider == null) init();
Object persProviderId = persistenceProvider.getId(target, lookupEntityManager());
return String.format("%s:%s", getIdentifierName(target.getClass()), persProviderId);
}
@@ -83,6 +92,7 @@
private EntityManager lookupEntityManager()
{
+ if(entityManager == null) init();
return entityManager.getValue();
}
}
Modified: branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/IdentifierPolicy.java
===================================================================
--- branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/IdentifierPolicy.java 2012-02-02 23:23:00 UTC (rev 14288)
+++ branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/IdentifierPolicy.java 2012-02-03 00:23:54 UTC (rev 14289)
@@ -25,7 +25,7 @@
@Scope(APPLICATION)
@BypassInterceptors
@Install(precedence = Install.BUILT_IN)
-public class IdentifierPolicy
+public class IdentifierPolicy implements java.io.Serializable
{
private Map<Class,IdentifierStrategy> strategies = new ConcurrentHashMap<Class,IdentifierStrategy>();
Modified: branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/PermissionMetadata.java
===================================================================
--- branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/PermissionMetadata.java 2012-02-02 23:23:00 UTC (rev 14288)
+++ branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/security/permission/PermissionMetadata.java 2012-02-03 00:23:54 UTC (rev 14289)
@@ -17,7 +17,7 @@
*
* @author Shane Bryzak
*/
-public class PermissionMetadata
+public class PermissionMetadata implements java.io.Serializable
{
private Map<Class,Boolean> usesActionMask = new HashMap<Class,Boolean>();
private Map<Class,Map<String,Long>> classActions = new HashMap<Class,Map<String,Long>>();
Modified: branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/util/AnnotatedBeanProperty.java
===================================================================
--- branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/util/AnnotatedBeanProperty.java 2012-02-02 23:23:00 UTC (rev 14288)
+++ branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/src/main/org/jboss/seam/util/AnnotatedBeanProperty.java 2012-02-03 00:23:54 UTC (rev 14289)
@@ -16,18 +16,28 @@
public class AnnotatedBeanProperty<T extends Annotation> implements Serializable
{
private static final long serialVersionUID = 12345678456L;
- private Field propertyField;
- private Method propertyGetter;
- private Method propertySetter;
+ private transient Field propertyField;
+ private transient Method propertyGetter;
+ private transient Method propertySetter;
private String name;
private Type propertyType;
private T annotation;
private boolean isFieldProperty;
private boolean set = false;
+
+ private Class<?> cls;
+ private Class<T> annotationClass;
public AnnotatedBeanProperty(Class<?> cls, Class<T> annotationClass)
{
+ this.cls = cls;
+ this.annotationClass = annotationClass;
+ init();
+ }
+
+ private void init()
+ {
// First check declared fields
for (Field f : cls.getDeclaredFields())
{
@@ -39,7 +49,7 @@
return;
}
}
-
+
// Then check public fields, in case it's inherited
for (Field f : cls.getFields())
{
@@ -51,7 +61,7 @@
return;
}
}
-
+
// Then check public methods (we ignore private methods)
for (Method m : cls.getMethods())
{
@@ -59,7 +69,7 @@
{
this.annotation = m.getAnnotation(annotationClass);
String methodName = m.getName();
-
+
if ( m.getName().startsWith("get") )
{
this.name = Introspector.decapitalize( m.getName().substring(3) );
@@ -68,7 +78,7 @@
{
this.name = Introspector.decapitalize( m.getName().substring(2) );
}
-
+
if (this.name != null)
{
this.propertyGetter = Reflections.getGetterMethod(cls, this.name);
@@ -83,9 +93,30 @@
"Method: " + m + " in class: " + cls);
}
}
- }
+ }
}
+ public Field getPropertyField()
+ {
+ if (propertyField == null)
+ init();
+ return propertyField;
+ }
+
+ public Method getPropertyGetter()
+ {
+ if (propertyGetter == null)
+ init();
+ return propertyGetter;
+ }
+
+ public Method getPropertySetter()
+ {
+ if (propertySetter == null)
+ init();
+ return propertySetter;
+ }
+
private void setupFieldProperty(Field propertyField)
{
this.propertyField = propertyField;
@@ -98,11 +129,11 @@
{
if (isFieldProperty)
{
- Reflections.setAndWrap(propertyField, bean, value);
+ Reflections.setAndWrap(getPropertyField(), bean, value);
}
else
{
- Reflections.invokeAndWrap(propertySetter, bean, value);
+ Reflections.invokeAndWrap(getPropertySetter(), bean, value);
}
}
@@ -110,11 +141,11 @@
{
if (isFieldProperty)
{
- return Reflections.getAndWrap(propertyField, bean);
+ return Reflections.getAndWrap(getPropertyField(), bean);
}
else
{
- return Reflections.invokeAndWrap(propertyGetter, bean);
+ return Reflections.invokeAndWrap(getPropertyGetter(), bean);
}
}
12 years, 11 months
Seam SVN: r14288 - branches/enterprise.
by seam-commits＠lists.jboss.org
Author: smendenh(a)redhat.com
Date: 2012-02-02 18:23:00 -0500 (Thu, 02 Feb 2012)
New Revision: 14288
Added:
branches/enterprise/JBPAPP_5_1_2_ER2_JBPAPP-8037/
Log:
One-off for JBPAPP-8037
12 years, 11 months
Seam SVN: r14287 - in branches/community/Seam_2_3/examples-ee6: mail/mail-web/src/main/webapp/WEB-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-02-02 09:53:44 -0500 (Thu, 02 Feb 2012)
New Revision: 14287
Modified:
branches/community/Seam_2_3/examples-ee6/mail/mail-web/src/main/webapp/WEB-INF/components.xml
branches/community/Seam_2_3/examples-ee6/pom.xml
Log:
added Mail example into Examples EE6
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-web/src/main/webapp/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-web/src/main/webapp/WEB-INF/components.xml 2012-02-02 14:52:51 UTC (rev 14286)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-web/src/main/webapp/WEB-INF/components.xml 2012-02-02 14:53:44 UTC (rev 14287)
@@ -15,4 +15,6 @@
<!-- If you need to alter the SMTP gateway, comment out this mail-session, -->
<!--<mail:mail-session host="localhost" port="2525" /> -->
+ <!-- uncomment this one and set the host attribute to the name or IP address of your SMTP gateway-->
+ <mail:mail-session host="localhost" tls="false" port="3025" ssl="false" />
</components>
Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-02-02 14:52:51 UTC (rev 14286)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-02-02 14:53:44 UTC (rev 14287)
@@ -17,6 +17,7 @@
<modules>
<module>booking</module>
+ <module>mail</module>
</modules>
<build>
12 years, 11 months
[forge/core] d1dd07: Unit tests
by GitHub
Branch: refs/heads/master
Home: https://github.com/forge/core
Commit: d1dd07c62095b987e6c623cdde607f57743e7075
https://github.com/forge/core/commit/d1dd07c62095b987e6c623cdde607f57743e...
Author: Richard Kennard <richard(a)kennardconsulting.com>
Date: 2012-02-01 (Wed, 01 Feb 2012)
Changed paths:
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilder.java
M scaffold-faces/src/main/resources/scaffold/faces/BackingBean.jv
M scaffold-faces/src/main/resources/scaffold/faces/create.xhtml
M scaffold-faces/src/main/resources/scaffold/faces/forge-style.css
M scaffold-faces/src/main/resources/scaffold/faces/search.xhtml
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/FacesScaffoldTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilderTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/scenario/shopping/FacesScaffoldShoppingClient.java
Log Message:
-----------
Unit tests
Change-Id: I371b6b834e44a3e0c92b88ac7a26a8f059b86204
Commit: 0c8de2c854af028081251606be29c02c7beb9bc5
https://github.com/forge/core/commit/0c8de2c854af028081251606be29c02c7beb...
Author: Richard Kennard <richard(a)kennardconsulting.com>
Date: 2012-02-01 (Wed, 01 Feb 2012)
Changed paths:
R .idea/libraries/Maven__org_jboss_seam_persistence_seam_persistence_api_3_1_0_Beta4.xml
R .idea/libraries/Maven__org_jboss_seam_transaction_seam_transaction_api_3_1_0_Beta3.xml
R .idea/libraries/Maven__org_jboss_solder_solder_api_3_1_0_Beta3.xml
R .idea/libraries/Maven__org_jboss_solder_solder_logging_3_1_0_Beta3.xml
R .idea/libraries/Maven__org_mvel_mvel2_2_1_Beta7.xml
M git-tools/pom.xml
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jpa/PersistenceFacetImpl.java
M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/ServletMappingHelper.java
M javaee-impl/src/test/java/org/jboss/forge/spec/javaee/jsf/ServletMappingHelperTest.java
M javaee-impl/src/test/java/org/jboss/forge/spec/jpa/NewFieldPluginTest.java
M javaee-impl/src/test/java/org/jboss/forge/spec/plugin/RestPluginTest.java
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/AbstractJavaSource.java
M parser-java/src/main/java/org/jboss/forge/parser/java/impl/JavaClassImpl.java
M parser-java/src/test/java/org/jboss/forge/test/parser/java/JavaClassTest.java
M pom.xml
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/FacesScaffoldTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/scenario/FacesScaffoldScenarioTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/scenario/petclinic/FacesScaffoldPetClinicTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/scenario/shopping/FacesScaffoldShoppingTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/scenario/weather/FacesScaffoldWeatherTest.java
M shell-api/src/main/java/org/jboss/forge/shell/util/Streams.java
M test-harness-web/pom.xml
Log Message:
-----------
Merge branch 'master' of git://github.com/forge/core
Commit: 26c94fcba811f0cf868b8430f7e1af2b19e7b6c7
https://github.com/forge/core/commit/26c94fcba811f0cf868b8430f7e1af2b19e7...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2012-02-01 (Wed, 01 Feb 2012)
Changed paths:
M scaffold-faces/src/main/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilder.java
M scaffold-faces/src/main/resources/scaffold/faces/BackingBean.jv
M scaffold-faces/src/main/resources/scaffold/faces/create.xhtml
M scaffold-faces/src/main/resources/scaffold/faces/forge-style.css
M scaffold-faces/src/main/resources/scaffold/faces/search.xhtml
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/FacesScaffoldTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilderTest.java
M scaffold-faces/src/test/java/org/jboss/forge/scaffold/faces/scenario/shopping/FacesScaffoldShoppingClient.java
Log Message:
-----------
Merge pull request #101 from kennardconsulting/master
Unit tests
Compare: https://github.com/forge/core/compare/e1e18bf...26c94fc
12 years, 11 months
Seam SVN: r14285 - in branches/community/Seam_2_3: jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-02-01 17:32:52 -0500 (Wed, 01 Feb 2012)
New Revision: 14285
Modified:
branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/DelegatingFacesContext.java
branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java
branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java
branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java
branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java
Log:
JBSEAM-4893 fixing jboss-seam-mail and relevant infra in jboss-seam-ui/jboss-seam for JSF2
Modified: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/DelegatingFacesContext.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/DelegatingFacesContext.java 2012-02-01 13:24:53 UTC (rev 14284)
+++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/DelegatingFacesContext.java 2012-02-01 22:32:52 UTC (rev 14285)
@@ -1,6 +1,5 @@
package org.jboss.seam.jsf;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -47,11 +46,9 @@
}
- public Map<Object, Object> getAttributes() {
- // FIXME: due JSF 2 new method for
- // javax.faces.context.FacesContext.getAttributes() and non existent
- // JSF 1.2 equivalent method it returns empty Map without delegating call
- return new HashMap<Object, Object>();
+ public Map<Object, Object> getAttributes()
+ {
+ return delegate.getAttributes();
}
@Override
Modified: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java 2012-02-01 13:24:53 UTC (rev 14284)
+++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java 2012-02-01 22:32:52 UTC (rev 14285)
@@ -1,16 +1,13 @@
package org.jboss.seam.jsf;
import java.io.IOException;
-import java.util.List;
import java.util.Locale;
-import java.util.Map;
import javax.faces.FacesException;
import javax.faces.application.ViewHandler;
import javax.faces.application.ViewHandlerWrapper;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
-import javax.faces.view.ViewDeclarationLanguage;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.international.LocaleSelector;
Modified: branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java 2012-02-01 13:24:53 UTC (rev 14284)
+++ branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java 2012-02-01 22:32:52 UTC (rev 14285)
@@ -6,6 +6,8 @@
import javax.faces.context.ResponseWriter;
import org.jboss.seam.jsf.DelegatingFacesContext;
+import org.jboss.seam.mail.ui.context.MailExternalContextImpl;
+import org.jboss.seam.mail.ui.context.MailResponseWriter;
public class MailFacesContextImpl extends DelegatingFacesContext
Modified: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java 2012-02-01 13:24:53 UTC (rev 14284)
+++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java 2012-02-01 22:32:52 UTC (rev 14285)
@@ -13,9 +13,6 @@
import org.jboss.seam.annotations.intercept.BypassInterceptors;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-
import com.sun.faces.application.ApplicationAssociate;
import com.sun.faces.facelets.compiler.SAXCompiler;
@@ -27,26 +24,24 @@
public class FaceletCompiler
{
- private LogProvider log = Logging.getLogProvider(FaceletCompiler.class);
private com.sun.faces.facelets.compiler.Compiler compiler;
@Create
public void create()
{
- compiler = new SAXCompiler();
- // fill the necessary parameters
- initializeCompiler(compiler);
+ ApplicationAssociate applicationAssociate = ApplicationAssociate.getCurrentInstance();
+ if (applicationAssociate != null)
+ {
+ compiler = applicationAssociate.getCompiler();
+ }
+ else
+ {
+ // TODO: this requires to initialize custom tag library
+ compiler = new SAXCompiler();
+ }
}
+
- /*
- * This method cribbed from FaceletViewHandler
- */
- protected void initializeCompiler(com.sun.faces.facelets.compiler.Compiler compiler)
- {
- compiler = ApplicationAssociate.getCurrentInstance().getCompiler();
- }
-
-
@Unwrap
public com.sun.faces.facelets.compiler.Compiler unwrap()
{
Modified: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java 2012-02-01 13:24:53 UTC (rev 14284)
+++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java 2012-02-01 22:32:52 UTC (rev 14285)
@@ -10,16 +10,15 @@
import javax.servlet.ServletContext;
import org.jboss.seam.core.ResourceLoader;
+import org.jboss.seam.jsf.DelegatingFacesContext;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
-import org.jboss.seam.jsf.DelegatingFacesContext;
import org.jboss.seam.mock.MockHttpServletRequest;
import org.jboss.seam.mock.MockHttpServletResponse;
import org.jboss.seam.ui.util.JSF;
+import com.sun.faces.application.ApplicationAssociate;
import com.sun.faces.facelets.Facelet;
-import com.sun.faces.facelets.impl.DefaultFaceletFactory;
-import com.sun.faces.facelets.impl.DefaultResourceResolver;
public class RendererRequest
{
@@ -126,8 +125,7 @@
{
throw new IllegalArgumentException("resource doesn't exist: " + viewId);
}
- return new DefaultFaceletFactory(FaceletCompiler.instance(), new DefaultResourceResolver())
- .getFacelet(url);
+ return ApplicationAssociate.getCurrentInstance().getFaceletFactory().getFacelet(url);
}
/**
12 years, 11 months
[forge/core] e1e18b: [maven-release-plugin] prepare for next developmen...
by GitHub
Branch: refs/heads/master
Home: https://github.com/forge/core
Commit: e1e18bf22c51547e74813dbb2dbf884baa066a4a
https://github.com/forge/core/commit/e1e18bf22c51547e74813dbb2dbf884baa06...
Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com>
Date: 2012-02-01 (Wed, 01 Feb 2012)
Changed paths:
M dev-plugins/pom.xml
M dist/pom.xml
M event-bus-api/pom.xml
M git-tools-tests/pom.xml
M git-tools/pom.xml
M javaee-api/pom.xml
M javaee-impl/pom.xml
M maven-api/pom.xml
M parser-java-api/pom.xml
M parser-java/pom.xml
M parser-xml/pom.xml
M plugin-loader/pom.xml
M pom.xml
M project-model-maven-tests/pom.xml
M project-model-maven/pom.xml
M scaffold-api/pom.xml
M scaffold-faces/pom.xml
M scaffold-plugins/pom.xml
M shell-api/pom.xml
M shell/pom.xml
M test-harness-web/pom.xml
M test-harness/pom.xml
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
12 years, 11 months