[seam-commits] Seam SVN: r9448 - in tags/JBoss_Seam_2_1_0_SP1: seam-gen/view and 2 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Oct 27 14:10:02 EDT 2008
Author: norman.richards at jboss.com
Date: 2008-10-27 14:10:02 -0400 (Mon, 27 Oct 2008)
New Revision: 9448
Modified:
tags/JBoss_Seam_2_1_0_SP1/seam
tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/edit.xhtml.ftl
tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/view.xhtml.ftl
tags/JBoss_Seam_2_1_0_SP1/seam.bat
tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/faces-config.xml
tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/seam-excel.taglib.xml
tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/persistence/HibernateSessionProxyInterceptor.java
Log:
merge trunk -r9389:9390 -r9396:9401 -r9404:9405
Modified: tags/JBoss_Seam_2_1_0_SP1/seam
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/seam 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/seam 2008-10-27 18:10:02 UTC (rev 9448)
@@ -1,16 +1,17 @@
#!/bin/sh
-############################################
-#
-# seam-gen - Seam project and code generator
-#
-############################################
+##############################################
+# #
+# seam-gen - Seam project and code generator #
+# #
+############################################ #
+
# Validate the JDK installation
if [ -z "$JAVA_HOME" ]; then
echo "The JAVA_HOME environment variable is not set"
- echo "Please point it to a valid JDK installation"
+ echo "Please point it to a JDK installation"
exit 1
-elif [ ! -x "$JAVA_HOME"/bin/javac ]; then
+elif [ ! -x "$JAVA_HOME/bin/javac" ]; then
echo "The JAVA_HOME environment variable should point to a JDK, not a JRE"
exit 1
fi
@@ -32,12 +33,11 @@
fi
SEAM_GEN_DIR="$SEAM_HOME/seam-gen"
-SEAM_COMMAND="${1}"
+SEAM_COMMAND="$1"
-echo "Location of seam script: $SEAM_HOME"
-echo "seam-gen template folder: $SEAM_GEN_DIR"
+echo "SEAM_HOME: $SEAM_HOME"
+echo "Using seam-gen sources from: $SEAM_GEN_DIR"
-# OS specific support (must be 'true' or 'false').
cygwin=false;
case "`uname`" in
CYGWIN*)
@@ -50,7 +50,12 @@
elif [ "$SEAM_COMMAND" = help ]; then
cat "$SEAM_GEN_DIR/README"
elif $cygwin; then
- java -cp "${JAVA_HOME}\lib\tools.jar;${SEAM_HOME}\build\lib\ant-launcher.jar;${SEAM_HOME}\build\lib\ant-nodeps.jar;${SEAM_HOME}\build\lib\ant.jar" -Dant.home="${SEAM_HOME}\lib" org.apache.tools.ant.launch.Launcher -buildfile "${SEAM_GEN_DIR}\build.xml" -Dworking.dir="$WORKING_DIR" ${*}
+ # Must pass real Windows paths to Java (Java doesn't execute in the context of cgywin)
+ JAVA_HOME_WINPATH=`cygpath -aw "$JAVA_HOME"`
+ SEAM_HOME_WINPATH=`cygpath -aw "$SEAM_HOME"`
+ SEAM_GEN_DIR_WINPATH=`cygpath -aw "$SEAM_GEN_DIR"`
+ WORKING_DIR_WINPATH=`cygpath -aw "$WORKING_DIR"`
+ "$JAVA_HOME/bin/java" -cp "$JAVA_HOME_WINPATH\lib\tools.jar;$SEAM_HOME_WINPATH\build\lib\ant-launcher.jar;$SEAM_HOME_WINPATH\build\lib\ant-nodeps.jar;$SEAM_HOME_WINPATH\build\lib\ant.jar" -Dant.home="$SEAM_HOME_WINPATH\lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR_WINPATH\build.xml" -Dworking.dir="$WORKING_DIR_WINPATH" "$@"
else
- java -cp "${JAVA_HOME}/lib/tools.jar:${SEAM_HOME}/build/lib/ant-launcher.jar:${SEAM_HOME}/build/lib/ant-nodeps.jar:${SEAM_HOME}/build/lib/ant.jar" -Dant.home="${SEAM_HOME}/lib" org.apache.tools.ant.launch.Launcher -buildfile "${SEAM_GEN_DIR}/build.xml" -Dworking.dir="$WORKING_DIR" ${*}
+ "$JAVA_HOME/bin/java" -cp "$JAVA_HOME/lib/tools.jar:$SEAM_HOME/build/lib/ant-launcher.jar:$SEAM_HOME/build/lib/ant-nodeps.jar:$SEAM_HOME/build/lib/ant.jar" -Dant.home="$SEAM_HOME/lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR/build.xml" -Dworking.dir="$WORKING_DIR" "$@"
fi
Modified: tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/edit.xhtml.ftl
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/edit.xhtml.ftl 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/edit.xhtml.ftl 2008-10-27 18:10:02 UTC (rev 9448)
@@ -124,7 +124,7 @@
<#else>
<h:column>
<f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet>
- <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
+ <@outputValue property=parentParentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
Modified: tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/view.xhtml.ftl
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/view.xhtml.ftl 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/seam-gen/view/view.xhtml.ftl 2008-10-27 18:10:02 UTC (rev 9448)
@@ -97,7 +97,7 @@
<#else>
<h:column>
<f:facet name="header">${label(parentProperty.name)} ${label(parentParentPojo.identifierProperty.name)?uncap_first}</f:facet>
- <@outputValue property=parentParentPojo.indentifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
+ <@outputValue property=parentParentPojo.identifierProperty expression="${'#'}{_${parentName}.${parentProperty.name}.${parentParentPojo.identifierProperty.name}}" indent=16/>
</h:column>
</#if>
</#if>
Modified: tags/JBoss_Seam_2_1_0_SP1/seam.bat
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/seam.bat 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/seam.bat 2008-10-27 18:10:02 UTC (rev 9448)
@@ -1,41 +1,63 @@
@echo off
- at if not "%ECHO%" == "" echo %ECHO%
- at if "%OS%" == "Windows_NT" setlocal
+ at if "%OS%" == "Windows_NT" setlocal
+rem ##############################################
+rem # #
+rem # seam-gen - Seam project and code generator #
+rem # #
+rem ##############################################
+
set WORKING_DIR=%CD%
-set SEAM_DIR=%~dp0
-if "%SEAM_DIR:~-1%" == "\" set SEAM_DIR=%SEAM_DIR:~0,-1%
-set SEAM_GEN_DIR=%SEAM_DIR%\seam-gen
+if "%WORKING_DIR:~-1%" == "\" (
+ set WORKING_DIR=%WORKING_DIR:~0,-1%
+)
+
+if ["%SEAM_HOME%"] == [""] (
+ set SEAM_HOME=%~dp0
+) else (
+ if not exist "%SEAM_HOME\seam.bat" (goto noseam)
+)
+if "%SEAM_HOME:~-1%" == "\" (
+ set SEAM_HOME=%SEAM_HOME:~0,-1%
+)
+
+set SEAM_GEN_DIR=%SEAM_HOME%\seam-gen
set COMMAND=%1%
-set ARGS=%*
if [%COMMAND%] == [] (goto usage)
if %COMMAND% == help (goto help)
-if ["%JAVA_HOME%"] == [] (goto nojava)
+if ["%JAVA_HOME%"] == [""] (goto nojava)
if not exist "%JAVA_HOME%\bin\javac.exe" (goto nojdk)
-java -cp "%JAVA_HOME%\lib\tools.jar;%SEAM_DIR%\build\lib\ant-launcher.jar;%SEAM_DIR%\build\lib\ant-nodeps.jar;%SEAM_DIR%\build\lib\ant.jar" -Dant.home="%SEAM_DIR%\lib" org.apache.tools.ant.launch.Launcher -buildfile "%SEAM_GEN_DIR%\build.xml" -Dworking.dir=%WORKING_DIR% %ARGS%
+echo SEAM_HOME: %SEAM_HOME%
+echo Using seam-gen sources from: %SEAM_GEN_DIR%
+"%JAVA_HOME%\bin\java" -cp "%JAVA_HOME%\lib\tools.jar;%SEAM_HOME%\build\lib\ant-launcher.jar;%SEAM_HOME%\build\lib\ant-nodeps.jar;%SEAM_HOME%\build\lib\ant.jar" -Dant.home="%SEAM_HOME%\lib" org.apache.tools.ant.launch.Launcher -buildfile "%SEAM_GEN_DIR%\build.xml" -Dworking.dir="%WORKING_DIR%" %*
+
goto END_NO_PAUSE
:nojava
echo The JAVA_HOME environment variable is not set
-echo Please point it to a valid JDK installation
+echo Please point it to a JDK installation
goto END_NO_PAUSE
:nojdk
echo The JAVA_HOME environment variable should point to a JDK, not a JRE
goto END_NO_PAUSE
+:noseam
+echo The SEAM_HOME environment variable should point to a Seam distribution
+goto END_NO_PAUSE
+
:usage
-more %SEAM_GEN_DIR%\USAGE
+more "%SEAM_GEN_DIR%\USAGE"
goto END_NO_PAUSE
:help
-more %SEAM_GEN_DIR%\README
+more "%SEAM_GEN_DIR%\README"
goto END_NO_PAUSE
-:END_NO_PAUSE
\ No newline at end of file
+:END_NO_PAUSE
Modified: tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/faces-config.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/faces-config.xml 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/faces-config.xml 2008-10-27 18:10:02 UTC (rev 9448)
@@ -84,10 +84,6 @@
<component-type>org.jboss.seam.excel.ui.command.UIRowPageBreak</component-type>
<component-class>org.jboss.seam.excel.ui.command.UIRowPageBreak</component-class>
</component>
- <component>
- <component-type>org.jboss.seam.excel.ui.UIExcelExport</component-type>
- <component-class>org.jboss.seam.excel.ui.UIExcelExport</component-class>
- </component>
<component>
<component-type>org.jboss.seam.excel.ui.UILink</component-type>
<component-class>org.jboss.seam.excel.ui.UILink</component-class>
Modified: tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/seam-excel.taglib.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/seam-excel.taglib.xml 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/src/excel/META-INF/seam-excel.taglib.xml 2008-10-27 18:10:02 UTC (rev 9448)
@@ -146,13 +146,6 @@
</component>
</tag>
- <tag>
- <tag-name>excelExport</tag-name>
- <component>
- <component-type>org.jboss.seam.excel.ui.UIExcelExport</component-type>
- </component>
- </tag>
-
<tag>
<tag-name>debug</tag-name>
<component>
Modified: tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/persistence/HibernateSessionProxyInterceptor.java
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/persistence/HibernateSessionProxyInterceptor.java 2008-10-27 18:02:12 UTC (rev 9447)
+++ tags/JBoss_Seam_2_1_0_SP1/src/main/org/jboss/seam/persistence/HibernateSessionProxyInterceptor.java 2008-10-27 18:10:02 UTC (rev 9448)
@@ -4,12 +4,12 @@
import static org.jboss.seam.ComponentType.STATELESS_SESSION_BEAN;
import javax.annotation.PostConstruct;
-import javax.ejb.PostActivate;
import org.hibernate.Session;
import org.jboss.seam.Component.BijectedAttribute;
import org.jboss.seam.annotations.intercept.AroundInvoke;
import org.jboss.seam.annotations.intercept.Interceptor;
+import org.jboss.seam.annotations.intercept.PostActivate;
import org.jboss.seam.intercept.AbstractInterceptor;
import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.util.Reflections;
More information about the seam-commits
mailing list