SmalltalkWorkspace moved to examples/tomcat - NB stuff removed, directory layout made the same as for webapps/examples
--- a/libs/SmalltalkWorkspace/build.xml Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="SmalltalkWorkspace" default="default" basedir=".">
- <description>Builds, tests, and runs the project SmalltalkWorkspace.</description>
- <import file="nbproject/build-impl.xml"/>
- <!--
-
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
-
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
- -pre-compile-single: called before javac compilation of single file
- -post-compile-single: called after javac compilation of single file
- -pre-compile-test: called before javac compilation of JUnit tests
- -post-compile-test: called after javac compilation of JUnit tests
- -pre-compile-test-single: called before javac compilation of single JUnit test
- -post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
- -pre-run-deploy: called before deploying
- -post-run-deploy: called after deploying
-
- Example of pluging an obfuscator after the compilation could look like
-
- <target name="-post-compile">
- <obfuscate>
- <fileset dir="${build.classes.dir}"/>
- </obfuscate>
- </target>
-
- For list of available properties check the imported
- nbproject/build-impl.xml file.
-
-
- Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
-
- init-macrodef-javac: defines macro for javac compilation
- init-macrodef-junit: defines macro for junit execution
- init-macrodef-debug: defines macro for class debugging
- do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
-
- Example of overriding the target for project execution could look like
-
- <target name="run" depends="<PROJNAME>-impl.jar">
- <exec dir="bin" executable="launcher.exe">
- <arg file="${dist.jar}"/>
- </exec>
- </target>
-
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
-
- -->
-</project>
--- a/libs/SmalltalkWorkspace/nbproject/ant-deploy.xml Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="-deploy-ant" basedir=".">
- <target name="-init" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}"/>
- <tempfile property="temp.module.folder" prefix="tomcat" destdir="${java.io.tmpdir}"/>
- <unwar src="${deploy.ant.archive}" dest="${temp.module.folder}">
- <patternset includes="META-INF/context.xml"/>
- </unwar>
- <xmlproperty file="${temp.module.folder}/META-INF/context.xml"/>
- <delete dir="${temp.module.folder}"/>
- </target>
- <target name="-check-credentials" if="deploy.ant.enabled" depends="-init">
- <fail message="Tomcat password has to be passed as tomcat.password property.">
- <condition>
- <not>
- <isset property="tomcat.password"/>
- </not>
- </condition>
- </fail>
- </target>
- <target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
- <echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/>
- <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"
- classpath="${tomcat.home}/lib/catalina-ant.jar"/>
- <deploy url="${tomcat.url}/manager" username="${tomcat.username}"
- password="${tomcat.password}" path="${Context(path)}"
- war="${deploy.ant.archive}"/>
- <property name="deploy.ant.client.url" value="${tomcat.url}${Context(path)}"/>
- </target>
- <target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
- <echo message="Undeploying ${Context(path)}"/>
- <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask"
- classpath="${tomcat.home}/lib/catalina-ant.jar"/>
- <undeploy url="${tomcat.url}/manager" username="${tomcat.username}"
- password="${tomcat.password}" path="${Context(path)}"/>
- </target>
-</project>
--- a/libs/SmalltalkWorkspace/nbproject/build-impl.xml Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1057 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SmalltalkWorkspace-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or/>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <and>
- <isset property="endorsed.classpath"/>
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </and>
- </condition>
- <condition else="false" property="jdkBug6558476">
- <and>
- <matches pattern="1\.[56]" string="${java.specification.version}"/>
- <not>
- <os family="unix"/>
- </not>
- </and>
- </condition>
- <property name="javac.fork" value="${jdkBug6558476}"/>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <or>
- <istrue value="${j2ee.deploy.on.save}"/>
- <istrue value="${j2ee.compile.on.save}"/>
- </or>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-The Java EE server classpath is not correctly set up - server home directory is missing.
-Either open the project in the IDE and assign the server or setup the server classpath manually.
-For example like this:
- ant -Dj2ee.server.home=<app_server_installation_directory>
- </fail>
- <fail unless="j2ee.platform.classpath">
-The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
-Either open the project in the IDE and assign the server or setup the server classpath manually.
-For example like this:
- ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file)
-or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
- <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
- <delete>
- <files includesfile="${javac.includesfile.binary}"/>
- </delete>
- <delete file="${javac.includesfile.binary}"/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}"/>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg value="-ea"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-The libs.CopyLibs.classpath property is not set up.
-This property must point to
-org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
-<netbeans_installation>/java<version>/ant/extra folder.
-Either open the project in the IDE and make sure CopyLibs library
-exists or setup the property manually. For example like this:
- ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
- <target name="-profile-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-profile-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
- <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
- <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <property name="jspc.schemas" value="/resources/schemas/"/>
- <property name="jspc.dtds" value="/resources/dtds/"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-schemas ${jspc.schemas}"/>
- <arg value="-dtds ${jspc.dtds}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-schemas ${jspc.schemas}"/>
- <arg value="-dtds ${jspc.dtds}"/>
- <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy,-do-update-breakpoints" name="run-deploy"/>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-do-update-breakpoints">
- <webproject1:nbjpdaappreloaded/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- =================
- PROFILING SECTION
- =================
- -->
- <target description="Profile a J2EE project in the IDE." name="profile">
- <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
- <isset property="profiler.info.jvmargs.extra"/>
- </condition>
- <antcall target="${profiler.startserver.target}"/>
- <antcall target="run"/>
- <antcall target="start-loadgen"/>
- </target>
- <target name="start-profiled-server">
- <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
- <jvmarg value="${profiler.info.jvmargs.agent}"/>
- <jvmarg value="${profiler.j2ee.agentID}"/>
- </nbstartprofiledserver>
- </target>
- <target name="start-profiled-server-extraargs">
- <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
- <jvmarg value="${profiler.info.jvmargs.extra}"/>
- <jvmarg value="${profiler.info.jvmargs.agent}"/>
- <jvmarg value="${profiler.j2ee.agentID}"/>
- </nbstartprofiledserver>
- </target>
- <target if="profiler.loadgen.path" name="start-loadgen">
- <loadgenstart path="${profiler.loadgen.path}"/>
- </target>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- <copy todir="${dist.javadoc.dir}">
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/doc-files/**"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/doc-files/**"/>
- </fileset>
- </copy>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir=""/>
- <copy todir="${build.test.classes.dir}"/>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir=""/>
- <copy todir="${build.test.classes.dir}"/>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
- =========================
- TESTS PROFILING SECTION
- =========================
- -->
- <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
- <nbprofiledirect>
- <classpath>
- <path path="${run.test.classpath}"/>
- <path path="${j2ee.platform.classpath}"/>
- </classpath>
- </nbprofiledirect>
- <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
- <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
- <jvmarg value="${profiler.info.jvmargs.agent}"/>
- <jvmarg line="${profiler.info.jvmargs}"/>
- <test name="${profile.class}"/>
- <classpath>
- <path path="${run.test.classpath}"/>
- <path path="${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- </junit>
- </target>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
--- a/libs/SmalltalkWorkspace/nbproject/genfiles.properties Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=17cbd2a6
-build.xml.script.CRC32=52cba8d9
-build.xml.stylesheet.CRC32=651128d4@1.33.1.1
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=17cbd2a6
-nbproject/build-impl.xml.script.CRC32=b3e7c9f9
-nbproject/build-impl.xml.stylesheet.CRC32=0cbf5bb7@1.33.1.1
--- a/libs/SmalltalkWorkspace/nbproject/private/private.properties Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-deploy.ant.properties.file=/home/m/.netbeans/7.0/tomcat60.properties
-j2ee.server.home=/home/m/apps/apache-tomcat-6.0.35
-j2ee.server.instance=tomcat60:home=/home/m/apps/apache-tomcat-6.0.35
-user.properties.file=/home/m/.netbeans/7.0/build.properties
--- a/libs/SmalltalkWorkspace/nbproject/project.properties Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-build.classes.dir=${build.web.dir}/WEB-INF/classes
-build.classes.excludes=**/*.java,**/*.form
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-build.web.dir=${build.dir}/web
-build.web.excludes=${build.classes.excludes}
-client.urlPart=
-compile.jsps=false
-conf.dir=src/conf
-debug.classpath=${build.classes.dir}:${javac.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-display.browser=true
-dist.dir=dist
-dist.ear.war=${dist.dir}/${war.ear.name}
-dist.javadoc.dir=${dist.dir}/javadoc
-dist.war=${dist.dir}/${war.name}
-excludes=
-file.reference.src-java=src/java
-includes=**
-j2ee.compile.on.save=true
-j2ee.deploy.on.save=true
-j2ee.platform=1.5
-j2ee.platform.classpath=${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/dom4j-1.6.1.jar:${j2ee.server.home}/lib/jackson-all-1.9.4.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/vaadin-6.7.1.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/org.springframework.web.servlet-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/jta-1.1.jar:${j2ee.server.home}/lib/org.springframework.jdbc-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/mysql-connector-java-5.1.7-bin.jar:${j2ee.server.home}/lib/velocity-1.6.2.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/iText-2.1.7.jar:${j2ee.server.home}/lib/com.springsource.org.aopalliance-1.0.0.jar:${j2ee.server.home}/lib/commons-beanutils-1.8.0.jar:${j2ee.server.home}/lib/log4j-1.2.15.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/quartz-all-1.6.5.jar:${j2ee.server.home}/lib/hibernate3.jar:${j2ee.server.home}/lib/validation-api-1.0.0.GA.jar:${j2ee.server.home}/lib/jasperreports-3.7.4.jar:${j2ee.server.home}/lib/joda-time-1.6.2.jar:${j2ee.server.home}/lib/commons-logging-1.1.1.jar:${j2ee.server.home}/lib/aopalliance-1.0.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/commons-fileupload-1.2.1.jar:${j2ee.server.home}/lib/spring-security-web-3.0.5.RELEASE.jar:${j2ee.server.home}/lib/commons-collections-3.1.jar:${j2ee.server.home}/lib/aspectj-1.6.8.jar:${j2ee.server.home}/lib/ecj-3.7.jar:${j2ee.server.home}/lib/org.springframework.web.portlet-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/cglib-nodep-2.2.jar:${j2ee.server.home}/lib/org.springframework.web-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/org.springframework.beans-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/spring-security-config-3.0.5.RELEASE.jar:${j2ee.server.home}/lib/spring-security-core-3.0.5.RELEASE.jar:${j2ee.server.home}/lib/commons-lang-2.4.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/commons-io-1.4.jar:${j2ee.server.home}/lib/commons-collections-3.2.1.jar:${j2ee.server.home}/lib/spring-security-taglibs-3.0.5.RELEASE.jar:${j2ee.server.home}/lib/slf4j-api-1.6.0.jar:${j2ee.server.home}/lib/org.springframework.test-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/c3p0-0.9.1.2.jar:${j2ee.server.home}/lib/org.springframework.expression-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/aspectjtools.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/commons-configuration-1.6.jar:${j2ee.server.home}/lib/org.springframework.instrument-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/org.springframework.instrument.tomcat-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/commons-codec-1.3.jar:${j2ee.server.home}/lib/jsoup-1.5.2.jar:${j2ee.server.home}/lib/org.springframework.core-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/org.springframework.context-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/org.springframework.asm-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/hibernate-validator-4.1.0.Final.jar:${j2ee.server.home}/lib/org.springframework.aspects-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/org.springframework.aop-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/antlr-2.7.6.jar:${j2ee.server.home}/lib/jsoup-1.5.2-sources.jar:${j2ee.server.home}/lib/org.springframework.transaction-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/mail.jar:${j2ee.server.home}/lib/commons-net-2.0.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/org.aspectj.matcher.jar:${j2ee.server.home}/lib/jsoup-1.5.2-javadoc.jar:${j2ee.server.home}/lib/velocity-tools-generic-1.4.jar:${j2ee.server.home}/lib/org.springframework.oxm-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/jstl.jar:${j2ee.server.home}/lib/org.springframework.orm-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/javassist-3.9.0.GA.jar:${j2ee.server.home}/lib/standard.jar:${j2ee.server.home}/lib/commons-digester-1.7.jar:${j2ee.server.home}/lib/org.springframework.web.struts-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/org.springframework.jms-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/aspectjrt.jar:${j2ee.server.home}/lib/aspectjweaver.jar:${j2ee.server.home}/lib/org.springframework.context.support-3.1.0.RELEASE.jar:${j2ee.server.home}/lib/postgresql-9.1-901.jdbc4.jar:${j2ee.server.home}/bin/tomcat-juli.jar
-j2ee.server.type=Tomcat
-jar.compress=false
-java.source.based=true
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.debug=true
-javac.deprecation=false
-javac.processorpath=\
- ${javac.classpath}
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-javac.test.processorpath=\
- ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.preview=true
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-no.dependencies=false
-persistence.xml.dir=${conf.dir}
-platform.active=default_platform
-resource.dir=setup
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-# Space-separated list of JVM arguments used when running a class with a main method or a unit test
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
-runmain.jvmargs=
-source.encoding=UTF-8
-source.root=.
-src.dir=${file.reference.src-java}
-test.src.dir=
-war.content.additional=
-war.ear.name=SmalltalkWorkspace.war
-war.name=SmalltalkWorkspace.war
-web.docbase.dir=web
-webinf.dir=web/WEB-INF
--- a/libs/SmalltalkWorkspace/nbproject/project.xml Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SmalltalkWorkspace</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots/>
- </data>
- </configuration>
-</project>
--- a/libs/SmalltalkWorkspace/src/conf/MANIFEST.MF Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
--- a/libs/SmalltalkWorkspace/src/java/stx/libjava/ClassLoader.java Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-package stx.libjava;
-
-/**
- *
- * @author Marcel Hlopko
- */
-public class ClassLoader extends java.lang.ClassLoader {
-
- @Override
- protected Class<?> findClass(String name) throws ClassNotFoundException {
- return findClassS(name);
- }
-
- protected native Class<?> findClassS(String name) throws ClassNotFoundException;
-
- public static java.lang.ClassLoader getSmalltalkClassLoader() {
- return scl;
- }
- protected static ClassLoader scl = new stx.libjava.ClassLoader();
-}
\ No newline at end of file
--- a/libs/SmalltalkWorkspace/src/java/stx/libjava/stworkspace/Evaluator.java Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-package stx.libjava.stworkspace;
-
-/**
- *
- * @author Marcel Hlopko
- */
-public interface Evaluator {
-
- public String evaluate(String code);
-}
--- a/libs/SmalltalkWorkspace/src/java/stx/libjava/stworkspace/EvaluatorServlet.java Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-package stx.libjava.stworkspace;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import stx.libjava.ClassLoader;
-
-/**
- *
- * @author Marcel Hlopko
- */
-public class EvaluatorServlet extends HttpServlet {
-
- @Override
- protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- java.lang.ClassLoader smalltalkClassLoader = ClassLoader.getSmalltalkClassLoader();
- String code = "";
- BufferedReader reader = req.getReader();
- String line;
- while ((line = reader.readLine()) != null) {
- code += line;
- }
- try {
- Class<Evaluator> stCompiler = (Class<Evaluator>) smalltalkClassLoader.loadClass("ByteCodeCompiler");
- String result = stCompiler.newInstance().evaluate(code);
- resp.getWriter().print(result);
- } catch (ClassNotFoundException ex) {
- resp.getWriter().print("Cannot load ByteCodeCompiler - not found");
- } catch (InstantiationException e) {
- resp.getWriter().print("cannot instantiate ByteCodeCompiler: " + e);
- } catch (IllegalAccessException e) {
- resp.getWriter().print("cannot instantiate ByteCodeCompiler - illegal access ");
- } catch (UnsatisfiedLinkError e) {
- resp.getWriter().print("cannot load ByteCodeCompiler - link error ");
- }
- }
-}
--- a/libs/SmalltalkWorkspace/web/META-INF/context.xml Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path="/SmalltalkWorkspace"/>
--- a/libs/SmalltalkWorkspace/web/WEB-INF/web.xml Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>WorkspaceServlet</servlet-name>
- <servlet-class>stx.libjava.stworkspace.EvaluatorServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>WorkspaceServlet</servlet-name>
- <url-pattern>/evaluate</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>
- 30
- </session-timeout>
- </session-config>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
--- a/libs/SmalltalkWorkspace/web/index.jsp Wed Aug 22 14:49:02 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-<%--
- Document : index
- Created on : Aug 21, 2012, 9:03:18 PM
- Author : Marcel Hlopko
---%>
-
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Smalltalk Workspace</title>
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.0/css/bootstrap-combined.min.css"/>
- <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.0/js/bootstrap.min.js"></script>
- <script type="text/javascript">
- $.fn.isBound = function(type, fn) {
- if (this.data('events') === undefined) {
- return false;
- }
- var data = this.data('events')[type];
-
- if (data === undefined || data.length === 0) {
- return false;
- }
- return (-1 !== $.inArray(fn, data.map(function(o) {
- return o.handler
- })));
- };
-
- $.fn.bindIfNotBound = function(eventName, handler) {
- this.each(function() {
- if (!$(this).isBound(eventName, handler)) {
- $(this).bind(eventName, handler);
- }
- });
- };
-
- $(document).ready(function() {
- $("#submit-button").click(function(e) {
- e.preventDefault();
- submitData();
- });
- $("#input").focus();
- });
-
- function submitData() {
- $.ajax({
- type: "POST",
- url: "evaluate",
- data: $("#input").val(),
- contentType: 'application/json;charset=utf-8',
- success: success,
- error: error
- });
- }
-
- function prependNewOutputElement(text, element) {
- outputElement = '' +
- ' <div class="span8 well remove-output">' +
- ' <button class="close">×</button>' +
- ' <p>' + text + '</p>' +
- ' </div>';
- $(outputElement).hide().prependTo(element).fadeIn('slow');
- $(".remove-output").bindIfNotBound("click", function(e) {
- e.preventDefault();
- $(this).fadeOut('slow', function() {$(this).remove();});
- })
- }
-
- function success(result) {
- prependNewOutputElement(result, $("#output"));
- $("#input").val('');
- $("#input").focus();
- }
-
- function error() {
- prependNewOutputElement("Could not talk to the evaluator :(",$("#output"));
- }
- </script>
- </head>
- <body>
- <div class="row" style="margin-top: 30px">
- <div class="span8 offset2">
- <div class="span5">
- <h1>Smalltalk Workspace</h1>
- </div>
- <div class="span2">
- <a id="logo" href="https://swing.fit.cvut.cz/projects/stx-libjava">
- <img src="https://swing.fit.cvut.cz/projects/stx-libjava/chrome/site/javax_web_270x70.png" alt="STX:LIBJAVA" />
- </a>
- </div>
- </div>
- <div class="span8 offset2">
- <p class="lead" style="text-align: justify">
- Hello! I'm Smalltalk Workspace. Write some Smalltalk code
- and I will print the result. By the way, I am running as a Java web application
- deployed on Tomcat. And this Tomcat is running on
- <a href="https://swing.fit.cvut.cz/projects/stx-libjava/">STX:LIBJAVA</a>.
- Pretty cool, huh? :)
- </p>
- <p>
- STX:LIBJAVA is a tiny Java implementation allowing Java programs to run
- directly under
- <a href="http://www.exept.de/en/products/smalltalkx">Smalltalk/X VM</a>.
- </p>
- </div>
- <div class="span9 offset2">
- <div class="row">
- <div class="span8">
- <textarea rows="5" style="width: 100%; resize: none" id="input"></textarea>
- </div>
- </div>
- <div class="row">
- <div class="span2 offset6" >
- <input type="submit" id="submit-button" class="span2 btn btn-primary" value="Evaluate!" />
- </div>
- </div>
- <div id="output" class="row" style="margin-top: 50px;">
- </div>
- </div>
- </div>
- </body>
-</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/examples/tomcat/apache-tomcat-6.0.35-src/webapps/workspace/META-INF/context.xml Wed Aug 22 17:12:03 2012 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context antiJARLocking="true" path="/SmalltalkWorkspace"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/examples/tomcat/apache-tomcat-6.0.35-src/webapps/workspace/WEB-INF/classes/stx/libjava/stworkspace/Evaluator.java Wed Aug 22 17:12:03 2012 +0000
@@ -0,0 +1,10 @@
+package stx.libjava.stworkspace;
+
+/**
+ *
+ * @author Marcel Hlopko
+ */
+public interface Evaluator {
+
+ public String evaluate(String code);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/examples/tomcat/apache-tomcat-6.0.35-src/webapps/workspace/WEB-INF/classes/stx/libjava/stworkspace/EvaluatorServlet.java Wed Aug 22 17:12:03 2012 +0000
@@ -0,0 +1,40 @@
+package stx.libjava.stworkspace;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import stx.libjava.ClassLoader;
+
+/**
+ *
+ * @author Marcel Hlopko
+ */
+public class EvaluatorServlet extends HttpServlet {
+
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ java.lang.ClassLoader smalltalkClassLoader = ClassLoader.getSmalltalkClassLoader();
+ String code = "";
+ BufferedReader reader = req.getReader();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ code += line;
+ }
+ try {
+ Class<Evaluator> stCompiler = (Class<Evaluator>) smalltalkClassLoader.loadClass("ByteCodeCompiler");
+ String result = stCompiler.newInstance().evaluate(code);
+ resp.getWriter().print(result);
+ } catch (ClassNotFoundException ex) {
+ resp.getWriter().print("Cannot load ByteCodeCompiler - not found");
+ } catch (InstantiationException e) {
+ resp.getWriter().print("cannot instantiate ByteCodeCompiler: " + e);
+ } catch (IllegalAccessException e) {
+ resp.getWriter().print("cannot instantiate ByteCodeCompiler - illegal access ");
+ } catch (UnsatisfiedLinkError e) {
+ resp.getWriter().print("cannot load ByteCodeCompiler - link error ");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/examples/tomcat/apache-tomcat-6.0.35-src/webapps/workspace/WEB-INF/web.xml Wed Aug 22 17:12:03 2012 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>WorkspaceServlet</servlet-name>
+ <servlet-class>stx.libjava.stworkspace.EvaluatorServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>WorkspaceServlet</servlet-name>
+ <url-pattern>/evaluate</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>
+ 30
+ </session-timeout>
+ </session-config>
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/examples/tomcat/apache-tomcat-6.0.35-src/webapps/workspace/index.jsp Wed Aug 22 17:12:03 2012 +0000
@@ -0,0 +1,124 @@
+<%--
+ Document : index
+ Created on : Aug 21, 2012, 9:03:18 PM
+ Author : Marcel Hlopko
+--%>
+
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Smalltalk Workspace</title>
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.0/css/bootstrap-combined.min.css"/>
+ <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.0/js/bootstrap.min.js"></script>
+ <script type="text/javascript">
+ $.fn.isBound = function(type, fn) {
+ if (this.data('events') === undefined) {
+ return false;
+ }
+ var data = this.data('events')[type];
+
+ if (data === undefined || data.length === 0) {
+ return false;
+ }
+ return (-1 !== $.inArray(fn, data.map(function(o) {
+ return o.handler
+ })));
+ };
+
+ $.fn.bindIfNotBound = function(eventName, handler) {
+ this.each(function() {
+ if (!$(this).isBound(eventName, handler)) {
+ $(this).bind(eventName, handler);
+ }
+ });
+ };
+
+ $(document).ready(function() {
+ $("#submit-button").click(function(e) {
+ e.preventDefault();
+ submitData();
+ });
+ $("#input").focus();
+ });
+
+ function submitData() {
+ $.ajax({
+ type: "POST",
+ url: "evaluate",
+ data: $("#input").val(),
+ contentType: 'application/json;charset=utf-8',
+ success: success,
+ error: error
+ });
+ }
+
+ function prependNewOutputElement(text, element) {
+ outputElement = '' +
+ ' <div class="span8 well remove-output">' +
+ ' <button class="close">×</button>' +
+ ' <p>' + text + '</p>' +
+ ' </div>';
+ $(outputElement).hide().prependTo(element).fadeIn('slow');
+ $(".remove-output").bindIfNotBound("click", function(e) {
+ e.preventDefault();
+ $(this).fadeOut('slow', function() {$(this).remove();});
+ })
+ }
+
+ function success(result) {
+ prependNewOutputElement(result, $("#output"));
+ $("#input").val('');
+ $("#input").focus();
+ }
+
+ function error() {
+ prependNewOutputElement("Could not talk to the evaluator :(",$("#output"));
+ }
+ </script>
+ </head>
+ <body>
+ <div class="row" style="margin-top: 30px">
+ <div class="span8 offset2">
+ <div class="span5">
+ <h1>Smalltalk Workspace</h1>
+ </div>
+ <div class="span2">
+ <a id="logo" href="https://swing.fit.cvut.cz/projects/stx-libjava">
+ <img src="https://swing.fit.cvut.cz/projects/stx-libjava/chrome/site/javax_web_270x70.png" alt="STX:LIBJAVA" />
+ </a>
+ </div>
+ </div>
+ <div class="span8 offset2">
+ <p class="lead" style="text-align: justify">
+ Hello! I'm Smalltalk Workspace. Write some Smalltalk code
+ and I will print the result. By the way, I am running as a Java web application
+ deployed on Tomcat. And this Tomcat is running on
+ <a href="https://swing.fit.cvut.cz/projects/stx-libjava/">STX:LIBJAVA</a>.
+ Pretty cool, huh? :)
+ </p>
+ <p>
+ STX:LIBJAVA is a tiny Java implementation allowing Java programs to run
+ directly under
+ <a href="http://www.exept.de/en/products/smalltalkx">Smalltalk/X VM</a>.
+ </p>
+ </div>
+ <div class="span9 offset2">
+ <div class="row">
+ <div class="span8">
+ <textarea rows="5" style="width: 100%; resize: none" id="input"></textarea>
+ </div>
+ </div>
+ <div class="row">
+ <div class="span2 offset6" >
+ <input type="submit" id="submit-button" class="span2 btn btn-primary" value="Evaluate!" />
+ </div>
+ </div>
+ <div id="output" class="row" style="margin-top: 50px;">
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
--- a/tests/libjava/.classpath Wed Aug 22 14:49:02 2012 +0000
+++ b/tests/libjava/.classpath Wed Aug 22 17:12:03 2012 +0000
@@ -22,5 +22,8 @@
<classpathentry kind="lib" path="/home/jv/Projects/libjava/libs/tomcat/tomcat-6.0.28-src/lib/tomcat-i18n-fr.jar"/>
<classpathentry kind="lib" path="/home/jv/Projects/libjava/libs/tomcat/tomcat-6.0.28-src/lib/tomcat-i18n-ja.jar"/>
<classpathentry kind="lib" path="/home/jv/Projects/libjava/libs/tomcat/tomcat-6.0.28-src/lib/tomcat-juli.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jv2 - stx:libjava"/>
+ <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
+ <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="output" path="bin"/>
</classpath>
--- a/tests/libjava/.project Wed Aug 22 14:49:02 2012 +0000
+++ b/tests/libjava/.project Wed Aug 22 17:12:03 2012 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>stx:libjava - tests - libjava</name>
+ <name>ext - stx:libjava - tests</name>
<comment></comment>
<projects>
</projects>
@@ -12,6 +12,7 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Binary file thesis/beamer/figures/libjava_world.pdf has changed
Binary file thesis/beamer/figures/object_model_mapping.pdf has changed
Binary file thesis/beamer/libjava-swing.pdf has changed
--- a/thesis/beamer/libjava-swing.tex Wed Aug 22 14:49:02 2012 +0000
+++ b/thesis/beamer/libjava-swing.tex Wed Aug 22 17:12:03 2012 +0000
@@ -118,7 +118,7 @@
\begin{frame}
\fullsizegraphic{-1cm}{-25pt}{figures/cogsb.png}
- \frametitle{Future work}
+ \frametitle{Bits missing -- future work}
\begin{itemize}
\item JIT \pause
\item Integration \pause
--- a/thesis/latex/hlopko-thesis.tex Wed Aug 22 14:49:02 2012 +0000
+++ b/thesis/latex/hlopko-thesis.tex Wed Aug 22 17:12:03 2012 +0000
@@ -116,6 +116,29 @@
\vglue30mm
\noindent{\Huge \textbf{Abstract}}
+
+A possibility to compose program of multiple different programming languages
+is becoming of great importance nowadays. For example, programmers can reuse
+existing software libraries even if they are written in a different language,
+which brings code use one level further. Recently, lot of effort has been spent
+on supporting multiple languages both major runtime environemnts -- Java and CLR.
+
+In this thesis, we will describe an implementation of libjava, a Java language implementation
+running on top of Smalltalk/X virtual machine. Contrary to Java or CLR, libjava is
+not translating Java programs into Smalltalk bytecode. Instead, the VM was modified
+so it can run both Smalltalk and Java bytecode. We have validated our implementation
+on several large Java applications - JUnit testing framework, Groovy compiler,
+Eclipse Java Compiler and Apache Tomcat Servlet Container.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+Lanugage interoperability problem is becoming very common in modern programming languages industry.
+There are many languages written on top of existing Virtual Machines.
+Smalltalk/X is Smalltalk implementation already having support for Ruby, Javascript, XQuery and Pascal.
+In this thesis we describe how we implemented support for Java programming language.
+Our approach is unique in the way how we integrated Java into the Virtual Machine, making Smalltalk and Java equal.
+We present solutions to encountered problems and validate our work on JUnit library, Groovy programming language written in Java and Tomcat, web application server for Java.
+
\vskip 2.75\baselineskip
\noindent
@@ -483,6 +506,7 @@
If the receiver is instance, method or field is looked up in instance and static methods (or fields).
If not found, the same happens in superclass until reaching \texttt{java.lang.Object}.
+}
\subsection{Object Model Mapping}
@@ -505,6 +529,7 @@
\section{Runtime Support}
+\jv{explain!!! what is runtime support}
In this section we will describe the most important classes forming the \libjava{} runtime support.
Runtime support classes in many ways simulate a work, which is normally done by JVM, some of them provide services to the programmer (such as \texttt{Java} class), some of them are important in connecting Java model classes together (such as \texttt{JavaClassReader}), etc.
@@ -639,10 +664,9 @@
Instance and static fields are represented by \texttt{JavaField}.
Instances of JavaField know their index into instVars array of Java object.
-\texttt{JavaMethod} represents a Java method.
-Each class has its methods stored in the methods field.
-\texttt{JavaMethod} is subclass of \texttt{CompiledCode}, which is direct parent of Smalltalk blocks and methods.
-This allows us to use Java methods like any other Smalltalk method, and eases integration of Java methods into development tools.
+\texttt{JavaMethod} represents a Java method. Each class has its methods stored in its method dictionary, just like Smalltalk classes have.
+\texttt{JavaMethod} is subclass of \texttt{CompiledCode}, which is a common superclass representing bytecode-compiled executable thingy.
+This allows us to use Java methods just like any other Smalltalk method and eases integration of Java methods into development tools.
JavaMethod has three subclasses, \texttt{JavaMethodWithException}, representing any Java method, which declares throws clause, \texttt{JavaMethodWithHandler}, representing Java method, which has catch block in its body, and \texttt{JavaNativeMethod}, which represents method written in native code.
\begin{figure}[ht]
@@ -658,8 +682,8 @@
Constant pool is a structure where all constants from classfile are stored - integers or UTF8 literals, but also class references, method references, or field references.
Because runtime system during compilation can differ from the system used to load class file and execute the code, all references to the outside of the class must be symbolic and must be resolved in run time.\footnote{Or at load time, we will talk about reasons for first or second way in chapter \ref{chap:resolving}}
-On the \ref{fig:cp_content} we see classes, instances of which can be found in runtime constant pool of Java class.
-Besides them, there are only primitive values, such as integers or UTF8 literals.
+Figure \ref{fig:cp_content} shows classes, instances of which can be found in runtime constant pool of Java class.
+Besides them, there are only primitive values, such as numbers or strings.
\begin{figure}[ht]
\begin{center}