[seam-commits] Seam SVN: r14199 - in branches/community/Seam_2_3: distribution/src/main/assembly and 1 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Sep 26 11:53:12 EDT 2011
Author: manaRH
Date: 2011-09-26 11:53:12 -0400 (Mon, 26 Sep 2011)
New Revision: 14199
Added:
branches/community/Seam_2_3/distribution/src/main/assembly/seam
branches/community/Seam_2_3/distribution/src/main/assembly/seam.bat
branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy.settings.xml
Modified:
branches/community/Seam_2_3/.gitignore
Log:
fixed missing ignored project files in seam-gen - second try
Modified: branches/community/Seam_2_3/.gitignore
===================================================================
--- branches/community/Seam_2_3/.gitignore 2011-09-26 15:52:30 UTC (rev 14198)
+++ branches/community/Seam_2_3/.gitignore 2011-09-26 15:53:12 UTC (rev 14199)
@@ -1,7 +1,7 @@
# ignore eclipse files
.project
.classpath
-*.settings*
+.settings/
*.ipr
.idea
*.iws
Added: branches/community/Seam_2_3/distribution/src/main/assembly/seam
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/seam (rev 0)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/seam 2011-09-26 15:53:12 UTC (rev 14199)
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+##############################################
+# #
+# 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 JDK installation"
+ exit 1
+elif [ ! -x "$JAVA_HOME/bin/javac" ]; then
+ echo "The JAVA_HOME environment variable should point to a JDK, not a JRE"
+ exit 1
+fi
+
+WORKING_DIR=$PWD
+
+if [ -z "$SEAM_HOME" ]; then
+ if [ -h "$0" ]; then
+ SEAM_SCRIPT=`readlink "$0"`
+ else
+ SEAM_SCRIPT=$0
+ fi
+ # get the full path without any relative bits (not really necessary)
+ SEAM_SCRIPT_ABS_PATH=`readlink -f "$0" 2>/dev/null`
+ if [ $? -eq 0 ]; then
+ SEAM_SCRIPT=$SEAM_SCRIPT_ABS_PATH
+ fi
+ SEAM_HOME=`dirname "$SEAM_SCRIPT"`
+fi
+
+SEAM_GEN_DIR="$SEAM_HOME/seam-gen"
+SEAM_COMMAND="$1"
+
+echo "SEAM_HOME: $SEAM_HOME"
+echo "Using seam-gen sources from: $SEAM_GEN_DIR"
+
+cygwin=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+esac
+
+if [ -z "$SEAM_COMMAND" ]; then
+ cat "$SEAM_GEN_DIR/USAGE"
+elif [ "$SEAM_COMMAND" = help ]; then
+ cat "$SEAM_GEN_DIR/README"
+elif $cygwin; then
+ # 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_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
Property changes on: branches/community/Seam_2_3/distribution/src/main/assembly/seam
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/community/Seam_2_3/distribution/src/main/assembly/seam.bat
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/seam.bat (rev 0)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/seam.bat 2011-09-26 15:53:12 UTC (rev 14199)
@@ -0,0 +1,63 @@
+ at echo off
+ at if "%OS%" == "Windows_NT" setlocal
+
+rem ##############################################
+rem # #
+rem # seam-gen - Seam project and code generator #
+rem # #
+rem ##############################################
+
+set WORKING_DIR=%CD%
+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%
+
+if [%COMMAND%] == [] (goto usage)
+
+if %COMMAND% == help (goto help)
+
+if ["%JAVA_HOME%"] == [""] (goto nojava)
+
+if not exist "%JAVA_HOME%\bin\javac.exe" (goto nojdk)
+
+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 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"
+goto END_NO_PAUSE
+
+:help
+more "%SEAM_GEN_DIR%\README"
+goto END_NO_PAUSE
+
+:END_NO_PAUSE
Property changes on: branches/community/Seam_2_3/distribution/src/main/assembly/seam.bat
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy.settings.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy.settings.xml (rev 0)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy.settings.xml 2011-09-26 15:53:12 UTC (rev 14199)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivysettings>
+ <settings defaultResolver="seam"/>
+ <include url="${ivy.default.settings.dir}/ivysettings.xml" />
+ <resolvers>
+ <ibiblio name="jboss" m2compatible="true" usepoms="true" root="${jboss.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+ <ibiblio name="jboss-deprec" m2compatible="true" usepoms="true" root="${jboss.deprecated.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+ <chain name="seam" dual="true">
+ <!-- local is always checked; public needs to be before jboss to allow Ivy to properly locate sources -->
+ <resolver ref="public"/>
+ <resolver ref="jboss"/>
+ <resolver ref="jboss-deprec"/>
+ </chain>
+ </resolvers>
+</ivysettings>
More information about the seam-commits
mailing list