Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 28274 invoked from network); 5 Jun 2007 19:04:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jun 2007 19:04:11 -0000 Received: (qmail 35594 invoked by uid 500); 5 Jun 2007 19:04:14 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 35448 invoked by uid 500); 5 Jun 2007 19:04:14 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 35433 invoked by uid 99); 5 Jun 2007 19:04:14 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2007 12:04:14 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2007 12:04:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 47A771A981A; Tue, 5 Jun 2007 12:03:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r544595 - in /geronimo/sandbox/j2g: plugins/org.apache.geronimo.j2g.jasper/src/org/apache/geronimo/j2g/jasper/ src/main/resources/ Date: Tue, 05 Jun 2007 19:03:47 -0000 To: scm@geronimo.apache.org From: dwoods@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070605190349.47A771A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dwoods Date: Tue Jun 5 12:03:46 2007 New Revision: 544595 URL: http://svn.apache.org/viewvc?view=rev&rev=544595 Log: GERONIMO-3158 - J2G should support *nix Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.jasper/src/org/apache/geronimo/j2g/jasper/JspCompiler.java geronimo/sandbox/j2g/src/main/resources/j2g-configure.sh geronimo/sandbox/j2g/src/main/resources/jdesc2g.sh geronimo/sandbox/j2g/src/main/resources/jres2g.sh geronimo/sandbox/j2g/src/main/resources/jsrc2g.sh Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.jasper/src/org/apache/geronimo/j2g/jasper/JspCompiler.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.jasper/src/org/apache/geronimo/j2g/jasper/JspCompiler.java?view=diff&rev=544595&r1=544594&r2=544595 ============================================================================== --- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.jasper/src/org/apache/geronimo/j2g/jasper/JspCompiler.java (original) +++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.jasper/src/org/apache/geronimo/j2g/jasper/JspCompiler.java Tue Jun 5 12:03:46 2007 @@ -85,10 +85,10 @@ File[] fileList = file.listFiles(jspFilesFilter); for (int i = 0; i < fileList.length; i++) { if (fileList[i].isDirectory()) { - searchJspFiles(base + File.separator + fileList[i].getName(), fileList[i]); + searchJspFiles("." + base + File.separator + fileList[i].getName(), fileList[i]); } else { - jspCompiler.setJspFiles(base + File.separator + fileList[i].getName()); + jspCompiler.setJspFiles("." + base + File.separator + fileList[i].getName()); } } } Modified: geronimo/sandbox/j2g/src/main/resources/j2g-configure.sh URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/j2g-configure.sh?view=diff&rev=544595&r1=544594&r2=544595 ============================================================================== --- geronimo/sandbox/j2g/src/main/resources/j2g-configure.sh (original) +++ geronimo/sandbox/j2g/src/main/resources/j2g-configure.sh Tue Jun 5 12:03:46 2007 @@ -18,6 +18,22 @@ # -------------------------------------------------------------------- # $Rev$ $Date$ # -------------------------------------------------------------------- +if [ -z $ECLIPSE_HOME ]; then + echo "" + echo "ERROR: ECLIPSE_HOME not found in the environment." + echo "Please specify the path to the Eclipse SDK now, or define it as an environment variable and restart this tool." + echo "(Note: This will ONLY be in effect for this session)." + echo "" + echo -n "ECLIPSE_HOME=" + read ECLIPSE_HOME + export ECLIPSE_HOME=$ECLIPSE_HOME +fi + +echo "" +echo "Copying J2G plugins to $ECLIPSE_HOME/plugins/ ..." +echo "" +cp -vf ../plugins/*.jar $ECLIPSE_HOME/plugins/ +echo "" +java -cp ../lib/configurator-1.0.0-SNAPSHOT.jar org.apache.geronimo.j2g.Configurator $ECLIPSE_HOME -java -cp configurator.jar org.apache.geronimo.j2g.Configurator $ECLIPSE_HOME Modified: geronimo/sandbox/j2g/src/main/resources/jdesc2g.sh URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/jdesc2g.sh?view=diff&rev=544595&r1=544594&r2=544595 ============================================================================== --- geronimo/sandbox/j2g/src/main/resources/jdesc2g.sh (original) +++ geronimo/sandbox/j2g/src/main/resources/jdesc2g.sh Tue Jun 5 12:03:46 2007 @@ -18,4 +18,25 @@ # -------------------------------------------------------------------- # $Rev$ $Date$ # -------------------------------------------------------------------- -java -classpath $ECLIPSE_HOME\startup.jar org.eclipse.core.launcher.Main -application org.apache.geronimo.j2g.descriptors.tool -data $WORKSPACE "$*" \ No newline at end of file +if [ -z $ECLIPSE_HOME ]; then + echo "" + echo "ERROR: ECLIPSE_HOME not found in the environment." + echo "Please specify the path to the Eclipse SDK now, or define it as an environment variable and restart this tool." + echo "(Note: This will ONLY be in effect for this session)." + echo "" + echo -n "ECLIPSE_HOME=" + read ECLIPSE_HOME + STARTUP_JAR=$ECLIPSE_HOME +fi + +if [ -z $WORKSPACE ]; then + echo "" + echo "ERROR: WORKSPACE not found in the environment." + echo "Please specify a path for an Eclipse workspace now, or define it as an environment variable and restart this tool." + echo "(Note: This will ONLY be in effect for this session)." + echo "" + echo -n "WORKSPACE=" + read WORKSPACE +fi + +java -classpath $ECLIPSE_HOME/plugins/org.eclipse.equinox.launcher_*.jar org.eclipse.core.launcher.Main -application org.apache.geronimo.j2g.descriptors.tool -data $WORKSPACE $* Modified: geronimo/sandbox/j2g/src/main/resources/jres2g.sh URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/jres2g.sh?view=diff&rev=544595&r1=544594&r2=544595 ============================================================================== --- geronimo/sandbox/j2g/src/main/resources/jres2g.sh (original) +++ geronimo/sandbox/j2g/src/main/resources/jres2g.sh Tue Jun 5 12:03:46 2007 @@ -18,5 +18,25 @@ # -------------------------------------------------------------------- # $Rev$ $Date$ # -------------------------------------------------------------------- +if [ -z $ECLIPSE_HOME ]; then + echo "" + echo "ERROR: ECLIPSE_HOME not found in the environment." + echo "Please specify the path to the Eclipse SDK now, or define it as an environment variable and restart this tool." + echo "(Note: This will ONLY be in effect for this session)." + echo "" + echo -n "ECLIPSE_HOME=" + read ECLIPSE_HOME + STARTUP_JAR=$ECLIPSE_HOME +fi -java -classpath $ECLIPSE_HOME\startup.jar org.eclipse.core.launcher.Main -application org.apache.geronimo.j2g.resources.tool -data $WORKSPACE "$*" \ No newline at end of file +if [ -z $WORKSPACE ]; then + echo "" + echo "ERROR: WORKSPACE not found in the environment." + echo "Please specify a path for an Eclipse workspace now, or define it as an environment variable and restart this tool." + echo "(Note: This will ONLY be in effect for this session)." + echo "" + echo -n "WORKSPACE=" + read WORKSPACE +fi + +java -classpath $ECLIPSE_HOME/plugins/org.eclipse.equinox.launcher_*.jar org.eclipse.core.launcher.Main -application org.apache.geronimo.j2g.resources.tool -data $WORKSPACE $* Modified: geronimo/sandbox/j2g/src/main/resources/jsrc2g.sh URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/jsrc2g.sh?view=diff&rev=544595&r1=544594&r2=544595 ============================================================================== --- geronimo/sandbox/j2g/src/main/resources/jsrc2g.sh (original) +++ geronimo/sandbox/j2g/src/main/resources/jsrc2g.sh Tue Jun 5 12:03:46 2007 @@ -18,4 +18,25 @@ # -------------------------------------------------------------------- # $Rev$ $Date$ # -------------------------------------------------------------------- -java -classpath $ECLIPSE_HOME\startup.jar org.eclipse.core.launcher.Main -application org.apache.geronimo.j2g.sources.tool -data $WORKSPACE "$*" \ No newline at end of file +if [ -z $ECLIPSE_HOME ]; then + echo "" + echo "ERROR: ECLIPSE_HOME not found in the environment." + echo "Please specify the path to the Eclipse SDK now, or define it as an environment variable and restart this tool." + echo "(Note: This will ONLY be in effect for this session)." + echo "" + echo -n "ECLIPSE_HOME=" + read ECLIPSE_HOME + STARTUP_JAR=$ECLIPSE_HOME +fi + +if [ -z $WORKSPACE ]; then + echo "" + echo "ERROR: WORKSPACE not found in the environment." + echo "Please specify a path for an Eclipse workspace now, or define it as an environment variable and restart this tool." + echo "(Note: This will ONLY be in effect for this session)." + echo "" + echo -n "WORKSPACE=" + read WORKSPACE +fi + +java -classpath $ECLIPSE_HOME/plugins/org.eclipse.equinox.launcher_*.jar org.eclipse.core.launcher.Main -application org.apache.geronimo.j2g.sources.tool -data $WORKSPACE -configuration $ECLIPSE_HOME/configuration $*