diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | .gitmodules | 9 | ||||
| -rw-r--r-- | build.gradle | 37 | ||||
| -rw-r--r-- | build.xml | 94 | ||||
| m--------- | deps/com.juick | 6 | ||||
| m--------- | deps/com.juick.server | 6 | ||||
| m--------- | deps/com.juick.xmpp | 0 | ||||
| -rw-r--r-- | nbproject/ant-deploy.xml | 37 | ||||
| -rw-r--r-- | nbproject/build-impl.xml | 1092 | ||||
| -rw-r--r-- | nbproject/genfiles.properties | 8 | ||||
| -rw-r--r-- | nbproject/project.properties | 87 | ||||
| -rw-r--r-- | nbproject/project.xml | 49 | ||||
| -rw-r--r-- | settings.gradle | 1 | ||||
| -rw-r--r-- | src/conf/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | src/main/java/com/juick/Message.java (renamed from src/java/com/juick/Message.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/Tag.java (renamed from src/java/com/juick/Tag.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/User.java (renamed from src/java/com/juick/User.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/Discover.java (renamed from src/java/com/juick/http/www/Discover.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/Errors.java (renamed from src/java/com/juick/http/www/Errors.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/FacebookLogin.java (renamed from src/java/com/juick/http/www/FacebookLogin.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/Help.java (renamed from src/java/com/juick/http/www/Help.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/Home.java (renamed from src/java/com/juick/http/www/Home.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/Login.java (renamed from src/java/com/juick/http/www/Login.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/Main.java (renamed from src/java/com/juick/http/www/Main.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/NewMessage.java (renamed from src/java/com/juick/http/www/NewMessage.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/PM.java (renamed from src/java/com/juick/http/www/PM.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/PageTemplates.java (renamed from src/java/com/juick/http/www/PageTemplates.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/RSS.java (renamed from src/java/com/juick/http/www/RSS.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/Settings.java (renamed from src/java/com/juick/http/www/Settings.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/SignUp.java (renamed from src/java/com/juick/http/www/SignUp.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/User.java (renamed from src/java/com/juick/http/www/User.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/UserThread.java (renamed from src/java/com/juick/http/www/UserThread.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/Utils.java (renamed from src/java/com/juick/http/www/Utils.java) | 0 | ||||
| -rw-r--r-- | src/main/java/com/juick/http/www/VKontakteLogin.java (renamed from src/java/com/juick/http/www/VKontakteLogin.java) | 0 | ||||
| -rw-r--r-- | src/main/java/ru/sape/Sape.java (renamed from src/java/ru/sape/Sape.java) | 0 | ||||
| -rw-r--r-- | src/main/java/ru/sape/SapeConnection.java (renamed from src/java/ru/sape/SapeConnection.java) | 0 | ||||
| -rw-r--r-- | src/main/java/ru/sape/SapePageLinks.java (renamed from src/java/ru/sape/SapePageLinks.java) | 0 | ||||
| -rw-r--r-- | src/main/java/ru/sape/SerializedPhpParser.java (renamed from src/java/ru/sape/SerializedPhpParser.java) | 0 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/web.xml (renamed from web/WEB-INF/web.xml) | 0 | ||||
| -rw-r--r-- | src/main/webapp/favicon.png (renamed from web/favicon.png) | bin | 244 -> 244 bytes | |||
| -rw-r--r-- | src/main/webapp/logo.png (renamed from web/logo.png) | bin | 1184 -> 1184 bytes | |||
| -rw-r--r-- | src/main/webapp/scripts.js (renamed from web/scripts.js) | 0 | ||||
| -rw-r--r-- | src/main/webapp/style.css (renamed from web/style.css) | 0 | ||||
| -rw-r--r-- | web/META-INF/context.xml | 2 |
44 files changed, 62 insertions, 1374 deletions
@@ -1,3 +1,3 @@ -/build/ -/dist/ -/nbproject/private/
\ No newline at end of file +build/* +.gradle/* +deps/* diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..822ef0b3 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "deps/com.juick"] + path = deps/com.juick + url = ssh://den.jabber.ru:2205/var/lib/git/com.juick.git +[submodule "deps/com.juick.server"] + path = deps/com.juick.server + url = ssh://den.jabber.ru:2205/var/lib/git/com.juick.server.git +[submodule "deps/com.juick.xmpp"] + path = deps/com.juick.xmpp + url = ssh://den.jabber.ru:2205/var/lib/git/com.juick.xmpp.git diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..5b180fd9 --- /dev/null +++ b/build.gradle @@ -0,0 +1,37 @@ +subprojects { + apply plugin: 'java' + repositories { + mavenCentral() + } +} + +apply plugin: 'war' +apply plugin: 'jetty' + +repositories { + mavenCentral() +} + +def core = project(':deps:com.juick') +def server = project(':deps:com.juick.server') +def xmpp = project(':deps:com.juick.xmpp') + +project(':deps:com.juick.server') { + dependencies { + compile core + } +} + +project(':deps:com.juick.xmpp') { + dependencies { + compile core + } +} + +dependencies { + compile 'org.json:json:20150729' + compile core + compile server + compile xmpp + providedCompile 'javax.servlet:javax.servlet-api:3.1.0' +} diff --git a/build.xml b/build.xml deleted file mode 100644 index b66246a0..00000000 --- a/build.xml +++ /dev/null @@ -1,94 +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="com.juick.http.www" default="default" basedir="."> - <description>Builds, tests, and runs the project com.juick.http.www.</description> - <import file="nbproject/build-impl.xml"/> - - <target name="-pre-dist"> - <echo level="info" message="Compressing JavaScript and CSS files...." /> - <path id="yuicompressor.classpath"> - <fileset dir="${ant.home}/lib"> - <include name="yuiant.jar"/> - <include name="yuicompressor-2.4.7.jar"/> - </fileset> - </path> - <taskdef name="yuicompress" classname="com.yahoo.platform.yui.compressor.YUICompressTask"> - <classpath> - <path refid="yuicompressor.classpath"/> - </classpath> - </taskdef> - <yuicompress linebreak="8000" warn="false" munge="yes" preserveallsemicolons="true" outputfolder="${basedir}/${build.web.dir}"> - <fileset dir="${basedir}/web"> - <include name="**/*.js" /> - <include name="**/*.css" /> - </fileset> - </yuicompress> - <echo level="info" message="Compression Complete" /> - </target> - - <!-- - - 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> diff --git a/deps/com.juick b/deps/com.juick new file mode 160000 +Subproject a1a47038e4e37e16211dd7c56aa1051093752db diff --git a/deps/com.juick.server b/deps/com.juick.server new file mode 160000 +Subproject d00fd7705cb1a4b085eed7f34df2f1c6d9a69f7 diff --git a/deps/com.juick.xmpp b/deps/com.juick.xmpp new file mode 160000 +Subproject 0203ca836701e543c903ce14d89c72760388c2b diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml deleted file mode 100644 index cbfe67c3..00000000 --- a/nbproject/ant-deploy.xml +++ /dev/null @@ -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/text" 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/text" username="${tomcat.username}" - password="${tomcat.password}" path="${Context(path)}"/> - </target> -</project> diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml deleted file mode 100644 index c516e2e9..00000000 --- a/nbproject/build-impl.xml +++ /dev/null @@ -1,1092 +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="com.juick.http.www-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> - <available file="${test.src.dir}"/> - </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="test.src.dir">Must set test.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}"> - <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - </batchtest> - <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"> - <ant antfile="${project.com_juick_server}/build.xml" inheritall="false" target="jar"> - <property name="deploy.on.save" value="false"/> - </ant> - <ant antfile="${project.com_juick_xmpp}/build.xml" inheritall="false" target="jar"> - <property name="deploy.on.save" value="false"/> - </ant> - </target> - <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"> - <ant antfile="${project.com_juick_server}/build.xml" inheritall="false" target="jar"> - <property name="deploy.on.save" value="false"/> - </ant> - <ant antfile="${project.com_juick_xmpp}/build.xml" inheritall="false" target="jar"> - <property name="deploy.on.save" value="false"/> - </ant> - </target> - <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"> - <copyfiles files="${reference.com_juick_server.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> - <copyfiles files="${reference.com_juick_xmpp.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> - <copyfiles files="${libs.JSON.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> - <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"> - <copyfiles files="${reference.com_juick_server.jar}" todir="${build.web.dir}/WEB-INF/lib"/> - <copyfiles files="${reference.com_juick_xmpp.jar}" todir="${build.web.dir}/WEB-INF/lib"/> - <copyfiles files="${libs.JSON.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> - </target> - <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="${test.src.dir}"/> - <copy todir="${build.test.classes.dir}"> - <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> - </copy> - </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="${test.src.dir}"/> - <copy todir="${build.test.classes.dir}"> - <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> - </copy> - </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"> - <ant antfile="${project.com_juick_server}/build.xml" inheritall="false" target="clean"/> - <ant antfile="${project.com_juick_xmpp}/build.xml" inheritall="false" target="clean"/> - </target> - <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> diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties deleted file mode 100644 index 91e63deb..00000000 --- a/nbproject/genfiles.properties +++ /dev/null @@ -1,8 +0,0 @@ -build.xml.data.CRC32=8d999c58 -build.xml.script.CRC32=c93fa366 -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=a61f7a05 -nbproject/build-impl.xml.script.CRC32=dc268d62 -nbproject/build-impl.xml.stylesheet.CRC32=0cbf5bb7@1.33.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index c7f77170..00000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,87 +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,**/*.js,**/*.css,**/*.png -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=${source.root}/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} -endorsed.classpath=\ - ${libs.javaee-endorsed-api-6.0.classpath} -excludes= -includes=** -j2ee.compile.on.save=true -j2ee.deploy.on.save=true -j2ee.platform=1.6-web -j2ee.platform.classpath=${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat7-websocket.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.2.2.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/websocket-api.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/annotations-api.jar -j2ee.server.type=Tomcat -jar.compress=false -javac.classpath=\ - ${reference.com_juick_server.jar}:\ - ${reference.com_juick_xmpp.jar}:\ - ${libs.JSON.classpath} -# Space-separated list of extra javac options -javac.compilerargs= -javac.debug=true -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -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= -lib.dir=${web.docbase.dir}/WEB-INF/lib -persistence.xml.dir=${conf.dir} -platform.active=default_platform -project.com_juick_server=../com.juick.server -project.com_juick_xmpp=../com.juick.xmpp -reference.com_juick_server.jar=${project.com_juick_server}/dist/com.juick.server.jar -reference.com_juick_xmpp.jar=${project.com_juick_xmpp}/dist/com.juick.xmpp.jar -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 -src.dir=${source.root}/java -test.src.dir=test -war.content.additional= -war.ear.name=com.juick.http.www.war -war.name=com.juick.http.www.war -web.docbase.dir=web -webinf.dir=web/WEB-INF diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 44d3db08..00000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,49 +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>com.juick.http.www</name> - <minimum-ant-version>1.6.5</minimum-ant-version> - <web-module-libraries> - <library dirs="200"> - <file>${reference.com_juick_server.jar}</file> - <path-in-war>WEB-INF/lib</path-in-war> - </library> - <library dirs="200"> - <file>${reference.com_juick_xmpp.jar}</file> - <path-in-war>WEB-INF/lib</path-in-war> - </library> - <library dirs="200"> - <file>${libs.JSON.classpath}</file> - <path-in-war>WEB-INF/lib</path-in-war> - </library> - </web-module-libraries> - <web-module-additional-libraries/> - <source-roots> - <root id="src.dir"/> - </source-roots> - <test-roots> - <root id="test.src.dir"/> - </test-roots> - </data> - <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> - <reference> - <foreign-project>com_juick_server</foreign-project> - <artifact-type>jar</artifact-type> - <script>build.xml</script> - <target>jar</target> - <clean-target>clean</clean-target> - <id>jar</id> - </reference> - <reference> - <foreign-project>com_juick_xmpp</foreign-project> - <artifact-type>jar</artifact-type> - <script>build.xml</script> - <target>jar</target> - <clean-target>clean</clean-target> - <id>jar</id> - </reference> - </references> - </configuration> -</project> diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..c2600556 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':deps:com.juick', ':deps:com.juick.server', ':deps:com.juick.xmpp' diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF deleted file mode 100644 index 59499bce..00000000 --- a/src/conf/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/src/java/com/juick/Message.java b/src/main/java/com/juick/Message.java index 65c9c015..65c9c015 100644 --- a/src/java/com/juick/Message.java +++ b/src/main/java/com/juick/Message.java diff --git a/src/java/com/juick/Tag.java b/src/main/java/com/juick/Tag.java index 3cee3358..3cee3358 100644 --- a/src/java/com/juick/Tag.java +++ b/src/main/java/com/juick/Tag.java diff --git a/src/java/com/juick/User.java b/src/main/java/com/juick/User.java index e3fc0ae7..e3fc0ae7 100644 --- a/src/java/com/juick/User.java +++ b/src/main/java/com/juick/User.java diff --git a/src/java/com/juick/http/www/Discover.java b/src/main/java/com/juick/http/www/Discover.java index 201139c4..201139c4 100644 --- a/src/java/com/juick/http/www/Discover.java +++ b/src/main/java/com/juick/http/www/Discover.java diff --git a/src/java/com/juick/http/www/Errors.java b/src/main/java/com/juick/http/www/Errors.java index f65b6201..f65b6201 100644 --- a/src/java/com/juick/http/www/Errors.java +++ b/src/main/java/com/juick/http/www/Errors.java diff --git a/src/java/com/juick/http/www/FacebookLogin.java b/src/main/java/com/juick/http/www/FacebookLogin.java index 9658c0d6..9658c0d6 100644 --- a/src/java/com/juick/http/www/FacebookLogin.java +++ b/src/main/java/com/juick/http/www/FacebookLogin.java diff --git a/src/java/com/juick/http/www/Help.java b/src/main/java/com/juick/http/www/Help.java index eed62efa..eed62efa 100644 --- a/src/java/com/juick/http/www/Help.java +++ b/src/main/java/com/juick/http/www/Help.java diff --git a/src/java/com/juick/http/www/Home.java b/src/main/java/com/juick/http/www/Home.java index 52012182..52012182 100644 --- a/src/java/com/juick/http/www/Home.java +++ b/src/main/java/com/juick/http/www/Home.java diff --git a/src/java/com/juick/http/www/Login.java b/src/main/java/com/juick/http/www/Login.java index a24eac2b..a24eac2b 100644 --- a/src/java/com/juick/http/www/Login.java +++ b/src/main/java/com/juick/http/www/Login.java diff --git a/src/java/com/juick/http/www/Main.java b/src/main/java/com/juick/http/www/Main.java index 56aa439f..56aa439f 100644 --- a/src/java/com/juick/http/www/Main.java +++ b/src/main/java/com/juick/http/www/Main.java diff --git a/src/java/com/juick/http/www/NewMessage.java b/src/main/java/com/juick/http/www/NewMessage.java index 34733511..34733511 100644 --- a/src/java/com/juick/http/www/NewMessage.java +++ b/src/main/java/com/juick/http/www/NewMessage.java diff --git a/src/java/com/juick/http/www/PM.java b/src/main/java/com/juick/http/www/PM.java index d0d2f514..d0d2f514 100644 --- a/src/java/com/juick/http/www/PM.java +++ b/src/main/java/com/juick/http/www/PM.java diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/main/java/com/juick/http/www/PageTemplates.java index 7d6bd1c8..7d6bd1c8 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/main/java/com/juick/http/www/PageTemplates.java diff --git a/src/java/com/juick/http/www/RSS.java b/src/main/java/com/juick/http/www/RSS.java index ab96221e..ab96221e 100644 --- a/src/java/com/juick/http/www/RSS.java +++ b/src/main/java/com/juick/http/www/RSS.java diff --git a/src/java/com/juick/http/www/Settings.java b/src/main/java/com/juick/http/www/Settings.java index de37bdd0..de37bdd0 100644 --- a/src/java/com/juick/http/www/Settings.java +++ b/src/main/java/com/juick/http/www/Settings.java diff --git a/src/java/com/juick/http/www/SignUp.java b/src/main/java/com/juick/http/www/SignUp.java index 395232a6..395232a6 100644 --- a/src/java/com/juick/http/www/SignUp.java +++ b/src/main/java/com/juick/http/www/SignUp.java diff --git a/src/java/com/juick/http/www/User.java b/src/main/java/com/juick/http/www/User.java index 83601ade..83601ade 100644 --- a/src/java/com/juick/http/www/User.java +++ b/src/main/java/com/juick/http/www/User.java diff --git a/src/java/com/juick/http/www/UserThread.java b/src/main/java/com/juick/http/www/UserThread.java index 73809f6c..73809f6c 100644 --- a/src/java/com/juick/http/www/UserThread.java +++ b/src/main/java/com/juick/http/www/UserThread.java diff --git a/src/java/com/juick/http/www/Utils.java b/src/main/java/com/juick/http/www/Utils.java index afaf131e..afaf131e 100644 --- a/src/java/com/juick/http/www/Utils.java +++ b/src/main/java/com/juick/http/www/Utils.java diff --git a/src/java/com/juick/http/www/VKontakteLogin.java b/src/main/java/com/juick/http/www/VKontakteLogin.java index 5f26fef1..5f26fef1 100644 --- a/src/java/com/juick/http/www/VKontakteLogin.java +++ b/src/main/java/com/juick/http/www/VKontakteLogin.java diff --git a/src/java/ru/sape/Sape.java b/src/main/java/ru/sape/Sape.java index c00054ae..c00054ae 100644 --- a/src/java/ru/sape/Sape.java +++ b/src/main/java/ru/sape/Sape.java diff --git a/src/java/ru/sape/SapeConnection.java b/src/main/java/ru/sape/SapeConnection.java index 8c794b08..8c794b08 100644 --- a/src/java/ru/sape/SapeConnection.java +++ b/src/main/java/ru/sape/SapeConnection.java diff --git a/src/java/ru/sape/SapePageLinks.java b/src/main/java/ru/sape/SapePageLinks.java index 498aeac0..498aeac0 100644 --- a/src/java/ru/sape/SapePageLinks.java +++ b/src/main/java/ru/sape/SapePageLinks.java diff --git a/src/java/ru/sape/SerializedPhpParser.java b/src/main/java/ru/sape/SerializedPhpParser.java index a24551b9..a24551b9 100644 --- a/src/java/ru/sape/SerializedPhpParser.java +++ b/src/main/java/ru/sape/SerializedPhpParser.java diff --git a/web/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 16e4d30f..16e4d30f 100644 --- a/web/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml diff --git a/web/favicon.png b/src/main/webapp/favicon.png Binary files differindex bc7161e2..bc7161e2 100644 --- a/web/favicon.png +++ b/src/main/webapp/favicon.png diff --git a/web/logo.png b/src/main/webapp/logo.png Binary files differindex 933f6099..933f6099 100644 --- a/web/logo.png +++ b/src/main/webapp/logo.png diff --git a/web/scripts.js b/src/main/webapp/scripts.js index 50c8b8d0..50c8b8d0 100644 --- a/web/scripts.js +++ b/src/main/webapp/scripts.js diff --git a/web/style.css b/src/main/webapp/style.css index ea069c25..ea069c25 100644 --- a/web/style.css +++ b/src/main/webapp/style.css diff --git a/web/META-INF/context.xml b/web/META-INF/context.xml deleted file mode 100644 index 5bee3dc3..00000000 --- a/web/META-INF/context.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path=""/> |
